Commit @ee9c3fc27af4f11a8de72830bb9241d509244ca1

조민수 09-15

Merge branch 'develop'

@ee9c3fc27af4f11a8de72830bb9241d509244ca1

6c18a3c

ee9c3fc

src/main/resources/egovframework/egovProps/globals.properties

--- src/main/resources/egovframework/egovProps/globals.properties

+++ src/main/resources/egovframework/egovProps/globals.properties


 #-----------------------------------------------------------------------
 #
-#   globals.properties : \uc2dc\uc2a4\ud15c
+#   globals.properties : \uC2DC\uC2A4\uD15C
 #
 #-----------------------------------------------------------------------
-#   1.  key = value \uad6c\uc870\uc785\ub2c8\ub2e4.
-#   2.  key\uac12\uc740 \uacf5\ubc31\ubb38\uc790\ub97c \ud3ec\ud568\ubd88\uac00, value\uac12\uc740 \uacf5\ubc31\ubb38\uc790\ub97c \uac00\ub2a5
-#   3.  key\uac12\uc73c\ub85c \ud55c\uae00\uc744 \uc0ac\uc6a9\ubd88\uac00,   value\uac12\uc740 \ud55c\uae00\uc0ac\uc6a9\uc774 \uac00\ub2a5
-#   4.  \uc904\uc744 \ubc14\uafc0 \ud544\uc694\uac00 \uc788\uc73c\uba74 '\'\ub97c \ub77c\uc778\uc758 \ub05d\uc5d0 \ucd94\uac00(\ub9cc\uc57d  '\'\ubb38\uc790\ub97c \uc0ac\uc6a9\ud574\uc57c \ud558\ub294 \uacbd\uc6b0\ub294 '\\'\ub97c \uc0ac\uc6a9)
-#   5.  Windows\uc5d0\uc11c\uc758 \ub514\ub809\ud1a0\ub9ac \ud45c\uc2dc : '\\' or '/'  ('\' \uc0ac\uc6a9\ud558\uba74 \uc548\ub428)
-#   6.  Unix\uc5d0\uc11c\uc758 \ub514\ub809\ud1a0\ub9ac \ud45c\uc2dc : '/'
-#   7.  \uc8fc\uc11d\ubb38 \ucc98\ub9ac\ub294  #\uc0ac\uc6a9
-#   8.  value\uac12 \ub4a4\uc5d0 \uc2a4\ud398\uc774\uc2a4\uac00 \uc874\uc7ac\ud558\ub294 \uacbd\uc6b0 \uc11c\ube14\ub9bf\uc5d0\uc11c \ucc38\uc870\ud560\ub54c\ub294 \uc5d0\ub7ec\ubc1c\uc0dd\ud560 \uc218 \uc788\uc73c\ubbc0\ub85c trim()\ud558\uac70\ub098 \ub9c8\uc9c0\ub9c9 \uacf5\ubc31\uc5c6\uc774 properties \uac12\uc744 \uc124\uc815\ud560\uac83
+#   1.  key = value \uAD6C\uC870\uC785\uB2C8\uB2E4.
+#   2.  key\uAC12\uC740 \uACF5\uBC31\uBB38\uC790\uB97C \uD3EC\uD568\uBD88\uAC00, value\uAC12\uC740 \uACF5\uBC31\uBB38\uC790\uB97C \uAC00\uB2A5
+#   3.  key\uAC12\uC73C\uB85C \uD55C\uAE00\uC744 \uC0AC\uC6A9\uBD88\uAC00,   value\uAC12\uC740 \uD55C\uAE00\uC0AC\uC6A9\uC774 \uAC00\uB2A5
+#   4.  \uC904\uC744 \uBC14\uAFC0 \uD544\uC694\uAC00 \uC788\uC73C\uBA74 '\'\uB97C \uB77C\uC778\uC758 \uB05D\uC5D0 \uCD94\uAC00(\uB9CC\uC57D  '\'\uBB38\uC790\uB97C \uC0AC\uC6A9\uD574\uC57C \uD558\uB294 \uACBD\uC6B0\uB294 '\\'\uB97C \uC0AC\uC6A9)
+#   5.  Windows\uC5D0\uC11C\uC758 \uB514\uB809\uD1A0\uB9AC \uD45C\uC2DC : '\\' or '/'  ('\' \uC0AC\uC6A9\uD558\uBA74 \uC548\uB428)
+#   6.  Unix\uC5D0\uC11C\uC758 \uB514\uB809\uD1A0\uB9AC \uD45C\uC2DC : '/'
+#   7.  \uC8FC\uC11D\uBB38 \uCC98\uB9AC\uB294  #\uC0AC\uC6A9
+#   8.  value\uAC12 \uB4A4\uC5D0 \uC2A4\uD398\uC774\uC2A4\uAC00 \uC874\uC7AC\uD558\uB294 \uACBD\uC6B0 \uC11C\uBE14\uB9BF\uC5D0\uC11C \uCC38\uC870\uD560\uB54C\uB294 \uC5D0\uB7EC\uBC1C\uC0DD\uD560 \uC218 \uC788\uC73C\uBBC0\uB85C trim()\uD558\uAC70\uB098 \uB9C8\uC9C0\uB9C9 \uACF5\uBC31\uC5C6\uC774 properties \uAC12\uC744 \uC124\uC815\uD560\uAC83
 #-----------------------------------------------------------------------
 
-# \uc6b4\uc601\uc11c\ubc84 \ud0c0\uc785(WINDOWS, UNIX)
+# \uC6B4\uC601\uC11C\uBC84 \uD0C0\uC785(WINDOWS, UNIX)
 Globals.OsType = WINDOWS
 
-# G4C \uc5f0\uacb0\uc6a9 IP (localhost)
+# G4C \uC5F0\uACB0\uC6A9 IP (localhost)
 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
+# DB\uC11C\uBC84 \uD0C0\uC785(mysql,oracle,altibase,tibero) - datasource \uBC0F sqlMap \uD30C\uC77C \uC9C0\uC815\uC5D0 \uC0AC\uC6A9\uB428
 Globals.DbType = mysql
 
 

 
 # MainPage Setting(admin)
 Globals.MainPage = /cmm/main/mainPage.do
-#\ucee8\ud150\uce20 \ud30c\uc77c\uc704\uce58
+#\uCEE8\uD150\uCE20 \uD30C\uC77C\uC704\uCE58
 #Globals.ckeditorUploadDir=/home/file/ckeditor/
 Globals.ckeditorUploadDir=/usr/local/tomcat/file/ckeditor/
 #TEST SERVER

 Globals.file.saveDir=/usr/local/tomcat
 
 
-#SNS \ub85c\uadf8\uc778 KEY \uac12
-#ITN \ub124\uc774\ubc84
+#SNS \uB85C\uADF8\uC778 KEY \uAC12
+#ITN \uB124\uC774\uBC84
 Globals.itn.naver.clentId=d9Ohvhty_RVsfrq9p_2J
 Globals.itn.naver.clientSecret=kwiEmpkLg5
 Globals.itn.naver.returnUrl=http://localhost:80/snsLogin/naverOauth.do
-#ITN \uce74\uce74\uc624
+#ITN \uCE74\uCE74\uC624
 Globals.itn.kakao.restApiKey=10b66ad0c44b68b659855ddd64db2c44
 Globals.itn.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 
+#\uC0AC\uC774\uD2B8 \uC544\uC774\uB514 \uC81C\uAC70\uB85C JSP\uC5D0\uC11C siteId/siteNm \uBCF4\uC5EC\uC8FC\uAE30 \uC704\uD574 
 Globals.homepage.siteId=mjon
-Globals.homepage.siteNm=\ubb38\uc790ON
+Globals.homepage.siteNm=\uBB38\uC790ON
 
 
 

 Globals.fax.file.permit.ext=hwp,hwpml,doc,xls,ppt,pdf,txt,docx,xlsx,pptx,tif,htm,html,jpg,jpeg,gif,bmp,gul
 
 
-#KG \ubaa8\ube4c\ub9ac\uc5b8\uc2a4 \uc124\uc815
+#KG \uBAA8\uBE4C\uB9AC\uC5B8\uC2A4 \uC124\uC815
 #CARD
 Globals.pay.kgm.card.cnSvcid=191017078687
 Globals.pay.kgm.card.payMode=10
 #BANK
-Globals.pay.kgm.bank.raSvcid=230510133362
+Globals.pay.kgm.bank.raSvcid=260908166392
 Globals.pay.kgm.bank.payMode=00
 #MOBILE
 Globals.pay.kgm.mobile.mcSvcid=170622040674

6c18a3c

ee9c3fc

src/main/resources/egovframework/egovProps/globals_dev.properties

--- src/main/resources/egovframework/egovProps/globals_dev.properties

+++ src/main/resources/egovframework/egovProps/globals_dev.properties


 Globals.pay.kgm.card.cnSvcid=191017078687
 Globals.pay.kgm.card.payMode=10
 #BANK
-Globals.pay.kgm.bank.raSvcid=230510133362
+Globals.pay.kgm.bank.raSvcid=260908166392
 Globals.pay.kgm.bank.payMode=00
 #MOBILE
 Globals.pay.kgm.mobile.mcSvcid=170622040674

6c18a3c

ee9c3fc

src/main/resources/egovframework/egovProps/globals_local.properties

--- src/main/resources/egovframework/egovProps/globals_local.properties

+++ src/main/resources/egovframework/egovProps/globals_local.properties


 Globals.pay.kgm.card.cnSvcid=191017078687
 Globals.pay.kgm.card.payMode=10
 #BANK
-Globals.pay.kgm.bank.raSvcid=230510133362
+Globals.pay.kgm.bank.raSvcid=260908166392
 Globals.pay.kgm.bank.payMode=00
 #MOBILE
 Globals.pay.kgm.mobile.mcSvcid=170622040674

6c18a3c

ee9c3fc

src/main/resources/egovframework/egovProps/globals_prod.properties

--- src/main/resources/egovframework/egovProps/globals_prod.properties

+++ src/main/resources/egovframework/egovProps/globals_prod.properties


 
 #KG \uBAA8\uBE4C\uB9AC\uC5B8\uC2A4 \uC124\uC815
 #CARD
-Globals.pay.kgm.card.cnSvcid=230523133878
+Globals.pay.kgm.card.cnSvcid=260908166386
 Globals.pay.kgm.card.payMode=10
 #BANK
-Globals.pay.kgm.bank.raSvcid=230510133362
+Globals.pay.kgm.bank.raSvcid=260908166392
 Globals.pay.kgm.bank.payMode=10
 #MOBILE
-Globals.pay.kgm.mobile.mcSvcid=220613125202
+Globals.pay.kgm.mobile.mcSvcid=260908166398
 Globals.pay.kgm.mobile.payMode=10
 
 #Slack

Add a comment

Open 0
Closed 0

List

...	...	@@ -109,7 +109,7 @@
109	109	Globals.pay.kgm.card.cnSvcid=191017078687
110	110	Globals.pay.kgm.card.payMode=10
111	111	#BANK
112		-Globals.pay.kgm.bank.raSvcid=230510133362
	112	+Globals.pay.kgm.bank.raSvcid=260908166392
113	113	Globals.pay.kgm.bank.payMode=00
114	114	#MOBILE
115	115	Globals.pay.kgm.mobile.mcSvcid=170622040674

...	...	@@ -117,7 +117,7 @@
117	117	Globals.pay.kgm.card.cnSvcid=191017078687
118	118	Globals.pay.kgm.card.payMode=10
119	119	#BANK
120		-Globals.pay.kgm.bank.raSvcid=230510133362
	120	+Globals.pay.kgm.bank.raSvcid=260908166392
121	121	Globals.pay.kgm.bank.payMode=00
122	122	#MOBILE
123	123	Globals.pay.kgm.mobile.mcSvcid=170622040674

...	...	@@ -1,25 +1,25 @@
1	1	#-----------------------------------------------------------------------
2	2	#
3		-# globals.properties : \uc2dc\uc2a4\ud15c
	3	+# globals.properties : \uC2DC\uC2A4\uD15C
4	4	#
5	5	#-----------------------------------------------------------------------
6		-# 1. key = value \uad6c\uc870\uc785\ub2c8\ub2e4.
7		-# 2. key\uac12\uc740 \uacf5\ubc31\ubb38\uc790\ub97c \ud3ec\ud568\ubd88\uac00, value\uac12\uc740 \uacf5\ubc31\ubb38\uc790\ub97c \uac00\ub2a5
8		-# 3. key\uac12\uc73c\ub85c \ud55c\uae00\uc744 \uc0ac\uc6a9\ubd88\uac00, value\uac12\uc740 \ud55c\uae00\uc0ac\uc6a9\uc774 \uac00\ub2a5
9		-# 4. \uc904\uc744 \ubc14\uafc0 \ud544\uc694\uac00 \uc788\uc73c\uba74 '\'\ub97c \ub77c\uc778\uc758 \ub05d\uc5d0 \ucd94\uac00(\ub9cc\uc57d '\'\ubb38\uc790\ub97c \uc0ac\uc6a9\ud574\uc57c \ud558\ub294 \uacbd\uc6b0\ub294 '\\'\ub97c \uc0ac\uc6a9)
10		-# 5. Windows\uc5d0\uc11c\uc758 \ub514\ub809\ud1a0\ub9ac \ud45c\uc2dc : '\\' or '/' ('\' \uc0ac\uc6a9\ud558\uba74 \uc548\ub428)
11		-# 6. Unix\uc5d0\uc11c\uc758 \ub514\ub809\ud1a0\ub9ac \ud45c\uc2dc : '/'
12		-# 7. \uc8fc\uc11d\ubb38 \ucc98\ub9ac\ub294 #\uc0ac\uc6a9
13		-# 8. value\uac12 \ub4a4\uc5d0 \uc2a4\ud398\uc774\uc2a4\uac00 \uc874\uc7ac\ud558\ub294 \uacbd\uc6b0 \uc11c\ube14\ub9bf\uc5d0\uc11c \ucc38\uc870\ud560\ub54c\ub294 \uc5d0\ub7ec\ubc1c\uc0dd\ud560 \uc218 \uc788\uc73c\ubbc0\ub85c trim()\ud558\uac70\ub098 \ub9c8\uc9c0\ub9c9 \uacf5\ubc31\uc5c6\uc774 properties \uac12\uc744 \uc124\uc815\ud560\uac83
	6	+# 1. key = value \uAD6C\uC870\uC785\uB2C8\uB2E4.
	7	+# 2. key\uAC12\uC740 \uACF5\uBC31\uBB38\uC790\uB97C \uD3EC\uD568\uBD88\uAC00, value\uAC12\uC740 \uACF5\uBC31\uBB38\uC790\uB97C \uAC00\uB2A5
	8	+# 3. key\uAC12\uC73C\uB85C \uD55C\uAE00\uC744 \uC0AC\uC6A9\uBD88\uAC00, value\uAC12\uC740 \uD55C\uAE00\uC0AC\uC6A9\uC774 \uAC00\uB2A5
	9	+# 4. \uC904\uC744 \uBC14\uAFC0 \uD544\uC694\uAC00 \uC788\uC73C\uBA74 '\'\uB97C \uB77C\uC778\uC758 \uB05D\uC5D0 \uCD94\uAC00(\uB9CC\uC57D '\'\uBB38\uC790\uB97C \uC0AC\uC6A9\uD574\uC57C \uD558\uB294 \uACBD\uC6B0\uB294 '\\'\uB97C \uC0AC\uC6A9)
	10	+# 5. Windows\uC5D0\uC11C\uC758 \uB514\uB809\uD1A0\uB9AC \uD45C\uC2DC : '\\' or '/' ('\' \uC0AC\uC6A9\uD558\uBA74 \uC548\uB428)
	11	+# 6. Unix\uC5D0\uC11C\uC758 \uB514\uB809\uD1A0\uB9AC \uD45C\uC2DC : '/'
	12	+# 7. \uC8FC\uC11D\uBB38 \uCC98\uB9AC\uB294 #\uC0AC\uC6A9
	13	+# 8. value\uAC12 \uB4A4\uC5D0 \uC2A4\uD398\uC774\uC2A4\uAC00 \uC874\uC7AC\uD558\uB294 \uACBD\uC6B0 \uC11C\uBE14\uB9BF\uC5D0\uC11C \uCC38\uC870\uD560\uB54C\uB294 \uC5D0\uB7EC\uBC1C\uC0DD\uD560 \uC218 \uC788\uC73C\uBBC0\uB85C trim()\uD558\uAC70\uB098 \uB9C8\uC9C0\uB9C9 \uACF5\uBC31\uC5C6\uC774 properties \uAC12\uC744 \uC124\uC815\uD560\uAC83
14	14	#-----------------------------------------------------------------------
15	15
16		-# \uc6b4\uc601\uc11c\ubc84 \ud0c0\uc785(WINDOWS, UNIX)
	16	+# \uC6B4\uC601\uC11C\uBC84 \uD0C0\uC785(WINDOWS, UNIX)
17	17	Globals.OsType = WINDOWS
18	18
19		-# G4C \uc5f0\uacb0\uc6a9 IP (localhost)
	19	+# G4C \uC5F0\uACB0\uC6A9 IP (localhost)
20	20	Globals.LocalIp = 127.0.0.1
21	21
22		-# DB\uc11c\ubc84 \ud0c0\uc785(mysql,oracle,altibase,tibero) - datasource \ubc0f sqlMap \ud30c\uc77c \uc9c0\uc815\uc5d0 \uc0ac\uc6a9\ub428
	22	+# DB\uC11C\uBC84 \uD0C0\uC785(mysql,oracle,altibase,tibero) - datasource \uBC0F sqlMap \uD30C\uC77C \uC9C0\uC815\uC5D0 \uC0AC\uC6A9\uB428
23	23	Globals.DbType = mysql
24	24
25	25
...	...	@@ -54,7 +54,7 @@
54	54
55	55	# MainPage Setting(admin)
56	56	Globals.MainPage = /cmm/main/mainPage.do
57		-#\ucee8\ud150\uce20 \ud30c\uc77c\uc704\uce58
	57	+#\uCEE8\uD150\uCE20 \uD30C\uC77C\uC704\uCE58
58	58	#Globals.ckeditorUploadDir=/home/file/ckeditor/
59	59	Globals.ckeditorUploadDir=/usr/local/tomcat/file/ckeditor/
60	60	#TEST SERVER
...	...	@@ -65,18 +65,18 @@
65	65	Globals.file.saveDir=/usr/local/tomcat
66	66
67	67
68		-#SNS \ub85c\uadf8\uc778 KEY \uac12
69		-#ITN \ub124\uc774\ubc84
	68	+#SNS \uB85C\uADF8\uC778 KEY \uAC12
	69	+#ITN \uB124\uC774\uBC84
70	70	Globals.itn.naver.clentId=d9Ohvhty_RVsfrq9p_2J
71	71	Globals.itn.naver.clientSecret=kwiEmpkLg5
72	72	Globals.itn.naver.returnUrl=http://localhost:80/snsLogin/naverOauth.do
73		-#ITN \uce74\uce74\uc624
	73	+#ITN \uCE74\uCE74\uC624
74	74	Globals.itn.kakao.restApiKey=10b66ad0c44b68b659855ddd64db2c44
75	75	Globals.itn.kakao.returnUrl=http://localhost:80/snsLogin/kakaoOauth.do
76	76
77		-#\uc0ac\uc774\ud2b8 \uc544\uc774\ub514 \uc81c\uac70\ub85c JSP\uc5d0\uc11c siteId/siteNm \ubcf4\uc5ec\uc8fc\uae30 \uc704\ud574
	77	+#\uC0AC\uC774\uD2B8 \uC544\uC774\uB514 \uC81C\uAC70\uB85C JSP\uC5D0\uC11C siteId/siteNm \uBCF4\uC5EC\uC8FC\uAE30 \uC704\uD574
78	78	Globals.homepage.siteId=mjon
79		-Globals.homepage.siteNm=\ubb38\uc790ON
	79	+Globals.homepage.siteNm=\uBB38\uC790ON
80	80
81	81
82	82
...	...	@@ -88,12 +88,12 @@
88	88	Globals.fax.file.permit.ext=hwp,hwpml,doc,xls,ppt,pdf,txt,docx,xlsx,pptx,tif,htm,html,jpg,jpeg,gif,bmp,gul
89	89
90	90
91		-#KG \ubaa8\ube4c\ub9ac\uc5b8\uc2a4 \uc124\uc815
	91	+#KG \uBAA8\uBE4C\uB9AC\uC5B8\uC2A4 \uC124\uC815
92	92	#CARD
93	93	Globals.pay.kgm.card.cnSvcid=191017078687
94	94	Globals.pay.kgm.card.payMode=10
95	95	#BANK
96		-Globals.pay.kgm.bank.raSvcid=230510133362
	96	+Globals.pay.kgm.bank.raSvcid=260908166392
97	97	Globals.pay.kgm.bank.payMode=00
98	98	#MOBILE
99	99	Globals.pay.kgm.mobile.mcSvcid=170622040674

...	...	@@ -94,13 +94,13 @@
94	94
95	95	#KG \uBAA8\uBE4C\uB9AC\uC5B8\uC2A4 \uC124\uC815
96	96	#CARD
97		-Globals.pay.kgm.card.cnSvcid=230523133878
	97	+Globals.pay.kgm.card.cnSvcid=260908166386
98	98	Globals.pay.kgm.card.payMode=10
99	99	#BANK
100		-Globals.pay.kgm.bank.raSvcid=230510133362
	100	+Globals.pay.kgm.bank.raSvcid=260908166392
101	101	Globals.pay.kgm.bank.payMode=10
102	102	#MOBILE
103		-Globals.pay.kgm.mobile.mcSvcid=220613125202
	103	+Globals.pay.kgm.mobile.mcSvcid=260908166398
104	104	Globals.pay.kgm.mobile.payMode=10
105	105
106	106	#Slack

Delete comment