Merge remote-tracking branch 'origin/dev' into dev

bd-third/src/main/resources/bootstrap.yml

@@ -121,3 +121,60 @@ delivery:
   appKey: 204784177
   appSecret: KrTbnrAV01j7bIQ5mpr3W0FB73KvjaG8
   appCode: 7390ccb8230f4e74a1b0ba31ec6f1419
+
+## 京东收银台支付配置
+jd:
+  bank:
+    ## 二级商户号
+    merchantNo: 153428607005
+    ## 签名密钥
+    signKey: 3d2647236d1c70e25b5acf6b9d903136439e29a06c50a412dc0c7bc3de2ef523
+    ## 证书加密密码
+    priCertPwd: bd147258369
+    ## 私钥文件名
+    priCert: jd/merchantCert005.pfx
+    ## 公钥文件名
+    pubCert: jd/npp_11_API2_pro.cer
+    ## 生产环境api接口域名
+    apiDomain: http://wapi.jd.com
+    ## 页面回调地址
+    #    pageBackUrl: https://t-app.beida666.com/prod-api/pay/jd/sync-notify
+    pageBackUrl: http://t-app.beida666.com/#/pages/pay/success
+    ## 支付回调地址
+    notifyUrl: https://t-app.beida666.com/prod-api/pay/jd/trade-notify
+    #    notifyUrl: https://b747-218-57-66-5.ngrok-free.app/pay/jd/trade-notify
+    ## 退款回调地下
+    refundNotifyUrl: https://t-app.beida666.com/prod-api/pay/jd-refund/trade-notify
+    #    refundNotifyUrl: https://b747-218-57-66-5.ngrok-free.app/pay/jd-refund/trade-notify
+    separateAccounts:
+      - account: 153428607007
+        proportion: 0.5
+      - account: 153428607005
+        proportion: 0.5
+  wechat-alipay:
+    ## 二级商户号
+    merchantNo: 153428607006
+    ## 签名密钥
+    signKey: 34ea117103df740ac66847aa7aebbbb2ee58ef716b8bc0c525ef90eb3fbdd4b0
+    ## 证书加密密码
+    priCertPwd: bd258369147
+    ## 私钥文件名
+    priCert: jd/merchantCert006.pfx
+    ## 公钥文件名
+    pubCert: jd/npp_11_API2_pro.cer
+    ## 生产环境api接口域名
+    apiDomain: http://wapi.jd.com
+    ## 页面回调地址
+    #    pageBackUrl: https://t-app.beida666.com/prod-api/pay/jd/sync-notify
+    pageBackUrl: http://t-app.beida666.com/#/pages/pay/success
+    ## 支付回调地址
+    #    notifyUrl: https://t-app.beida666.com/prod-api/pay/jd/trade-notify
+    notifyUrl: https://b747-218-57-66-5.ngrok-free.app/pay/jd/trade-notify
+    ## 退款回调地下
+    #    refundNotifyUrl: https://t-app.beida666.com/prod-api/pay/jd-refund/trade-notify
+    refundNotifyUrl: https://b747-218-57-66-5.ngrok-free.app/pay/jd-refund/trade-notify
+    separateAccounts:
+      - account: 153428607008
+        proportion: 0.5
+      - account: 153428607006
+        proportion: 0.5