From 71fe0b0687fa9d4865d45b0f1e3294d2467d66a1 Mon Sep 17 00:00:00 2001
From: tolag3 <tolag3@gmail.com>
Date: Mon, 30 Dec 2024 11:36:41 +0900
Subject: [PATCH] =?UTF-8?q?=E3=85=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../egovProps/globals_svr.properties          |  2 +-
 .../egovProps/globals_svr_test.properties     |  2 +-
 src/main/webapp/META-INF/context.xml          | 12 ++++++++-
 .../clipreport4/DataConnection.properties     | 25 ++++++++++++-------
 4 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/src/main/resources/egovframework/egovProps/globals_svr.properties b/src/main/resources/egovframework/egovProps/globals_svr.properties
index c9f037bb..9c7e6b17 100644
--- a/src/main/resources/egovframework/egovProps/globals_svr.properties
+++ b/src/main/resources/egovframework/egovProps/globals_svr.properties
@@ -22,7 +22,7 @@ Globals.LocalIp = 127.0.0.1
 # DB\uc11c\ubc84 \ud0c0\uc785(mysql,oracle,altibase,tibero) - datasource \ubc0f sqlMap \ud30c\uc77c \uc9c0\uc815\uc5d0 \uc0ac\uc6a9\ub428
 Globals.DbType = oracle
 Globals.UserName= FAIRNETUR
-Globals.Password= FAIRNETUR@#$
+Globals.Password= FAIRNETUR!@#$
 
 # oracle
 Globals.DriverClassName=oracle.jdbc.OracleDriver
diff --git a/src/main/resources/egovframework/egovProps/globals_svr_test.properties b/src/main/resources/egovframework/egovProps/globals_svr_test.properties
index ab496095..b7cf272b 100644
--- a/src/main/resources/egovframework/egovProps/globals_svr_test.properties
+++ b/src/main/resources/egovframework/egovProps/globals_svr_test.properties
@@ -26,7 +26,7 @@ Globals.Password= FAIRNETUR@#$
 
 # oracle
 Globals.DriverClassName=oracle.jdbc.OracleDriver
-Globals.Url=jdbc:oracle:thin:@119.193.215.98:1523:XE
+Globals.Url=jdbc:oracle:thin:@119.193.215.98:1524:XE
 
 # MainPage Setting(admin)
 Globals.MainPage = /cmm/main/mainPage.do
diff --git a/src/main/webapp/META-INF/context.xml b/src/main/webapp/META-INF/context.xml
index 52e11d89..ba606de9 100644
--- a/src/main/webapp/META-INF/context.xml
+++ b/src/main/webapp/META-INF/context.xml
@@ -29,7 +29,17 @@
 		username="FAIRNETUR"
 		password="FAIRNETUR@#$"
 		type="javax.sql.DataSource"
-		url="jdbc:oracle:thin:@192.168.0.60:1524/XE"
+		url="jdbc:oracle:thin:@211.245.106.125:1521/XE"
+		factory="org.apache.tomcat.jdbc.pool.DataSourceFactory"
+	/>
+	<Resource
+		name="jndi/svr_test"
+		auth="Container"
+		driverClassName="oracle.jdbc.driver.OracleDriver"
+		username="FAIRNETUR"
+		password="FAIRNETUR@#$"
+		type="javax.sql.DataSource"
+		url="jdbc:oracle:thin:@119.193.215.98:1524/XE"
 		factory="org.apache.tomcat.jdbc.pool.DataSourceFactory"
 	/>
 	<!-- 심볼릭링크 걸린 폴더를 tomcat이 허용하도록 설정(보안상 기본값 false) -->
diff --git a/src/main/webapp/WEB-INF/clipreport4/DataConnection.properties b/src/main/webapp/WEB-INF/clipreport4/DataConnection.properties
index 093eff11..efee84dd 100644
--- a/src/main/webapp/WEB-INF/clipreport4/DataConnection.properties
+++ b/src/main/webapp/WEB-INF/clipreport4/DataConnection.properties
@@ -6,23 +6,30 @@
 # version SQL_Server 2000, 2005, 2008, 2012
 dataconnection.count=3
 
+
+################################# \uac1c\ubc1c #################################
 dataconnection1.conntype=jdbc
 dataconnection1.type=Oracle
-#dataconnection1.dbname=oracle1
 dataconnection1.dbname=XE
 dataconnection1.version=
-#dataconnection1.url=jdbc:oracle:thin:@192.168.0.254:1521:orcl
-dataconnection1.url=jdbc:oracle:thin:@192.168.0.60:1524:XE
-#dataconnection1.url=jdbc:oracle:thin:@218.234.66.99:1521:orcl
-#dataconnection1.url=jdbc:oracle:thin:@211.245.106.115:1521:kofairdb
-#dataconnection1.user=case
+dataconnection1.url=jdbc:oracle:thin:@119.193.215.98:1524:XE
 dataconnection1.user=FAIRNETUR
-#dataconnection1.user=newcasedb
-#dataconnection1.password=case1234
 dataconnection1.password=FAIRNETUR@#$
-#dataconnection1.password=newcasedb1130
 dataconnection1.encoding=
 dataconnection1.decoding=
+################################# \uac1c\ubc1c #################################
+
+################################# \uc2e4\uc11c\ubc84 #################################
+dataconnection1.conntype=jdbc
+dataconnection1.type=Oracle
+dataconnection1.dbname=XE
+dataconnection1.version=
+dataconnection1.url=jdbc:oracle:thin:@211.245.106.125:1521:XE
+dataconnection1.user=FAIRNETUR
+dataconnection1.password=FAIRNETUR!@#$
+dataconnection1.encoding=
+dataconnection1.decoding=
+################################# \uc2e4\uc11c\ubc84 #################################
 
 dataconnection2.conntype=jdbc
 dataconnection2.type=UserCustom