mirror of
https://gitcode.com/ageerle/ruoyi-ai.git
synced 2026-04-17 13:53:41 +00:00
Merge remote-tracking branch 'origin/main'
This commit is contained in:
@@ -1,16 +1,14 @@
|
|||||||
package org.ruoyi.controller;
|
package org.ruoyi.controller;
|
||||||
|
|
||||||
import cn.dev33.satoken.stp.StpUtil;
|
import cn.dev33.satoken.stp.StpUtil;
|
||||||
|
import jakarta.servlet.http.HttpServletRequest;
|
||||||
import jakarta.servlet.http.HttpServletResponse;
|
import jakarta.servlet.http.HttpServletResponse;
|
||||||
import jakarta.validation.Valid;
|
import jakarta.validation.Valid;
|
||||||
import jakarta.validation.constraints.NotEmpty;
|
import jakarta.validation.constraints.NotEmpty;
|
||||||
import jakarta.validation.constraints.NotNull;
|
import jakarta.validation.constraints.NotNull;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import org.ruoyi.common.chat.config.ChatConfig;
|
|
||||||
import org.ruoyi.common.chat.domain.request.ChatRequest;
|
import org.ruoyi.common.chat.domain.request.ChatRequest;
|
||||||
import org.ruoyi.common.chat.entity.chat.ChatCompletion;
|
|
||||||
import org.ruoyi.common.chat.entity.chat.Message;
|
import org.ruoyi.common.chat.entity.chat.Message;
|
||||||
import org.ruoyi.common.chat.openai.OpenAiStreamClient;
|
|
||||||
import org.ruoyi.common.core.domain.R;
|
import org.ruoyi.common.core.domain.R;
|
||||||
import org.ruoyi.common.core.validate.AddGroup;
|
import org.ruoyi.common.core.validate.AddGroup;
|
||||||
import org.ruoyi.common.excel.utils.ExcelUtil;
|
import org.ruoyi.common.excel.utils.ExcelUtil;
|
||||||
@@ -20,6 +18,7 @@ import org.ruoyi.common.mybatis.core.page.PageQuery;
|
|||||||
import org.ruoyi.common.mybatis.core.page.TableDataInfo;
|
import org.ruoyi.common.mybatis.core.page.TableDataInfo;
|
||||||
import org.ruoyi.common.satoken.utils.LoginHelper;
|
import org.ruoyi.common.satoken.utils.LoginHelper;
|
||||||
import org.ruoyi.common.web.core.BaseController;
|
import org.ruoyi.common.web.core.BaseController;
|
||||||
|
import org.ruoyi.knowledge.chain.vectorstore.VectorStore;
|
||||||
import org.ruoyi.knowledge.domain.bo.KnowledgeAttachBo;
|
import org.ruoyi.knowledge.domain.bo.KnowledgeAttachBo;
|
||||||
import org.ruoyi.knowledge.domain.bo.KnowledgeFragmentBo;
|
import org.ruoyi.knowledge.domain.bo.KnowledgeFragmentBo;
|
||||||
import org.ruoyi.knowledge.domain.bo.KnowledgeInfoBo;
|
import org.ruoyi.knowledge.domain.bo.KnowledgeInfoBo;
|
||||||
@@ -31,11 +30,9 @@ import org.ruoyi.knowledge.service.EmbeddingService;
|
|||||||
import org.ruoyi.knowledge.service.IKnowledgeAttachService;
|
import org.ruoyi.knowledge.service.IKnowledgeAttachService;
|
||||||
import org.ruoyi.knowledge.service.IKnowledgeFragmentService;
|
import org.ruoyi.knowledge.service.IKnowledgeFragmentService;
|
||||||
import org.ruoyi.knowledge.service.IKnowledgeInfoService;
|
import org.ruoyi.knowledge.service.IKnowledgeInfoService;
|
||||||
import org.ruoyi.system.listener.SSEEventSourceListener;
|
|
||||||
import org.ruoyi.system.service.ISseService;
|
import org.ruoyi.system.service.ISseService;
|
||||||
import org.springframework.validation.annotation.Validated;
|
import org.springframework.validation.annotation.Validated;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
import org.ruoyi.knowledge.chain.vectorstore.VectorStore;
|
|
||||||
import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
|
import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
@@ -63,47 +60,26 @@ public class KnowledgeController extends BaseController {
|
|||||||
|
|
||||||
private final EmbeddingService embeddingService;
|
private final EmbeddingService embeddingService;
|
||||||
|
|
||||||
private OpenAiStreamClient openAiStreamClient;
|
|
||||||
|
|
||||||
private final ChatConfig chatConfig;
|
|
||||||
|
|
||||||
private final ISseService sseService;
|
private final ISseService sseService;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 知识库对话
|
* 知识库对话
|
||||||
*/
|
*/
|
||||||
@PostMapping("/send")
|
@PostMapping("/send")
|
||||||
public SseEmitter send(@RequestBody @Valid ChatRequest chatRequest) {
|
public SseEmitter send(@RequestBody @Valid ChatRequest chatRequest, HttpServletRequest request) {
|
||||||
|
|
||||||
openAiStreamClient = chatConfig.getOpenAiStreamClient();
|
|
||||||
SseEmitter sseEmitter = new SseEmitter(0L);
|
|
||||||
SSEEventSourceListener openAIEventSourceListener = new SSEEventSourceListener(sseEmitter);
|
|
||||||
List<Message> messages = chatRequest.getMessages();
|
List<Message> messages = chatRequest.getMessages();
|
||||||
String content = messages.get(messages.size() - 1).getContent().toString();
|
// 获取知识库信息
|
||||||
|
Message message = messages.get(messages.size() - 1);
|
||||||
|
StringBuilder sb = new StringBuilder(message.getContent().toString());
|
||||||
List<String> nearestList;
|
List<String> nearestList;
|
||||||
List<Double> queryVector = embeddingService.getQueryVector(content, chatRequest.getKid());
|
List<Double> queryVector = embeddingService.getQueryVector(message.getContent().toString(), chatRequest.getKid());
|
||||||
nearestList = vectorStore.nearest(queryVector,chatRequest.getKid());
|
nearestList = vectorStore.nearest(queryVector, chatRequest.getKid());
|
||||||
for (String prompt : nearestList) {
|
for (String prompt : nearestList) {
|
||||||
Message sysMessage = Message.builder().content(prompt).role(Message.Role.USER).build();
|
sb.append("\n####").append(prompt);
|
||||||
messages.add(sysMessage);
|
|
||||||
}
|
}
|
||||||
Message userMessage = Message.builder().content(content + (nearestList.size() > 0 ? "\n\n注意:回答问题时,须严格根据我给你的系统上下文内容原文进行回答,请不要自己发挥,回答时保持原来文本的段落层级" : "") ).role(Message.Role.USER).build();
|
sb.append( (nearestList.size() > 0 ? "\n\n注意:回答问题时,须严格根据我给你的系统上下文内容原文进行回答,请不要自己发挥,回答时保持原来文本的段落层级" : ""));
|
||||||
messages.add(userMessage);
|
message.setContent(sb.toString());
|
||||||
if (chatRequest.getModel().startsWith("ollama")) {
|
return sseService.sseChat(chatRequest, request);
|
||||||
return sseService.ollamaChat(chatRequest);
|
|
||||||
}
|
|
||||||
|
|
||||||
ChatCompletion completion = ChatCompletion
|
|
||||||
.builder()
|
|
||||||
.messages(messages)
|
|
||||||
.model(chatRequest.getModel())
|
|
||||||
.temperature(chatRequest.getTemperature())
|
|
||||||
.topP(chatRequest.getTop_p())
|
|
||||||
.stream(true)
|
|
||||||
.build();
|
|
||||||
openAiStreamClient.streamChatCompletion(completion, openAIEventSourceListener);
|
|
||||||
|
|
||||||
return sseEmitter;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -40,6 +40,16 @@ public class ChatRequest {
|
|||||||
private String kid;
|
private String kid;
|
||||||
|
|
||||||
private String userId;
|
private String userId;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 1 联网搜索
|
||||||
|
*/
|
||||||
|
private int chat_type;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 应用ID
|
||||||
|
*/
|
||||||
|
private String appId;
|
||||||
//
|
//
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ package org.ruoyi.common.chat.entity.chat;
|
|||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
|
||||||
import com.fasterxml.jackson.annotation.JsonInclude;
|
import com.fasterxml.jackson.annotation.JsonInclude;
|
||||||
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import org.ruoyi.common.chat.entity.chat.tool.ToolCalls;
|
import org.ruoyi.common.chat.entity.chat.tool.ToolCalls;
|
||||||
|
|
||||||
@@ -20,6 +21,8 @@ import java.util.List;
|
|||||||
public class Message extends BaseMessage implements Serializable {
|
public class Message extends BaseMessage implements Serializable {
|
||||||
|
|
||||||
private Object content;
|
private Object content;
|
||||||
|
@JsonProperty("reasoning_content")
|
||||||
|
private String reasoningContent;
|
||||||
|
|
||||||
public static Builder builder() {
|
public static Builder builder() {
|
||||||
return new Builder();
|
return new Builder();
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ package org.ruoyi.common.satoken.utils;
|
|||||||
|
|
||||||
import cn.dev33.satoken.context.SaHolder;
|
import cn.dev33.satoken.context.SaHolder;
|
||||||
import cn.dev33.satoken.context.model.SaStorage;
|
import cn.dev33.satoken.context.model.SaStorage;
|
||||||
|
import cn.dev33.satoken.session.SaSession;
|
||||||
import cn.dev33.satoken.stp.SaLoginModel;
|
import cn.dev33.satoken.stp.SaLoginModel;
|
||||||
import cn.dev33.satoken.stp.StpUtil;
|
import cn.dev33.satoken.stp.StpUtil;
|
||||||
import cn.hutool.core.convert.Convert;
|
import cn.hutool.core.convert.Convert;
|
||||||
@@ -73,8 +74,11 @@ public class LoginHelper {
|
|||||||
if (loginUser != null) {
|
if (loginUser != null) {
|
||||||
return loginUser;
|
return loginUser;
|
||||||
}
|
}
|
||||||
loginUser = (LoginUser) StpUtil.getTokenSession().get(LOGIN_USER_KEY);
|
SaSession tokenSession = StpUtil.getTokenSession();
|
||||||
|
if (tokenSession != null) {
|
||||||
|
loginUser = (LoginUser) tokenSession.get(LOGIN_USER_KEY);
|
||||||
SaHolder.getStorage().set(LOGIN_USER_KEY, loginUser);
|
SaHolder.getStorage().set(LOGIN_USER_KEY, loginUser);
|
||||||
|
};
|
||||||
return loginUser;
|
return loginUser;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -11,6 +11,8 @@ import org.ruoyi.common.chat.entity.embeddings.EmbeddingResponse;
|
|||||||
import org.ruoyi.common.chat.openai.OpenAiStreamClient;
|
import org.ruoyi.common.chat.openai.OpenAiStreamClient;
|
||||||
import org.ruoyi.knowledge.domain.vo.KnowledgeInfoVo;
|
import org.ruoyi.knowledge.domain.vo.KnowledgeInfoVo;
|
||||||
import org.ruoyi.knowledge.service.IKnowledgeInfoService;
|
import org.ruoyi.knowledge.service.IKnowledgeInfoService;
|
||||||
|
import org.ruoyi.system.domain.SysModel;
|
||||||
|
import org.ruoyi.system.service.ISysModelService;
|
||||||
import org.springframework.beans.factory.annotation.Value;
|
import org.springframework.beans.factory.annotation.Value;
|
||||||
import org.springframework.context.annotation.Lazy;
|
import org.springframework.context.annotation.Lazy;
|
||||||
import org.springframework.stereotype.Component;
|
import org.springframework.stereotype.Component;
|
||||||
@@ -31,6 +33,9 @@ public class OpenAiVectorization implements Vectorization {
|
|||||||
@Lazy
|
@Lazy
|
||||||
@Resource
|
@Resource
|
||||||
private LocalModelsVectorization localModelsVectorization;
|
private LocalModelsVectorization localModelsVectorization;
|
||||||
|
@Lazy
|
||||||
|
@Resource
|
||||||
|
private ISysModelService sysModelService;
|
||||||
|
|
||||||
@Getter
|
@Getter
|
||||||
private OpenAiStreamClient openAiStreamClient;
|
private OpenAiStreamClient openAiStreamClient;
|
||||||
@@ -40,9 +45,18 @@ public class OpenAiVectorization implements Vectorization {
|
|||||||
@Override
|
@Override
|
||||||
public List<List<Double>> batchVectorization(List<String> chunkList, String kid) {
|
public List<List<Double>> batchVectorization(List<String> chunkList, String kid) {
|
||||||
List<List<Double>> vectorList;
|
List<List<Double>> vectorList;
|
||||||
openAiStreamClient = chatConfig.getOpenAiStreamClient();
|
|
||||||
// 获取知识库信息
|
// 获取知识库信息
|
||||||
KnowledgeInfoVo knowledgeInfoVo = knowledgeInfoService.queryById(Long.valueOf(kid));
|
KnowledgeInfoVo knowledgeInfoVo = knowledgeInfoService.queryById(Long.valueOf(kid));
|
||||||
|
if(knowledgeInfoVo == null){
|
||||||
|
log.warn("知识库不存在:请查检ID {}",kid);
|
||||||
|
vectorList=new ArrayList<>();
|
||||||
|
vectorList.add(new ArrayList<>());
|
||||||
|
return vectorList;
|
||||||
|
}
|
||||||
|
SysModel sysModel = sysModelService.selectModelByName(knowledgeInfoVo.getVectorModel());
|
||||||
|
String apiHost= sysModel.getApiHost();
|
||||||
|
String apiKey= sysModel.getApiKey();
|
||||||
|
openAiStreamClient = chatConfig.createOpenAiStreamClient(apiHost,apiKey);
|
||||||
|
|
||||||
Embedding embedding = buildEmbedding(chunkList, knowledgeInfoVo);
|
Embedding embedding = buildEmbedding(chunkList, knowledgeInfoVo);
|
||||||
EmbeddingResponse embeddings = openAiStreamClient.embeddings(embedding);
|
EmbeddingResponse embeddings = openAiStreamClient.embeddings(embedding);
|
||||||
|
|||||||
@@ -63,6 +63,24 @@ public class ChatConfigController extends BaseController {
|
|||||||
return R.ok(configService.getConfigValue("sys",configKey));
|
return R.ok(configService.getConfigValue("sys",configKey));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 查询版权信息
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
@GetMapping(value = "/configKey/copyright")
|
||||||
|
public R<String> getConfigKeyCopyright() {
|
||||||
|
return R.ok(configService.getConfigValue("sys","copyright"));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 查询logoImage
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
@GetMapping(value = "/configKey/logoImage")
|
||||||
|
public R<String> getConfigKeyLogoImage() {
|
||||||
|
return R.ok(configService.getConfigValue("sys","logoImage"));
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 查询系统参数
|
* 查询系统参数
|
||||||
*
|
*
|
||||||
|
|||||||
@@ -31,7 +31,6 @@ public class SysNoticeController extends BaseController {
|
|||||||
/**
|
/**
|
||||||
* 获取公告列表
|
* 获取公告列表
|
||||||
*/
|
*/
|
||||||
@SaCheckPermission("system:notice:list")
|
|
||||||
@GetMapping("/list")
|
@GetMapping("/list")
|
||||||
public TableDataInfo<SysNoticeVo> list(SysNoticeBo notice, PageQuery pageQuery) {
|
public TableDataInfo<SysNoticeVo> list(SysNoticeBo notice, PageQuery pageQuery) {
|
||||||
//公告类型(1通知 2公告)
|
//公告类型(1通知 2公告)
|
||||||
|
|||||||
@@ -97,5 +97,15 @@ public class ChatGpts extends BaseEntity {
|
|||||||
*/
|
*/
|
||||||
private String updateIp;
|
private String updateIp;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 模型名称
|
||||||
|
*/
|
||||||
|
private String modelName;
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 模型system
|
||||||
|
*/
|
||||||
|
private String systemPrompt;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -84,4 +84,14 @@ public class ChatGptsBo extends BaseEntity {
|
|||||||
*/
|
*/
|
||||||
private String updateIp;
|
private String updateIp;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 模型名称
|
||||||
|
*/
|
||||||
|
private String modelName;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 模型system
|
||||||
|
*/
|
||||||
|
private String systemPrompt;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -96,5 +96,16 @@ public class ChatGptsVo implements Serializable {
|
|||||||
@ExcelProperty(value = "更新IP")
|
@ExcelProperty(value = "更新IP")
|
||||||
private String updateIp;
|
private String updateIp;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 模型名称
|
||||||
|
*/
|
||||||
|
@ExcelProperty(value = "模型名称")
|
||||||
|
private String modelName;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 模型system
|
||||||
|
*/
|
||||||
|
private String systemPrompt;
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -106,7 +106,8 @@ public class SSEEventSourceListener extends EventSourceListener {
|
|||||||
}
|
}
|
||||||
Object content = completionResponse.getChoices().get(0).getDelta().getContent();
|
Object content = completionResponse.getChoices().get(0).getDelta().getContent();
|
||||||
if(content == null){
|
if(content == null){
|
||||||
return;
|
content = completionResponse.getChoices().get(0).getDelta().getReasoningContent();
|
||||||
|
if(content == null) return;
|
||||||
}
|
}
|
||||||
if(StringUtils.isEmpty(modelName)){
|
if(StringUtils.isEmpty(modelName)){
|
||||||
modelName = completionResponse.getModel();
|
modelName = completionResponse.getModel();
|
||||||
|
|||||||
@@ -228,7 +228,9 @@ public class SysLoginService {
|
|||||||
TenantHelper.clearDynamic();
|
TenantHelper.clearDynamic();
|
||||||
}
|
}
|
||||||
StpUtil.logout();
|
StpUtil.logout();
|
||||||
|
if (loginUser !=null) {
|
||||||
recordLogininfor(loginUser.getTenantId(), loginUser.getUsername(), Constants.LOGOUT, MessageUtils.message("user.logout.success"));
|
recordLogininfor(loginUser.getTenantId(), loginUser.getUsername(), Constants.LOGOUT, MessageUtils.message("user.logout.success"));
|
||||||
|
}
|
||||||
} catch (NotLoginException ignored) {
|
} catch (NotLoginException ignored) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -44,6 +44,7 @@ import org.ruoyi.common.satoken.utils.LoginHelper;
|
|||||||
import org.ruoyi.system.domain.SysModel;
|
import org.ruoyi.system.domain.SysModel;
|
||||||
import org.ruoyi.system.domain.bo.ChatMessageBo;
|
import org.ruoyi.system.domain.bo.ChatMessageBo;
|
||||||
import org.ruoyi.system.domain.request.translation.TranslationRequest;
|
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.listener.SSEEventSourceListener;
|
||||||
import org.ruoyi.system.service.*;
|
import org.ruoyi.system.service.*;
|
||||||
import org.springframework.core.io.InputStreamResource;
|
import org.springframework.core.io.InputStreamResource;
|
||||||
@@ -88,6 +89,8 @@ public class SseServiceImpl implements ISseService {
|
|||||||
|
|
||||||
private final ConfigService configService;
|
private final ConfigService configService;
|
||||||
|
|
||||||
|
private final IChatGptsService chatGptsService;
|
||||||
|
|
||||||
static final OkHttpClient HTTP_CLIENT = new OkHttpClient().newBuilder().build();
|
static final OkHttpClient HTTP_CLIENT = new OkHttpClient().newBuilder().build();
|
||||||
|
|
||||||
private static final String requestIdTemplate = "mycompany-%d";
|
private static final String requestIdTemplate = "mycompany-%d";
|
||||||
@@ -132,20 +135,22 @@ public class SseServiceImpl implements ISseService {
|
|||||||
chatMessageBo.setContent(chatString);
|
chatMessageBo.setContent(chatString);
|
||||||
|
|
||||||
String model = chatRequest.getModel();
|
String model = chatRequest.getModel();
|
||||||
// 如果是gpts系列模型
|
|
||||||
if (chatRequest.getModel().startsWith("gpt-4-gizmo")) {
|
|
||||||
model = "gpt-4-gizmo";
|
|
||||||
}
|
|
||||||
SysModel sysModel = sysModelService.selectModelByName(model);
|
SysModel sysModel = sysModelService.selectModelByName(model);
|
||||||
if (sysModel == null) {
|
if (sysModel == null) {
|
||||||
// 如果模型不存在默认使用token扣费方式
|
// 如果模型不存在默认使用token扣费方式
|
||||||
processByToken(chatRequest.getModel(), chatString, chatMessageBo);
|
processByToken(chatRequest.getModel(), chatString, chatMessageBo);
|
||||||
} else {
|
} else {
|
||||||
openAiStreamClient = chatConfig.createOpenAiStreamClient(sysModel.getApiHost(), sysModel.getApiKey());
|
openAiStreamClient = chatConfig.createOpenAiStreamClient(sysModel.getApiHost(), sysModel.getApiKey());
|
||||||
|
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())) {
|
if (StringUtils.isNotEmpty(sysModel.getSystemPrompt())) {
|
||||||
Message sysMessage = Message.builder().content(sysModel.getSystemPrompt()).role(Message.Role.SYSTEM).build();
|
Message sysMessage = Message.builder().content(sysModel.getSystemPrompt()).role(Message.Role.SYSTEM).build();
|
||||||
messages.add(sysMessage);
|
messages.add(0,sysMessage);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
// 计费类型: 1 token扣费 2 次数扣费
|
// 计费类型: 1 token扣费 2 次数扣费
|
||||||
if ("2".equals(sysModel.getModelType())) {
|
if ("2".equals(sysModel.getModelType())) {
|
||||||
|
|||||||
@@ -63,6 +63,7 @@ public class SysModelServiceImpl implements ISysModelService {
|
|||||||
lqw.like(StringUtils.isNotBlank(bo.getModelShow()), SysModel::getModelShow, bo.getModelShow());
|
lqw.like(StringUtils.isNotBlank(bo.getModelShow()), SysModel::getModelShow, bo.getModelShow());
|
||||||
lqw.eq(StringUtils.isNotBlank(bo.getModelDescribe()), SysModel::getModelDescribe, bo.getModelDescribe());
|
lqw.eq(StringUtils.isNotBlank(bo.getModelDescribe()), SysModel::getModelDescribe, bo.getModelDescribe());
|
||||||
lqw.eq(StringUtils.isNotBlank(bo.getModelType()), SysModel::getModelType, bo.getModelType());
|
lqw.eq(StringUtils.isNotBlank(bo.getModelType()), SysModel::getModelType, bo.getModelType());
|
||||||
|
lqw.eq(StringUtils.isNotBlank(bo.getCategory()), SysModel::getCategory, bo.getCategory());
|
||||||
return lqw;
|
return lqw;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
14
script/sql/update/updatdata20250407-2.sql
Normal file
14
script/sql/update/updatdata20250407-2.sql
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
SET FOREIGN_KEY_CHECKS=0;
|
||||||
|
|
||||||
|
ALTER TABLE `ruoyi-org`.`chat_gpts` ADD COLUMN `model_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '模型名称' AFTER `tenant_id`;
|
||||||
|
|
||||||
|
ALTER TABLE `ruoyi-org`.`chat_gpts` ADD COLUMN `system_prompt` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '系统提示词' AFTER `model_name`;
|
||||||
|
|
||||||
|
INSERT INTO `ruoyi-ai`.`chat_gpts` (`id`, `gid`, `name`, `logo`, `info`, `author_id`, `author_name`, `use_cnt`, `bad`, `type`, `create_dept`, `create_time`, `create_by`, `update_by`, `update_time`, `remark`, `version`, `del_flag`, `update_ip`, `tenant_id`, `model_name`, `system_prompt`) VALUES (1810602934286237698, 'gpt-4-gizmo-g-RQAWjtI6u', '翻译助手', 'https://external-content.duckduckgo.com/ip3/chat.openai.com.ico', '中英和英中翻译专家', 'winkey', 'winkey', 0, 0, 'vector', 103, '2024-07-09 17:12:34', '1', '1', '2025-04-07 21:44:11', 'Ms. Smith, the AI-powered Language Teacher, is a revolutionary GPT-based bot that offers personalized language learning experiences in over 20 languages, including Spanish, German, French, English, Chinese, Korean, Japanese, and more\n', NULL, '0', '127.0.0.1', 0, 'deepseek-r1:1.5b', '你是一位精通各国语言的翻译大师\r\n\r\n请将用户输入词语翻译成英文或中文\r\n\r\n==示例输出==\r\n**原文** : <这里显示要翻译的原文信息>\r\n**翻译** : <这里显示翻译成英语的结果>\r\n==示例结束==\r\n\r\n注意:请严格按示例进行输出,返回markdown格式');
|
||||||
|
INSERT INTO `ruoyi-ai`.`chat_gpts` (`id`, `gid`, `name`, `logo`, `info`, `author_id`, `author_name`, `use_cnt`, `bad`, `type`, `create_dept`, `create_time`, `create_by`, `update_by`, `update_time`, `remark`, `version`, `del_flag`, `update_ip`, `tenant_id`, `model_name`, `system_prompt`) VALUES (1811668415990931458, 'gpt-4-gizmo-g-XbReEL4Uq', '清北全科医生', 'https://external-content.duckduckgo.com/ip3/chat.openai.com.ico', '富有同情心的全科医生提供健康指导', NULL, NULL, 0, 0, NULL, 103, '2024-07-12 15:46:24', '1', '1', '2024-07-12 15:46:24', NULL, NULL, '0', NULL, 0, 'deepseek-r1:1.5b', '富有同情心的全科医生提供健康指导');
|
||||||
|
INSERT INTO `ruoyi-ai`.`chat_gpts` (`id`, `gid`, `name`, `logo`, `info`, `author_id`, `author_name`, `use_cnt`, `bad`, `type`, `create_dept`, `create_time`, `create_by`, `update_by`, `update_time`, `remark`, `version`, `del_flag`, `update_ip`, `tenant_id`, `model_name`, `system_prompt`) VALUES (1811670922074988545, 'gpt-4-gizmo-g-AphhNRLxt', '提示词优化', 'https://external-content.duckduckgo.com/ip3/chat.openai.com.ico', '擅长为Prompt 提升清晰度和创造力的大师', NULL, NULL, 0, 0, NULL, 103, '2024-07-12 15:56:22', '1', '1', '2024-07-12 15:56:22', NULL, NULL, '0', NULL, 0, 'deepseek-r1:1.5b', '擅长为Prompt 提升清晰度和创造力的大师');
|
||||||
|
INSERT INTO `ruoyi-ai`.`chat_gpts` (`id`, `gid`, `name`, `logo`, `info`, `author_id`, `author_name`, `use_cnt`, `bad`, `type`, `create_dept`, `create_time`, `create_by`, `update_by`, `update_time`, `remark`, `version`, `del_flag`, `update_ip`, `tenant_id`, `model_name`, `system_prompt`) VALUES (1811815442062188545, 'gpt-4-gizmo-g-ThuHxKi7e', '小红书文案生成器', 'https://external-content.duckduckgo.com/ip3/chat.openai.com.ico', '小红书文案生成器', NULL, NULL, 0, 0, NULL, 103, '2024-07-13 01:30:38', '1', '1', '2024-07-13 01:30:38', NULL, NULL, '0', NULL, 0, 'deepseek-r1:1.5b', '小红书文案生成器');
|
||||||
|
INSERT INTO `ruoyi-ai`.`chat_gpts` (`id`, `gid`, `name`, `logo`, `info`, `author_id`, `author_name`, `use_cnt`, `bad`, `type`, `create_dept`, `create_time`, `create_by`, `update_by`, `update_time`, `remark`, `version`, `del_flag`, `update_ip`, `tenant_id`, `model_name`, `system_prompt`) VALUES (1811817605668741121, 'gpt-4-gizmo-g-AsQCd3k8', '中国法律助手', 'https://external-content.duckduckgo.com/ip3/chat.openai.com.ico', '全面掌握中国法律的智能助手,可帮助起草文书,分析案件,进行法律咨询', NULL, NULL, 0, 0, NULL, 103, '2024-07-13 01:39:14', '1', '1', '2024-07-13 01:39:14', NULL, NULL, '2', NULL, 0, 'deepseek-r1:1.5b', '全面掌握中国法律的智能助手,可帮助起草文书,分析案件,进行法律咨询');
|
||||||
|
INSERT INTO `ruoyi-ai`.`chat_gpts` (`id`, `gid`, `name`, `logo`, `info`, `author_id`, `author_name`, `use_cnt`, `bad`, `type`, `create_dept`, `create_time`, `create_by`, `update_by`, `update_time`, `remark`, `version`, `del_flag`, `update_ip`, `tenant_id`, `model_name`, `system_prompt`) VALUES (1811817605668741122, 'gpt-4-gizmo-g-IXwub6dJu', '英语老师', 'https://external-content.duckduckgo.com/ip3/chat.openai.com.ico', '英语学习GPT是一个专门设计来帮助用户提高他们的英语技能的人工智能助手', NULL, NULL, 0, 0, NULL, NULL, NULL, '', '', NULL, NULL, NULL, '0', NULL, 0, 'deepseek-r1:1.5b', '英语学习GPT是一个专门设计来帮助用户提高他们的英语技能的人工智能助手');
|
||||||
|
|
||||||
|
SET FOREIGN_KEY_CHECKS=1;
|
||||||
4
script/sql/update/updatdata20250407.sql
Normal file
4
script/sql/update/updatdata20250407.sql
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
INSERT INTO `ruoyi-ai`.`chat_model` (`id`, `tenant_id`, `category`, `model_name`, `model_describe`, `model_price`, `model_type`, `model_show`, `system_prompt`, `api_host`, `api_key`, `create_dept`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (1907575746601119746, '000000', 'vector', 'text-embedding-3-small', 'text-embedding-3-small', 0, '2', '0', NULL, 'https://api.pandarobot.chat/', 'sk-cdBlIaZcufccm2RaDe547cBd054d49C7B0782eCa72A0052b', 103, 1, '2025-04-03 07:27:54', 1, '2025-04-03 07:27:54', 'text-embedding-3-small');
|
||||||
|
INSERT INTO `ruoyi-ai`.`chat_model` (`id`, `tenant_id`, `category`, `model_name`, `model_describe`, `model_price`, `model_type`, `model_show`, `system_prompt`, `api_host`, `api_key`, `create_dept`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (1907576007017066497, '000000', 'vector', 'quentinz/bge-large-zh-v1.5', 'bge-large-zh-v1.5', 0, '2', '0', NULL, 'https://api.pandarobot.chat/', 'cdBlIaZcufccm2RaDe547cBd054d49C7B0782eCa72A0052b', 103, 1, '2025-04-03 07:28:56', 1, '2025-04-03 07:28:56', 'bge-large-zh-v1.5');
|
||||||
|
INSERT INTO `ruoyi-ai`.`chat_model` (`id`, `tenant_id`, `category`, `model_name`, `model_describe`, `model_price`, `model_type`, `model_show`, `system_prompt`, `api_host`, `api_key`, `create_dept`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (1907576806191362049, '000000', 'vector', 'nomic-embed-text', 'nomic-embed-text', 0, '2', '0', NULL, 'http://127.0.0.1:11434/', 'nomic-embed-text', 103, 1, '2025-04-03 07:32:06', 1, '2025-04-03 07:32:06', 'nomic-embed-text');
|
||||||
|
INSERT INTO `ruoyi-ai`.`chat_model` (`id`, `tenant_id`, `category`, `model_name`, `model_describe`, `model_price`, `model_type`, `model_show`, `system_prompt`, `api_host`, `api_key`, `create_dept`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (1907577073490161665, '000000', 'vector', 'snowflake-arctic-embed', 'snowflake-arctic-embed', 0, '2', '0', NULL, 'http://127.0.0.1:11434/', 'snowflake-arctic-embed', 103, 1, '2025-04-03 07:33:10', 1, '2025-04-03 07:33:10', 'snowflake-arctic-embed');
|
||||||
Reference in New Issue
Block a user