diff --git a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/conversation/ConversationServiceImpl.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/conversation/ConversationServiceImpl.java
index c9123e5ed..92c116f6d 100644
--- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/conversation/ConversationServiceImpl.java
+++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/conversation/ConversationServiceImpl.java
@@ -434,40 +434,40 @@ public class ConversationServiceImpl implements ConversationService {
String knowledgeBaseString="";
if (chatReqVO.getKnowledge() != null) {
StringBuilder knowledgeBase = getKnowledgeBase(chatReqVO);
- knowledgeBaseString = knowledgeBase.toString();
+ knowledgeBaseString = knowledgeBase.toString();
- if (org.apache.commons.lang3.StringUtils.isBlank(knowledgeBaseString)){
- knowledgeBaseString="";
- }
+ // 处理 knowledgeBaseString
+ if (StringUtils.isNotBlank(knowledgeBaseString)) {
+ knowledgeBaseString = "" + knowledgeBaseString + "";
+ }
// 处理 systemPrompt
- systemPrompt = StringUtils.isBlank(chatReqVO.getSystemPrompt())
+ systemPrompt = StringUtils.isBlank(chatReqVO.getSystemPrompt())
? PROMPT
: chatReqVO.getSystemPrompt() + "\n" + PROMPT;
-
}
- String mess = systemPrompt + ""+knowledgeBaseString+"";
+ String mess = systemPrompt + knowledgeBaseString;
- // 查询历史记录消息,并将查询出来的知识信息放入到 role = system 的消息中
- List messageHistoryList = stringRedisTemplate.opsForList().range(CHAT_HIStORY_REDIS_KEY + ":" + chatReqVO.getUuid(), 0, -1);
- if (messageHistoryList != null && !messageHistoryList.isEmpty()) {
- log.info("存在聊天历史记录,处理历史记录消息");
- for (String messageHistory : messageHistoryList) {
- ModelCompletionsReqVO.ModelCompletionsMessage modelCompletionsMessage = JsonUtils.parseObject(messageHistory, ModelCompletionsReqVO.ModelCompletionsMessage.class);
- if ("system".equals(modelCompletionsMessage.getRole())) {
- modelCompletionsMessage.setContent(mess);
- stringRedisTemplate.opsForList().set(CHAT_HIStORY_REDIS_KEY + ":" + chatReqVO.getUuid(), 0, JsonUtils.toJsonString(modelCompletionsMessage));
- }
- messages.add(modelCompletionsMessage);
- }
- } else {
+// // 查询历史记录消息,并将查询出来的知识信息放入到 role = system 的消息中
+// List messageHistoryList = stringRedisTemplate.opsForList().range(CHAT_HIStORY_REDIS_KEY + ":" + chatReqVO.getUuid(), 0, -1);
+// if (messageHistoryList != null && !messageHistoryList.isEmpty()) {
+// log.info("存在聊天历史记录,处理历史记录消息");
+// for (String messageHistory : messageHistoryList) {
+// ModelCompletionsReqVO.ModelCompletionsMessage modelCompletionsMessage = JsonUtils.parseObject(messageHistory, ModelCompletionsReqVO.ModelCompletionsMessage.class);
+// if ("system".equals(modelCompletionsMessage.getRole())) {
+// modelCompletionsMessage.setContent(mess);
+// stringRedisTemplate.opsForList().set(CHAT_HIStORY_REDIS_KEY + ":" + chatReqVO.getUuid(), 0, JsonUtils.toJsonString(modelCompletionsMessage));
+// }
+// messages.add(modelCompletionsMessage);
+// }
+// } else {
log.info("不存在聊天历史记录,创建新的系统消息");
ModelCompletionsReqVO.ModelCompletionsMessage systemMessage = new ModelCompletionsReqVO.ModelCompletionsMessage();
systemMessage.setRole("system");
systemMessage.setContent(mess);
stringRedisTemplate.opsForList().rightPush(CHAT_HIStORY_REDIS_KEY + ":" + chatReqVO.getUuid(), JsonUtils.toJsonString(systemMessage));
messages.add(systemMessage);
- }
+// }
// 创建用户消息
ModelCompletionsReqVO.ModelCompletionsMessage message = new ModelCompletionsReqVO.ModelCompletionsMessage();