Merge remote-tracking branch 'origin/master'

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/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-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/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