From 00f362acf194ba459b4d583860eb018179053961 Mon Sep 17 00:00:00 2001
From: ageerle <ageerle@163.com>
Date: 星期二, 08 四月 2025 11:11:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/main'
---
ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/service/impl/SseServiceImpl.java | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
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..7310b23 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.getSystemPrompt()).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