Merge remote-tracking branch 'origin/jsh77b' into card007

src/main/resources/config/application-locd.yml

@@ -25,7 +25,6 @@ domain:
     uximage: //ldfront.style24.com
 
 upload:
-    dext.target.path: /WIDE/workspace/files/data/style24/dext
     default:
         target.path: /WIDE/workspace/files/data/style24
         max.size: 10
@@ -103,8 +102,30 @@ naverPay:
     service.name: MallService5
     version: 5.0
 
+#카카오 API
+kakao:
+    cid : TC0ONETIME
+    appId : 399207
+    appName : 구축용 테스트앱
+    companyName : 예스이십사
+    nativeAppKey : f961e612e07b47aa2d1884714518a194
+    restApiKey: b3955cef0328a09156c7e25f18552164
+    javascriptKey : 06cab652ad5d25be2190388d11a88fa4
+    adminKey : a25ca74dde640f3a63a8d8442fe35fcd
+    addressApiRequestUrl : https://dapi.kakao.com/v2/local/search/address.json?page=1&query=
+    login.callbackUrl: /signin/snsLoginCallback?snsType=KK
+    tokenUrl: https://kauth.kakao.com/oauth/token
+    userInfoUrl: https://kapi.kakao.com/v2/user/me
+    authorizeUrl: https://kauth.kakao.com/oauth/authorize
+    unlinkUrl : https://kapi.kakao.com/v1/user/unlink
+    paymentReadyUrl : https://kapi.kakao.com/v1/payment/ready
+    paymentRedirectUrl : /order/kakao/payment/request
+    approvePaymentUrl : https://kapi.kakao.com/v1/payment/approve
+    paymentOrderUrl : https://kapi.kakao.com/v1/payment/order
+    cancelPaymentUrl : https://kapi.kakao.com/v1/payment/cancel
+
 # 검색엔진(NHN다이퀘스트)
 search:
     engine:
-        diquest.ip: 133.186.171.33
-        diquest.port: 44555
+        diquest.ip: 172.30.89.120
+        diquest.port: 5555

src/main/resources/config/application-style.yml

@@ -69,54 +69,76 @@ download.path: /files/data/style24
 
 # USAFE 보증보험 정보
 usafe.guarantee:
-    mall.id: TEST00
-    send.url: http://gateway.usafe.co.kr/esafe/guartrn.asp
-
+    mall.id: istyle2400
+    send.url: https://gateway.usafe.co.kr/esafe/guartrn.asp
 
 # PG
 pg:
     kcp:
         log.dir: /logs/style24/kcpLogs/front
         gw:
-            url: testpaygw.kcp.co.kr
+            url: paygw.kcp.co.kr
             port: 8090
-        js.url: https://testpay.kcp.co.kr/plugin/payplus_web.jsp
-        server: false
+        user.type: PGNW
+        js.url: https://pay.kcp.co.kr/plugin/payplus_web.jsp
+        server: true
         site:
             cd: U3476
-            key:
-            name: KCP TEST SHOP
+            key: 4aVa--.Xz8Fc78nwYPsrmmY__
+            name: ISTYLE
         log.level: 3
         module.type: 01
         tx.mode: 0
-        receipt.url : https://testadmin8.kcp.co.kr/assist/bill.BillActionNew.do
+        receipt.url : https://admin8.kcp.co.kr/assist/bill.BillActionNew.do
 
 # 네이버페이 API
 naverPay:
-    apiUrl: https://dev.apis.naver.com/
+    apiUrl: https://apis.naver.com/
     payUrl:
-        web : test-pay.naver.com
-        mob : test-m.pay.naver.com
-    shop.id: istyle24
-    button.key: 3A1578F9-6824-4FCF-AC8D-262318C63227
-    button.pc.js.url: https://test-pay.naver.com/customer/js/naverPayButton.js
-    button.mobile.js.url: https://test-pay.naver.com/customer/js/mobile/naverPayButton.js
+        web : pay.naver.com
+        mob : m.pay.naver.com
+    shop.id: istyle2424
+    button.key: 5DF64042-EF37-45F1-878E-67C7098135E6
+    button.pc.js.url: https://pay.naver.com/customer/js/naverPayButton.js
+    button.mobile.js.url: https://pay.naver.com/customer/js/mobile/naverPayButton.js
     common.certification.key: s_3799db3bf4af
-    certification.key: E3122594-C690-4542-B3A0-E74ABD4E8222
-    order.api.url: https://test-api.pay.naver.com/o/customer/api/order/v20/register
-    order.pc.url: https://test-order.pay.naver.com/customer/buy/
-    order.mobile.url: https://test-m.pay.naver.com/o/customer/buy/
+    certification.key: 2BC5E173-2840-4B48-BC7D-FF770005DD76
+    order.api.url: https://api.pay.naver.com/o/customer/api/order/v20/register
+    order.pc.url: https://order.pay.naver.com/customer/buy/
+    order.mobile.url: https://m.pay.naver.com/o/customer/buy/
     zzim.api.url: https://pay.naver.com/customer/api/wishlist.nhn
     zzim.popup.url: https://pay.naver.com/customer/wishlistPopup.nhn
     zzim.mobile.url: https://m.pay.naver.com/mobile/customer/wishList.nhn
-    access.license: 01000100005b15bb8faab722d100d589f34bd64843659e37a168b3617443c4f52a3fda45b8
-    secret.key: AQABAADtZ/jOC1Y3LNsyI0TWwCMvPfrg0sqM9pnxliSegbjSqQ==
-    port.address: http://sandbox.api.naver.com/Checkout/MallService5
+    access.license:
+    secret.key:
+    port.address: http://ec.api.naver.com/Checkout/MallService5
     service.name: MallService5
     version: 5.0
 
+#카카오 API
+kakao:
+    cid : CT22482324 
+    appId: 442702
+    appName: 아이스타일24
+    companyName: 예스이십사
+    nativeAppKey: 5d97db2ee36fa0e121d962b2531ae0c1
+    restApiKey: 46d601394bd887cbada3cf00fdddef54
+    javascriptKey: b3c9ee69171042c3637e8d714a4c8a75
+    adminKey: 7cc33b2ef96d785c4caf3376f9dc9254
+    addressApiRequestUrl : https://dapi.kakao.com/v2/local/search/address.json?page=1&query=
+    login.callbackUrl: /signin/snsLoginCallback?snsType=KK
+    tokenUrl: https://kauth.kakao.com/oauth/token
+    userInfoUrl: https://kapi.kakao.com/v2/user/me
+    authorizeUrl: https://kauth.kakao.com/oauth/authorize
+    unlinkUrl : https://kapi.kakao.com/v1/user/unlink
+    paymentReadyUrl : https://kapi.kakao.com/v1/payment/ready
+    paymentRedirectUrl : /order/kakao/payment/request
+    approvePaymentUrl : https://kapi.kakao.com/v1/payment/approve
+    paymentOrderUrl : https://kapi.kakao.com/v1/payment/order
+    cancelPaymentUrl : https://kapi.kakao.com/v1/payment/cancel
+
 # 검색엔진(NHN다이퀘스트)
 search:
     engine:
-        diquest.ip: 172.30.89.120
-        diquest.port: 5555
+        diquest.ip: 133.186.171.33
+        diquest.port: 44555

src/main/resources/config/application.yml

@@ -69,38 +69,6 @@ naverPay:
     paymentOrderUrl: /naverpay/payments/v2/list/history
     cancelPaymentUrl: /naverpay/payments/v1/cancel
 
-#카카오 API
-kakao:
-# 카카오페이 운영정보
-#    cid : 운영cid정보 없음
-#    appId: 442702
-#    appName: 아이스타일24
-#    companyName: 예스이십사
-#    nativeAppKey: 5d97db2ee36fa0e121d962b2531ae0c1
-#    restApiKey: 46d601394bd887cbada3cf00fdddef54
-#    javascriptKey: b3c9ee69171042c3637e8d714a4c8a75
-#    adminKey: 7cc33b2ef96d785c4caf3376f9dc9254
-# 카카오페이 운영정보
-    cid : TC0ONETIME
-    appId : 399207
-    appName : 구축용 테스트앱
-    companyName : 예스이십사
-    nativeAppKey : f961e612e07b47aa2d1884714518a194
-    restApiKey: b3955cef0328a09156c7e25f18552164
-    javascriptKey : 06cab652ad5d25be2190388d11a88fa4
-    adminKey : a25ca74dde640f3a63a8d8442fe35fcd
-    addressApiRequestUrl : https://dapi.kakao.com/v2/local/search/address.json?page=1&query=
-    login.callbackUrl: /signin/snsLoginCallback?snsType=KK
-    tokenUrl: https://kauth.kakao.com/oauth/token
-    userInfoUrl: https://kapi.kakao.com/v2/user/me
-    authorizeUrl: https://kauth.kakao.com/oauth/authorize
-    unlinkUrl : https://kapi.kakao.com/v1/user/unlink
-    paymentReadyUrl : https://kapi.kakao.com/v1/payment/ready
-    paymentRedirectUrl : /order/kakao/payment/request
-    approvePaymentUrl : https://kapi.kakao.com/v1/payment/approve
-    paymentOrderUrl : https://kapi.kakao.com/v1/payment/order
-    cancelPaymentUrl : https://kapi.kakao.com/v1/payment/cancel
-
 #YES24 API
 yes24 :
     id : 101582
@@ -124,6 +92,7 @@ app.down.url:
     ios: https://apps.apple.com/kr/app/id627774402?mt=8
     aos: https://play.google.com/store/apps/details?id=com.istyle24.commerce
 
+
 # 핑거푸시
 fingerPush:
     appKey : 3S2C52DCXOO9