Merge branch 'dev' into 'mp-server-test'

银盛配置

See merge request quanshu/mp-server!1041

mp-admin/src/main/resources/application-test.yml

@@ -145,3 +145,14 @@ shipping:
   channel: 7
 bind:
   channelId: 2
+
+
+# 银盛支付配置
+ys-pay:
+  private-key-path: /home/quanshu/mp-server/data/ysPayPre.pfx
+  public-key-path: /home/quanshu/mp-server/data/ysPayPub.cer
+  # 支付完后跳转
+  return-url: https://test-mp-h5.quanshu123.com
+  # 回调地址
+  notify-url: https://www.quanshu123.com
+