Merge remote-tracking branch 'origin/develop' into xodud1202

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

@@ -90,3 +90,12 @@ naverPay:
     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
+    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/

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

@@ -87,4 +87,13 @@ naverPay:
     apiUrl: https://dev.apis.naver.com/
     payUrl:
         web : test-pay.naver.com
-        mob : test-m.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
+    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/

src/main/resources/config/application.yml

@@ -54,32 +54,43 @@ cj:
 
 #카카오 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
+    # 카카오페이 운영정보
+    #    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
+  
+# 네이버페이 API
+naverPay:
+    partnerId: np_ktptw906068
+    clientId: 8TSWSyJMMUvOLKUySQx6
+    clientSecret: oGXnO7cMD1
+    paymentReadyUrl: /naverpay/payments/v2/reserve
+    paymentRedirectUrl: /order/naver/payment/request
+    approvePaymentUrl: /naverpay/payments/v2/apply/payment
+    paymentOrderUrl: /naverpay/payments/v2/list/history
+    cancelPaymentUrl: /naverpay/payments/v1/cancel