Merge remote-tracking branch 'origin/master'

fs-service/src/main/java/com/fs/core/config/WxOpenProperties.java

@@ -9,7 +9,7 @@ import org.springframework.context.annotation.Configuration;
 @ConfigurationProperties("wx.open")
 public class WxOpenProperties {
 
-    private String appId = "wxcb1e78baf03c0662";
+    private String appId;
 
-    private String secret = "d041d3e2392a68a3e86dc22d976ed4a0";
+    private String secret;
 }

fs-service/src/main/java/com/fs/course/mapper/FsCourseTrafficLogMapper.java

@@ -127,6 +127,7 @@ public interface FsCourseTrafficLogMapper
             "<if test='createTime != null'>AND create_time &lt;= #{createTime}</if> " +
             "</script>")
     List<Long> findRecordsNumByIds( @Param("createTime") Date createTime);
+
     @Update("<script>" +
             "UPDATE fs_course_traffic_log SET status = #{status} WHERE log_id IN " +
             "<foreach item='id' collection='ids' open='(' separator=',' close=')'>" +
@@ -145,14 +146,14 @@ public interface FsCourseTrafficLogMapper
             "</script>")
     Long findRecordsNum(@Param("companyId") Long companyId);
 
-    // 批量更新状态
-    @Update("<script>" +
-            "UPDATE fs_course_traffic_log SET status = 1 WHERE log_id IN " +
-            "<foreach item='id' collection='ids' open='(' separator=',' close=')'>" +
-            "#{id}" +
-            "</foreach>" +
-            "</script>")
-    int updateStatusByIds(@Param("ids") List<Long> ids);
+//    // 批量更新状态
+//    @Update("<script>" +
+//            "UPDATE fs_course_traffic_log SET status = 1 WHERE log_id IN " +
+//            "<foreach item='id' collection='ids' open='(' separator=',' close=')'>" +
+//            "#{id}" +
+//            "</foreach>" +
+//            "</script>")
+//    int updateStatusByIds(@Param("ids") List<Long> ids);
 
     @Select("<script>" +
             "SELECT internet_traffic FROM fs_course_traffic_log WHERE log_id IN " +

fs-service/src/main/java/com/fs/course/service/impl/FsUserCourseVideoServiceImpl.java

@@ -1024,6 +1024,7 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
         packetParam.setSource(param.getSource());
         packetParam.setRedPacketMode(config.getRedPacketMode());
         packetParam.setCompanyId(param.getCompanyId());
+        packetParam.setAppId(param.getAppId());
 
         System.out.println("红包金额"+amount);
         System.out.println("红包商户号"+packetParam);

fs-service/src/main/resources/application-config-druid-kyt.yml

@@ -79,7 +79,7 @@ cloud_host:
 headerImg:
   imgUrl: https://kuanyitang-1317640934.cos.ap-shanghai.myqcloud.com/kuanyitang/20250813/6b3b62e01672407c98f0561b73e35f6a.jpg
 ipad:
-  ipadUrl:
+  ipadUrl: http://kytIpad.ylrzcloud.com
   aiApi:
 wx_miniapp_temp:
   pay_order_temp_id:

fs-service/src/main/resources/application-config-druid-sxjz.yml

@@ -80,7 +80,7 @@ headerImg:
   imgUrl: https://jz-cos-1356808054.cos.ap-chengdu.myqcloud.com/fs/20250515/0877754b59814ea8a428fa3697b20e68.png
 ipad:
   ipadUrl: http://ipad.xintaihl.cn
-  aiApi:
+  aiApi: http://1.95.196.10:3000/api
 wx_miniapp_temp:
   pay_order_temp_id:
   inquiry_temp_id:

fs-service/src/main/resources/application-config-zkzh.yml

@@ -94,9 +94,9 @@ wx:
         secret: 473a992e28d5c524b4ff3783559026cb
         token: PPKOdAlCoMO # 接口配置里的Token值
         aesKey: Eswa6VjwtVMCcw03qZy6fWllgrv5aytIA1SZPEU0kU2 # 接口配置里的EncodingAESKey值
-    open:
-      appId: wx40f3de7bd405fb5c
-      secret: 4038e9209ddaf5f23dcde35e41be3120
+  open:
+    appId: wx40f3de7bd405fb5c
+    secret: 4038e9209ddaf5f23dcde35e41be3120
 jpush:
   appKey: cc9a0120a3e4270c9cba340d
   masterSecret: cfc2575d3cd7470d584c990c

fs-service/src/main/resources/application-druid-kyt.yml

@@ -5,9 +5,12 @@ spring:
   # redis 配置
   redis:
     # 地址
-    host: 172.17.0.4
+#    host: 172.17.0.4
+#    # 端口，默认为6379
+#    port: 6379
+    host: sh-crs-bln5ggez.sql.tencentcdb.com
     # 端口，默认为6379
-    port: 6379
+    port: 26161
     # 密码
     password: Ylrztek250218!3@.
     # 连接超时时间
@@ -30,7 +33,8 @@ spring:
       druid:
         # 主库数据源
         master:
-          url: jdbc:mysql://172.17.0.3:3306/fs_his?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+#          url: jdbc:mysql://172.17.0.3:3306/fs_his?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+          url: jdbc:mysql://sh-cdb-qyfybkwy.sql.tencentcdb.com:24529/fs_his?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
           username: root
           password: Ylrztek250218!3@.
         # 从库数据源
@@ -85,7 +89,8 @@ spring:
       druid:
         # 主库数据源
         master:
-          url: jdbc:mysql://172.17.0.3:3306/sop?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+#          url: jdbc:mysql://172.17.0.3:3306/sop?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+          url: jdbc:mysql://sh-cdb-qyfybkwy.sql.tencentcdb.com:24529/sop?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
           username: root
           password: Ylrztek250218!3@.
         # 初始连接数