diff --git a/src/main/java/seed/utils/SeedSqlCon.java b/src/main/java/seed/utils/SeedSqlCon.java index c9867dbb..505b03f9 100644 --- a/src/main/java/seed/utils/SeedSqlCon.java +++ b/src/main/java/seed/utils/SeedSqlCon.java @@ -11,9 +11,13 @@ import javax.naming.NamingException; import javax.sql.DataSource; import org.apache.log4j.Logger; +import org.springframework.beans.factory.annotation.Value; public class SeedSqlCon { + @Value("${spring.profiles.active}") + private String springProfilesActive; + private Logger log = Logger.getLogger(this.getClass()); private Connection connection = null; @@ -32,7 +36,11 @@ public class SeedSqlCon { setDbType(seedProperties.getConfigProperties().getProperty("database").toUpperCase()); setDbVersion(seedProperties.getConfigProperties().getProperty("database.version").toUpperCase()); - String jndi = "jndi/XE"; + /* 운영환경에따른 분기 */ + + + String jndi = "jndi/"; + jndi += springProfilesActive; if ((jndiName != null) && (!("".equals(jndiName)))) { jndi = jndiName; @@ -102,7 +110,9 @@ public class SeedSqlCon { setDbType(dbType); setDbVersion(dbVersion); - String jndi = "jndi/XE"; + /* 운영환경에따른 분기 */ + String jndi = "jndi/"; + jndi += springProfilesActive; if ((jndiName != null) && (!("".equals(jndiName)))) { jndi = jndiName; diff --git a/src/main/resources/egovframework/egovProps/globals_dev.properties b/src/main/resources/egovframework/egovProps/globals_dev.properties index 0a2537b5..6ba6d616 100644 --- a/src/main/resources/egovframework/egovProps/globals_dev.properties +++ b/src/main/resources/egovframework/egovProps/globals_dev.properties @@ -20,149 +20,20 @@ Globals.OsType = WINDOWS 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 = mysql -Globals.UserName= kccadradvcUr -Globals.Password= kccadradvc!@#$ +Globals.DbType = oracle +Globals.UserName= FAIRNETUR +Globals.Password= FAIRNETUR!@#$ -# mysql -#Globals.DriverClassName=net.sf.log4jdbc.DriverSpy -#Globals.Url=jdbc:log4jdbc:mysql://112.161.144.18:3306/kopostMysql -#Globals.DriverClassName=com.mysql.jdbc.Driver -#Globals.Url=jdbc:mysql://14.63.218.135:3306/kofons -Globals.DriverClassName=cubrid.jdbc.driver.CUBRIDDriver -#\ud074\ub77c\uc6b0\ub4dc \uc11c\ubc84 -#Globals.Url=jdbc:cubrid:158.247.225.133:30000:kcc_adrs4:::?charset=utf8 -#\uac1c\ubc1c\uc11c\ubc84 -Globals.Url=jdbc:cubrid:119.193.215.98:30000:kcc_adr_advc:::?charset=utf8 -#\uc2e4\uc11c\ubc84 -#Globals.Url=jdbc:cubrid:192.168.39.146:30000:kcc_adr_advc:::?charset=utf8 - - -# \uc800\uc791\uc704 \ubb38\uc790\uc804\uc1a1 DB(\uac1c\ubc1c) -Globals.SMSDB.DriverClassName=oracle.jdbc.driver.OracleDriver -Globals.SMSDB.Url=jdbc:oracle:thin:@192.168.0.118:1521:xe -Globals.SMSDB.UserName=KCCADR -Globals.SMSDB.Password=kccadr -# \uc800\uc791\uc704 \ubb38\uc790\uc804\uc1a1 DB(\uc6b4\uc601) -#Globals.SMSDB.DriverClassName=oracle.jdbc.driver.OracleDriver -#Globals.SMSDB.Url=jdbc:oracle:thin:@222.231.43.26:1521:ora10g -#Globals.SMSDB.UserName=smsmanager -#Globals.SMSDB.Password=eksanswk2014 - -Globals.SMSDB.SendTelNo=02-2669-0044 -Globals.SMSDB.TrId=kccadr - -# \uc800\uc791\uc704 \uba54\uc77c\uc804\uc1a1 -Globals.KccMail.URI=https://mail.copyright.or.kr/mail_api/form_send_mail -Globals.KccMail.api_key=#!@mail5455 -Globals.KccMail.sender=adr@copyright.or.kr -Globals.KccMail.title=[\ud55c\uad6d\uc800\uc791\uad8c\uc704\uc6d0\ud68c] \ubd84\uc7c1\uc870\uc815\uc2dc\uc2a4\ud15c \uc54c\ub9bc - - -#SSO \uc811\uc18d\uc815\ubcf4 -#\uac1c\ubc1c\uc11c\ubc84 -Globals.sso.ssoUri=https://devsso.copyright.or.kr/oauth2/token.do -Globals.sso.clientId=30354835c3684ff79e7fb1bfd3a768f6 -Globals.sso.clientSecret=1ueil5ee05wr0t1gjy1ppt212 -Globals.sso.scope=http://sso.copyright.or.kr -Globals.sso.returnSiteUrl=http://119.193.215.98:8081/web/user/login/ssoUsrModifyResult.do -Globals.sso.returnSiteCode=SITE011 - -#\uc2e4\uc11c\ubc84 -#Globals.sso.ssoUri=https://sso.copyright.or.kr/oauth2/token.do -#Globals.sso.clientId=30354835c3684ff79e7fb1bfd3a768f6 -#Globals.sso.clientSecret=1ueil5ee05wr0t1gjy1ppt212 -#Globals.sso.scope=http://sso.copyright.or.kr -#Globals.sso.returnSiteUrl=http://adr.copyright.or.kr/web/user/login/ssoUsrModifyResult.do -#Globals.sso.returnSiteCode=SITE011 - -#SSO \ud1b5\ud569\ud68c\uc6d0\uc0ac\uc774\ud2b8 URL -#\uac1c\ubc1c\uc11c\ubc84 -Globals.sso.joinUrl=https://devoneid.copyright.or.kr/member/signUp/signUpStep1.do -Globals.sso.modifyUrl=https://devoneid.copyright.or.kr/member/baseInfo/baseInfoModify.do -Globals.sso.idFindUrl=https://devoneid.copyright.or.kr/member/infoFind/idFindStep1.do -Globals.sso.pwFindUrl=https://devoneid.copyright.or.kr/member/infoFind/passFindStep1.do -#\uc2e4\uc11c\ubc84 -#Globals.sso.joinUrl=https://oneid.copyright.or.kr/member/signUp/signUpStep1.do -#Globals.sso.modifyUrl=https://oneid.copyright.or.kr/member/baseInfo/baseInfoModify.do -#Globals.sso.idFindUrl=https://oneid.copyright.or.kr/member/infoFind/idFindStep1.do -#Globals.sso.pwFindUrl=https://oneid.copyright.or.kr/member/infoFind/passFindStep1.do +# oracle +Globals.DriverClassName=oracle.jdbc.OracleDriver +Globals.Url=jdbc:oracle:thin:@192.168.0.30:1523:XE # MainPage Setting(admin) Globals.MainPage = /cmm/main/mainPage.do #\ucee8\ud150\uce20 \ud30c\uc77c\uc704\uce58 -#Globals.ckeditorUploadDir=/home/file/ckeditor/ Globals.ckeditorUploadDir=/usr/local/tomcat/file/ckeditor/ #TEST SERVER Globals.RealCntFileFolder=C:/eGovFrameDev-3.9.0-64bit_ncms/workspace/ncms39/src/main/webapp/WEB-INF/jsp/cnt/ -Globals.Solr.url=http://192.168.0.125:8983/solr -#Globals.Solr.url=http://localhost:8983/solr - -#SNS \ub85c\uadf8\uc778 KEY \uac12 -#ITN \ub124\uc774\ubc84 -Globals.kcc.naver.clentId=d9Ohvhty_RVsfrq9p_2J -Globals.kcc.naver.clientSecret=kwiEmpkLg5 -Globals.kcc.naver.returnUrl=http://localhost:80/snsLogin/naverOauth.do -#ITN \uce74\uce74\uc624 -Globals.kcc.kakao.restApiKey=10b66ad0c44b68b659855ddd64db2c44 -Globals.kcc.kakao.returnUrl=http://localhost:80/snsLogin/kakaoOauth.do - -#\uc0ac\uc774\ud2b8 \uc544\uc774\ub514 \uc81c\uac70\ub85c JSP\uc5d0\uc11c siteId/siteNm \ubcf4\uc5ec\uc8fc\uae30 \uc704\ud574 -Globals.homepage.siteId=kccadr -Globals.homepage.siteNm=\uc804\uc790\uc870\uc815\uc2dc\uc2a4\ud15c - -#\uc774\ub2c8\uc2dc\uc2a4PG \uac00\uc0c1\uacc4\uc88c -Globals.iniPg.ip1=203.238.37.15 -Globals.iniPg.ip2=39.115.212.9 -Globals.iniPg.ip3=183.109.71.153 -Globals.iniPg.mid=crosorkr01 -Globals.iniPg.signKey=UE9idGFmcGJEdU1HR04zbEdLdUM0QT09 - - - -#pdf-url -##=====================================1.local(http://192.168.0.34:7080)============================================================= -##pdf\ubcc0\ud658\uc11c\ubc84 - WAS \uc5d0\uc11c \ud638\ucd9c\ud558\ub294 PDF \ubcc0\ud658 \uc11c\ubc84 IP \uc815\ubcf4\ub97c \ub123\ub294\ub2e4. -#Globals.pdf.serverUrl=192.168.0.200 - - -##\uc6f9\ud398\uc774\uc9c0\ub97c pdf\ub85c \ubcc0\ud658\ud558\uae30 \uc704\ud55c api \ud638\ucd9curl - \uc870\uc815\uc2e0\uccad\uc11c \ub4f1 - WAS \uc11c\ubc84 \uc815\ubcf4\ub97c \ub123\ub294\ub2e4. -#Globals.pdf.apiUrl=http://192.168.0.34:7080 - - -##pdf \uc11c\ubc84\uc758 \ub124\ud2b8\uc6cc\ud06c \uacbd\ub85c -##pdf\ubcc0\ud658 \uc11c\ube0c\ub97c \uc704\ud55c path - 1.pdf\ubcc0\ud658\uc758 \uacb0\uacfc\ubb3c\uc774 \uc0dd\uc131\ub418\ub294 \uacbd\ub85c - PDF \ubcc0\ud658 \uc11c\ubc84\uc5d0\uc11c \uc0ac\uc6a9\ud558\ub294 \ud3f4\ub354 \uc815\ubcf4\ub97c \ub123\ub294\ub2e4. -#Globals.pdf.filepath.out=file:/z:/out/ - - -##tomcat upload \uacbd\ub85c -##\ud30c\uc77c \uad00\ub9ac\ub97c \uc704\ud55c path - 2.pdf\ubcc0\ud658\uc744 \uc704\ud55c \uc5c5\ub85c\ub4dc \ud30c\uc77c \uacbd\ub85c - WAS \uc11c\ubc84\uc5d0\uc11c PDF \ubcc0\ud658 \uc9c0\uc6d0\uc744 \uc704\ud574 \uc81c\uc5b4 \ud558\ub294 \uacbd\ub85c -#Globals.pdf.makepath=y:/ - -##\ud30c\uc77c \uad00\ub9ac\ub97c \uc704\ud55c path - 3.pdf\ubcc0\ud658\uc758 \uacb0\uacfc\ubb3c\uc774 \uc0dd\uc131\ub418\ub294 \uacbd\ub85c - WAS \uc11c\ubc84\uc5d0\uc11c PDF \ubcc0\ud658 \uc9c0\uc6d0\uc744 \uc704\ud574 \uc81c\uc5b4 \ud558\ub294 \uacbd\ub85c -#Globals.pdf.makepath.out=y:/out/ - - -##pdf\ubcc0\ud658 \ud30c\uc77c\uc758 \uc6f9\uc811\uadfc\uc744 \uc704\ud55c path - 4.pdf\ubcc0\ud658\uc758 \uacb0\uacfc\ubb3c\uc744 \uc6f9\uc5d0\uc11c \uc811\uadfc\ud558\uae30 \uc704\ud55c \uacbd\ub85c - \ubcc0\ud658\ub41c PDF \ud30c\uc77c\uc744 \uc6f9\ud398\uc774\uc9c0\uc5d0\uc11c \uc811\uadfc\ud558\uae30 \uc704\ud574 \uc124\uc815\ub41c \uacbd\ub85c \uc815\ubcf4 -#Globals.pdf.webpath=/pdf/out/ - -##=====================================2.\uac1c\ubc1c\uc11c\ubc84(http://119.193.215.98:8081)============================================================= -## \uc0c1\uc138 \ud56d\ubaa9\uc5d0 \ub300\ud55c \uc124\uba85\uc740 \uc0c1\ub2e8\uc5d0\uc11c \ud655\uc778 \ubc14\ub78d\ub2c8\ub2e4. -Globals.pdf.serverUrl=192.168.0.200 -Globals.pdf.apiUrl=http://119.193.215.98:8081 -Globals.pdf.filepath.out=file:/z:/out/ -Globals.pdf.makepath=/usr/local/tomcat/file/sht/ -Globals.pdf.makepath.out=/usr/local/tomcat/file/sht/out/ -Globals.pdf.webpath=/pdf/out/ - -##=====================================3.\uc2e4\uc11c\ubc84(192.168.39.143, 192.168.39.144)============================================================= -## \uc0c1\uc138 \ud56d\ubaa9\uc5d0 \ub300\ud55c \uc124\uba85\uc740 \uc0c1\ub2e8\uc5d0\uc11c \ud655\uc778 \ubc14\ub78d\ub2c8\ub2e4. -#Globals.pdf.serverUrl=192.168.39.147 -#Globals.pdf.apiUrl=http://192.168.39.143:8080 -#Globals.pdf.filepath.out=file:/z:/out/ -#Globals.pdf.makepath=/usr/local/tomcat/file/sht/ -#Globals.pdf.makepath.out=/usr/local/tomcat/file/sht/out/ -#Globals.pdf.webpath=/pdf/out/ #prod \uac1c\ubc1c, \uc2e4\uc11c\ubc84 \uad6c\ubd84\uac12 #\uac1c\ubc1c\uc11c\ubc84 @@ -170,70 +41,17 @@ Globals.prod.islocal=local #\uc2e4\uc11c\ubc84 #Globals.prod.islocal=real -#\uc624\uc988\ub9ac\ud3ec\ud2b8 \ud3f0\ud2b8 \uc800\uc7a5\uacbd\ub85c -#\uac1c\ubc1c\uc11c\ubc84 -Globals.ozFontPath=/home/oz80/fontTestDir/ -#oz \uac1c\ubc1c\uc11c\ubc84IP & \uc800\uc7a5\uacbd\ub85c -\uc2e4\uc11c\ubc84IP\ub294 \ud558\ub4dc\ucf54\ub529\ucc98\ub9ac -Globals.oz.devServerIp=192.168.0.176:8086 -Globals.oz.devSchedulerIp=192.168.0.200 -#Globals.oz.devPdfSavePath=/usr/local/tomcat/webapps/data -Globals.oz.devPdfSavePath=\\192.168.0.176\\shared_folder_176\\out -Globals.oz.devServerCheckString=localhost||119.193.215.98||iten.co.kr||192.168.0.176||ljhtest -Globals.oz.realServerIp=192.168.39.145:8080 -Globals.oz.realSchedulerIp=192.168.39.147 -Globals.oz.realPdfSavePath=\\192.168.39.125\\data3\\out -#\uc2e4\uc11c\ubc84 -#Globals.ozFontPath=/home/oz80/fontTestDir/ - -#\uc624\uc988\ub9ac\ud3ec\ud2b8 \ud3f0\ud2b8 \uc885\ub958 -Globals.ozFont=NanumSquareR.ttf - -#\ub300\uc6a9\ub7c9 innorix filePath -Globals.Innorix.FilePath=D:\\usr\\local\\tomcat\\file\\sht\\ - -#\ub300\uc6a9\ub7c9 innorix license -Globals.Innorix.License=dev - -#inipay \uacb0\uc81c -#\uac1c\ubc1c\uc11c\ubc84 -Globals.pay.mid=INIpayTest -Globals.pay.signKey=SU5JTElURV9UUklQTEVERVNfS0VZU1RS -Globals.pay.siteDomain=http://119.193.215.98:8081/web/kccadr/payment/inipay -#\uc2e4\uc11c\ubc84 -#inipay \uacb0\uc81c -#Globals.pay.mid=crosorkr01 -#Globals.pay.signKey=UE9idGFmcGJEdU1HR04zbEdLdUM0QT09 - -#Globals.pay.siteDomain=https://adr.copyright.or.kr/web/kccadr/payment/inipay - -#DB \uc554\ud638\ud654 \uc194\ub8e8\uc158 \uc815\ucc45\uba85 -Globals.MagicDB.PolicyName=POLICY001 - -#Sns \uc778\uc99d \uac12 -Globals.Naver.clientId=c7G40_m4so3YV8Ypb4D3 -Globals.Naver.callbackUrl=http://119.193.215.98:8081/web/kccadr/certDoc/snsCallBack.do - -#[\uce74\uce74\uc624]Sns \uc778\uc99d \uac12 -Globals.Kakao.Key=5c0404a0840eb8821a0fdf6b3f2659b4 - -#Streamdocs \ub4f1\ub85d URL -Globals.Streamdocs.Url=http://192.168.0.176:8085/streamdocs/v4/documents - -# \uce74\uce74\uc624\uc54c\ub9bc\ud1a1(\ube44\uc988\ubfcc\ub9ac\uc624) API URL -#\uac1c\ubc1c\uc11c\ubc84 -#Globals.BizPpurio.siteUrl=https://dev-api.bizppurio.com -#\uc2e4\uc11c\ubc84 - \uc2dc\uc5f0\uc744\uc704\ud55c\ubc18\uc601 -Globals.BizPpurio.siteUrl=https://api.bizppurio.com - -#OCR\uc11c\ubc84\uc8fc\uc18c -Globals.textSense.apiUrl=http://222.231.43.29:7777 -Globals.textSense.inputUri=http://119.193.215.98:8081 -Globals.textSense.callbackUri=http://119.193.215.98:8081 - ############################################################################################################## #############################################\ubd84\uc7c1\uc870\uc815 \ucd94\uac00 \uc601\uc5ed ################################################### ############################################################################################################## #hibernate \uc124\uc815 language=ko -database.hibernate.dialect=org.hibernate.dialect.Oracle10gDialect \ No newline at end of file +database.hibernate.dialect=org.hibernate.dialect.Oracle10gDialect + +#\uba54\uc2dc\uc9c0 \ud398\uc774\uc9c0 \ud0c0\uc785 \uc124\uc815 ex). message,script +Globals.message.check=message +#\uba54\uc2dc\uc9c0 \ud398\uc774\uc9c0 \ubc84\ud2bc\ud65c\uc131\ud654 \uc124\uc815 ex). true[\uc0ac\uc6a9],false[\uc0ac\uc6a9\uc548\ud568] +Globals.message.confirm=false +#\uba54\uc2dc\uc9c0 \ud398\uc774\uc9c0 \uc2dc\uac04 \uc124\uc815 ex). 1500 +Globals.message.time=1500 \ No newline at end of file diff --git a/src/main/resources/egovframework/hibernate/hibernate.xml b/src/main/resources/egovframework/hibernate/hibernate.xml index 87715c92..4e6a22e3 100644 --- a/src/main/resources/egovframework/hibernate/hibernate.xml +++ b/src/main/resources/egovframework/hibernate/hibernate.xml @@ -40,7 +40,9 @@ - + + + diff --git a/src/main/resources/egovframework/spring/com/context-datasource.xml b/src/main/resources/egovframework/spring/com/context-datasource.xml index cc9a304a..018a3a59 100644 --- a/src/main/resources/egovframework/spring/com/context-datasource.xml +++ b/src/main/resources/egovframework/spring/com/context-datasource.xml @@ -19,33 +19,6 @@ - - - @@ -67,7 +40,9 @@ - + + + diff --git a/src/main/resources/egovframework/spring/com/context-sqlMap.xml b/src/main/resources/egovframework/spring/com/context-sqlMap.xml index 282862b0..bf64374d 100644 --- a/src/main/resources/egovframework/spring/com/context-sqlMap.xml +++ b/src/main/resources/egovframework/spring/com/context-sqlMap.xml @@ -38,41 +38,6 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/src/main/webapp/META-INF/context.xml b/src/main/webapp/META-INF/context.xml index 6b5d5812..7c9e302c 100644 --- a/src/main/webapp/META-INF/context.xml +++ b/src/main/webapp/META-INF/context.xml @@ -1,7 +1,29 @@ + + + +