diff --git a/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/service/chat/impl/ChatCostServiceImpl.java b/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/service/chat/impl/ChatCostServiceImpl.java index 7b7bb235..619a1754 100644 --- a/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/service/chat/impl/ChatCostServiceImpl.java +++ b/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/service/chat/impl/ChatCostServiceImpl.java @@ -54,6 +54,12 @@ public class ChatCostServiceImpl implements IChatCostService { ChatMessageBo chatMessageBo = new ChatMessageBo(); + Object userId = LocalCache.CACHE.get("userId"); + if(userId!=null){ + chatMessageBo.setUserId((Long) userId); + }else { + chatMessageBo.setUserId(getUserId()); + } // 计算总token数 ChatToken chatToken = chatTokenService.queryByUserId(getUserId(), modelName); if (chatToken == null) { @@ -97,12 +103,6 @@ public class ChatCostServiceImpl implements IChatCostService { chatToken.setUserId(chatMessageBo.getUserId()); chatTokenService.editToken(chatToken); } - Object userId = LocalCache.CACHE.get("userId"); - if(userId!=null){ - chatMessageBo.setUserId((Long) userId); - }else { - chatMessageBo.setUserId(getUserId()); - } // 保存消息记录 chatMessageService.insertByBo(chatMessageBo); } diff --git a/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/service/chat/impl/SseServiceImpl.java b/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/service/chat/impl/SseServiceImpl.java index ac9d8c5b..c011d504 100644 --- a/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/service/chat/impl/SseServiceImpl.java +++ b/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/service/chat/impl/SseServiceImpl.java @@ -73,7 +73,7 @@ public class SseServiceImpl implements ISseService { public SseEmitter sseChat(ChatRequest chatRequest, HttpServletRequest request) { SseEmitter sseEmitter = new SseEmitter(); try { - // 构建消息列表增加联网、知识库等内容 + // 构建消息列表 buildChatMessageList(chatRequest); if (!StpUtil.isLogin()) { // 未登录用户限制对话次数 @@ -145,7 +145,7 @@ public class SseServiceImpl implements ISseService { if(StringUtils.isEmpty(sysPrompt)){ sysPrompt ="你是一个由RuoYI-AI开发的人工智能助手,名字叫熊猫助手。你擅长中英文对话,能够理解并处理各种问题,提供安全、有帮助、准确的回答。" + "当前时间:"+ DateUtils.getDate()+ - "#注意:回复之前注意结合上下文内容。 "; + "#注意:回复之前注意结合上下文和工具返回内容。"; } // 设置系统默认提示词