Merge remote-tracking branch 'origin/master'

fs-live-app/src/main/java/com/fs/live/task/LiveCompletionPointsTask.java

@@ -62,10 +62,11 @@ public class LiveCompletionPointsTask {
                     
                     // 使用Hash结构获取该直播间所有用户的观看时长
                     String hashKey = "live:watch:duration:hash:" + liveId;
-                    Map<Object, Object> userDurations = redisCache.redisTemplate.opsForHash().entries(hashKey);
+                    Map<Object, Object> userDurations = redisCache.hashEntries(hashKey);
                     
                     if (userDurations == null || userDurations.isEmpty()) {
-                        log.debug("直播间没有观看时长数据, liveId={}, liveName={}", liveId, live.getLiveName());
+                        log.warn("直播间没有观看时长数据, liveId={}, liveName={}, Redis Key: {}, userDurations={}", 
+                                liveId, live.getLiveName(), hashKey, userDurations);
                         continue;
                     }
                     

fs-live-app/src/main/java/com/fs/live/task/Task.java

@@ -723,7 +723,7 @@ public class Task {
                     
                     // 使用Hash结构存储每个直播间的观看时长
                     String hashKey = "live:watch:duration:hash:" + liveId;
-                    Map<Object, Object> userDurations = redisCache.redisTemplate.opsForHash().entries(hashKey);
+                    Map<Object, Object> userDurations = redisCache.hashEntries(hashKey);
                     
                     if (userDurations == null || userDurations.isEmpty()) {
                         continue;

fs-service/src/main/java/com/fs/fastGpt/service/impl/AiHookServiceImpl.java

@@ -465,8 +465,8 @@ public class AiHookServiceImpl implements AiHookService {
             }
 
             //对用户处理的内容做处理，去除手机号替换
-            //String maskedContent = processContent(qwContent);
-            String contentEmj = replaceWxEmo(qwContent);
+            String maskedContent = processContent(qwContent);
+            String contentEmj = replaceWxEmo(maskedContent);
             if(!contentEmj.contains("表情包")){
                 if(!contentEmj.isEmpty()){
                     addSaveAiMsg(1,1,contentEmj,user,fastGptChatSession.getSessionId(),role.getRoleId(),qwExternalContacts,fastGptChatSession.getUserId(),null,null,null);
@@ -972,7 +972,8 @@ public class AiHookServiceImpl implements AiHookService {
      * @return
      */
     private @Nullable String processContent(String qwContent) {
-        String maskedContent = SensitiveDataUtils.maskMobileNumbers(qwContent);
+        //String maskedContent = SensitiveDataUtils.maskMobileNumbers(qwContent);
+        String maskedContent = qwContent;
         if(maskedContent != null && !maskedContent.isEmpty()){
             FastGptChatReplaceText fastGptChatReplaceText = new FastGptChatReplaceText();
             fastGptChatReplaceText.setStatus(1);

fs-service/src/main/java/com/fs/live/service/impl/LiveCompletionPointsRecordServiceImpl.java

@@ -143,16 +143,16 @@ public class LiveCompletionPointsRecordServiceImpl implements ILiveCompletionPoi
 
                 long daysBetween = ChronoUnit.DAYS.between(lastDate, today);
 
-                if (daysBetween == 1) {
+                if (daysBetween == 0) {
+                    continuousDays = latestRecord.getContinuousDays();
+                    log.debug("今天已有其他直播间完课记录，继承连续天数, liveId={}, userId={}, continuousDays={}", 
+                            liveId, userId, continuousDays);
+                } else if (daysBetween == 1) {
                     // 昨天完课了,连续天数+1
                     continuousDays = latestRecord.getContinuousDays() + 1;
-                } else if (daysBetween > 1) {
+                } else {
                     // 中断了,重新开始
                     continuousDays = 1;
-                } else {
-                    // daysBetween == 0 说明今天已经有记录了(理论上不会进入这里,因为前面已经检查过)
-                    log.warn("异常情况: 今天已有完课记录, liveId={}, userId={}", liveId, userId);
-                    return;
                 }
             }
 

fs-service/src/main/resources/application-config-dev-jnlzjk.yml

@@ -86,8 +86,8 @@ tmp_secret_config:
 cloud_host:
   company_name: 济南联志健康
   projectCode: LZJK
-  spaceName:
-  volcengineUrl: https://jnlzvolcengine.ylrztop.com
+  spaceName: lzjk-2114522511
+  volcengineUrl: https://jnlzjkvolcengine.ylrztop.com
 headerImg:
   imgUrl:
 

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

@@ -87,8 +87,8 @@ tmp_secret_config:
 cloud_host:
   company_name: 济南联志健康
   projectCode: LZJK
-  spaceName:
-  volcengineUrl: https://jnlzvolcengine.ylrztop.com
+  spaceName: lzjk-2114522511
+  volcengineUrl: https://jnlzjkvolcengine.ylrztop.com
 headerImg:
   imgUrl:
 

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

@@ -0,0 +1,104 @@
+baidu:
+  token: 12313231232
+  back-domain: https://www.xxxx.com
+#配置
+logging:
+  level:
+    org.springframework.web: INFO
+    com.github.binarywang.demo.wx.cp: DEBUG
+    me.chanjar.weixin: DEBUG
+wx:
+  miniapp:
+    configs:
+      - appid: wx94951f52d3ac5e25   #北京存在文化
+        secret: bfe27b20c6e3c4232a1d4ef36228e84b #北京存在文化
+        token: Ncbnd7lJvkripxxna6NAWCxCrvC
+        aesKey: HlEiBB55eaWUaeBVAQO3cWKWPYv1vOVQSq7nFNICw4E
+        msgDataFormat: JSON
+  cp:
+    corpId: wwa46ffb9ff6ac35b8 #企业ID北京存在文化
+    appConfigs:
+      - agentId: 1000070       #北京存在文化
+        secret: pu2EFz6gY2Fo2K-aRUxLPaAkKIaMJJRp8ES9JdpHkp4 #北京存在文化
+        token: PPKOdAlCoMO
+        aesKey: PKvaxtpSv8NGpfTDm7VUHIK8Wok2ESyYX24qpXJAdMP
+  pay:
+    appId:  #微信公众号或者小程序等的appid
+    mchId:  #微信支付商户号
+    mchKey:  #微信支付商户密钥
+    subAppId:  #服务商模式下的子商户公众账号ID
+    subMchId:  #服务商模式下的子商户号
+    keyPath: c:\\cert\\apiclient_cert.p12 # p12证书的位置，可以指定绝对路径，也可以指定类路径（以classpath:开头）
+    notifyUrl: https://userapp.his.runtzh.com/app/wxpay/wxPayNotify
+  mp:
+    useRedis: false
+    redisConfig:
+      host: 127.0.0.1
+      port: 6379
+      timeout: 2000
+    configs:
+#      - appId: wxce847c8ebe5e62aa # 第一个公众号的appid  //公众号名称:济南联智健康
+#        secret: 37f7c5e3b7ff07794343957f7ced8de4 # 公众号的appsecret--济南联智健康
+      - appId: wxd6905bed94e45ef0 # 第一个公众号的appid  //公众号名称:济南联智健康
+        secret: c1a042a55bac24033535da50ce8ab6a2 # 公众号的appsecret--济南联智健康
+        token: PPKOdAlCoMO # 接口配置里的Token值
+        aesKey: Eswa6VjwtVMCcw03qZy6fWllgrv5aytIA1SZPEU0kU2 # 接口配置里的EncodingAESKey值
+aifabu:  #爱链接
+  appKey: 7b471be905ab17e00f3b858c6710dd117601d008
+watch:
+  watchUrl: watch.ylrzcloud.com/prod-api
+  #  account: tcloud
+  #  password: mdf-m2h_6yw2$hq
+  account1: ccif #866655060138751
+  password1: cp-t5or_6xw7$mt
+  account2: tcloud #rt500台
+  password2: mdf-m2h_6yw2$hq
+  account3: whr
+  password3: v9xsKuqn_$d2y
+
+fs :
+  commonApi: http://10.206.0.12:7771
+  h5CommonApi: http://10.206.0.12:7771
+  jwt:
+    # 加密秘钥
+    secret: 3e6d9c0b4a7f1e2d5c4e0d3c6b9a2f5e
+    # token有效时长，7天，单位秒
+    expire: 31536000
+    header: AppToken
+nuonuo:
+  key: 10924508
+  secret: A2EB20764D304D16
+
+# 存储捅配置
+tencent_cloud_config:
+  secret_id: AKIDiMq9lDf2EOM9lIfqqfKo7FNgM5meD0sT
+  secret_key: u5SuS80342xzx8FRBukza9lVNHKNMSaB
+  bucket: jnlzjk-1323137866
+  app_id: 1323137866
+  region: ap-chongqing
+  proxy: jnlzjk
+tmp_secret_config:
+  secret_id: AKIDCj7NSNAovtqeJpBau8GZ4CGB71thXIxX
+  secret_key: lTB5zwqqz7CNhzDOWivFWedgfTBgxgBT
+  bucket: fs-1319721001
+  app_id: 1319721001
+  region: ap-chongqing
+  proxy: fs
+cloud_host:
+  company_name: 济南联志健康
+  projectCode: LZJK
+  spaceName:
+  volcengineUrl: https://jnlzvolcengine.ylrztop.com
+headerImg:
+  imgUrl:
+
+ipad:
+  ipadUrl: http://ipad.ljhehualu.com
+  aiApi: http://49.232.181.28:3000/api
+  voiceApi: http://129.28.187.88:8667
+  commonApi: http://129.28.187.88:7771
+wx_miniapp_temp:
+  pay_order_temp_id:
+  inquiry_temp_id:
+
+

fs-service/src/main/resources/application-dev-jnlzjk.yml

@@ -42,6 +42,9 @@ spring:
                   url: jdbc:mysql://nj-cdb-22nvjajz.sql.tencentcdb.com:29237/fs_his?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&allowMultiQueries=true
                   username: root
                   password: Ylrz_1q2w3e4r5t6y
+#                  url: jdbc:mysql://139.186.77.83:3306/fs_his_jnlzjk_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&allowMultiQueries=true
+#                  username: Rtroot
+#                  password: Rtroot
                 # 从库数据源
                 slave:
                     # 从数据源开关/默认关闭
@@ -97,6 +100,9 @@ spring:
                     url: jdbc:mysql://nj-cdb-22nvjajz.sql.tencentcdb.com:29237/fs_his_sop?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                     username: root
                     password: Ylrz_1q2w3e4r5t6y
+#                    url: jdbc:mysql://139.186.77.83:3306/fs_his_jnlzjk_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&allowMultiQueries=true
+#                    username: Rtroot
+#                    password: Rtroot
                 # 初始连接数
                 initialSize: 5
                 # 最小连接池数量

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

@@ -1,7 +1,7 @@
 # 数据源配置
 spring:
     profiles:
-        include: config-druid-jnlzjk,common
+        include: config-druid-shdn,common
     # redis 配置
     redis:
         host: 10.206.0.10
@@ -39,9 +39,9 @@ spring:
             druid:
                 # 主库数据源
                 master:
-                  url: jdbc:mysql://10.206.0.17:65535/fs_his?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&allowMultiQueries=true
+                  url: jdbc:mysql://172.17.0.12:65535/fs_his?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&allowMultiQueries=true
                   username: root
-                  password: Ylrz_1q2w3e4r5t6y
+                  password: QWEqwe123!@#
                 # 从库数据源
                 slave:
                     # 从数据源开关/默认关闭
@@ -94,9 +94,9 @@ spring:
             druid:
                 # 主库数据源
                 master:
-                    url: jdbc:mysql://10.206.0.17:65535/fs_his_sop?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&allowMultiQueries=true
+                    url: jdbc:mysql://172.17.0.12:65535/fs_his_sop?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&allowMultiQueries=true
                     username: root
-                    password: Ylrz_1q2w3e4r5t6y
+                    password: QWEqwe123!@#
                 # 初始连接数
                 initialSize: 5
                 # 最小连接池数量

fs-service/src/main/resources/mapper/hisStore/FsStoreOrderScrmMapper.xml

@@ -1736,6 +1736,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <!--        <if test="maps.productName != null and  maps.productName !=  ''   ">-->
 <!--            group by o.id-->
 <!--        </if>-->
+        group by o.id
             order by
         <if test="maps.sortField == 'companyUserName'">
             cu.nick_name