xieyinlu/ruoyi-ai
1
0
Fork 0
mirror of https://gitcode.com/ageerle/ruoyi-ai.git synced 2026-04-06 00:07:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

修改应用使用，通过配置的应用的appid modelname字段关联

Browse Source
This commit is contained in:
winkey
2025-04-07 20:54:30 +08:00
parent cc23508527
commit 0153f004f4
5 changed files with 34 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ruoyi-admin/src/main/java/org/ruoyi/controller/KnowledgeController.java
View File

@@ -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);
}

10
ruoyi-common/ruoyi-common-chat/src/main/java/org/ruoyi/common/chat/domain/request/ChatRequest.java
View File

@@ -40,6 +40,16 @@ public class ChatRequest {
private String kid;
private String userId;
/**
* 1 联网搜索
*/
private int chat_type;
/**
* 应用ID
*/
private String appId;
//
//

5
ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/domain/ChatGpts.java
View File

@@ -97,5 +97,10 @@ public class ChatGpts extends BaseEntity {
*/
private String updateIp;
/**
* 模型名称
*/
private String modelName;
}

6
ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/domain/vo/ChatGptsVo.java
View File

@@ -96,5 +96,11 @@ public class ChatGptsVo implements Serializable {
@ExcelProperty(value = "更新IP")
private String updateIp;
/**
* 模型名称
*/
@ExcelProperty(value = "模型名称")
private String modelName;
}

21
ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/service/impl/SseServiceImpl.java
View File

@@ -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())) {