From 0153f004f437fdeda4d3eb421114ab8e69059d69 Mon Sep 17 00:00:00 2001 From: winkey Date: Mon, 7 Apr 2025 20:54:30 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=94=E7=94=A8=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=EF=BC=8C=E9=80=9A=E8=BF=87=E9=85=8D=E7=BD=AE=E7=9A=84?= =?UTF-8?q?=E5=BA=94=E7=94=A8=E7=9A=84appid=20modelname=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E5=85=B3=E8=81=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/controller/KnowledgeController.java | 1 - .../chat/domain/request/ChatRequest.java | 10 +++++++++ .../org/ruoyi/system/domain/ChatGpts.java | 5 +++++ .../ruoyi/system/domain/vo/ChatGptsVo.java | 6 ++++++ .../system/service/impl/SseServiceImpl.java | 21 ++++++++++++------- 5 files changed, 34 insertions(+), 9 deletions(-) diff --git a/ruoyi-admin/src/main/java/org/ruoyi/controller/KnowledgeController.java b/ruoyi-admin/src/main/java/org/ruoyi/controller/KnowledgeController.java index 1b5b2fa5..e399e888 100644 --- a/ruoyi-admin/src/main/java/org/ruoyi/controller/KnowledgeController.java +++ b/ruoyi-admin/src/main/java/org/ruoyi/controller/KnowledgeController.java @@ -78,7 +78,6 @@ public class KnowledgeController extends BaseController { sb.append("\n####").append(prompt); } sb.append( (nearestList.size() > 0 ? "\n\n注意：回答问题时，须严格根据我给你的系统上下文内容原文进行回答，请不要自己发挥,回答时保持原来文本的段落层级" : "")); - message.setRole(Message.Role.USER.getName()); message.setContent(sb.toString()); return sseService.sseChat(chatRequest, request); } diff --git a/ruoyi-common/ruoyi-common-chat/src/main/java/org/ruoyi/common/chat/domain/request/ChatRequest.java b/ruoyi-common/ruoyi-common-chat/src/main/java/org/ruoyi/common/chat/domain/request/ChatRequest.java index 35f5269a..65f76fff 100644 --- a/ruoyi-common/ruoyi-common-chat/src/main/java/org/ruoyi/common/chat/domain/request/ChatRequest.java +++ b/ruoyi-common/ruoyi-common-chat/src/main/java/org/ruoyi/common/chat/domain/request/ChatRequest.java @@ -40,6 +40,16 @@ public class ChatRequest { private String kid; private String userId; + + /** + * 1 联网搜索 + */ + private int chat_type; + + /** + * 应用ID + */ + private String appId; // // diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/domain/ChatGpts.java b/ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/domain/ChatGpts.java index 79f27727..a1cb2b48 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/domain/ChatGpts.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/domain/ChatGpts.java @@ -97,5 +97,10 @@ public class ChatGpts extends BaseEntity { */ private String updateIp; + /** + * 模型名称 + */ + private String modelName; + } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/domain/vo/ChatGptsVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/domain/vo/ChatGptsVo.java index 9d732418..d1b17d1c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/domain/vo/ChatGptsVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/domain/vo/ChatGptsVo.java @@ -96,5 +96,11 @@ public class ChatGptsVo implements Serializable { @ExcelProperty(value = "更新IP") private String updateIp; + /** + * 模型名称 + */ + @ExcelProperty(value = "模型名称") + private String modelName; + } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/service/impl/SseServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/service/impl/SseServiceImpl.java index 3f35e535..adb9ccff 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/service/impl/SseServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/service/impl/SseServiceImpl.java @@ -44,6 +44,7 @@ import org.ruoyi.common.satoken.utils.LoginHelper; import org.ruoyi.system.domain.SysModel; import org.ruoyi.system.domain.bo.ChatMessageBo; import org.ruoyi.system.domain.request.translation.TranslationRequest; +import org.ruoyi.system.domain.vo.ChatGptsVo; import org.ruoyi.system.listener.SSEEventSourceListener; import org.ruoyi.system.service.*; import org.springframework.core.io.InputStreamResource; @@ -88,6 +89,8 @@ public class SseServiceImpl implements ISseService { private final ConfigService configService; + private final IChatGptsService chatGptsService; + static final OkHttpClient HTTP_CLIENT = new OkHttpClient().newBuilder().build(); private static final String requestIdTemplate = "mycompany-%d"; @@ -132,20 +135,22 @@ public class SseServiceImpl implements ISseService { chatMessageBo.setContent(chatString); String model = chatRequest.getModel(); - // 如果是gpts系列模型 - if (chatRequest.getModel().startsWith("gpt-4-gizmo")) { - model = "gpt-4-gizmo"; - } SysModel sysModel = sysModelService.selectModelByName(model); if (sysModel == null) { // 如果模型不存在默认使用token扣费方式 processByToken(chatRequest.getModel(), chatString, chatMessageBo); } else { openAiStreamClient = chatConfig.createOpenAiStreamClient(sysModel.getApiHost(), sysModel.getApiKey()); - // 模型设置默认提示词 - if (StringUtils.isNotEmpty(sysModel.getSystemPrompt())) { - Message sysMessage = Message.builder().content(sysModel.getSystemPrompt()).role(Message.Role.SYSTEM).build(); - messages.add(sysMessage); + if (StringUtils.isNotEmpty(chatRequest.getAppId())) { // 设置应用的系统角色为描述 + ChatGptsVo chatGptsVo = chatGptsService.queryById(Long.valueOf(chatRequest.getAppId())); + Message sysMessage = Message.builder().content(chatGptsVo.getInfo()).role(Message.Role.SYSTEM).build(); + messages.add(0,sysMessage); + } else { + // 模型设置默认提示词 + if (StringUtils.isNotEmpty(sysModel.getSystemPrompt())) { + Message sysMessage = Message.builder().content(sysModel.getSystemPrompt()).role(Message.Role.SYSTEM).build(); + messages.add(0,sysMessage); + } } // 计费类型: 1 token扣费 2 次数扣费 if ("2".equals(sysModel.getModelType())) {