1.调整谷芽抖音信息

2.更新红朵证书

src/main/java/com/rf/psychological/douyin/service/impl/DouYinServiceImpl.java

@@ -15,7 +15,6 @@ import com.rf.psychological.user.service.UserService;
 import com.rf.psychological.utils.Constant;
 import com.rf.psychological.utils.JWTUtil;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpPost;
@@ -25,6 +24,7 @@ import org.apache.http.impl.client.HttpClients;
 import org.apache.http.util.EntityUtils;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import java.io.ByteArrayOutputStream;

src/main/java/com/rf/psychological/douyin/util/SignUtil.java

@@ -40,8 +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 = "WRXp4QHzuw8C5Otw3jPzmIGduUHBDWMNmNlh6AIH";
+    private static final String SALT = "I9mmeXYF5lvXonBkvohpVnHOqm2LMJQhLZbrAFDK";
+    //private static final String SALT = "WRXp4QHzuw8C5Otw3jPzmIGduUHBDWMNmNlh6AIH";
 
     /**
      * callbackToken 是平台上配置的token

src/main/java/com/rf/psychological/security/SSLConfig.java

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

src/main/resources/config/application-public.yml

@@ -1,18 +1,18 @@
 #公网版
 server:
-  port: 8446
+  port: 8445
   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: z4793x61z299
     key-store-type: JKS
 
+#  ssl:
+#    key-store: classpath:guya-tech.com.jks
+#    key-store-password: 120jtiv035z7
+#    key-store-type: JKS
+
 
 spring:
   datasource:
@@ -45,22 +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
-  api-v3-key: MentalHealth20240624HuYaTest0628
-  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
@@ -78,13 +78,13 @@ wx.pay:
 #抖音支付
 douyin:
   #hongduo
-#  appid: tt444a32f7db77627c01
-#  notifyUrl: https://hnhong-duo.com
-#  secret: d8a880ae1f5cf6e1588f4367e13f95c1d5b4be9b
+  appid: tt444a32f7db77627c01
+  notifyUrl: https://hnhong-duo.com
+  secret: d8a880ae1f5cf6e1588f4367e13f95c1d5b4be9b
   #guya
-  appid: tt368a4037a9bda77b01
-  notifyUrl: https://guya-tech.com
-  secret: c684ae4d1a903d1b909fc66942b2dd81a974657d
+#  appid: tt368a4037a9bda77b01
+#  notifyUrl: https://guya-tech.com
+#  secret: c684ae4d1a903d1b909fc66942b2dd81a974657d
   appName: douyin
   sessionUrl: https://developer.toutiao.com/api/apps/v2/jscode2session
   tokenUrl: https://developer.toutiao.com/api/apps/v2/token