Эх сурвалжийг харах

refactor(ai): 优化 AI聊天消息响应

zrd 3 долоо хоног өмнө
parent
commit
0d7d6b81f7

+ 3 - 6
yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/chat/AiChatConversationServiceImpl.java

@@ -4,10 +4,8 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.lang.Assert;
 import cn.hutool.core.util.ObjUtil;
 import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.json.JSONUtil;
 import cn.iocoder.yudao.framework.ai.core.enums.AiModelTypeEnum;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.util.http.HttpUtils;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.framework.dict.core.DictFrameworkUtils;
 import cn.iocoder.yudao.module.ai.controller.admin.chat.vo.conversation.AiChatConversationCreateMyReqVO;
@@ -17,7 +15,6 @@ import cn.iocoder.yudao.module.ai.dal.dataobject.chat.AiChatConversationDO;
 import cn.iocoder.yudao.module.ai.dal.dataobject.model.AiChatRoleDO;
 import cn.iocoder.yudao.module.ai.dal.dataobject.model.AiModelDO;
 import cn.iocoder.yudao.module.ai.dal.mysql.chat.AiChatConversationMapper;
-import cn.iocoder.yudao.module.ai.service.chat.vo.KcbResponse;
 import cn.iocoder.yudao.module.ai.service.knowledge.AiKnowledgeService;
 import cn.iocoder.yudao.module.ai.service.model.AiChatRoleService;
 import cn.iocoder.yudao.module.ai.service.model.AiModelService;
@@ -103,9 +100,9 @@ public class AiChatConversationServiceImpl implements AiChatConversationService
         header.put("Authorization", "Bearer " + apiKey);
         
         header.put("Content-Type", "application/json");
-        String responseBody = HttpUtils.get(baseUrl + "v1/parameters", header);
-        KcbResponse kcbResponse = JSONUtil.toBean(responseBody, KcbResponse.class);
-        conversation.setSystemMessage(kcbResponse.getOpening_statement());
+    /*    String responseBody = HttpUtils.get(baseUrl + "/v1/parameters", header);
+        KcbResponse kcbResponse = JSONUtil.toBean(responseBody, KcbResponse.class);*/
+        conversation.setSystemMessage("新对话");
         chatConversationMapper.insert(conversation);
         return conversation;
     }

+ 3 - 2
yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/chat/AiChatMessageServiceImpl.java

@@ -100,7 +100,7 @@ public class AiChatMessageServiceImpl implements AiChatMessageService {
     private String baseUrl;
     
     public AiChatMessageServiceImpl(WebClient.Builder webClientBuilder) {
-        this.webClient = webClientBuilder.baseUrl(baseUrl).build();
+        this.webClient = webClientBuilder.baseUrl("http://42.194.163.46:9502").build();
     }
     
     @Override
@@ -244,6 +244,7 @@ public class AiChatMessageServiceImpl implements AiChatMessageService {
             requestBody.set("conversation_id", conversation.getDifyConversationId());
         } else {
             kcb = getKcb(apiKey);
+            requestBody.set("conversation_id", "");
         }
         String type = "";
         if (userId == 1L) {
@@ -365,7 +366,7 @@ public class AiChatMessageServiceImpl implements AiChatMessageService {
         header.put("Authorization", "Bearer " + apiKey);
         
         header.put("Content-Type", "application/json");
-        String responseBody = HttpUtils.get(baseUrl + "v1/parameters", header);
+        String responseBody = HttpUtils.get(baseUrl + "/v1/parameters", header);
         KcbResponse kcbResponse = JSONUtil.toBean(responseBody, KcbResponse.class);
         return kcbResponse.getOpening_statement();
     }

+ 1 - 1
yudao-server/src/main/resources/application-dev.yaml

@@ -225,7 +225,7 @@ pf4j:
   pluginsDir: ${user.home}/plugins # 插件目录# 插件配置
 # dify 配置项
 dify:
-  base-url: http://42.194.163.46:9502/
+  base-url: http://42.194.163.46:9502
   ocr-key: app-LtIiXlum1GZjDhuhOqQXi6MG # 图片识别的key
   asset-key: app-EsQ4vAwda8YhtosbDOefOZSA # 数据集登记的key
   file-path: /home

+ 1 - 1
yudao-server/src/main/resources/application-local.yaml

@@ -276,7 +276,7 @@ pf4j:
   pluginsDir: ../plugins
 
 dify:
-  base-url: http://42.194.163.46:9502/
+  base-url: http://42.194.163.46:9502
   ocr-key: app-LtIiXlum1GZjDhuhOqQXi6MG # 图片识别的key
   asset-key: app-EsQ4vAwda8YhtosbDOefOZSA # 数据集登记的key
   file-path: F:\wd\