From 0153f004f437fdeda4d3eb421114ab8e69059d69 Mon Sep 17 00:00:00 2001
From: winkey <wwwgto@qq.com>
Date: 星期一, 07 四月 2025 22:41:33 +0800
Subject: [PATCH] 修改应用使用，通过配置的应用的appid modelname字段关联
---
ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/domain/ChatGpts.java | 5 +++++
ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/domain/vo/ChatGptsVo.java | 6 ++++++
ruoyi-admin/src/main/java/org/ruoyi/controller/KnowledgeController.java | 1 -
ruoyi-common/ruoyi-common-chat/src/main/java/org/ruoyi/common/chat/domain/request/ChatRequest.java | 10 ++++++++++
ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/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 1b5b2fa..e399e88 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 @@
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 35f5269..65f76ff 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 @@
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 79f2772..a1cb2b4 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 @@
*/
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 9d73241..d1b17d1 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 @@
@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 3f35e53..adb9ccf 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.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;
@@ -87,6 +88,8 @@
private final ISysModelService sysModelService;
private final ConfigService configService;
+
+ private final IChatGptsService chatGptsService;
static final OkHttpClient HTTP_CLIENT = new OkHttpClient().newBuilder().build();
@@ -132,20 +135,22 @@
chatMessageBo.setContent(chatString);
String model = chatRequest.getModel();
- // 濡傛灉鏄痝pts绯诲垪妯″瀷
- if (chatRequest.getModel().startsWith("gpt-4-gizmo")) {
- model = "gpt-4-gizmo";
- }
SysModel sysModel = sysModelService.selectModelByName(model);
if (sysModel == null) {
// 濡傛灉妯″瀷涓嶅瓨鍦ㄩ粯璁や娇鐢╰oken鎵ｈ垂鏂瑰紡
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())) {
--
Gitblit v1.9.3