From 71fe0b0687fa9d4865d45b0f1e3294d2467d66a1 Mon Sep 17 00:00:00 2001 From: tolag3 Date: Mon, 30 Dec 2024 11:36:41 +0900 Subject: [PATCH 1/3] =?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" + /> + 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 From 4521a4d3006db9065e674bf40bfc618f92fba7dd Mon Sep 17 00:00:00 2001 From: tolag3 Date: Mon, 30 Dec 2024 12:11:35 +0900 Subject: [PATCH 2/3] Merge branch 'tolag3' --- ...t.properties => globals_svrtest.properties} | 0 src/main/webapp/META-INF/context.xml | 4 ++-- .../clipreport4/DataConnection.properties | 18 +++++++++--------- 3 files changed, 11 insertions(+), 11 deletions(-) rename src/main/resources/egovframework/egovProps/{globals_svr_test.properties => globals_svrtest.properties} (100%) diff --git a/src/main/resources/egovframework/egovProps/globals_svr_test.properties b/src/main/resources/egovframework/egovProps/globals_svrtest.properties similarity index 100% rename from src/main/resources/egovframework/egovProps/globals_svr_test.properties rename to src/main/resources/egovframework/egovProps/globals_svrtest.properties diff --git a/src/main/webapp/META-INF/context.xml b/src/main/webapp/META-INF/context.xml index ba606de9..10156738 100644 --- a/src/main/webapp/META-INF/context.xml +++ b/src/main/webapp/META-INF/context.xml @@ -27,13 +27,13 @@ auth="Container" driverClassName="oracle.jdbc.driver.OracleDriver" username="FAIRNETUR" - password="FAIRNETUR@#$" + password="FAIRNETUR!@#$" type="javax.sql.DataSource" url="jdbc:oracle:thin:@211.245.106.125:1521/XE" factory="org.apache.tomcat.jdbc.pool.DataSourceFactory" /> Date: Mon, 30 Dec 2024 15:07:13 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=EC=9D=B4=EB=85=B8=EB=A6=AD=EC=8A=A4=20?= =?UTF-8?q?=EC=8B=A4=EC=84=9C=EB=B2=84=20=EB=9D=BC=EC=9D=B4=EC=84=BC?= =?UTF-8?q?=EC=8A=A4=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/innorix/innorix_svr.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/webapp/innorix/innorix_svr.js b/src/main/webapp/innorix/innorix_svr.js index 25054da7..5e4f57e0 100644 --- a/src/main/webapp/innorix/innorix_svr.js +++ b/src/main/webapp/innorix/innorix_svr.js @@ -7,8 +7,11 @@ */ // 체험버전 설치, 활용과 관련된 기술문의는 02-557-2757로 문의하여 주십시오. // 라이선스 유형 : INNORIX WP 109일 체험 (만료 2024-12-31) -var INNORIX_LICENSE = "P+L8qrf/hL4Id2FXzLe/ZqwP7rcTxTccKbwHLkZrmyfHpY7smsLyXrqpzRqbk7DvWbvzVqdT+rE9n5pjpN7q73TC/nAvxZ/8D265Iicl81eWDnresf2Fo9pgQ1sYIM9pIbS8cuXGT3ZtlgTgHopO6rQo9O00XkTb+yYAujgFOvlTjgnctYcigUh9nnjnzTAQvt5wOfhYiPEiqF/++QDmF3fSxhW1g8mUA3C6H1owe/SDcAKl+MOlTWByW6w+MBtRJOc429aLOCUkaOaWpxq7OCjwqVoRsTg0y4869VMSGL2Mi/4JUDzLjEag53jrAmoAOTadGvYOcHMS/3rMH8gmaA=="; -var INNORIX_SIGNATURE = "pTdx0va8paDO9BW+E+K4NFwIeGrWyegEBqhFtvZDz+taMbL+tHKTshFfniFtcyFSnQxRwj4sCcvC/XqY6K5JAvN5WkKOtgH5CDnaeLdV3t6xwmvZoxTH/bNyahSvqfH96Q4VWDb4ZkEXdbGBOzrbCd3/QuKrSKUYPZu6oyzZ7GHUCybCUZEZVqqztNVzqm+zuce4HK78xGU6b40oCAepNARmE/9kBJl0gJZIjy7vx6QeuioVqInqsiK9qJwpU+jpiIJO5FxT9r1BzbpJd4ZfX4mZ7ok0UxdfLCDAtDS6bE2D7k6NVm3Z0paOXmNcmUOvNCcDW4ywrHb1521JoMFnLQ=="; +//var INNORIX_LICENSE = "P+L8qrf/hL4Id2FXzLe/ZqwP7rcTxTccKbwHLkZrmyfHpY7smsLyXrqpzRqbk7DvWbvzVqdT+rE9n5pjpN7q73TC/nAvxZ/8D265Iicl81eWDnresf2Fo9pgQ1sYIM9pIbS8cuXGT3ZtlgTgHopO6rQo9O00XkTb+yYAujgFOvlTjgnctYcigUh9nnjnzTAQvt5wOfhYiPEiqF/++QDmF3fSxhW1g8mUA3C6H1owe/SDcAKl+MOlTWByW6w+MBtRJOc429aLOCUkaOaWpxq7OCjwqVoRsTg0y4869VMSGL2Mi/4JUDzLjEag53jrAmoAOTadGvYOcHMS/3rMH8gmaA=="; +//var INNORIX_SIGNATURE = "pTdx0va8paDO9BW+E+K4NFwIeGrWyegEBqhFtvZDz+taMbL+tHKTshFfniFtcyFSnQxRwj4sCcvC/XqY6K5JAvN5WkKOtgH5CDnaeLdV3t6xwmvZoxTH/bNyahSvqfH96Q4VWDb4ZkEXdbGBOzrbCd3/QuKrSKUYPZu6oyzZ7GHUCybCUZEZVqqztNVzqm+zuce4HK78xGU6b40oCAepNARmE/9kBJl0gJZIjy7vx6QeuioVqInqsiK9qJwpU+jpiIJO5FxT9r1BzbpJd4ZfX4mZ7ok0UxdfLCDAtDS6bE2D7k6NVm3Z0paOXmNcmUOvNCcDW4ywrHb1521JoMFnLQ=="; +var INNORIX_LICENSE = "RIfVrY2sXEQfh3eogVLAn1pVnB8XfcdC02WX/2ReTAQs8EcApQcdJ90jbybPS/EiUptvnOEEqR2JysNSySyMW3iKidLLK0bIajVKGT2exy0beybrjbTISPnnOMcLkr/sWOUW82QQ+1NUlgVX2vOQdCoRNJxDj513k//e++7tqBV7WCiX4xPK3KwPn2lZgcLGZsDZSRk3DhebMWrNyTOaihyOM1ZpgbeB8bjP/Kz22I0dC9DbO0Ma4SwHVhHCRI5JbOrFQENkntwPHAklZBSO2mqq2j6iJjXPXHfh/gA6rk6KjnlC8xEeSo4G2QyPWvPoV++6sz6CKNrdyiJ+3QLFUA=="; + +var INNORIX_SIGNATURE = "qcFHynkt8zcwst10kle0yd0AnvQx0989RcJ5oS46SZwNkk8QswA4lu6rt8heIp6qHUn3ernHQTdNDKyNxB/us0fGENTqcwNlWAmhBT0mJ7W+EUdv+C0GTxlqCRbBHuYQgC8rTCUS4JkSfCSzo/cEFLzI1o9pcdO4ZDg7TFnChhwWhi6nxdzOJGrnt7NVMggW4zrxTETaB/Eq0rJuL3cFgg3pHjbeLszXa5LATxdEeWVKyksrDDT6D+muH+3UK5jZd2cHj56n5v5ox3scnO9og3Iwovl58Uatz15Ny9carxwhvqGsdRzt5wndiw5wO/KEG+kWHc66Z9zLbM7raCx4zA=="; var INNORIX_VERSION = '1.2.4.526' var INNORIX_WIN_VERSION = '1.2.4.526'