Merge branch 'master' of http://1.14.104.71:10880/root/ylrz_his_scrm_java

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

@@ -612,7 +612,7 @@ public class AiHookServiceImpl implements AiHookService {
             if(isNewVersion){
                 Gson gson = new Gson();
                 FastGptChatConversation fastGptChatConversation = gson.fromJson(contentKh, FastGptChatConversation.class);
-                content = fastGptChatConversation.getAiContent();
+                content = replace(fastGptChatConversation.getAiContent()).trim();
 
                 // 知识库未命中：异步写明细 + 归类统计（不阻塞主流程）
                 if ("0".equals(String.valueOf(fastGptChatConversation.getIsRepository()))) {

fs-service/src/main/java/com/fs/fastgptApi/service/Impl/ChatServiceImpl.java

@@ -45,9 +45,6 @@ public class ChatServiceImpl implements ChatService {
                 if(JSON.parseObject(choices.get(0).toString()).getJSONObject("message").getString("content").contains("【转人工】")){
                     jsonObject.put("artificial", true);
                 }
-                if(JSON.parseObject(choices.get(0).toString()).getJSONObject("message").getString("aiContent").contains("【转人工】")){
-                    jsonObject.put("artificial", true);
-                }
                 if(JSON.parseObject(choices.get(0).toString()).getJSONObject("message").getString("content").contains("FunctionCallBegin")){
                     jsonObject.put("artificial", true);
                 }