baolei преди 2 месеца
родител
ревизия
bb8c1e8c52

+ 6 - 7
08.src/Xingxi/xingxi-miniprogram-api/src/main/resources/application-release.yml

@@ -16,22 +16,21 @@ spring:
           private-key-path: "classpath:META-INF/apiclient_key.pem"
           private-cert-path: "classpath:META-INF/apiclient_cert.pem"
     request:
-      referers: "https://mpapi.ysyd.cloud,http://127.0.0.1"
+      referers: "https://mpapi.gululuq.com,http://127.0.0.1"
     cors:
       pathPattern: "/api/store/**"
       allowedMethods: "GET,POST"
       allowedHeaders: "authorization,x-requested-with,x-store-id,content-type"
-      allowedOrigins: "*,https://mpapi.ysyd.cloud"
+      allowedOrigins: "*,https://mpapi.gululuq.com"
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
     driver-class-name: com.mysql.cj.jdbc.Driver
     url: "jdbc:mysql://rm-uf6fjpp72u4q4u0no.mysql.rds.aliyuncs.com:3306/gululuq?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8"
     username: "gululuqrw"
-    #password: 1273349861gululuQ
-    password: i1vU6aQ88KQFAVg66Nf/r+ympQniFGeqTxk1JIXsMLUNvBGlPzsiKNxp0F2HvWMoktBQI/KqHpZG4F4g4nkVTQ==
+    password: 1273349861gululuQ
     druid:
-      publickey: MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAJXk/tx1tLYxIgU6kbwbDepHKeHWgvH0GGmShsx2n3F3xg0Y3QFV64l3C9Z2zTEL7dHscwHRuZts+TisAbYsTS0CAwEAAQ==
-      connectionProperties: config.decrypt=true;config.decrypt.key=${spring.datasource.druid.publickey}
+#      publickey: MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAJXk/tx1tLYxIgU6kbwbDepHKeHWgvH0GGmShsx2n3F3xg0Y3QFV64l3C9Z2zTEL7dHscwHRuZts+TisAbYsTS0CAwEAAQ==
+#      connectionProperties: config.decrypt=true;config.decrypt.key=${spring.datasource.druid.publickey}
       initialSize: 5
       minIdle: 10
       maxActive: 20
@@ -56,7 +55,7 @@ spring:
     port: 5672
     username: gululu
     password: Gululuq123
-    virtual-host: gululuq-release
+    virtual-host: "gululuq-release"
     publisher-confirm-type: correlated
   # redis配置
   redis:

+ 16 - 13
08.src/Xingxi/xingxi-mq-server/src/main/resources/config/application-release.yml

@@ -1,6 +1,19 @@
 server:
   port: 8190
 spring:
+  application:
+    xingxi:
+      unifiedpay:
+        enabled: "true"
+        callbackUrl: "https://managertest.gululuq.com/unifiedpay/wxpay/callback"
+        wxpay:
+          enabled: "true"
+          app-id: "wx12e34630814e5d30"
+          mch-id: "1709337210"
+          apiv3-key: "mF9oH1oV9wY3gL8iW3kU4fJ7fE1dW4vK"
+          cert-serial-no: 4FBE124DE5AAD53E1FF52E740131A6072FE692F1
+          private-key-path: "classpath:META-INF/apiclient_key.pem"
+          private-cert-path: "classpath:META-INF/apiclient_cert.pem"
   # redis配置
   redis:
     database: 0
@@ -21,20 +34,17 @@ spring:
     username: gululu
     password: Gululuq123
     virtual-host: gululuq-release
-    #    publisher-confirms: true
     publisher-confirm-type: correlated
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
     driverClassName: com.mysql.cj.jdbc.Driver
     druid:
-      publickey: MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAJXk/tx1tLYxIgU6kbwbDepHKeHWgvH0GGmShsx2n3F3xg0Y3QFV64l3C9Z2zTEL7dHscwHRuZts+TisAbYsTS0CAwEAAQ==
       # 主库数据源
       master:
         url: "jdbc:mysql://rm-uf6fjpp72u4q4u0no.mysql.rds.aliyuncs.com:3306/gululuq?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8"
         username: "gululuqrw"
-        #password: $TyH69i4EEG^om!!
-        password: i1vU6aQ88KQFAVg66Nf/r+ympQniFGeqTxk1JIXsMLUNvBGlPzsiKNxp0F2HvWMoktBQI/KqHpZG4F4g4nkVTQ==
-        connectionProperties: config.decrypt=true;config.decrypt.key=${spring.datasource.druid.publickey}
+        password: 1273349861gululuQ
+
       # 从库数据源
       slave:
         # 从数据源开关/默认关闭
@@ -91,11 +101,4 @@ logging:
 wx:
   miniapp:
     appid: "wx12e34630814e5d30"
-    secret: "fc06d584d8544a00f0ff9df65a30af02"
-  pay:
-    mch-id: "1709337210"
-    apiv3-key: "mF9oH1oV9wY3gL8iW3kU4fJ7fE1dW4vK"
-    cert-serial-no: 4FBE124DE5AAD53E1FF52E740131A6072FE692F1
-    private-key-path: "classpath:META-INF/apiclient_key.pem"
-    private-cert-path: "classpath:META-INF/apiclient_cert.pem"
-    refundcallbackUrl: "https://manager.gululuq.com/unifiedpay/wxpay/refund/callback"
+    secret: "fc06d584d8544a00f0ff9df65a30af02"