Merge remote-tracking branch 'origin/main'

ruoyi-vue-pro-master/yudao-server/src/main/resources/application-dev.yaml

@@ -231,8 +231,8 @@ yudao:
       - ${spring.boot.admin.context-path}/** # 不处理 Spring Boot Admin 的请求
       - ${management.endpoints.web.base-path}/** # 不处理 Actuator 的请求
   pay:
-    order-notify-url: https://zd.huamar.com/admin-api/pay/notify/order # 支付渠道的【支付】回调地址
-    refund-notify-url: https://zd.huamar.com/admin-api/pay/notify/refund # 支付渠道的【退款】回调地址
+    order-notify-url: https://zdpay.huamar.com/admin-api/pay/notify/order # 支付渠道的【支付】回调地址
+    refund-notify-url: https://zdpay.huamar.com/admin-api/pay/notify/refund # 支付渠道的【退款】回调地址
   access-log: # 访问日志的配置项
     enable: false
   error-code: # 错误码相关配置项

ruoyi-vue-pro-master/yudao-server/src/main/resources/application-local.yaml

@@ -80,10 +80,10 @@ spring:
 #    database: 0 # 数据库索引
 #    password:  # 密码，建议生产环境开启
   redis:
-    host: 127.0.0.1 # 地址
-    port: 6379 # 端口
+    host: 120.46.159.203 # 地址
+    port: 16379 # 端口
     database: 0 # 数据库索引
-#    password: a8EYUSoT8wHbuRkX # 密码，建议生产环境开启
+    password: a8EYUSoT8wHbuRkX
 
 --- #################### 定时任务相关配置 ####################
 
@@ -275,6 +275,6 @@ alipay:
   appPrivateKey: MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCVtsGcFLqb4IKcNo5OoFmVkxp881AQgNQhJdM9AFIDdEaTcyNXtWabTdbJxNahBfeCOK01fpHbwMSMhRVwZmP+jiO/M/22QmyVLN6cUG7uN+rB1Sw5T1hCbUmSZpLgcfznaV1+2JIcx9dV4kPFJUSTokLapszCfBnmdlQ4oGUZD54zWCNHIEVckZGn/XC1PuiflxSscD9Sx2C6SBniG1sMz/BGFU8Sw5JwUKtzvGesUlKqeDLHQP1/WJjsajLfqPQV6SFxjDMEVZ0WSmJV0Tl80Ulup8vgNKHVD06U9VhqBnIYTf3JcCBMnV4jmM1NsOnlIbdS4GqwdoH5QmI3EmMFAgMBAAECggEAOP3dLgFmGDia/8R039GCyMG6753f+KhSGFxB0ZLxpYb55t+JsLXJXY2AGkboPVv8IIJazWZlN/Zl2+g9hRA1OI37ZanxBxS6KP9vrqmf0OdQYoE32Ikv2/mmbCjH+NDrqVwez066MGKSworjqYTKWjkGoh2lDNQZN/YLkZLdaXBHHAg8sAh66NROWgfnZBB7V93ScTWNcd2CYPOBK+jfLlWs9QmUjobn+NO2ihCvBDS5vX6lTrL4CDPMiEZHvnA71BLnRVaJl6wjdebVTao1TRo1njVSlvyArKYt/cfE366n/bfM1Ylhhnbgoj02g1JqQrS0wDH4Au86CLgepF8CgQKBgQDTCX8mxCX2hU96vEPxNVAS/Oh+TOTx0OLRvpowBlR3QEKheJZyNdcG2HG6cUTl0oihlUePcfiPkGKmhqeKXMt3ost5zO/axLfC06prEs6gPQftKJfYe+bIMvF7A41dt1m6oenXokHqg7BGSJ3k/CX/C8Q7nMsXhVYjKXBw/ErYTQKBgQC1nIj7RwofDPQcmiTwtAVVXXevoEXTpk+PslpdSLs+BmBJzvJ4oQtYP4thKxwWjIsJWT1AUWF66Ytismd/DEkK9MAJfiH1WPcDFFfbeAu4p+x3pYtyth3poQ+jgRfU3BgiwFDp4n0mZPn9na4vm93FkYFcy3soBT/Xm+AmiuIRmQKBgHzNX/GoDB9WxSL7VV6/PYSNJl0S0k4jTw/lHUALbkY7rWvaaXZPWsOEmvU8aRdUw1JzeqddKjaUl5KNjWUo7XbpwlVcmfgRX+8Kx/ycWa+viBF7cRkoZNm+Lsql1iM2/AyAFk9ceIjcqhFWfnHdoAbNiZYLapuVUdRnfESFHyn9AoGAJSN/t7MNVNA3U2oKR9boiE523UlvPhryhjY42H65G7P+GNnjJ9v3D/Les942/j17aUwAhJif0JzVzjchhw+iGEV4x/gtRZkN2mlclhr0eqyMZONLowevEknHgu4xS2w+20xsv4d7hFB99uk5565+KZrZ03ohE0wPhC3yJq+cD3ECgYEAnqgZN3KS0vcMb+LbWM0D+SI7z0LCK+zuZHWAqJBk/QQgWhLUniaNppTUVpmeiKxBMyL+o2wFhd8qM6ruSaPj18faZFnIXwCkOBdf2Ceawb6RFJpbQ916ihZsqo/6mWc6VSyezmko6Vdr7IVgRz8pehqcTv2nh7t+TOiuyz6jXm0=
   appId: 2021004170631369
   gateway: http://alipay.huamar.com/pay/alipay/transferUser
-  appCertPath: /cert/appCertPublicKey_2021004170631369.crt #应用公钥
-  alipayCertPath: /cert/alipayCertPublicKey_RSA2.crt #支付宝公钥
-  alipayRootCertPath: /cert/alipayRootCert.crt #支付宝根证书
+  appCertPath: appCertPublicKey_2021004170631369.crt #应用公钥
+  alipayCertPath: alipayCertPublicKey_RSA2.crt #支付宝公钥
+  alipayRootCertPath: alipayRootCert.crt #支付宝根证书