tolag3/fairnet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'tolag3'

Browse Source
This commit is contained in:
leejunho 2024-11-18 12:39:13 +09:00
parent 98857982e6
commit 752391a2c3
4 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -546,7 +546,7 @@
<build> <build>
<defaultGoal>install</defaultGoal> <defaultGoal>install</defaultGoal>
<directory>${basedir}/target</directory> <directory>${basedir}/target</directory>
<finalName>fairnet</finalName> <finalName>ROOT</finalName>
<pluginManagement> <pluginManagement>
<plugins> <plugins>
<plugin> <plugin>

3
src/main/java/seed/com/user/check/WebUserCheckController.java
View File

@ -446,6 +446,9 @@ public class WebUserCheckController {
session.setAttribute("hpSex", hpSex); session.setAttribute("hpSex", hpSex);
session.setAttribute("hpFgnGbn", hpFgnGbn); session.setAttribute("hpFgnGbn", hpFgnGbn);
session.setAttribute("hpDi", hpDi); session.setAttribute("hpDi", hpDi);
if("".equals(SeedUtils.setReplaceNull(hpCi1))) {
hpCi1 = hpDi;
}
session.setAttribute("hpCi1", hpCi1); session.setAttribute("hpCi1", hpCi1);
session.setAttribute("hpCi2", hpCi2); session.setAttribute("hpCi2", hpCi2);
session.setAttribute("hpResult", hpResult); session.setAttribute("hpResult", hpResult);

2
src/main/resources/egovframework/egovProps/globals_svr.properties
View File

@ -397,7 +397,7 @@ nice.uid=kofair
nice.pwd=kofair2016! nice.pwd=kofair2016!
#oz \uc11c\ubc84 \uc8fc\uc18c #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 #\uadf8\ub8f9\uc6e8\uc5b4 \uc5f0\ub3d9 \uc8fc\uc18c
gw.url=https://gwd.unicologx.com gw.url=https://gwd.unicologx.com

2
src/main/webapp/META-INF/context.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Context path="/"> <Context path="" docBase="ROOT" reloadable="true">
<!-- 운영환경에따른 분기 --> <!-- 운영환경에따른 분기 -->
<Resource <Resource