zsf 4 місяців тому
батько
коміт
495679f288

+ 2 - 1
src/main/java/com/rf/psychological/douyin/util/SignUtil.java

@@ -40,7 +40,8 @@ public class SignUtil {
      *
      * Payment key value, you need to replace it with your own key
      */
-    private static final String SALT = "I9mmeXYF5lvXonBkvohpVnHOqm2LMJQhLZbrAFDK";
+    //private static final String SALT = "I9mmeXYF5lvXonBkvohpVnHOqm2LMJQhLZbrAFDK";
+    private static final String SALT = "WRXp4QHzuw8C5Otw3jPzmIGduUHBDWMNmNlh6AIH";
 
     /**
      * callbackToken 是平台上配置的token

+ 2 - 2
src/main/java/com/rf/psychological/security/SSLConfig.java

@@ -54,8 +54,8 @@ public class SSLConfig {
             connector.setRedirectPort(8848);
         } else if ("public".equals(profile)) {
             //101心理照相机公网版正式
-            connector.setPort(8085);
-            connector.setRedirectPort(8445);
+            connector.setPort(8086);
+            connector.setRedirectPort(8446);
         } else {
             //TODO 待定
             //112心理照相机

+ 26 - 20
src/main/resources/config/application-public.yml

@@ -1,18 +1,18 @@
 #公网版
 server:
-  port: 8445
+  port: 8446
   address: 0.0.0.0
 
-  ssl:
-    key-store: classpath:hnhong-duo.com.jks
-    key-store-password: pk4x5v3pz83va2
-    key-store-type: JKS
-
 #  ssl:
-#    key-store: classpath:guya-tech.com.jks
-#    key-store-password: 120jtiv035z7
+#    key-store: classpath:hnhong-duo.com.jks
+#    key-store-password: pk4x5v3pz83va2
 #    key-store-type: JKS
 
+  ssl:
+    key-store: classpath:guya-tech.com.jks
+    key-store-password: 120jtiv035z7
+    key-store-type: JKS
+
 
 spring:
   datasource:
@@ -45,21 +45,22 @@ spring:
 wx.pay:
   #HD
   # 商户号
-  mch-id: 1655519363
+  #mch-id: 1655519363
   #商户api证书序列号
-  mch-serial-no: 692670931729B82A48747B47EFE3142BCA73D978
+  #mch-serial-no: 692670931729B82A48747B47EFE3142BCA73D978
   # 商户私钥文件
-  private-key-path: apiclient_key_hd.pem
+  #private-key-path: apiclient_key_hd.pem
   # API秘钥
-  api-v3-key: MentalHealth20191025HongduoTest1
+  #api-v3-key: MentalHealth20191025HongduoTest1
   # 接受结果回调地址
-  notify-domain: https://hnhong-duo.com/
+  #notify-domain: https://hnhong-duo.com/
 
   #GY
-#  mch-id: 1680226340
-#  mch-serial-no: 2D81528EEFB70503C10339D9655408E0A583C963
-#  private-key-path: apiclient_key_gy.pem
-#  notify-domain: https://guya-tech.com
+  mch-id: 1680226340
+  mch-serial-no: 2D81528EEFB70503C10339D9655408E0A583C963
+  api-v3-key: MentalHealth20240624HuYaTest0628
+  private-key-path: apiclient_key_gy.pem
+  notify-domain: https://guya-tech.com
 
 
   # APPID
@@ -76,14 +77,19 @@ wx.pay:
 
 #抖音支付
 douyin:
-  appid: tt444a32f7db77627c01
+  #hongduo
+#  appid: tt444a32f7db77627c01
+#  notifyUrl: https://hnhong-duo.com
+#  secret: d8a880ae1f5cf6e1588f4367e13f95c1d5b4be9b
+  #guya
+  appid: tt368a4037a9bda77b01
+  notifyUrl: https://guya-tech.com
+  secret: c684ae4d1a903d1b909fc66942b2dd81a974657d
   appName: douyin
-  secret: d8a880ae1f5cf6e1588f4367e13f95c1d5b4be9b
   sessionUrl: https://developer.toutiao.com/api/apps/v2/jscode2session
   tokenUrl: https://developer.toutiao.com/api/apps/v2/token
   createOrderUrl: https://developer.toutiao.com/api/apps/ecpay/v1/create_order
   codeUrl: https://developer.toutiao.com/api/apps/qrcode
-  notifyUrl: https://hnhong-duo.com
   queryOrderUrl: https://developer.toutiao.com/api/apps/ecpay/v1/query_order
   pushOrderUrl: https://developer.toutiao.com/api/apps/order/v2/push
   isDouYin: true