Merge branch 'tolag3'
This commit is contained in:
parent
98857982e6
commit
752391a2c3
2
pom.xml
2
pom.xml
@ -546,7 +546,7 @@
|
||||
<build>
|
||||
<defaultGoal>install</defaultGoal>
|
||||
<directory>${basedir}/target</directory>
|
||||
<finalName>fairnet</finalName>
|
||||
<finalName>ROOT</finalName>
|
||||
<pluginManagement>
|
||||
<plugins>
|
||||
<plugin>
|
||||
|
||||
@ -446,6 +446,9 @@ public class WebUserCheckController {
|
||||
session.setAttribute("hpSex", hpSex);
|
||||
session.setAttribute("hpFgnGbn", hpFgnGbn);
|
||||
session.setAttribute("hpDi", hpDi);
|
||||
if("".equals(SeedUtils.setReplaceNull(hpCi1))) {
|
||||
hpCi1 = hpDi;
|
||||
}
|
||||
session.setAttribute("hpCi1", hpCi1);
|
||||
session.setAttribute("hpCi2", hpCi2);
|
||||
session.setAttribute("hpResult", hpResult);
|
||||
|
||||
@ -397,7 +397,7 @@ nice.uid=kofair
|
||||
nice.pwd=kofair2016!
|
||||
|
||||
#oz \uc11c\ubc84 \uc8fc\uc18c
|
||||
oz.ozServerNm=http://119.193.215.98:8086
|
||||
oz.ozServerNm=http://119.193.215.98:8086\uc2e4\uc11c\ubc84\ub294 8071\ud3ec\ud2b8
|
||||
|
||||
#\uadf8\ub8f9\uc6e8\uc5b4 \uc5f0\ub3d9 \uc8fc\uc18c
|
||||
gw.url=https://gwd.unicologx.com
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Context path="/">
|
||||
<Context path="" docBase="ROOT" reloadable="true">
|
||||
|
||||
<!-- 운영환경에따른 분기 -->
|
||||
<Resource
|
||||
|
||||
Loading…
Reference in New Issue
Block a user