From 752391a2c3d876cc8d1226b763f429fce46af256 Mon Sep 17 00:00:00 2001
From: tolag3 <tolag3@gmail.com>
Date: Mon, 18 Nov 2024 12:39:13 +0900
Subject: [PATCH] Merge branch 'tolag3'

---
 pom.xml                                                        | 2 +-
 src/main/java/seed/com/user/check/WebUserCheckController.java  | 3 +++
 .../resources/egovframework/egovProps/globals_svr.properties   | 2 +-
 src/main/webapp/META-INF/context.xml                           | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index ec1f3e34..f61edf18 100644
--- a/pom.xml
+++ b/pom.xml
@@ -546,7 +546,7 @@
     <build>
         <defaultGoal>install</defaultGoal>
         <directory>${basedir}/target</directory>
-		<finalName>fairnet</finalName>
+		<finalName>ROOT</finalName>
         <pluginManagement>
             <plugins>
                 <plugin>
diff --git a/src/main/java/seed/com/user/check/WebUserCheckController.java b/src/main/java/seed/com/user/check/WebUserCheckController.java
index e92126c1..c5ee1752 100644
--- a/src/main/java/seed/com/user/check/WebUserCheckController.java
+++ b/src/main/java/seed/com/user/check/WebUserCheckController.java
@@ -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);
diff --git a/src/main/resources/egovframework/egovProps/globals_svr.properties b/src/main/resources/egovframework/egovProps/globals_svr.properties
index 0800c5d9..d72e6b07 100644
--- a/src/main/resources/egovframework/egovProps/globals_svr.properties
+++ b/src/main/resources/egovframework/egovProps/globals_svr.properties
@@ -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
diff --git a/src/main/webapp/META-INF/context.xml b/src/main/webapp/META-INF/context.xml
index 9e8f46e6..b107e4cb 100644
--- a/src/main/webapp/META-INF/context.xml
+++ b/src/main/webapp/META-INF/context.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Context path="/">
+<Context path="" docBase="ROOT" reloadable="true">
 
 	<!-- 운영환경에따른 분기 -->
 	<Resource