1.调整ai对话转人工逻辑

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

@@ -489,7 +489,7 @@ public class AiHookServiceImpl implements AiHookService {
         // 添加脱敏逻辑
         if(qwExternalContacts.getType() == 1){
             FastGptChatSession fastGptChatSession= getFastGptSession(qwExternalContacts,user,dto);
-            if (qwContent.contains("我已经添加了你")){
+            if (qwContent.contains("验证请求") || qwContent.contains("联系人验证请求") || qwContent.contains("我已经添加了你")){
                 return R.ok();
             }
             if(type == 104||type == 101){
@@ -2217,28 +2217,23 @@ public class AiHookServiceImpl implements AiHookService {
                 saveQwUserMsg(fastGptChatSession,2,count,sendUser);
                 // 客服进行回复后就转人工10分钟
                 if(type == 1){
-                    Calendar calendar = Calendar.getInstance();
-                    calendar.add(Calendar.MINUTE, -3);
-                    Date lastTime = calendar.getTime();
-                    //10:00:00
-                    if(lastTime.after(fastGptChatSession.getCreateTime())) {
-                        Calendar oneDayAgo = Calendar.getInstance();
-                        oneDayAgo.add(Calendar.DAY_OF_MONTH, -1);
-                        // 增加判断：lastTime必须在createTime之后，且与当前时间相差不超过1天
-                        if (oneDayAgo.getTime().after(fastGptChatSession.getLastTime())) {
-                            Calendar calendar1 = Calendar.getInstance();
-                            //定时任务会处理10分钟以内的，所以设置20分钟
-                            calendar1.add(Calendar.MINUTE, 20);
-                            Date expireTime = calendar1.getTime();
-
-                            FastGptChatSession chatSession = new FastGptChatSession();
-                            chatSession.setLastTime(expireTime);
-                            chatSession.setIsArtificial(1);
-                            chatSession.setUserId(String.valueOf(sender));
-                            chatSession.setSessionId(fastGptChatSession.getSessionId());
-
-                            fastGptChatSessionMapper.updateFastGptChatSession(chatSession);
-                        }
+                    //如果有欢迎语，进线就会转人工
+                    Calendar oneDayAgo = Calendar.getInstance();
+                    oneDayAgo.add(Calendar.DAY_OF_MONTH, -1);
+                    // 增加判断：lastTime必须在createTime之后，且与当前时间相差不超过1天
+                    if (oneDayAgo.getTime().after(fastGptChatSession.getLastTime())) {
+                        Calendar calendar1 = Calendar.getInstance();
+                        //定时任务会处理10分钟以内的，所以设置20分钟
+                        calendar1.add(Calendar.MINUTE, 20);
+                        Date expireTime = calendar1.getTime();
+
+                        FastGptChatSession chatSession = new FastGptChatSession();
+                        chatSession.setLastTime(expireTime);
+                        chatSession.setIsArtificial(1);
+                        chatSession.setUserId(String.valueOf(sender));
+                        chatSession.setSessionId(fastGptChatSession.getSessionId());
+
+                        fastGptChatSessionMapper.updateFastGptChatSession(chatSession);
                     }
                 }
             }else {