mirror of
https://gitcode.com/ageerle/ruoyi-ai.git
synced 2026-04-09 17:57:32 +00:00
Compare commits
30 Commits
v2.0.2
...
37a8b7dad3
| Author | SHA1 | Date | |
|---|---|---|---|
|
37a8b7dad3 | ||
|
|
efeb0bd6fb | ||
|
|
af33040117 | ||
|
|
ac4c037634 | ||
|
|
9734ec53f7 | ||
|
|
2b8a92c7d6 | ||
|
|
adb4538317 | ||
|
|
2509099146 | ||
|
|
3be9005f95 | ||
|
|
be6d027cad | ||
|
|
3d679f8749 | ||
|
|
5a5a48e153 | ||
|
|
e5da648941 | ||
|
|
d2755f00bc | ||
|
|
00f362acf1 | ||
|
|
65d479458e | ||
|
57e17e0dda | ||
|
691d1735fc | ||
|
|
360984bc4b | ||
|
|
0153f004f4 | ||
|
|
cc23508527 | ||
|
|
c884f4f2d3 | ||
|
|
fab6de1f5c | ||
|
|
c02f66636d | ||
|
|
c1162148b1 | ||
|
|
f76fdbf3ad | ||
|
|
feca08b3ec | ||
|
|
72675b17c4 | ||
|
|
9ea5186f49 | ||
|
|
d0a2eadc38 |
36
pom.xml
36
pom.xml
@@ -18,6 +18,7 @@
|
|||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||||
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
|
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
|
||||||
<java.version>17</java.version>
|
<java.version>17</java.version>
|
||||||
|
<mysql.version>8.0.33</mysql.version>
|
||||||
<spring-boot.mybatis>3.0.1</spring-boot.mybatis>
|
<spring-boot.mybatis>3.0.1</spring-boot.mybatis>
|
||||||
<springdoc.version>2.1.0</springdoc.version>
|
<springdoc.version>2.1.0</springdoc.version>
|
||||||
<therapi-javadoc.version>0.15.0</therapi-javadoc.version>
|
<therapi-javadoc.version>0.15.0</therapi-javadoc.version>
|
||||||
@@ -60,6 +61,7 @@
|
|||||||
<weixin-java-miniapp.version>4.5.0</weixin-java-miniapp.version>
|
<weixin-java-miniapp.version>4.5.0</weixin-java-miniapp.version>
|
||||||
<weixin-java-pay.version>4.6.0</weixin-java-pay.version>
|
<weixin-java-pay.version>4.6.0</weixin-java-pay.version>
|
||||||
<weixin-java-cp.version>4.6.0</weixin-java-cp.version>
|
<weixin-java-cp.version>4.6.0</weixin-java-cp.version>
|
||||||
|
<weixin-java-cp.version>4.6.0</weixin-java-cp.version>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
<profiles>
|
<profiles>
|
||||||
@@ -96,6 +98,12 @@
|
|||||||
<dependencyManagement>
|
<dependencyManagement>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
|
|
||||||
|
<dependency>
|
||||||
|
<groupId>mysql</groupId>
|
||||||
|
<artifactId>mysql-connector-java</artifactId>
|
||||||
|
<version>${mysql.version}</version>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
<!-- SpringBoot的依赖配置-->
|
<!-- SpringBoot的依赖配置-->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.springframework.boot</groupId>
|
<groupId>org.springframework.boot</groupId>
|
||||||
@@ -244,18 +252,6 @@
|
|||||||
<version>${tencent.sms.version}</version>
|
<version>${tencent.sms.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- <dependency>-->
|
|
||||||
<!-- <groupId>de.codecentric</groupId>-->
|
|
||||||
<!-- <artifactId>spring-boot-admin-starter-server</artifactId>-->
|
|
||||||
<!-- <version>${spring-boot-admin.version}</version>-->
|
|
||||||
<!-- </dependency>-->
|
|
||||||
<!-- <dependency>-->
|
|
||||||
<!-- <groupId>de.codecentric</groupId>-->
|
|
||||||
<!-- <artifactId>spring-boot-admin-starter-client</artifactId>-->
|
|
||||||
<!-- <version>${spring-boot-admin.version}</version>-->
|
|
||||||
<!-- </dependency>-->
|
|
||||||
|
|
||||||
<!--redisson-->
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.redisson</groupId>
|
<groupId>org.redisson</groupId>
|
||||||
<artifactId>redisson-spring-boot-starter</artifactId>
|
<artifactId>redisson-spring-boot-starter</artifactId>
|
||||||
@@ -321,10 +317,21 @@
|
|||||||
<version>${revision}</version>
|
<version>${revision}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.ruoyi</groupId>
|
||||||
|
<artifactId>ruoyi-knowledge-api</artifactId>
|
||||||
|
<version>${revision}</version>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.ruoyi</groupId>
|
<groupId>org.ruoyi</groupId>
|
||||||
<artifactId>ruoyi-knowledge</artifactId>
|
<artifactId>ruoyi-chat-api</artifactId>
|
||||||
|
<version>${revision}</version>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.ruoyi</groupId>
|
||||||
|
<artifactId>ruoyi-system-api</artifactId>
|
||||||
<version>${revision}</version>
|
<version>${revision}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
@@ -344,10 +351,11 @@
|
|||||||
</dependencyManagement>
|
</dependencyManagement>
|
||||||
|
|
||||||
<modules>
|
<modules>
|
||||||
<module>ruoyi-admin</module>
|
|
||||||
<module>ruoyi-common</module>
|
<module>ruoyi-common</module>
|
||||||
<module>ruoyi-modules</module>
|
<module>ruoyi-modules</module>
|
||||||
|
<module>ruoyi-modules-api</module>
|
||||||
</modules>
|
</modules>
|
||||||
|
|
||||||
<packaging>pom</packaging>
|
<packaging>pom</packaging>
|
||||||
|
|
||||||
<build>
|
<build>
|
||||||
|
|||||||
@@ -1,35 +0,0 @@
|
|||||||
#基础镜像
|
|
||||||
FROM findepi/graalvm:java17-native
|
|
||||||
|
|
||||||
# 设置环境变量
|
|
||||||
ENV LANG C.UTF-8
|
|
||||||
ENV LANGUAGE C.UTF-8
|
|
||||||
ENV LC_ALL C.UTF-8
|
|
||||||
ENV SERVER_PORT=6039
|
|
||||||
|
|
||||||
MAINTAINER ageerle
|
|
||||||
|
|
||||||
RUN mkdir -p /ruoyi/server/logs \
|
|
||||||
/ruoyi/server/temp \
|
|
||||||
/ruoyi/skywalking/agent
|
|
||||||
|
|
||||||
|
|
||||||
#工作空间
|
|
||||||
WORKDIR /ruoyi/server
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
EXPOSE ${SERVER_PORT}
|
|
||||||
|
|
||||||
ADD ./target/ruoyi-admin.jar ./app.jar
|
|
||||||
|
|
||||||
|
|
||||||
ENTRYPOINT ["java", \
|
|
||||||
"-Djava.security.egd=file:/dev/./urandom", \
|
|
||||||
"-Dserver.port=${SERVER_PORT}", \
|
|
||||||
# 应用名称 如果想区分集群节点监控 改成不同的名称即可
|
|
||||||
# "-Dskywalking.agent.service_name=ruoyi-server", \
|
|
||||||
# "-javaagent:/ruoyi/skywalking/agent/skywalking-agent.jar", \
|
|
||||||
"-jar", "app.jar"]
|
|
||||||
|
|
||||||
|
|
||||||
@@ -1,129 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project xmlns="http://maven.apache.org/POM/4.0.0"
|
|
||||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
|
||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
|
||||||
<parent>
|
|
||||||
<artifactId>ruoyi-ai</artifactId>
|
|
||||||
<groupId>org.ruoyi</groupId>
|
|
||||||
<version>${revision}</version>
|
|
||||||
<relativePath>../pom.xml</relativePath>
|
|
||||||
</parent>
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
|
||||||
<packaging>jar</packaging>
|
|
||||||
<artifactId>ruoyi-admin</artifactId>
|
|
||||||
|
|
||||||
<description>
|
|
||||||
web服务入口
|
|
||||||
</description>
|
|
||||||
|
|
||||||
<dependencies>
|
|
||||||
|
|
||||||
<!-- Mysql驱动包 -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.mysql</groupId>
|
|
||||||
<artifactId>mysql-connector-j</artifactId>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- Oracle -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.oracle.database.jdbc</groupId>
|
|
||||||
<artifactId>ojdbc8</artifactId>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- PostgreSql -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.postgresql</groupId>
|
|
||||||
<artifactId>postgresql</artifactId>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- SqlServer -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.microsoft.sqlserver</groupId>
|
|
||||||
<artifactId>mssql-jdbc</artifactId>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.ruoyi</groupId>
|
|
||||||
<artifactId>ruoyi-common-doc</artifactId>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.ruoyi</groupId>
|
|
||||||
<artifactId>ruoyi-system</artifactId>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.ruoyi</groupId>
|
|
||||||
<artifactId>ruoyi-chat</artifactId>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.ruoyi</groupId>
|
|
||||||
<artifactId>ruoyi-knowledge</artifactId>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.ruoyi</groupId>
|
|
||||||
<artifactId>ruoyi-generator</artifactId>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- demo模块 -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.ruoyi</groupId>
|
|
||||||
<artifactId>ruoyi-demo</artifactId>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.springframework.boot</groupId>
|
|
||||||
<artifactId>spring-boot-starter-test</artifactId>
|
|
||||||
<scope>test</scope>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- 添加thumbnailator依赖 -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>net.coobird</groupId>
|
|
||||||
<artifactId>thumbnailator</artifactId>
|
|
||||||
<version>0.4.11</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>io.github.ollama4j</groupId>
|
|
||||||
<artifactId>ollama4j</artifactId>
|
|
||||||
<version>1.0.79</version>
|
|
||||||
<scope>compile</scope>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
</dependencies>
|
|
||||||
|
|
||||||
<build>
|
|
||||||
<finalName>${project.artifactId}</finalName>
|
|
||||||
<plugins>
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.springframework.boot</groupId>
|
|
||||||
<artifactId>spring-boot-maven-plugin</artifactId>
|
|
||||||
<version>${spring-boot.version}</version>
|
|
||||||
<executions>
|
|
||||||
<execution>
|
|
||||||
<goals>
|
|
||||||
<goal>repackage</goal>
|
|
||||||
</goals>
|
|
||||||
</execution>
|
|
||||||
</executions>
|
|
||||||
</plugin>
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
|
||||||
<artifactId>maven-jar-plugin</artifactId>
|
|
||||||
<version>${maven-jar-plugin.version}</version>
|
|
||||||
</plugin>
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
|
||||||
<artifactId>maven-war-plugin</artifactId>
|
|
||||||
<version>${maven-war-plugin.version}</version>
|
|
||||||
<configuration>
|
|
||||||
<failOnMissingWebXml>false</failOnMissingWebXml>
|
|
||||||
<warName>${project.artifactId}</warName>
|
|
||||||
</configuration>
|
|
||||||
</plugin>
|
|
||||||
</plugins>
|
|
||||||
</build>
|
|
||||||
|
|
||||||
</project>
|
|
||||||
@@ -1,208 +0,0 @@
|
|||||||
package org.ruoyi.controller;
|
|
||||||
|
|
||||||
import cn.dev33.satoken.stp.StpUtil;
|
|
||||||
import jakarta.servlet.http.HttpServletResponse;
|
|
||||||
import jakarta.validation.Valid;
|
|
||||||
import jakarta.validation.constraints.NotEmpty;
|
|
||||||
import jakarta.validation.constraints.NotNull;
|
|
||||||
import lombok.RequiredArgsConstructor;
|
|
||||||
import org.ruoyi.common.chat.config.ChatConfig;
|
|
||||||
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.openai.OpenAiStreamClient;
|
|
||||||
import org.ruoyi.common.core.domain.R;
|
|
||||||
import org.ruoyi.common.core.validate.AddGroup;
|
|
||||||
import org.ruoyi.common.excel.utils.ExcelUtil;
|
|
||||||
import org.ruoyi.common.log.annotation.Log;
|
|
||||||
import org.ruoyi.common.log.enums.BusinessType;
|
|
||||||
import org.ruoyi.common.mybatis.core.page.PageQuery;
|
|
||||||
import org.ruoyi.common.mybatis.core.page.TableDataInfo;
|
|
||||||
import org.ruoyi.common.satoken.utils.LoginHelper;
|
|
||||||
import org.ruoyi.common.web.core.BaseController;
|
|
||||||
import org.ruoyi.knowledge.domain.bo.KnowledgeAttachBo;
|
|
||||||
import org.ruoyi.knowledge.domain.bo.KnowledgeFragmentBo;
|
|
||||||
import org.ruoyi.knowledge.domain.bo.KnowledgeInfoBo;
|
|
||||||
import org.ruoyi.knowledge.domain.req.KnowledgeInfoUploadRequest;
|
|
||||||
import org.ruoyi.knowledge.domain.vo.KnowledgeAttachVo;
|
|
||||||
import org.ruoyi.knowledge.domain.vo.KnowledgeFragmentVo;
|
|
||||||
import org.ruoyi.knowledge.domain.vo.KnowledgeInfoVo;
|
|
||||||
import org.ruoyi.knowledge.service.EmbeddingService;
|
|
||||||
import org.ruoyi.knowledge.service.IKnowledgeAttachService;
|
|
||||||
import org.ruoyi.knowledge.service.IKnowledgeFragmentService;
|
|
||||||
import org.ruoyi.knowledge.service.IKnowledgeInfoService;
|
|
||||||
import org.ruoyi.system.listener.SSEEventSourceListener;
|
|
||||||
import org.ruoyi.system.service.ISseService;
|
|
||||||
import org.springframework.validation.annotation.Validated;
|
|
||||||
import org.springframework.web.bind.annotation.*;
|
|
||||||
import org.ruoyi.knowledge.chain.vectorstore.VectorStore;
|
|
||||||
import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 知识库
|
|
||||||
*
|
|
||||||
* @author Lion Li
|
|
||||||
* @date 2024-10-21
|
|
||||||
*/
|
|
||||||
@Validated
|
|
||||||
@RequiredArgsConstructor
|
|
||||||
@RestController
|
|
||||||
@RequestMapping("/knowledge")
|
|
||||||
public class KnowledgeController extends BaseController {
|
|
||||||
|
|
||||||
private final IKnowledgeInfoService knowledgeInfoService;
|
|
||||||
|
|
||||||
private final VectorStore vectorStore;
|
|
||||||
|
|
||||||
private final IKnowledgeAttachService attachService;
|
|
||||||
|
|
||||||
private final IKnowledgeFragmentService fragmentService;
|
|
||||||
|
|
||||||
private final EmbeddingService embeddingService;
|
|
||||||
|
|
||||||
private OpenAiStreamClient openAiStreamClient;
|
|
||||||
|
|
||||||
private final ChatConfig chatConfig;
|
|
||||||
|
|
||||||
private final ISseService sseService;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 知识库对话
|
|
||||||
*/
|
|
||||||
@PostMapping("/send")
|
|
||||||
public SseEmitter send(@RequestBody @Valid ChatRequest chatRequest) {
|
|
||||||
|
|
||||||
openAiStreamClient = chatConfig.getOpenAiStreamClient();
|
|
||||||
SseEmitter sseEmitter = new SseEmitter(0L);
|
|
||||||
SSEEventSourceListener openAIEventSourceListener = new SSEEventSourceListener(sseEmitter);
|
|
||||||
List<Message> messages = chatRequest.getMessages();
|
|
||||||
String content = messages.get(messages.size() - 1).getContent().toString();
|
|
||||||
List<String> nearestList;
|
|
||||||
List<Double> queryVector = embeddingService.getQueryVector(content, chatRequest.getKid());
|
|
||||||
nearestList = vectorStore.nearest(queryVector,chatRequest.getKid());
|
|
||||||
for (String prompt : nearestList) {
|
|
||||||
Message sysMessage = Message.builder().content(prompt).role(Message.Role.USER).build();
|
|
||||||
messages.add(sysMessage);
|
|
||||||
}
|
|
||||||
Message userMessage = Message.builder().content(content + (nearestList.size() > 0 ? "\n\n注意：回答问题时，须严格根据我给你的系统上下文内容原文进行回答，请不要自己发挥,回答时保持原来文本的段落层级" : "") ).role(Message.Role.USER).build();
|
|
||||||
messages.add(userMessage);
|
|
||||||
if (chatRequest.getModel().startsWith("ollama")) {
|
|
||||||
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;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 根据用户信息查询本地知识库
|
|
||||||
*/
|
|
||||||
@GetMapping("/list")
|
|
||||||
public TableDataInfo<KnowledgeInfoVo> list(KnowledgeInfoBo bo, PageQuery pageQuery) {
|
|
||||||
if(!StpUtil.isLogin()){
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
bo.setUid(LoginHelper.getUserId());
|
|
||||||
return knowledgeInfoService.queryPageList(bo, pageQuery);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 新增知识库
|
|
||||||
*/
|
|
||||||
@Log(title = "知识库", businessType = BusinessType.INSERT)
|
|
||||||
@PostMapping("/save")
|
|
||||||
public R<Void> save(@Validated(AddGroup.class) @RequestBody KnowledgeInfoBo bo) {
|
|
||||||
knowledgeInfoService.saveOne(bo);
|
|
||||||
return R.ok();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 删除知识库
|
|
||||||
*/
|
|
||||||
@PostMapping("/remove/{id}")
|
|
||||||
public R<String> remove(@PathVariable String id){
|
|
||||||
knowledgeInfoService.removeKnowledge(id);
|
|
||||||
return R.ok("删除知识库成功!");
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 修改知识库
|
|
||||||
*/
|
|
||||||
@Log(title = "知识库", businessType = BusinessType.UPDATE)
|
|
||||||
@PostMapping("/edit")
|
|
||||||
public R<Void> edit( @RequestBody KnowledgeInfoBo bo) {
|
|
||||||
return toAjax(knowledgeInfoService.updateByBo(bo));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 导出知识库列表
|
|
||||||
*/
|
|
||||||
@Log(title = "知识库", businessType = BusinessType.EXPORT)
|
|
||||||
@PostMapping("/export")
|
|
||||||
public void export(KnowledgeInfoBo bo, HttpServletResponse response) {
|
|
||||||
List<KnowledgeInfoVo> list = knowledgeInfoService.queryList(bo);
|
|
||||||
ExcelUtil.exportExcel(list, "知识库", KnowledgeInfoVo.class, response);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 查询知识附件信息
|
|
||||||
*/
|
|
||||||
@GetMapping("/detail/{kid}")
|
|
||||||
public TableDataInfo<KnowledgeAttachVo> attach(KnowledgeAttachBo bo, PageQuery pageQuery,@PathVariable String kid){
|
|
||||||
bo.setKid(kid);
|
|
||||||
return attachService.queryPageList(bo, pageQuery);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 上传知识库附件
|
|
||||||
*/
|
|
||||||
@PostMapping(value = "/attach/upload")
|
|
||||||
public R<String> upload(KnowledgeInfoUploadRequest request){
|
|
||||||
knowledgeInfoService.upload(request);
|
|
||||||
return R.ok("上传知识库附件成功!");
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 获取知识库附件详细信息
|
|
||||||
*
|
|
||||||
* @param id 主键
|
|
||||||
*/
|
|
||||||
@GetMapping("attach/info/{id}")
|
|
||||||
public R<KnowledgeAttachVo> getAttachInfo(@NotNull(message = "主键不能为空")
|
|
||||||
@PathVariable Long id) {
|
|
||||||
return R.ok(attachService.queryById(id));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 删除知识库附件
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
@PostMapping("attach/remove/{docId}")
|
|
||||||
public R<Void> removeAttach(@NotEmpty(message = "主键不能为空") @PathVariable String docId) {
|
|
||||||
attachService.removeKnowledgeAttach(docId);
|
|
||||||
return R.ok();
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 查询知识片段
|
|
||||||
*/
|
|
||||||
@GetMapping("/fragment/list/{docId}")
|
|
||||||
public TableDataInfo<KnowledgeFragmentVo> fragmentList(KnowledgeFragmentBo bo, PageQuery pageQuery, @PathVariable String docId) {
|
|
||||||
bo.setDocId(docId);
|
|
||||||
return fragmentService.queryPageList(bo, pageQuery);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -2,13 +2,20 @@
|
|||||||
<project xmlns="http://maven.apache.org/POM/4.0.0"
|
<project xmlns="http://maven.apache.org/POM/4.0.0"
|
||||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<parent>
|
<parent>
|
||||||
<artifactId>ruoyi-ai</artifactId>
|
<artifactId>ruoyi-ai</artifactId>
|
||||||
<groupId>org.ruoyi</groupId>
|
<groupId>org.ruoyi</groupId>
|
||||||
<version>${revision}</version>
|
<version>${revision}</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
|
||||||
|
<artifactId>ruoyi-common</artifactId>
|
||||||
|
<packaging>pom</packaging>
|
||||||
|
|
||||||
|
<description>
|
||||||
|
common 通用模块
|
||||||
|
</description>
|
||||||
|
|
||||||
<modules>
|
<modules>
|
||||||
<module>ruoyi-common-bom</module>
|
<module>ruoyi-common-bom</module>
|
||||||
@@ -32,16 +39,9 @@
|
|||||||
<module>ruoyi-common-encrypt</module>
|
<module>ruoyi-common-encrypt</module>
|
||||||
<module>ruoyi-common-tenant</module>
|
<module>ruoyi-common-tenant</module>
|
||||||
<module>ruoyi-common-chat</module>
|
<module>ruoyi-common-chat</module>
|
||||||
<module>ruoyi-common-pay</module>
|
|
||||||
<module>ruoyi-common-wechat</module>
|
<module>ruoyi-common-wechat</module>
|
||||||
|
<module>ruoyi-common-pay</module>
|
||||||
<module>ruoyi-common-live</module>
|
<module>ruoyi-common-live</module>
|
||||||
</modules>
|
</modules>
|
||||||
|
|
||||||
<artifactId>ruoyi-common</artifactId>
|
|
||||||
<packaging>pom</packaging>
|
|
||||||
|
|
||||||
<description>
|
|
||||||
common 通用模块
|
|
||||||
</description>
|
|
||||||
|
|
||||||
</project>
|
</project>
|
||||||
|
|||||||
@@ -159,29 +159,14 @@
|
|||||||
<version>${revision}</version>
|
<version>${revision}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- 微信模块 -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.ruoyi</groupId>
|
|
||||||
<artifactId>ruoyi-common-wechat</artifactId>
|
|
||||||
<version>${revision}</version>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- AI绘画 -->
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.ruoyi</groupId>
|
<groupId>org.ruoyi</groupId>
|
||||||
<artifactId>ruoyi-chat</artifactId>
|
<artifactId>ruoyi-chat</artifactId>
|
||||||
<version>${revision}</version>
|
<version>${revision}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<!-- 支付模块 -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.ruoyi</groupId>
|
|
||||||
<artifactId>ruoyi-common-pay</artifactId>
|
|
||||||
<version>${revision}</version>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
</dependencyManagement>
|
</dependencyManagement>
|
||||||
|
|
||||||
</project>
|
</project>
|
||||||
|
|||||||
@@ -18,6 +18,10 @@
|
|||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<retrofit2.version>2.9.0</retrofit2.version>
|
<retrofit2.version>2.9.0</retrofit2.version>
|
||||||
|
<azure.version>1.0.0-beta.12</azure.version>
|
||||||
|
<chatglm.version>release-V4-2.3.0</chatglm.version>
|
||||||
|
<okhttp.version>2.7.5</okhttp.version>
|
||||||
|
<jtokkit.version>0.5.0</jtokkit.version>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
@@ -26,38 +30,22 @@
|
|||||||
<artifactId>ruoyi-common-core</artifactId>
|
<artifactId>ruoyi-common-core</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
<!-- 序列化模块 -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>mysql</groupId>
|
<groupId>org.ruoyi</groupId>
|
||||||
<artifactId>mysql-connector-java</artifactId>
|
<artifactId>ruoyi-common-json</artifactId>
|
||||||
<version>8.0.33</version>
|
</dependency>
|
||||||
|
|
||||||
|
<!-- redis模块 -->
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.ruoyi</groupId>
|
||||||
|
<artifactId>ruoyi-common-redis</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.azure</groupId>
|
<groupId>com.azure</groupId>
|
||||||
<artifactId>azure-ai-openai</artifactId>
|
<artifactId>azure-ai-openai</artifactId>
|
||||||
<version>1.0.0-beta.12</version>
|
<version>${azure.version}</version>
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>io.github.ollama4j</groupId>
|
|
||||||
<artifactId>ollama4j</artifactId>
|
|
||||||
<version>1.0.79</version>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- 序列化模块 -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.ruoyi</groupId>
|
|
||||||
<artifactId>ruoyi-common-json</artifactId>
|
|
||||||
<version>1.0.0</version>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.ruoyi</groupId>
|
|
||||||
<artifactId>ruoyi-common-redis</artifactId>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.ruoyi</groupId>
|
|
||||||
<artifactId>ruoyi-common-satoken</artifactId>
|
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
@@ -79,13 +67,7 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.knuddels</groupId>
|
<groupId>com.knuddels</groupId>
|
||||||
<artifactId>jtokkit</artifactId>
|
<artifactId>jtokkit</artifactId>
|
||||||
<version>0.5.0</version>
|
<version>${jtokkit.version}</version>
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>cn.hutool</groupId>
|
|
||||||
<artifactId>hutool-all</artifactId>
|
|
||||||
<version>5.8.12</version>
|
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
@@ -98,21 +80,18 @@
|
|||||||
</exclusion>
|
</exclusion>
|
||||||
</exclusions>
|
</exclusions>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
|
||||||
<groupId>junit</groupId>
|
|
||||||
<artifactId>junit</artifactId>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>cn.bigmodel.openapi</groupId>
|
<groupId>cn.bigmodel.openapi</groupId>
|
||||||
<artifactId>oapi-java-sdk</artifactId>
|
<artifactId>oapi-java-sdk</artifactId>
|
||||||
<version>release-V4-2.3.0</version>
|
<version>${chatglm.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.squareup.okhttp</groupId>
|
<groupId>com.squareup.okhttp</groupId>
|
||||||
<artifactId>okhttp</artifactId>
|
<artifactId>okhttp</artifactId>
|
||||||
<version>2.7.5</version>
|
<version>${okhttp.version}</version>
|
||||||
<scope>compile</scope>
|
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
</dependencies>
|
</dependencies>
|
||||||
</project>
|
</project>
|
||||||
|
|||||||
@@ -12,6 +12,9 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
|
|||||||
@Data
|
@Data
|
||||||
public class WebSocketProperties {
|
public class WebSocketProperties {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 是否开启
|
||||||
|
*/
|
||||||
private Boolean enabled;
|
private Boolean enabled;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -1,73 +0,0 @@
|
|||||||
package org.ruoyi.common.chat.demo;
|
|
||||||
|
|
||||||
import cn.hutool.json.JSONUtil;
|
|
||||||
|
|
||||||
import lombok.Getter;
|
|
||||||
import lombok.SneakyThrows;
|
|
||||||
import lombok.extern.slf4j.Slf4j;
|
|
||||||
import okhttp3.Response;
|
|
||||||
import okhttp3.ResponseBody;
|
|
||||||
import okhttp3.sse.EventSource;
|
|
||||||
import okhttp3.sse.EventSourceListener;
|
|
||||||
import org.ruoyi.common.chat.entity.chat.ChatCompletionResponse;
|
|
||||||
|
|
||||||
import java.util.Objects;
|
|
||||||
import java.util.concurrent.CountDownLatch;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 描述： sse
|
|
||||||
*
|
|
||||||
* @author https:www.unfbx.com
|
|
||||||
* 2023-06-15
|
|
||||||
*/
|
|
||||||
@Slf4j
|
|
||||||
public class ConsoleEventSourceListenerV2 extends EventSourceListener {
|
|
||||||
@Getter
|
|
||||||
String args = "";
|
|
||||||
final CountDownLatch countDownLatch;
|
|
||||||
|
|
||||||
public ConsoleEventSourceListenerV2(CountDownLatch countDownLatch) {
|
|
||||||
this.countDownLatch = countDownLatch;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onOpen(EventSource eventSource, Response response) {
|
|
||||||
log.info("OpenAI建立sse连接...");
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onEvent(EventSource eventSource, String id, String type, String data) {
|
|
||||||
log.info("OpenAI返回数据：{}", data);
|
|
||||||
if (data.equals("[DONE]")) {
|
|
||||||
log.info("OpenAI返回数据结束了");
|
|
||||||
countDownLatch.countDown();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
ChatCompletionResponse chatCompletionResponse = JSONUtil.toBean(data, ChatCompletionResponse.class);
|
|
||||||
if(Objects.nonNull(chatCompletionResponse.getChoices().get(0).getDelta().getFunctionCall())){
|
|
||||||
args += chatCompletionResponse.getChoices().get(0).getDelta().getFunctionCall().getArguments();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onClosed(EventSource eventSource) {
|
|
||||||
log.info("OpenAI关闭sse连接...");
|
|
||||||
}
|
|
||||||
|
|
||||||
@SneakyThrows
|
|
||||||
@Override
|
|
||||||
public void onFailure(EventSource eventSource, Throwable t, Response response) {
|
|
||||||
if(Objects.isNull(response)){
|
|
||||||
log.error("OpenAI sse连接异常:{}", t);
|
|
||||||
eventSource.cancel();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
ResponseBody body = response.body();
|
|
||||||
if (Objects.nonNull(body)) {
|
|
||||||
log.error("OpenAI sse连接异常data：{}，异常：{}", body.string(), t);
|
|
||||||
} else {
|
|
||||||
log.error("OpenAI sse连接异常data：{}，异常：{}", response, t);
|
|
||||||
}
|
|
||||||
eventSource.cancel();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,92 +0,0 @@
|
|||||||
package org.ruoyi.common.chat.demo;
|
|
||||||
|
|
||||||
import cn.hutool.core.collection.CollectionUtil;
|
|
||||||
import cn.hutool.json.JSONUtil;
|
|
||||||
import lombok.Getter;
|
|
||||||
import lombok.SneakyThrows;
|
|
||||||
import lombok.extern.slf4j.Slf4j;
|
|
||||||
import okhttp3.Response;
|
|
||||||
import okhttp3.ResponseBody;
|
|
||||||
import okhttp3.sse.EventSource;
|
|
||||||
import okhttp3.sse.EventSourceListener;
|
|
||||||
import org.ruoyi.common.chat.entity.chat.ChatCompletionResponse;
|
|
||||||
import org.ruoyi.common.chat.entity.chat.Message;
|
|
||||||
import org.ruoyi.common.chat.entity.chat.tool.ToolCallFunction;
|
|
||||||
import org.ruoyi.common.chat.entity.chat.tool.ToolCalls;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Objects;
|
|
||||||
import java.util.concurrent.CountDownLatch;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 描述： demo测试实现类，仅供思路参考
|
|
||||||
*
|
|
||||||
* @author https:www.unfbx.com
|
|
||||||
* 2023-11-12
|
|
||||||
*/
|
|
||||||
@Slf4j
|
|
||||||
public class ConsoleEventSourceListenerV3 extends EventSourceListener {
|
|
||||||
@Getter
|
|
||||||
List<ToolCalls> choices = new ArrayList<>();
|
|
||||||
@Getter
|
|
||||||
ToolCalls toolCalls = new ToolCalls();
|
|
||||||
@Getter
|
|
||||||
ToolCallFunction toolCallFunction = ToolCallFunction.builder().name("").arguments("").build();
|
|
||||||
final CountDownLatch countDownLatch;
|
|
||||||
|
|
||||||
public ConsoleEventSourceListenerV3(CountDownLatch countDownLatch) {
|
|
||||||
this.countDownLatch = countDownLatch;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onOpen(EventSource eventSource, Response response) {
|
|
||||||
log.info("OpenAI建立sse连接...");
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onEvent(EventSource eventSource, String id, String type, String data) {
|
|
||||||
log.info("OpenAI返回数据：{}", data);
|
|
||||||
if (data.equals("[DONE]")) {
|
|
||||||
log.info("OpenAI返回数据结束了");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
ChatCompletionResponse chatCompletionResponse = JSONUtil.toBean(data, ChatCompletionResponse.class);
|
|
||||||
Message delta = chatCompletionResponse.getChoices().get(0).getDelta();
|
|
||||||
if (CollectionUtil.isNotEmpty(delta.getToolCalls())) {
|
|
||||||
choices.addAll(delta.getToolCalls());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onClosed(EventSource eventSource) {
|
|
||||||
if(CollectionUtil.isNotEmpty(choices)){
|
|
||||||
toolCalls.setId(choices.get(0).getId());
|
|
||||||
toolCalls.setType(choices.get(0).getType());
|
|
||||||
choices.forEach(e -> {
|
|
||||||
toolCallFunction.setName(e.getFunction().getName());
|
|
||||||
toolCallFunction.setArguments(toolCallFunction.getArguments() + e.getFunction().getArguments());
|
|
||||||
toolCalls.setFunction(toolCallFunction);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
log.info("OpenAI关闭sse连接...");
|
|
||||||
countDownLatch.countDown();
|
|
||||||
}
|
|
||||||
|
|
||||||
@SneakyThrows
|
|
||||||
@Override
|
|
||||||
public void onFailure(EventSource eventSource, Throwable t, Response response) {
|
|
||||||
if(Objects.isNull(response)){
|
|
||||||
log.error("OpenAI sse连接异常:{}", t);
|
|
||||||
eventSource.cancel();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
ResponseBody body = response.body();
|
|
||||||
if (Objects.nonNull(body)) {
|
|
||||||
log.error("OpenAI sse连接异常data：{}，异常：{}", body.string(), t);
|
|
||||||
} else {
|
|
||||||
log.error("OpenAI sse连接异常data：{}，异常：{}", response, t);
|
|
||||||
}
|
|
||||||
eventSource.cancel();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,417 +0,0 @@
|
|||||||
package org.ruoyi.common.chat.demo;
|
|
||||||
|
|
||||||
import cn.hutool.json.JSONUtil;
|
|
||||||
import com.alibaba.fastjson.JSONObject;
|
|
||||||
import lombok.Builder;
|
|
||||||
import lombok.Data;
|
|
||||||
import lombok.extern.slf4j.Slf4j;
|
|
||||||
import okhttp3.OkHttpClient;
|
|
||||||
import okhttp3.logging.HttpLoggingInterceptor;
|
|
||||||
import org.junit.Before;
|
|
||||||
import org.junit.Test;
|
|
||||||
import org.ruoyi.common.chat.entity.chat.*;
|
|
||||||
import org.ruoyi.common.chat.entity.chat.tool.ToolCallFunction;
|
|
||||||
import org.ruoyi.common.chat.entity.chat.tool.ToolCalls;
|
|
||||||
import org.ruoyi.common.chat.entity.chat.tool.Tools;
|
|
||||||
import org.ruoyi.common.chat.entity.chat.tool.ToolsFunction;
|
|
||||||
import org.ruoyi.common.chat.openai.OpenAiClient;
|
|
||||||
import org.ruoyi.common.chat.openai.OpenAiStreamClient;
|
|
||||||
import org.ruoyi.common.chat.openai.function.KeyRandomStrategy;
|
|
||||||
import org.ruoyi.common.chat.openai.interceptor.DynamicKeyOpenAiAuthInterceptor;
|
|
||||||
import org.ruoyi.common.chat.openai.interceptor.OpenAILogger;
|
|
||||||
import org.ruoyi.common.chat.openai.interceptor.OpenAiResponseInterceptor;
|
|
||||||
import org.ruoyi.common.chat.openai.plugin.PluginAbstract;
|
|
||||||
import org.ruoyi.common.chat.plugin.CmdPlugin;
|
|
||||||
import org.ruoyi.common.chat.plugin.CmdReq;
|
|
||||||
import org.ruoyi.common.chat.sse.ConsoleEventSourceListener;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.Arrays;
|
|
||||||
import java.util.Collections;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.concurrent.CountDownLatch;
|
|
||||||
import java.util.concurrent.TimeUnit;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 描述：
|
|
||||||
*
|
|
||||||
* @author ageerle@163.com
|
|
||||||
* date 2025/3/8
|
|
||||||
*/
|
|
||||||
@Slf4j
|
|
||||||
public class PluginTest {
|
|
||||||
|
|
||||||
private OpenAiClient openAiClient;
|
|
||||||
private OpenAiStreamClient openAiStreamClient;
|
|
||||||
|
|
||||||
@Before
|
|
||||||
public void before() {
|
|
||||||
//可以为null
|
|
||||||
// Proxy proxy = new Proxy(Proxy.Type.HTTP, new InetSocketAddress("127.0.0.1", 7890));
|
|
||||||
HttpLoggingInterceptor httpLoggingInterceptor = new HttpLoggingInterceptor(new OpenAILogger());
|
|
||||||
//！！！！千万别再生产或者测试环境打开BODY级别日志！！！！
|
|
||||||
//！！！生产或者测试环境建议设置为这三种级别：NONE,BASIC,HEADERS,！！！
|
|
||||||
httpLoggingInterceptor.setLevel(HttpLoggingInterceptor.Level.HEADERS);
|
|
||||||
OkHttpClient okHttpClient = new OkHttpClient
|
|
||||||
.Builder()
|
|
||||||
// .proxy(proxy)
|
|
||||||
.addInterceptor(httpLoggingInterceptor)
|
|
||||||
.addInterceptor(new OpenAiResponseInterceptor())
|
|
||||||
.connectTimeout(10, TimeUnit.SECONDS)
|
|
||||||
.writeTimeout(30, TimeUnit.SECONDS)
|
|
||||||
.readTimeout(30, TimeUnit.SECONDS)
|
|
||||||
.build();
|
|
||||||
openAiClient = OpenAiClient.builder()
|
|
||||||
//支持多key传入，请求时候随机选择
|
|
||||||
.apiKey(Arrays.asList("sk-xx"))
|
|
||||||
//自定义key的获取策略：默认KeyRandomStrategy
|
|
||||||
//.keyStrategy(new KeyRandomStrategy())
|
|
||||||
.keyStrategy(new KeyRandomStrategy())
|
|
||||||
.okHttpClient(okHttpClient)
|
|
||||||
//自己做了代理就传代理地址，没有可不不传,(关注公众号回复：openai ，获取免费的测试代理地址)
|
|
||||||
.apiHost("https://api.pandarobot.chat/")
|
|
||||||
.build();
|
|
||||||
|
|
||||||
openAiStreamClient = OpenAiStreamClient.builder()
|
|
||||||
//支持多key传入，请求时候随机选择
|
|
||||||
.apiKey(Arrays.asList("sk-xx"))
|
|
||||||
//自定义key的获取策略：默认KeyRandomStrategy
|
|
||||||
.keyStrategy(new KeyRandomStrategy())
|
|
||||||
.authInterceptor(new DynamicKeyOpenAiAuthInterceptor())
|
|
||||||
.okHttpClient(okHttpClient)
|
|
||||||
//自己做了代理就传代理地址，没有可不不传,(关注公众号回复：openai ，获取免费的测试代理地址)
|
|
||||||
.apiHost("https://api.pandarobot.chat/")
|
|
||||||
.build();
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void chatFunction() {
|
|
||||||
//模型：GPT_3_5_TURBO_16K_0613
|
|
||||||
Message message = Message.builder().role(Message.Role.USER).content("给我输出一个长度为2的中文词语，并解释下词语对应物品的用途").build();
|
|
||||||
//属性一
|
|
||||||
JSONObject wordLength = new JSONObject();
|
|
||||||
wordLength.put("type", "number");
|
|
||||||
wordLength.put("description", "词语的长度");
|
|
||||||
//属性二
|
|
||||||
JSONObject language = new JSONObject();
|
|
||||||
language.put("type", "string");
|
|
||||||
language.put("enum", Arrays.asList("zh", "en"));
|
|
||||||
language.put("description", "语言类型，例如：zh代表中文、en代表英语");
|
|
||||||
//参数
|
|
||||||
JSONObject properties = new JSONObject();
|
|
||||||
properties.put("wordLength", wordLength);
|
|
||||||
properties.put("language", language);
|
|
||||||
|
|
||||||
Parameters parameters = Parameters.builder()
|
|
||||||
.type("object")
|
|
||||||
.properties(properties)
|
|
||||||
.required(Collections.singletonList("wordLength")).build();
|
|
||||||
Functions functions = Functions.builder()
|
|
||||||
.name("getOneWord")
|
|
||||||
.description("获取一个指定长度和语言类型的词语")
|
|
||||||
.parameters(parameters)
|
|
||||||
.build();
|
|
||||||
|
|
||||||
ChatCompletion chatCompletion = ChatCompletion
|
|
||||||
.builder()
|
|
||||||
.messages(Collections.singletonList(message))
|
|
||||||
.functions(Collections.singletonList(functions))
|
|
||||||
.functionCall("auto")
|
|
||||||
.model(ChatCompletion.Model.GPT_4_1106_PREVIEW.getName())
|
|
||||||
.build();
|
|
||||||
ChatCompletionResponse chatCompletionResponse = openAiClient.chatCompletion(chatCompletion);
|
|
||||||
|
|
||||||
ChatChoice chatChoice = chatCompletionResponse.getChoices().get(0);
|
|
||||||
log.info("构造的方法值：{}", chatChoice.getMessage().getFunctionCall());
|
|
||||||
log.info("构造的方法名称：{}", chatChoice.getMessage().getFunctionCall().getName());
|
|
||||||
log.info("构造的方法参数：{}", chatChoice.getMessage().getFunctionCall().getArguments());
|
|
||||||
WordParam wordParam = JSONUtil.toBean(chatChoice.getMessage().getFunctionCall().getArguments(), WordParam.class);
|
|
||||||
String oneWord = getOneWord(wordParam);
|
|
||||||
|
|
||||||
FunctionCall functionCall = FunctionCall.builder()
|
|
||||||
.arguments(chatChoice.getMessage().getFunctionCall().getArguments())
|
|
||||||
.name("getOneWord")
|
|
||||||
.build();
|
|
||||||
Message message2 = Message.builder().role(Message.Role.ASSISTANT).content("方法参数").functionCall(functionCall).build();
|
|
||||||
String content
|
|
||||||
= "{ " +
|
|
||||||
"\"wordLength\": \"3\", " +
|
|
||||||
"\"language\": \"zh\", " +
|
|
||||||
"\"word\": \"" + oneWord + "\"," +
|
|
||||||
"\"用途\": [\"直接吃\", \"做沙拉\", \"售卖\"]" +
|
|
||||||
"}";
|
|
||||||
Message message3 = Message.builder().role(Message.Role.FUNCTION).name("getOneWord").content(content).build();
|
|
||||||
List<Message> messageList = Arrays.asList(message, message2, message3);
|
|
||||||
ChatCompletion chatCompletionV2 = ChatCompletion
|
|
||||||
.builder()
|
|
||||||
.messages(messageList)
|
|
||||||
.model(ChatCompletion.Model.GPT_4_1106_PREVIEW.getName())
|
|
||||||
.build();
|
|
||||||
ChatCompletionResponse chatCompletionResponseV2 = openAiClient.chatCompletion(chatCompletionV2);
|
|
||||||
log.info("自定义的方法返回值：{}",chatCompletionResponseV2.getChoices().get(0).getMessage().getContent());
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void plugin() {
|
|
||||||
CmdPlugin plugin = new CmdPlugin(CmdReq.class);
|
|
||||||
// 插件名称
|
|
||||||
plugin.setName("命令行工具");
|
|
||||||
// 方法名称
|
|
||||||
plugin.setFunction("openCmd");
|
|
||||||
// 方法说明
|
|
||||||
plugin.setDescription("提供一个命令行指令,比如<记事本>,指令使用中文,以function返回结果为准");
|
|
||||||
|
|
||||||
PluginAbstract.Arg arg = new PluginAbstract.Arg();
|
|
||||||
// 参数名称
|
|
||||||
arg.setName("cmd");
|
|
||||||
// 参数说明
|
|
||||||
arg.setDescription("命令行指令");
|
|
||||||
// 参数类型
|
|
||||||
arg.setType("string");
|
|
||||||
arg.setRequired(true);
|
|
||||||
plugin.setArgs(Collections.singletonList(arg));
|
|
||||||
|
|
||||||
Message message2 = Message.builder().role(Message.Role.USER).content("帮我打开计算器,结合上下文判断指令是否执行成功,只用回复成功或者失败").build();
|
|
||||||
List<Message> messages = new ArrayList<>();
|
|
||||||
messages.add(message2);
|
|
||||||
//有四个重载方法，都可以使用
|
|
||||||
ChatCompletionResponse response = openAiClient.chatCompletionWithPlugin(messages,"gpt-4o-mini",plugin);
|
|
||||||
log.info("自定义的方法返回值：{}", response.getChoices().get(0).getMessage().getContent());
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 自定义返回数据格式
|
|
||||||
*/
|
|
||||||
@Test
|
|
||||||
public void diyReturnDataModelChat() {
|
|
||||||
Message message = Message.builder().role(Message.Role.USER).content("随机输出10个单词，使用json输出").build();
|
|
||||||
ChatCompletion chatCompletion = ChatCompletion
|
|
||||||
.builder()
|
|
||||||
.messages(Collections.singletonList(message))
|
|
||||||
.responseFormat(ResponseFormat.builder().type(ResponseFormat.Type.JSON_OBJECT.getName()).build())
|
|
||||||
.model(ChatCompletion.Model.GPT_4_1106_PREVIEW.getName())
|
|
||||||
.build();
|
|
||||||
ChatCompletionResponse chatCompletionResponse = openAiClient.chatCompletion(chatCompletion);
|
|
||||||
chatCompletionResponse.getChoices().forEach(e -> System.out.println(e.getMessage()));
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void streamPlugin() {
|
|
||||||
WeatherPlugin plugin = new WeatherPlugin(WeatherReq.class);
|
|
||||||
plugin.setName("知心天气");
|
|
||||||
plugin.setFunction("getLocationWeather");
|
|
||||||
plugin.setDescription("提供一个地址，方法将会获取该地址的天气的实时温度信息。");
|
|
||||||
PluginAbstract.Arg arg = new PluginAbstract.Arg();
|
|
||||||
arg.setName("location");
|
|
||||||
arg.setDescription("地名");
|
|
||||||
arg.setType("string");
|
|
||||||
arg.setRequired(true);
|
|
||||||
plugin.setArgs(Collections.singletonList(arg));
|
|
||||||
|
|
||||||
// Message message1 = Message.builder().role(Message.Role.USER).content("秦始皇统一了哪六国。").build();
|
|
||||||
Message message2 = Message.builder().role(Message.Role.USER).content("获取上海市的天气现在多少度，然后再给出3个推荐的户外运动。").build();
|
|
||||||
List<Message> messages = new ArrayList<>();
|
|
||||||
// messages.add(message1);
|
|
||||||
messages.add(message2);
|
|
||||||
//默认模型：GPT_3_5_TURBO_16K_0613
|
|
||||||
//有四个重载方法，都可以使用
|
|
||||||
openAiStreamClient.streamChatCompletionWithPlugin(messages, ChatCompletion.Model.GPT_4_1106_PREVIEW.getName(), new ConsoleEventSourceListener(), plugin);
|
|
||||||
CountDownLatch countDownLatch = new CountDownLatch(1);
|
|
||||||
try {
|
|
||||||
countDownLatch.await();
|
|
||||||
} catch (InterruptedException e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* tools使用示例
|
|
||||||
*/
|
|
||||||
@Test
|
|
||||||
public void toolsChat() {
|
|
||||||
Message message = Message.builder().role(Message.Role.USER).content("给我输出一个长度为2的中文词语，并解释下词语对应物品的用途").build();
|
|
||||||
//属性一
|
|
||||||
JSONObject wordLength = new JSONObject();
|
|
||||||
wordLength.put("type", "number");
|
|
||||||
wordLength.put("description", "词语的长度");
|
|
||||||
//属性二
|
|
||||||
JSONObject language = new JSONObject();
|
|
||||||
language.put("type", "string");
|
|
||||||
language.put("enum", Arrays.asList("zh", "en"));
|
|
||||||
language.put("description", "语言类型，例如：zh代表中文、en代表英语");
|
|
||||||
//参数
|
|
||||||
JSONObject properties = new JSONObject();
|
|
||||||
properties.put("wordLength", wordLength);
|
|
||||||
properties.put("language", language);
|
|
||||||
Parameters parameters = Parameters.builder()
|
|
||||||
.type("object")
|
|
||||||
.properties(properties)
|
|
||||||
.required(Collections.singletonList("wordLength")).build();
|
|
||||||
Tools tools = Tools.builder()
|
|
||||||
.type(Tools.Type.FUNCTION.getName())
|
|
||||||
.function(ToolsFunction.builder().name("getOneWord").description("获取一个指定长度和语言类型的词语").parameters(parameters).build())
|
|
||||||
.build();
|
|
||||||
|
|
||||||
ChatCompletion chatCompletion = ChatCompletion
|
|
||||||
.builder()
|
|
||||||
.messages(Collections.singletonList(message))
|
|
||||||
.tools(Collections.singletonList(tools))
|
|
||||||
.model(ChatCompletion.Model.GPT_4_1106_PREVIEW.getName())
|
|
||||||
.build();
|
|
||||||
ChatCompletionResponse chatCompletionResponse = openAiClient.chatCompletion(chatCompletion);
|
|
||||||
|
|
||||||
ChatChoice chatChoice = chatCompletionResponse.getChoices().get(0);
|
|
||||||
log.info("构造的方法值：{}", chatChoice.getMessage().getToolCalls());
|
|
||||||
|
|
||||||
ToolCalls openAiReturnToolCalls = chatChoice.getMessage().getToolCalls().get(0);
|
|
||||||
WordParam wordParam = JSONUtil.toBean(openAiReturnToolCalls.getFunction().getArguments(), WordParam.class);
|
|
||||||
String oneWord = getOneWord(wordParam);
|
|
||||||
|
|
||||||
|
|
||||||
ToolCallFunction tcf = ToolCallFunction.builder().name("getOneWord").arguments(openAiReturnToolCalls.getFunction().getArguments()).build();
|
|
||||||
ToolCalls tc = ToolCalls.builder().id(openAiReturnToolCalls.getId()).type(ToolCalls.Type.FUNCTION.getName()).function(tcf).build();
|
|
||||||
//构造tool call
|
|
||||||
Message message2 = Message.builder().role(Message.Role.ASSISTANT).content("方法参数").toolCalls(Collections.singletonList(tc)).build();
|
|
||||||
String content
|
|
||||||
= "{ " +
|
|
||||||
"\"wordLength\": \"3\", " +
|
|
||||||
"\"language\": \"zh\", " +
|
|
||||||
"\"word\": \"" + oneWord + "\"," +
|
|
||||||
"\"用途\": [\"直接吃\", \"做沙拉\", \"售卖\"]" +
|
|
||||||
"}";
|
|
||||||
Message message3 = Message.builder().toolCallId(openAiReturnToolCalls.getId()).role(Message.Role.TOOL).name("getOneWord").content(content).build();
|
|
||||||
List<Message> messageList = Arrays.asList(message, message2, message3);
|
|
||||||
ChatCompletion chatCompletionV2 = ChatCompletion
|
|
||||||
.builder()
|
|
||||||
.messages(messageList)
|
|
||||||
.model(ChatCompletion.Model.GPT_4_1106_PREVIEW.getName())
|
|
||||||
.build();
|
|
||||||
ChatCompletionResponse chatCompletionResponseV2 = openAiClient.chatCompletion(chatCompletionV2);
|
|
||||||
log.info("自定义的方法返回值：{}", chatCompletionResponseV2.getChoices().get(0).getMessage().getContent());
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* tools流式输出使用示例
|
|
||||||
*/
|
|
||||||
@Test
|
|
||||||
public void streamToolsChat() {
|
|
||||||
|
|
||||||
CountDownLatch countDownLatch = new CountDownLatch(1);
|
|
||||||
ConsoleEventSourceListenerV3 eventSourceListener = new ConsoleEventSourceListenerV3(countDownLatch);
|
|
||||||
|
|
||||||
Message message = Message.builder().role(Message.Role.USER).content("给我输出一个长度为2的中文词语，并解释下词语对应物品的用途").build();
|
|
||||||
//属性一
|
|
||||||
JSONObject wordLength = new JSONObject();
|
|
||||||
wordLength.put("type", "number");
|
|
||||||
wordLength.put("description", "词语的长度");
|
|
||||||
//属性二
|
|
||||||
JSONObject language = new JSONObject();
|
|
||||||
language.put("type", "string");
|
|
||||||
language.put("enum", Arrays.asList("zh", "en"));
|
|
||||||
language.put("description", "语言类型，例如：zh代表中文、en代表英语");
|
|
||||||
//参数
|
|
||||||
JSONObject properties = new JSONObject();
|
|
||||||
properties.put("wordLength", wordLength);
|
|
||||||
properties.put("language", language);
|
|
||||||
Parameters parameters = Parameters.builder()
|
|
||||||
.type("object")
|
|
||||||
.properties(properties)
|
|
||||||
.required(Collections.singletonList("wordLength")).build();
|
|
||||||
Tools tools = Tools.builder()
|
|
||||||
.type(Tools.Type.FUNCTION.getName())
|
|
||||||
.function(ToolsFunction.builder().name("getOneWord").description("获取一个指定长度和语言类型的词语").parameters(parameters).build())
|
|
||||||
.build();
|
|
||||||
|
|
||||||
ChatCompletion chatCompletion = ChatCompletion
|
|
||||||
.builder()
|
|
||||||
.messages(Collections.singletonList(message))
|
|
||||||
.tools(Collections.singletonList(tools))
|
|
||||||
.model(ChatCompletion.Model.GPT_4_1106_PREVIEW.getName())
|
|
||||||
.build();
|
|
||||||
openAiStreamClient.streamChatCompletion(chatCompletion, eventSourceListener);
|
|
||||||
|
|
||||||
try {
|
|
||||||
countDownLatch.await();
|
|
||||||
} catch (InterruptedException e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
|
|
||||||
ToolCalls openAiReturnToolCalls = eventSourceListener.getToolCalls();
|
|
||||||
WordParam wordParam = JSONUtil.toBean(openAiReturnToolCalls.getFunction().getArguments(), WordParam.class);
|
|
||||||
String oneWord = getOneWord(wordParam);
|
|
||||||
|
|
||||||
|
|
||||||
ToolCallFunction tcf = ToolCallFunction.builder().name("getOneWord").arguments(openAiReturnToolCalls.getFunction().getArguments()).build();
|
|
||||||
ToolCalls tc = ToolCalls.builder().id(openAiReturnToolCalls.getId()).type(ToolCalls.Type.FUNCTION.getName()).function(tcf).build();
|
|
||||||
//构造tool call
|
|
||||||
Message message2 = Message.builder().role(Message.Role.ASSISTANT).content("方法参数").toolCalls(Collections.singletonList(tc)).build();
|
|
||||||
String content
|
|
||||||
= "{ " +
|
|
||||||
"\"wordLength\": \"3\", " +
|
|
||||||
"\"language\": \"zh\", " +
|
|
||||||
"\"word\": \"" + oneWord + "\"," +
|
|
||||||
"\"用途\": [\"直接吃\", \"做沙拉\", \"售卖\"]" +
|
|
||||||
"}";
|
|
||||||
Message message3 = Message.builder().toolCallId(openAiReturnToolCalls.getId()).role(Message.Role.TOOL).name("getOneWord").content(content).build();
|
|
||||||
List<Message> messageList = Arrays.asList(message, message2, message3);
|
|
||||||
ChatCompletion chatCompletionV2 = ChatCompletion
|
|
||||||
.builder()
|
|
||||||
.messages(messageList)
|
|
||||||
.model(ChatCompletion.Model.GPT_4_1106_PREVIEW.getName())
|
|
||||||
.build();
|
|
||||||
|
|
||||||
|
|
||||||
CountDownLatch countDownLatch1 = new CountDownLatch(1);
|
|
||||||
openAiStreamClient.streamChatCompletion(chatCompletionV2, new ConsoleEventSourceListenerV3(countDownLatch));
|
|
||||||
try {
|
|
||||||
countDownLatch1.await();
|
|
||||||
} catch (InterruptedException e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
try {
|
|
||||||
countDownLatch1.await();
|
|
||||||
} catch (InterruptedException e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@Data
|
|
||||||
@Builder
|
|
||||||
static class WordParam {
|
|
||||||
private int wordLength;
|
|
||||||
@Builder.Default
|
|
||||||
private String language = "zh";
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 获取一个词语(根据语言和字符长度查询)
|
|
||||||
* @param wordParam
|
|
||||||
* @return
|
|
||||||
*/
|
|
||||||
public String getOneWord(WordParam wordParam) {
|
|
||||||
|
|
||||||
List<String> zh = Arrays.asList("大香蕉", "哈密瓜", "苹果");
|
|
||||||
List<String> en = Arrays.asList("apple", "banana", "cantaloupe");
|
|
||||||
if (wordParam.getLanguage().equals("zh")) {
|
|
||||||
for (String e : zh) {
|
|
||||||
if (e.length() == wordParam.getWordLength()) {
|
|
||||||
return e;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (wordParam.getLanguage().equals("en")) {
|
|
||||||
for (String e : en) {
|
|
||||||
if (e.length() == wordParam.getWordLength()) {
|
|
||||||
return e;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return "西瓜";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,24 +0,0 @@
|
|||||||
package org.ruoyi.common.chat.demo;
|
|
||||||
|
|
||||||
|
|
||||||
import org.ruoyi.common.chat.openai.plugin.PluginAbstract;
|
|
||||||
|
|
||||||
public class WeatherPlugin extends PluginAbstract<WeatherReq, WeatherResp> {
|
|
||||||
|
|
||||||
public WeatherPlugin(Class<?> r) {
|
|
||||||
super(r);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public WeatherResp func(WeatherReq args) {
|
|
||||||
WeatherResp weatherResp = new WeatherResp();
|
|
||||||
weatherResp.setTemp("25到28摄氏度");
|
|
||||||
weatherResp.setLevel(3);
|
|
||||||
return weatherResp;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String content(WeatherResp weatherResp) {
|
|
||||||
return "当前天气温度：" + weatherResp.getTemp() + "，风力等级：" + weatherResp.getLevel();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,13 +0,0 @@
|
|||||||
package org.ruoyi.common.chat.demo;
|
|
||||||
|
|
||||||
|
|
||||||
import lombok.Data;
|
|
||||||
import org.ruoyi.common.chat.openai.plugin.PluginParam;
|
|
||||||
|
|
||||||
@Data
|
|
||||||
public class WeatherReq extends PluginParam {
|
|
||||||
/**
|
|
||||||
* 城市
|
|
||||||
*/
|
|
||||||
private String location;
|
|
||||||
}
|
|
||||||
@@ -1,15 +0,0 @@
|
|||||||
package org.ruoyi.common.chat.demo;
|
|
||||||
|
|
||||||
import lombok.Data;
|
|
||||||
|
|
||||||
@Data
|
|
||||||
public class WeatherResp {
|
|
||||||
/**
|
|
||||||
* 温度
|
|
||||||
*/
|
|
||||||
private String temp;
|
|
||||||
/**
|
|
||||||
* 风力等级
|
|
||||||
*/
|
|
||||||
private Integer level;
|
|
||||||
}
|
|
||||||
@@ -1,223 +0,0 @@
|
|||||||
package org.ruoyi.common.chat.demo;
|
|
||||||
|
|
||||||
import com.fasterxml.jackson.core.JsonProcessingException;
|
|
||||||
import com.fasterxml.jackson.core.type.TypeReference;
|
|
||||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
|
||||||
import com.zhipu.oapi.ClientV4;
|
|
||||||
import com.zhipu.oapi.Constants;
|
|
||||||
import com.zhipu.oapi.service.v4.tools.*;
|
|
||||||
import org.junit.Test;
|
|
||||||
import org.slf4j.Logger;
|
|
||||||
import org.slf4j.LoggerFactory;
|
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.concurrent.TimeUnit;
|
|
||||||
import java.util.concurrent.atomic.AtomicBoolean;
|
|
||||||
import java.util.concurrent.atomic.AtomicReference;
|
|
||||||
|
|
||||||
|
|
||||||
import com.zhipu.oapi.service.v4.model.*;
|
|
||||||
import io.reactivex.Flowable;
|
|
||||||
|
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.Map;
|
|
||||||
|
|
||||||
|
|
||||||
public class WebSearchToolsTest {
|
|
||||||
|
|
||||||
private final static Logger logger = LoggerFactory.getLogger(WebSearchToolsTest.class);
|
|
||||||
private static final String API_SECRET_KEY = "xx";
|
|
||||||
|
|
||||||
private static final ClientV4 client = new ClientV4.Builder(API_SECRET_KEY)
|
|
||||||
.networkConfig(300, 100, 100, 100, TimeUnit.SECONDS)
|
|
||||||
.connectionPool(new okhttp3.ConnectionPool(8, 1, TimeUnit.SECONDS))
|
|
||||||
.build();
|
|
||||||
private static final ObjectMapper mapper = new ObjectMapper();
|
|
||||||
// 请自定义自己的业务id
|
|
||||||
private static final String requestIdTemplate = "mycompany-%d";
|
|
||||||
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void test1() throws JsonProcessingException {
|
|
||||||
|
|
||||||
// json 转换 ArrayList<SearchChatMessage>
|
|
||||||
String jsonString = "[\n" +
|
|
||||||
" {\n" +
|
|
||||||
" \"content\": \"今天武汉天气怎么样\",\n" +
|
|
||||||
" \"role\": \"user\"\n" +
|
|
||||||
" }\n" +
|
|
||||||
" ]";
|
|
||||||
|
|
||||||
ArrayList<SearchChatMessage> messages = new ObjectMapper().readValue(jsonString, new TypeReference<ArrayList<SearchChatMessage>>() {
|
|
||||||
});
|
|
||||||
|
|
||||||
|
|
||||||
String requestId = String.format(requestIdTemplate, System.currentTimeMillis());
|
|
||||||
WebSearchParamsRequest chatCompletionRequest = WebSearchParamsRequest.builder()
|
|
||||||
.model("web-search-pro")
|
|
||||||
.stream(Boolean.TRUE)
|
|
||||||
.messages(messages)
|
|
||||||
.requestId(requestId)
|
|
||||||
.build();
|
|
||||||
WebSearchApiResponse webSearchApiResponse = client.webSearchProStreamingInvoke(chatCompletionRequest);
|
|
||||||
if (webSearchApiResponse.isSuccess()) {
|
|
||||||
AtomicBoolean isFirst = new AtomicBoolean(true);
|
|
||||||
List<ChoiceDelta> choices = new ArrayList<>();
|
|
||||||
AtomicReference<WebSearchPro> lastAccumulator = new AtomicReference<>();
|
|
||||||
|
|
||||||
webSearchApiResponse.getFlowable().map(result -> result)
|
|
||||||
.doOnNext(accumulator -> {
|
|
||||||
{
|
|
||||||
if (isFirst.getAndSet(false)) {
|
|
||||||
logger.info("Response: ");
|
|
||||||
}
|
|
||||||
ChoiceDelta delta = accumulator.getChoices().get(0).getDelta();
|
|
||||||
if (delta != null && delta.getToolCalls() != null) {
|
|
||||||
logger.info("tool_calls: {}", mapper.writeValueAsString(delta.getToolCalls()));
|
|
||||||
}
|
|
||||||
choices.add(delta);
|
|
||||||
lastAccumulator.set(accumulator);
|
|
||||||
|
|
||||||
}
|
|
||||||
})
|
|
||||||
.doOnComplete(() -> System.out.println("Stream completed."))
|
|
||||||
.doOnError(throwable -> System.err.println("Error: " + throwable)) // Handle errors
|
|
||||||
.blockingSubscribe();// Use blockingSubscribe instead of blockingGet()
|
|
||||||
|
|
||||||
WebSearchPro chatMessageAccumulator = lastAccumulator.get();
|
|
||||||
|
|
||||||
webSearchApiResponse.setFlowable(null);// 打印前置空
|
|
||||||
webSearchApiResponse.setData(chatMessageAccumulator);
|
|
||||||
}
|
|
||||||
logger.info("model output: {}", mapper.writeValueAsString(webSearchApiResponse));
|
|
||||||
client.getConfig().getHttpClient().dispatcher().executorService().shutdown();
|
|
||||||
|
|
||||||
client.getConfig().getHttpClient().connectionPool().evictAll();
|
|
||||||
// List all active threads
|
|
||||||
for (Thread t : Thread.getAllStackTraces().keySet()) {
|
|
||||||
logger.info("Thread: " + t.getName() + " State: " + t.getState());
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void test2() throws JsonProcessingException {
|
|
||||||
|
|
||||||
// json 转换 ArrayList<SearchChatMessage>
|
|
||||||
String jsonString = "[\n" +
|
|
||||||
" {\n" +
|
|
||||||
" \"content\": \"今天天气怎么样\",\n" +
|
|
||||||
" \"role\": \"user\"\n" +
|
|
||||||
" }\n" +
|
|
||||||
" ]";
|
|
||||||
|
|
||||||
ArrayList<SearchChatMessage> messages = new ObjectMapper().readValue(jsonString, new TypeReference<ArrayList<SearchChatMessage>>() {
|
|
||||||
});
|
|
||||||
|
|
||||||
|
|
||||||
String requestId = String.format(requestIdTemplate, System.currentTimeMillis());
|
|
||||||
WebSearchParamsRequest chatCompletionRequest = WebSearchParamsRequest.builder()
|
|
||||||
.model("web-search-pro")
|
|
||||||
.stream(Boolean.FALSE)
|
|
||||||
.messages(messages)
|
|
||||||
.requestId(requestId)
|
|
||||||
.build();
|
|
||||||
WebSearchApiResponse webSearchApiResponse = client.invokeWebSearchPro(chatCompletionRequest);
|
|
||||||
|
|
||||||
logger.info("model output: {}", mapper.writeValueAsString(webSearchApiResponse));
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void testFunctionSSE() throws JsonProcessingException {
|
|
||||||
List<ChatMessage> messages = new ArrayList<>();
|
|
||||||
ChatMessage chatMessage = new ChatMessage(ChatMessageRole.USER.value(), "成都到北京要多久，天气如何");
|
|
||||||
messages.add(chatMessage);
|
|
||||||
String requestId = String.format(requestIdTemplate, System.currentTimeMillis());
|
|
||||||
// 函数调用参数构建部分
|
|
||||||
List<ChatTool> chatToolList = new ArrayList<>();
|
|
||||||
ChatTool chatTool = new ChatTool();
|
|
||||||
|
|
||||||
chatTool.setType(ChatToolType.FUNCTION.value());
|
|
||||||
ChatFunctionParameters chatFunctionParameters = new ChatFunctionParameters();
|
|
||||||
chatFunctionParameters.setType("object");
|
|
||||||
Map<String, Object> properties = new HashMap<>();
|
|
||||||
properties.put("location", new HashMap<String, Object>() {{
|
|
||||||
put("type", "string");
|
|
||||||
put("description", "城市，如：北京");
|
|
||||||
}});
|
|
||||||
properties.put("unit", new HashMap<String, Object>() {{
|
|
||||||
put("type", "string");
|
|
||||||
put("enum", new ArrayList<String>() {{
|
|
||||||
add("celsius");
|
|
||||||
add("fahrenheit");
|
|
||||||
}});
|
|
||||||
}});
|
|
||||||
chatFunctionParameters.setProperties(properties);
|
|
||||||
ChatFunction chatFunction = ChatFunction.builder()
|
|
||||||
.name("get_weather")
|
|
||||||
.description("Get the current weather of a location")
|
|
||||||
.parameters(chatFunctionParameters)
|
|
||||||
.build();
|
|
||||||
chatTool.setFunction(chatFunction);
|
|
||||||
chatToolList.add(chatTool);
|
|
||||||
HashMap<String, Object> extraJson = new HashMap<>();
|
|
||||||
extraJson.put("temperature", 0.5);
|
|
||||||
extraJson.put("max_tokens", 50);
|
|
||||||
|
|
||||||
ChatCompletionRequest chatCompletionRequest = ChatCompletionRequest.builder()
|
|
||||||
.model(Constants.ModelChatGLM4)
|
|
||||||
.stream(Boolean.TRUE)
|
|
||||||
.messages(messages)
|
|
||||||
.requestId(requestId)
|
|
||||||
.tools(chatToolList)
|
|
||||||
.toolChoice("auto")
|
|
||||||
.extraJson(extraJson)
|
|
||||||
.build();
|
|
||||||
ModelApiResponse sseModelApiResp = client.invokeModelApi(chatCompletionRequest);
|
|
||||||
if (sseModelApiResp.isSuccess()) {
|
|
||||||
AtomicBoolean isFirst = new AtomicBoolean(true);
|
|
||||||
List<Choice> choices = new ArrayList<>();
|
|
||||||
ChatMessageAccumulator chatMessageAccumulator = mapStreamToAccumulator(sseModelApiResp.getFlowable())
|
|
||||||
.doOnNext(accumulator -> {
|
|
||||||
{
|
|
||||||
if (isFirst.getAndSet(false)) {
|
|
||||||
logger.info("Response: ");
|
|
||||||
}
|
|
||||||
if (accumulator.getDelta() != null && accumulator.getDelta().getTool_calls() != null) {
|
|
||||||
String jsonString = mapper.writeValueAsString(accumulator.getDelta().getTool_calls());
|
|
||||||
logger.info("tool_calls: {}", jsonString);
|
|
||||||
}
|
|
||||||
if (accumulator.getDelta() != null && accumulator.getDelta().getContent() != null) {
|
|
||||||
logger.info(accumulator.getDelta().getContent());
|
|
||||||
}
|
|
||||||
choices.add(accumulator.getChoice());
|
|
||||||
}
|
|
||||||
})
|
|
||||||
.doOnComplete(System.out::println)
|
|
||||||
.lastElement()
|
|
||||||
.blockingGet();
|
|
||||||
|
|
||||||
|
|
||||||
ModelData data = new ModelData();
|
|
||||||
data.setChoices(choices);
|
|
||||||
data.setUsage(chatMessageAccumulator.getUsage());
|
|
||||||
data.setId(chatMessageAccumulator.getId());
|
|
||||||
data.setCreated(chatMessageAccumulator.getCreated());
|
|
||||||
data.setRequestId(chatCompletionRequest.getRequestId());
|
|
||||||
sseModelApiResp.setFlowable(null);// 打印前置空
|
|
||||||
sseModelApiResp.setData(data);
|
|
||||||
}
|
|
||||||
logger.info("model output: {}", mapper.writeValueAsString(sseModelApiResp));
|
|
||||||
}
|
|
||||||
|
|
||||||
public static Flowable<ChatMessageAccumulator> mapStreamToAccumulator(Flowable<ModelData> flowable) {
|
|
||||||
return flowable.map(chunk -> {
|
|
||||||
return new ChatMessageAccumulator(chunk.getChoices().get(0).getDelta(), null, chunk.getChoices().get(0), chunk.getUsage(), chunk.getCreated(), chunk.getId());
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,65 +0,0 @@
|
|||||||
package org.ruoyi.common.chat.domain.request;
|
|
||||||
|
|
||||||
import org.ruoyi.common.chat.entity.chat.Message;
|
|
||||||
import jakarta.validation.constraints.NotEmpty;
|
|
||||||
import lombok.Data;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 描述：
|
|
||||||
*
|
|
||||||
* @author https:www.unfbx.com
|
|
||||||
* @sine 2023-04-08
|
|
||||||
*/
|
|
||||||
@Data
|
|
||||||
public class ChatRequest {
|
|
||||||
|
|
||||||
|
|
||||||
private String frequency_penalty;
|
|
||||||
|
|
||||||
private String max_tokens;
|
|
||||||
|
|
||||||
@NotEmpty(message = "对话消息不能为空")
|
|
||||||
List<Message> messages;
|
|
||||||
|
|
||||||
@NotEmpty(message = "传入的模型不能为空")
|
|
||||||
private String model;
|
|
||||||
|
|
||||||
private String presence_penalty;
|
|
||||||
|
|
||||||
private String stream;
|
|
||||||
|
|
||||||
private double temperature;
|
|
||||||
|
|
||||||
private double top_p = 1;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 知识库id
|
|
||||||
*/
|
|
||||||
private String kid;
|
|
||||||
|
|
||||||
private String userId;
|
|
||||||
//
|
|
||||||
|
|
||||||
//
|
|
||||||
// /**
|
|
||||||
// * gpt的默认设置
|
|
||||||
// */
|
|
||||||
// private String systemMessage = "";
|
|
||||||
//
|
|
||||||
//
|
|
||||||
//
|
|
||||||
// private double temperature = 0.2;
|
|
||||||
//
|
|
||||||
// /**
|
|
||||||
// * 上下文的条数
|
|
||||||
// */
|
|
||||||
// private Integer contentNumber = 10;
|
|
||||||
//
|
|
||||||
// /**
|
|
||||||
// * 是否携带上下文
|
|
||||||
// */
|
|
||||||
// private Boolean usingContext = Boolean.TRUE;
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,33 +0,0 @@
|
|||||||
package org.ruoyi.common.chat.domain.request;
|
|
||||||
|
|
||||||
import jakarta.validation.constraints.NotEmpty;
|
|
||||||
import lombok.Data;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 描述：
|
|
||||||
*
|
|
||||||
* @author https:www.unfbx.com
|
|
||||||
* @sine 2023-04-08
|
|
||||||
*/
|
|
||||||
@Data
|
|
||||||
public class Dall3Request {
|
|
||||||
|
|
||||||
@NotEmpty(message = "传入的模型不能为空")
|
|
||||||
private String model;
|
|
||||||
|
|
||||||
@NotEmpty(message = "提示词不能为空")
|
|
||||||
private String prompt;
|
|
||||||
|
|
||||||
/** 图片大小 */
|
|
||||||
@NotEmpty(message = "图片大小不能为空")
|
|
||||||
private String size ;
|
|
||||||
|
|
||||||
/** 图片质量 */
|
|
||||||
@NotEmpty(message = "图片质量不能为空")
|
|
||||||
private String quality;
|
|
||||||
|
|
||||||
/** 图片风格 */
|
|
||||||
@NotEmpty(message = "图片风格不能为空")
|
|
||||||
private String style;
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -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,7 +2,6 @@ package org.ruoyi.common.chat.handler;
|
|||||||
|
|
||||||
import cn.hutool.core.util.StrUtil;
|
import cn.hutool.core.util.StrUtil;
|
||||||
import cn.hutool.json.JSONUtil;
|
import cn.hutool.json.JSONUtil;
|
||||||
import com.alibaba.fastjson2.JSONObject;
|
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.ruoyi.common.chat.config.LocalCache;
|
import org.ruoyi.common.chat.config.LocalCache;
|
||||||
import org.ruoyi.common.chat.entity.chat.ChatCompletion;
|
import org.ruoyi.common.chat.entity.chat.ChatCompletion;
|
||||||
@@ -12,7 +11,6 @@ import org.ruoyi.common.chat.listener.WebSocketEventListener;
|
|||||||
import org.ruoyi.common.chat.openai.OpenAiStreamClient;
|
import org.ruoyi.common.chat.openai.OpenAiStreamClient;
|
||||||
import org.ruoyi.common.chat.utils.WebSocketUtils;
|
import org.ruoyi.common.chat.utils.WebSocketUtils;
|
||||||
import org.ruoyi.common.core.utils.SpringUtils;
|
import org.ruoyi.common.core.utils.SpringUtils;
|
||||||
import org.springframework.beans.factory.annotation.Value;
|
|
||||||
import org.springframework.web.socket.*;
|
import org.springframework.web.socket.*;
|
||||||
import org.springframework.web.socket.handler.AbstractWebSocketHandler;
|
import org.springframework.web.socket.handler.AbstractWebSocketHandler;
|
||||||
|
|
||||||
|
|||||||
@@ -1,198 +0,0 @@
|
|||||||
package org.ruoyi.common.chat.localModels;
|
|
||||||
|
|
||||||
import io.micrometer.common.util.StringUtils;
|
|
||||||
import lombok.extern.slf4j.Slf4j;
|
|
||||||
import okhttp3.OkHttpClient;
|
|
||||||
import org.ruoyi.common.chat.entity.models.LocalModelsSearchRequest;
|
|
||||||
import org.ruoyi.common.chat.entity.models.LocalModelsSearchResponse;
|
|
||||||
import org.springframework.stereotype.Service;
|
|
||||||
import retrofit2.Call;
|
|
||||||
import retrofit2.Callback;
|
|
||||||
import retrofit2.Response;
|
|
||||||
import retrofit2.Retrofit;
|
|
||||||
import retrofit2.converter.jackson.JacksonConverterFactory;
|
|
||||||
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.concurrent.CountDownLatch;
|
|
||||||
|
|
||||||
@Slf4j
|
|
||||||
@Service
|
|
||||||
public class LocalModelsofitClient {
|
|
||||||
private static final String BASE_URL = "http://127.0.0.1:5000"; // Flask 服务的 URL
|
|
||||||
private static Retrofit retrofit = null;
|
|
||||||
|
|
||||||
// 获取 Retrofit 实例
|
|
||||||
public static Retrofit getRetrofitInstance() {
|
|
||||||
if (retrofit == null) {
|
|
||||||
OkHttpClient client = new OkHttpClient.Builder()
|
|
||||||
.build();
|
|
||||||
|
|
||||||
retrofit = new Retrofit.Builder()
|
|
||||||
.baseUrl(BASE_URL)
|
|
||||||
.client(client)
|
|
||||||
.addConverterFactory(JacksonConverterFactory.create()) // 使用 Jackson 处理 JSON 转换
|
|
||||||
.build();
|
|
||||||
}
|
|
||||||
return retrofit;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 向 Flask 服务发送文本向量化请求
|
|
||||||
*
|
|
||||||
* @param queries 查询文本列表
|
|
||||||
* @param modelName 模型名称
|
|
||||||
* @param delimiter 文本分隔符
|
|
||||||
* @param topK 返回的结果数
|
|
||||||
* @param blockSize 文本块大小
|
|
||||||
* @param overlapChars 重叠字符数
|
|
||||||
* @return 返回计算得到的 Top K 嵌入向量列表
|
|
||||||
*/
|
|
||||||
|
|
||||||
public static List<List<Double>> getTopKEmbeddings(
|
|
||||||
List<String> queries,
|
|
||||||
String modelName,
|
|
||||||
String delimiter,
|
|
||||||
int topK,
|
|
||||||
int blockSize,
|
|
||||||
int overlapChars) {
|
|
||||||
|
|
||||||
modelName = (!StringUtils.isEmpty(modelName)) ? modelName : "msmarco-distilbert-base-tas-b"; // 默认模型名称
|
|
||||||
delimiter = (!StringUtils.isEmpty(delimiter) ) ? delimiter : "."; // 默认分隔符
|
|
||||||
topK = (topK > 0) ? topK : 3; // 默认返回 3 个结果
|
|
||||||
blockSize = (blockSize > 0) ? blockSize : 500; // 默认文本块大小为 500
|
|
||||||
overlapChars = (overlapChars > 0) ? overlapChars : 50; // 默认重叠字符数为 50
|
|
||||||
|
|
||||||
// 创建 Retrofit 实例
|
|
||||||
Retrofit retrofit = getRetrofitInstance();
|
|
||||||
|
|
||||||
// 创建 SearchService 接口
|
|
||||||
SearchService service = retrofit.create(SearchService.class);
|
|
||||||
|
|
||||||
// 创建请求对象 LocalModelsSearchRequest
|
|
||||||
LocalModelsSearchRequest request = new LocalModelsSearchRequest(
|
|
||||||
queries, // 查询文本列表
|
|
||||||
modelName, // 模型名称
|
|
||||||
delimiter, // 文本分隔符
|
|
||||||
topK, // 返回的结果数
|
|
||||||
blockSize, // 文本块大小
|
|
||||||
overlapChars // 重叠字符数
|
|
||||||
);
|
|
||||||
|
|
||||||
final CountDownLatch latch = new CountDownLatch(1); // 创建一个 CountDownLatch
|
|
||||||
final List<List<Double>>[] topKEmbeddings = new List[]{null}; // 使用数组来存储结果（因为 Java 不支持直接修改 List）
|
|
||||||
|
|
||||||
// 发起异步请求
|
|
||||||
service.vectorize(request).enqueue(new Callback<LocalModelsSearchResponse>() {
|
|
||||||
@Override
|
|
||||||
public void onResponse(Call<LocalModelsSearchResponse> call, Response<LocalModelsSearchResponse> response) {
|
|
||||||
if (response.isSuccessful()) {
|
|
||||||
LocalModelsSearchResponse searchResponse = response.body();
|
|
||||||
if (searchResponse != null) {
|
|
||||||
topKEmbeddings[0] = searchResponse.getTopKEmbeddings().get(0); // 获取结果
|
|
||||||
log.info("Successfully retrieved embeddings");
|
|
||||||
} else {
|
|
||||||
log.error("Response body is null");
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
log.error("Request failed. HTTP error code: " + response.code());
|
|
||||||
}
|
|
||||||
latch.countDown(); // 请求完成，减少计数
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onFailure(Call<LocalModelsSearchResponse> call, Throwable t) {
|
|
||||||
t.printStackTrace();
|
|
||||||
log.error("Request failed: ", t);
|
|
||||||
latch.countDown(); // 请求失败，减少计数
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
try {
|
|
||||||
latch.await(); // 等待请求完成
|
|
||||||
} catch (InterruptedException e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
|
|
||||||
return topKEmbeddings[0]; // 返回结果
|
|
||||||
}
|
|
||||||
|
|
||||||
// public static void main(String[] args) {
|
|
||||||
// // 示例调用
|
|
||||||
// List<String> queries = Arrays.asList("What is artificial intelligence?", "AI is transforming industries.");
|
|
||||||
// String modelName = "msmarco-distilbert-base-tas-b";
|
|
||||||
// String delimiter = ".";
|
|
||||||
// int topK = 3;
|
|
||||||
// int blockSize = 500;
|
|
||||||
// int overlapChars = 50;
|
|
||||||
//
|
|
||||||
// List<List<Double>> topKEmbeddings = getTopKEmbeddings(queries, modelName, delimiter, topK, blockSize, overlapChars);
|
|
||||||
//
|
|
||||||
// // 打印结果
|
|
||||||
// if (topKEmbeddings != null) {
|
|
||||||
// System.out.println("Top K embeddings: ");
|
|
||||||
// for (List<Double> embedding : topKEmbeddings) {
|
|
||||||
// System.out.println(embedding);
|
|
||||||
// }
|
|
||||||
// } else {
|
|
||||||
// System.out.println("No embeddings returned.");
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
|
|
||||||
|
|
||||||
// public static void main(String[] args) {
|
|
||||||
// // 创建 Retrofit 实例
|
|
||||||
// Retrofit retrofit = LocalModelsofitClient.getRetrofitInstance();
|
|
||||||
//
|
|
||||||
// // 创建 SearchService 接口
|
|
||||||
// SearchService service = retrofit.create(SearchService.class);
|
|
||||||
//
|
|
||||||
// // 创建请求对象 LocalModelsSearchRequest
|
|
||||||
// LocalModelsSearchRequest request = new LocalModelsSearchRequest(
|
|
||||||
// Arrays.asList("What is artificial intelligence?", "AI is transforming industries."), // 查询文本列表
|
|
||||||
// "msmarco-distilbert-base-tas-b", // 模型名称
|
|
||||||
// ".", // 分隔符
|
|
||||||
// 3, // 返回的结果数
|
|
||||||
// 500, // 文本块大小
|
|
||||||
// 50 // 重叠字符数
|
|
||||||
// );
|
|
||||||
//
|
|
||||||
// // 发起请求
|
|
||||||
// service.vectorize(request).enqueue(new Callback<LocalModelsSearchResponse>() {
|
|
||||||
// @Override
|
|
||||||
// public void onResponse(Call<LocalModelsSearchResponse> call, Response<LocalModelsSearchResponse> response) {
|
|
||||||
// if (response.isSuccessful()) {
|
|
||||||
// LocalModelsSearchResponse searchResponse = response.body();
|
|
||||||
// System.out.println("Response Body: " + response.body()); // Print the whole response body for debugging
|
|
||||||
//
|
|
||||||
// if (searchResponse != null) {
|
|
||||||
// // If the response is not null, process it.
|
|
||||||
// // Example: Extract the embeddings and print them
|
|
||||||
// List<List<List<Double>>> topKEmbeddings = searchResponse.getTopKEmbeddings();
|
|
||||||
// if (topKEmbeddings != null) {
|
|
||||||
// // Print the Top K embeddings
|
|
||||||
//
|
|
||||||
// } else {
|
|
||||||
// System.err.println("Top K embeddings are null");
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// // If there is more information you want to process, handle it here
|
|
||||||
//
|
|
||||||
// } else {
|
|
||||||
// System.err.println("Response body is null");
|
|
||||||
// }
|
|
||||||
// } else {
|
|
||||||
// System.err.println("Request failed. HTTP error code: " + response.code());
|
|
||||||
// log.error("Failed to retrieve data. HTTP error code: " + response.code());
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// @Override
|
|
||||||
// public void onFailure(Call<LocalModelsSearchResponse> call, Throwable t) {
|
|
||||||
// // 请求失败，打印错误
|
|
||||||
// t.printStackTrace();
|
|
||||||
// log.error("Request failed: ", t);
|
|
||||||
// }
|
|
||||||
// });
|
|
||||||
// }
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,25 +0,0 @@
|
|||||||
package org.ruoyi.common.chat.localModels;
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
import org.ruoyi.common.chat.entity.models.LocalModelsSearchRequest;
|
|
||||||
import org.ruoyi.common.chat.entity.models.LocalModelsSearchResponse;
|
|
||||||
import retrofit2.Call;
|
|
||||||
import retrofit2.http.Body;
|
|
||||||
import retrofit2.http.POST;
|
|
||||||
/**
|
|
||||||
* @program: RUOYIAI
|
|
||||||
* @ClassName SearchService
|
|
||||||
* @description: 请求模型
|
|
||||||
* @author: hejh
|
|
||||||
* @create: 2025-03-15 17:27
|
|
||||||
* @Version 1.0
|
|
||||||
**/
|
|
||||||
|
|
||||||
|
|
||||||
public interface SearchService {
|
|
||||||
@POST("/vectorize") // 与 Flask 服务中的路由匹配
|
|
||||||
Call<LocalModelsSearchResponse> vectorize(@Body LocalModelsSearchRequest request);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@@ -466,8 +466,8 @@ public class OpenAiStreamClient {
|
|||||||
* @since 1.1.3
|
* @since 1.1.3
|
||||||
*/
|
*/
|
||||||
public ResponseBody textToSpeech(TextToSpeech textToSpeech){
|
public ResponseBody textToSpeech(TextToSpeech textToSpeech){
|
||||||
Call<ResponseBody> responseBody = this.openAiApi.textToSpeech(textToSpeech);
|
|
||||||
try {
|
try {
|
||||||
|
Call<ResponseBody> responseBody = this.openAiApi.textToSpeech(textToSpeech);
|
||||||
return responseBody.execute().body();
|
return responseBody.execute().body();
|
||||||
} catch (IOException e) {
|
} catch (IOException e) {
|
||||||
throw new BaseException("文本转语音（同步）失败: "+e.getMessage());
|
throw new BaseException("文本转语音（同步）失败: "+e.getMessage());
|
||||||
@@ -593,11 +593,6 @@ public class OpenAiStreamClient {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 构造
|
* 构造
|
||||||
*
|
*
|
||||||
|
|||||||
@@ -1,36 +0,0 @@
|
|||||||
package org.ruoyi.common.chat.plugin;
|
|
||||||
|
|
||||||
import org.ruoyi.common.chat.openai.plugin.PluginAbstract;
|
|
||||||
|
|
||||||
import java.io.IOException;
|
|
||||||
|
|
||||||
public class CmdPlugin extends PluginAbstract<CmdReq, CmdResp> {
|
|
||||||
|
|
||||||
public CmdPlugin(Class<?> r) {
|
|
||||||
super(r);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public CmdResp func(CmdReq args) {
|
|
||||||
try {
|
|
||||||
if("计算器".equals(args.getCmd())){
|
|
||||||
Runtime.getRuntime().exec("calc");
|
|
||||||
}else if("记事本".equals(args.getCmd())){
|
|
||||||
Runtime.getRuntime().exec("notepad");
|
|
||||||
}else if("命令行".equals(args.getCmd())){
|
|
||||||
String [] cmd={"cmd","/C","start copy exel exe2"};
|
|
||||||
Runtime.getRuntime().exec(cmd);
|
|
||||||
}
|
|
||||||
} catch (IOException e) {
|
|
||||||
throw new RuntimeException("指令执行失败");
|
|
||||||
}
|
|
||||||
CmdResp resp = new CmdResp();
|
|
||||||
resp.setResult(args.getCmd()+"指令执行成功!");
|
|
||||||
return resp;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String content(CmdResp resp) {
|
|
||||||
return resp.getResult();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -2,31 +2,44 @@ package org.ruoyi.common.chat.request;
|
|||||||
|
|
||||||
import jakarta.validation.constraints.NotEmpty;
|
import jakarta.validation.constraints.NotEmpty;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import org.ruoyi.common.chat.entity.chat.Content;
|
|
||||||
import org.ruoyi.common.chat.entity.chat.Message;
|
import org.ruoyi.common.chat.entity.chat.Message;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 描述：
|
* 描述：对话请求对象
|
||||||
*
|
*
|
||||||
* @author https:www.unfbx.com
|
* @author ageerle
|
||||||
* @sine 2023-04-08
|
* @sine 2023-04-08
|
||||||
*/
|
*/
|
||||||
@Data
|
@Data
|
||||||
public class ChatRequest {
|
public class ChatRequest {
|
||||||
|
|
||||||
@NotEmpty(message = "传入的模型不能为空")
|
|
||||||
private String model;
|
|
||||||
|
|
||||||
@NotEmpty(message = "对话消息不能为空")
|
@NotEmpty(message = "对话消息不能为空")
|
||||||
List<Message> messages;
|
List<Message> messages;
|
||||||
|
|
||||||
List<Content> imageContent;
|
@NotEmpty(message = "传入的模型不能为空")
|
||||||
|
private String model;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 提示词
|
||||||
|
*/
|
||||||
private String prompt;
|
private String prompt;
|
||||||
|
|
||||||
private String userId;
|
/**
|
||||||
|
* 系统提示词
|
||||||
|
*/
|
||||||
|
private String sysPrompt;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 是否开启流式对话
|
||||||
|
*/
|
||||||
|
private Boolean stream = Boolean.TRUE;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 是否开启联网搜索(0关闭 1开启)
|
||||||
|
*/
|
||||||
|
private Boolean search = Boolean.FALSE;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 知识库id
|
* 知识库id
|
||||||
@@ -34,13 +47,14 @@ public class ChatRequest {
|
|||||||
private String kid;
|
private String kid;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* gpt的默认设置
|
* 用户id
|
||||||
*/
|
*/
|
||||||
private String systemMessage = "";
|
private String userId;
|
||||||
|
|
||||||
private double top_p = 1;
|
/**
|
||||||
|
* 应用ID
|
||||||
private double temperature = 0.2;
|
*/
|
||||||
|
private String appId;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 上下文的条数
|
* 上下文的条数
|
||||||
@@ -52,4 +66,5 @@ public class ChatRequest {
|
|||||||
*/
|
*/
|
||||||
private Boolean usingContext = Boolean.TRUE;
|
private Boolean usingContext = Boolean.TRUE;
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -28,7 +28,6 @@ public class ConsoleEventSourceListener extends EventSourceListener {
|
|||||||
log.info("OpenAI返回数据：{}", data);
|
log.info("OpenAI返回数据：{}", data);
|
||||||
if ("[DONE]".equals(data)) {
|
if ("[DONE]".equals(data)) {
|
||||||
log.info("OpenAI返回数据结束了");
|
log.info("OpenAI返回数据结束了");
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -8,7 +8,6 @@ import okhttp3.ResponseBody;
|
|||||||
import okhttp3.sse.EventSource;
|
import okhttp3.sse.EventSource;
|
||||||
import okhttp3.sse.EventSourceListener;
|
import okhttp3.sse.EventSourceListener;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
import org.ruoyi.common.chat.constant.OpenAIConst;
|
|
||||||
import org.ruoyi.common.chat.entity.chat.ChatCompletion;
|
import org.ruoyi.common.chat.entity.chat.ChatCompletion;
|
||||||
import org.ruoyi.common.chat.entity.chat.ChatCompletionResponse;
|
import org.ruoyi.common.chat.entity.chat.ChatCompletionResponse;
|
||||||
import org.ruoyi.common.chat.entity.chat.FunctionCall;
|
import org.ruoyi.common.chat.entity.chat.FunctionCall;
|
||||||
|
|||||||
@@ -47,25 +47,11 @@
|
|||||||
<artifactId>jakarta.servlet-api</artifactId>
|
<artifactId>jakarta.servlet-api</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
<!-- hutool工具模块 -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>cn.hutool</groupId>
|
<groupId>cn.hutool</groupId>
|
||||||
<artifactId>hutool-core</artifactId>
|
<artifactId>hutool-all</artifactId>
|
||||||
</dependency>
|
<version>${hutool.version}</version>
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>cn.hutool</groupId>
|
|
||||||
<artifactId>hutool-http</artifactId>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>cn.hutool</groupId>
|
|
||||||
<artifactId>hutool-extra</artifactId>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>cn.hutool</groupId>
|
|
||||||
<artifactId>hutool-json</artifactId>
|
|
||||||
<scope>provided</scope>
|
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
@@ -73,18 +59,6 @@
|
|||||||
<artifactId>lombok</artifactId>
|
<artifactId>lombok</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.github.binarywang</groupId>
|
|
||||||
<artifactId>weixin-java-cp</artifactId>
|
|
||||||
<version>${weixin-java-miniapp.version}</version>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.github.binarywang</groupId>
|
|
||||||
<artifactId>weixin-java-cp</artifactId>
|
|
||||||
<version>${weixin-java-cp.version}</version>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- 自动生成YML配置关联JSON文件 -->
|
<!-- 自动生成YML配置关联JSON文件 -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.springframework.boot</groupId>
|
<groupId>org.springframework.boot</groupId>
|
||||||
@@ -108,6 +82,11 @@
|
|||||||
<artifactId>ip2region</artifactId>
|
<artifactId>ip2region</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
<dependency>
|
||||||
|
<groupId>com.github.binarywang</groupId>
|
||||||
|
<artifactId>weixin-java-cp</artifactId>
|
||||||
|
<version>${weixin-java-cp.version}</version>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.github.binarywang</groupId>
|
<groupId>com.github.binarywang</groupId>
|
||||||
|
|||||||
@@ -1,17 +1,19 @@
|
|||||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
|
||||||
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>org.ruoyi</groupId>
|
<groupId>org.ruoyi</groupId>
|
||||||
<artifactId>ruoyi-common</artifactId>
|
<artifactId>ruoyi-common</artifactId>
|
||||||
<version>${revision}</version>
|
<version>${revision}</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<packaging>pom</packaging>
|
<packaging>pom</packaging>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
|
||||||
<artifactId>ruoyi-common-live</artifactId>
|
<artifactId>ruoyi-common-live</artifactId>
|
||||||
|
|
||||||
<description>
|
<description>
|
||||||
弹幕监听
|
AI直播
|
||||||
</description>
|
</description>
|
||||||
|
|
||||||
<modules>
|
<modules>
|
||||||
|
|||||||
@@ -7,8 +7,7 @@ import org.ruoyi.common.core.service.ConfigService;
|
|||||||
import org.ruoyi.common.mail.utils.MailAccount;
|
import org.ruoyi.common.mail.utils.MailAccount;
|
||||||
import org.springframework.context.annotation.Bean;
|
import org.springframework.context.annotation.Bean;
|
||||||
import org.springframework.context.annotation.Configuration;
|
import org.springframework.context.annotation.Configuration;
|
||||||
import org.springframework.context.annotation.Scope;
|
|
||||||
import org.springframework.scheduling.annotation.Scheduled;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* JavaMail 配置
|
* JavaMail 配置
|
||||||
@@ -22,10 +21,9 @@ import org.springframework.scheduling.annotation.Scheduled;
|
|||||||
public class MailConfig {
|
public class MailConfig {
|
||||||
|
|
||||||
private final ConfigService configService;
|
private final ConfigService configService;
|
||||||
private MailAccount account; // 缓存MailAccount实例
|
private MailAccount account;
|
||||||
|
|
||||||
@Bean
|
@Bean
|
||||||
@Scope("singleton")
|
|
||||||
public MailAccount mailAccount() {
|
public MailAccount mailAccount() {
|
||||||
if (account == null) {
|
if (account == null) {
|
||||||
account = new MailAccount();
|
account = new MailAccount();
|
||||||
@@ -34,7 +32,6 @@ public class MailConfig {
|
|||||||
return account;
|
return account;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Scheduled(fixedDelay = 10000) // 每10秒检查一次
|
|
||||||
public void updateMailAccount() {
|
public void updateMailAccount() {
|
||||||
account.setHost(getKey("host"));
|
account.setHost(getKey("host"));
|
||||||
account.setPort(NumberUtils.toInt(getKey("port"), 465));
|
account.setPort(NumberUtils.toInt(getKey("port"), 465));
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
package org.ruoyi.common.mail.config.properties;
|
package org.ruoyi.common.mail.properties;
|
||||||
|
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
@@ -11,38 +11,33 @@
|
|||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<artifactId>ruoyi-common-pay</artifactId>
|
<artifactId>ruoyi-common-pay</artifactId>
|
||||||
<dependencies>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.ruoyi</groupId>
|
|
||||||
<artifactId>ruoyi-common-web</artifactId>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.google.zxing</groupId>
|
|
||||||
<artifactId>core</artifactId>
|
|
||||||
<version>3.3.3</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.springframework.boot</groupId>
|
|
||||||
<artifactId>spring-boot-starter-test</artifactId>
|
|
||||||
<scope>test</scope>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.stripe</groupId>
|
|
||||||
<artifactId>stripe-java</artifactId>
|
|
||||||
<version>22.5.1</version>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>cn.hutool</groupId>
|
|
||||||
<artifactId>hutool-all</artifactId>
|
|
||||||
<version>5.8.12</version>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
|
||||||
<properties>
|
<properties>
|
||||||
<maven.compiler.source>17</maven.compiler.source>
|
<maven.compiler.source>17</maven.compiler.source>
|
||||||
<maven.compiler.target>17</maven.compiler.target>
|
<maven.compiler.target>17</maven.compiler.target>
|
||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||||
|
<zxing.version>3.3.3</zxing.version>
|
||||||
|
<stripe.version>22.5.1</stripe.version>
|
||||||
</properties>
|
</properties>
|
||||||
|
<dependencies>
|
||||||
|
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.ruoyi</groupId>
|
||||||
|
<artifactId>ruoyi-common-web</artifactId>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
|
<dependency>
|
||||||
|
<groupId>com.google.zxing</groupId>
|
||||||
|
<artifactId>core</artifactId>
|
||||||
|
<version>${zxing.version}</version>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
|
|
||||||
|
<dependency>
|
||||||
|
<groupId>com.stripe</groupId>
|
||||||
|
<artifactId>stripe-java</artifactId>
|
||||||
|
<version>${stripe.version}</version>
|
||||||
|
</dependency>
|
||||||
|
</dependencies>
|
||||||
|
|
||||||
</project>
|
</project>
|
||||||
|
|||||||
@@ -23,7 +23,6 @@ public class PayInit {
|
|||||||
private PayConfig payConfig;
|
private PayConfig payConfig;
|
||||||
|
|
||||||
@Bean
|
@Bean
|
||||||
@Scope("singleton")
|
|
||||||
public PayConfig payConfig() {
|
public PayConfig payConfig() {
|
||||||
if (payConfig == null) {
|
if (payConfig == null) {
|
||||||
payConfig = new PayConfig();
|
payConfig = new PayConfig();
|
||||||
@@ -32,7 +31,6 @@ public class PayInit {
|
|||||||
return payConfig;
|
return payConfig;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Scheduled(fixedDelay = 10000) // 每10秒检查一次
|
|
||||||
public void updatePayConfig() {
|
public void updatePayConfig() {
|
||||||
payConfig.setType("wxpay");
|
payConfig.setType("wxpay");
|
||||||
payConfig.setDevice("pc");
|
payConfig.setDevice("pc");
|
||||||
|
|||||||
@@ -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();
|
||||||
SaHolder.getStorage().set(LOGIN_USER_KEY, loginUser);
|
if (tokenSession != null) {
|
||||||
|
loginUser = (LoginUser) tokenSession.get(LOGIN_USER_KEY);
|
||||||
|
SaHolder.getStorage().set(LOGIN_USER_KEY, loginUser);
|
||||||
|
};
|
||||||
return loginUser;
|
return loginUser;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -36,20 +36,6 @@ public class PlusWebInvokeTimeInterceptor implements HandlerInterceptor {
|
|||||||
String url = request.getMethod() + " " + request.getRequestURI();
|
String url = request.getMethod() + " " + request.getRequestURI();
|
||||||
String domainName = request.getServerName();
|
String domainName = request.getServerName();
|
||||||
log.info("域名信息：{}",domainName);
|
log.info("域名信息：{}",domainName);
|
||||||
|
|
||||||
String requestURI = request.getRequestURI();
|
|
||||||
List<String> urls = whitelistUrls();
|
|
||||||
boolean isWhitelisted = urls.stream().anyMatch(requestURI::startsWith);
|
|
||||||
|
|
||||||
if (!isWhitelisted){
|
|
||||||
// 根据授权编号查询激活状态
|
|
||||||
// ConfigService configService = SpringUtils.context().getBean(ConfigService.class);
|
|
||||||
// String authNo = configService.getConfigValue("sys", "authcode");
|
|
||||||
// if(!configService.checkAuth(authNo,domainName)){
|
|
||||||
// throw new BaseException("系统未激活,请联系管理员授权");
|
|
||||||
// }
|
|
||||||
}
|
|
||||||
|
|
||||||
// 打印请求参数
|
// 打印请求参数
|
||||||
if (isJsonRequest(request)) {
|
if (isJsonRequest(request)) {
|
||||||
String jsonParam = "";
|
String jsonParam = "";
|
||||||
@@ -67,7 +53,6 @@ public class PlusWebInvokeTimeInterceptor implements HandlerInterceptor {
|
|||||||
log.debug("[PLUS]开始请求 => URL[{}],无参数", url);
|
log.debug("[PLUS]开始请求 => URL[{}],无参数", url);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
StopWatch stopWatch = new StopWatch();
|
StopWatch stopWatch = new StopWatch();
|
||||||
invokeTimeTL.set(stopWatch);
|
invokeTimeTL.set(stopWatch);
|
||||||
stopWatch.start();
|
stopWatch.start();
|
||||||
@@ -99,15 +84,4 @@ public class PlusWebInvokeTimeInterceptor implements HandlerInterceptor {
|
|||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
// 授权白名单
|
|
||||||
public List<String> whitelistUrls() {
|
|
||||||
return Arrays.asList(
|
|
||||||
"/chat/config",
|
|
||||||
"/pay",
|
|
||||||
"/weixin",
|
|
||||||
"/user/qrcode",
|
|
||||||
"/user/login/qrcode"
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,9 +8,11 @@
|
|||||||
<version>${revision}</version>
|
<version>${revision}</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<artifactId>ruoyi-common-wechat</artifactId>
|
<artifactId>ruoyi-common-wechat</artifactId>
|
||||||
<version>1.0.0</version>
|
<version>1.0.0</version>
|
||||||
<description>ruoyi-common-wechat 微信服务</description>
|
<description>ruoyi-common-wechat 微信服务</description>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||||
</properties>
|
</properties>
|
||||||
@@ -21,6 +23,7 @@
|
|||||||
<artifactId>jfinal</artifactId>
|
<artifactId>jfinal</artifactId>
|
||||||
<version>3.5</version>
|
<version>3.5</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.jfinal</groupId>
|
<groupId>com.jfinal</groupId>
|
||||||
<artifactId>cos</artifactId>
|
<artifactId>cos</artifactId>
|
||||||
@@ -44,16 +47,19 @@
|
|||||||
<artifactId>emoji-java</artifactId>
|
<artifactId>emoji-java</artifactId>
|
||||||
<version>3.2.0</version>
|
<version>3.2.0</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>javax.activation</groupId>
|
<groupId>javax.activation</groupId>
|
||||||
<artifactId>activation</artifactId>
|
<artifactId>activation</artifactId>
|
||||||
<version>1.1.1</version>
|
<version>1.1.1</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>net.mamoe</groupId>
|
<groupId>net.mamoe</groupId>
|
||||||
<artifactId>mirai-core-jvm</artifactId>
|
<artifactId>mirai-core-jvm</artifactId>
|
||||||
<version>2.16.0</version>
|
<version>2.16.0</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.ruoyi</groupId>
|
<groupId>org.ruoyi</groupId>
|
||||||
<artifactId>ruoyi-common-json</artifactId>
|
<artifactId>ruoyi-common-json</artifactId>
|
||||||
@@ -64,5 +70,6 @@
|
|||||||
<artifactId>fastjson</artifactId>
|
<artifactId>fastjson</artifactId>
|
||||||
<version>1.2.31</version>
|
<version>1.2.31</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
</dependencies>
|
</dependencies>
|
||||||
</project>
|
</project>
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ package org.ruoyi.common.wechat.web.enums;
|
|||||||
import com.jfinal.plugin.activerecord.Record;
|
import com.jfinal.plugin.activerecord.Record;
|
||||||
|
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
public enum KeyMsgValueType {
|
public enum KeyMsgValueType {
|
||||||
|
|
||||||
IMG("IMG", "图片"),
|
IMG("IMG", "图片"),
|
||||||
FILE("FILE", "文件"),
|
FILE("FILE", "文件"),
|
||||||
|
|||||||
85
ruoyi-modules-api/pom.xml
Normal file
85
ruoyi-modules-api/pom.xml
Normal file
@@ -0,0 +1,85 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project xmlns="http://maven.apache.org/POM/4.0.0"
|
||||||
|
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
<parent>
|
||||||
|
<artifactId>ruoyi-ai</artifactId>
|
||||||
|
<groupId>org.ruoyi</groupId>
|
||||||
|
<version>${revision}</version>
|
||||||
|
<relativePath>../pom.xml</relativePath>
|
||||||
|
</parent>
|
||||||
|
|
||||||
|
<artifactId>ruoyi-modules-api</artifactId>
|
||||||
|
<packaging>pom</packaging>
|
||||||
|
|
||||||
|
<modules>
|
||||||
|
<module>ruoyi-chat-api</module>
|
||||||
|
<module>ruoyi-knowledge-api</module>
|
||||||
|
<module>ruoyi-system-api</module>
|
||||||
|
</modules>
|
||||||
|
|
||||||
|
<properties>
|
||||||
|
<maven.compiler.source>17</maven.compiler.source>
|
||||||
|
<maven.compiler.target>17</maven.compiler.target>
|
||||||
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||||
|
</properties>
|
||||||
|
|
||||||
|
<dependencies>
|
||||||
|
<!-- 系统核心模块 -->
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.ruoyi</groupId>
|
||||||
|
<artifactId>ruoyi-common-core</artifactId>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
|
<!-- mybaits基础模块 -->
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.ruoyi</groupId>
|
||||||
|
<artifactId>ruoyi-common-mybatis</artifactId>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
|
<!-- 脱敏模块 -->
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.ruoyi</groupId>
|
||||||
|
<artifactId>ruoyi-common-sensitive</artifactId>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
|
<!-- excel模块-->
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.ruoyi</groupId>
|
||||||
|
<artifactId>ruoyi-common-excel</artifactId>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
|
<!-- 租户基础模块 -->
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.ruoyi</groupId>
|
||||||
|
<artifactId>ruoyi-common-tenant</artifactId>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
|
<!-- 字段翻译基础模块 -->
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.ruoyi</groupId>
|
||||||
|
<artifactId>ruoyi-common-translation</artifactId>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
|
<!-- 系统日志模块 -->
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.ruoyi</groupId>
|
||||||
|
<artifactId>ruoyi-common-log</artifactId>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
|
<!-- 对象存储模块 -->
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.ruoyi</groupId>
|
||||||
|
<artifactId>ruoyi-common-oss</artifactId>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
|
<dependency>
|
||||||
|
<groupId>mysql</groupId>
|
||||||
|
<artifactId>mysql-connector-java</artifactId>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
|
|
||||||
|
</dependencies>
|
||||||
|
|
||||||
|
</project>
|
||||||
29
ruoyi-modules-api/ruoyi-chat-api/pom.xml
Normal file
29
ruoyi-modules-api/ruoyi-chat-api/pom.xml
Normal file
@@ -0,0 +1,29 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project xmlns="http://maven.apache.org/POM/4.0.0"
|
||||||
|
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
<parent>
|
||||||
|
<groupId>org.ruoyi</groupId>
|
||||||
|
<artifactId>ruoyi-modules-api</artifactId>
|
||||||
|
<version>${revision}</version>
|
||||||
|
<relativePath>../pom.xml</relativePath>
|
||||||
|
</parent>
|
||||||
|
|
||||||
|
<artifactId>ruoyi-chat-api</artifactId>
|
||||||
|
|
||||||
|
<properties>
|
||||||
|
<maven.compiler.source>17</maven.compiler.source>
|
||||||
|
<maven.compiler.target>17</maven.compiler.target>
|
||||||
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||||
|
</properties>
|
||||||
|
|
||||||
|
<!-- 对话基础模块 -->
|
||||||
|
<dependencies>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.ruoyi</groupId>
|
||||||
|
<artifactId>ruoyi-common-chat</artifactId>
|
||||||
|
</dependency>
|
||||||
|
</dependencies>
|
||||||
|
|
||||||
|
</project>
|
||||||
@@ -0,0 +1,86 @@
|
|||||||
|
package org.ruoyi.domain;
|
||||||
|
|
||||||
|
import com.baomidou.mybatisplus.annotation.*;
|
||||||
|
import lombok.Data;
|
||||||
|
import lombok.EqualsAndHashCode;
|
||||||
|
import org.ruoyi.common.mybatis.core.domain.BaseEntity;
|
||||||
|
|
||||||
|
import java.io.Serial;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 智能体管理对象 chat_agent_manage
|
||||||
|
*
|
||||||
|
* @author ageerle
|
||||||
|
* @date 2025-04-08
|
||||||
|
*/
|
||||||
|
@Data
|
||||||
|
@EqualsAndHashCode(callSuper = true)
|
||||||
|
@TableName("chat_agent_manage")
|
||||||
|
public class ChatAgentManage extends BaseEntity {
|
||||||
|
|
||||||
|
@Serial
|
||||||
|
private static final long serialVersionUID = 1L;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 主键id
|
||||||
|
*/
|
||||||
|
@TableId(value = "id")
|
||||||
|
private Long id;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 应用名称
|
||||||
|
*/
|
||||||
|
private String appName;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 应用类型
|
||||||
|
*/
|
||||||
|
private String appType;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 应用头像
|
||||||
|
*/
|
||||||
|
private String appIcon;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 应用描述
|
||||||
|
*/
|
||||||
|
private String appDescription;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 开场介绍
|
||||||
|
*/
|
||||||
|
private String introduction;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 模型
|
||||||
|
*/
|
||||||
|
private String model;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 对话可选模型
|
||||||
|
*/
|
||||||
|
private String conversationModel;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 应用设定
|
||||||
|
*/
|
||||||
|
private String applicationSettings;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 插件id
|
||||||
|
*/
|
||||||
|
private String pluginId;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 知识库id
|
||||||
|
*/
|
||||||
|
private Long knowledgeId;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 备注
|
||||||
|
*/
|
||||||
|
private String remark;
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
@@ -1,18 +1,17 @@
|
|||||||
package org.ruoyi.system.domain;
|
package org.ruoyi.domain;
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.annotation.TableId;
|
import com.baomidou.mybatisplus.annotation.*;
|
||||||
import com.baomidou.mybatisplus.annotation.TableName;
|
|
||||||
import org.ruoyi.common.mybatis.core.domain.BaseEntity;
|
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import lombok.EqualsAndHashCode;
|
import lombok.EqualsAndHashCode;
|
||||||
|
import org.ruoyi.common.mybatis.core.domain.BaseEntity;
|
||||||
|
|
||||||
import java.io.Serial;
|
import java.io.Serial;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 应用市场
|
* 应用商店对象 chat_app_store
|
||||||
*
|
*
|
||||||
* @author Lion Li
|
* @author ageerle
|
||||||
* @date 2024-03-19
|
* @date 2025-04-08
|
||||||
*/
|
*/
|
||||||
@Data
|
@Data
|
||||||
@EqualsAndHashCode(callSuper = true)
|
@EqualsAndHashCode(callSuper = true)
|
||||||
@@ -23,7 +22,7 @@ public class ChatAppStore extends BaseEntity {
|
|||||||
private static final long serialVersionUID = 1L;
|
private static final long serialVersionUID = 1L;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 主键
|
* id
|
||||||
*/
|
*/
|
||||||
@TableId(value = "id")
|
@TableId(value = "id")
|
||||||
private Long id;
|
private Long id;
|
||||||
@@ -39,16 +38,15 @@ public class ChatAppStore extends BaseEntity {
|
|||||||
private String description;
|
private String description;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 头像
|
* logo
|
||||||
*/
|
*/
|
||||||
private String avatar;
|
private String avatar;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 应用地址
|
* 地址
|
||||||
*/
|
*/
|
||||||
private String appUrl;
|
private String appUrl;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 备注
|
* 备注
|
||||||
*/
|
*/
|
||||||
@@ -1,9 +1,6 @@
|
|||||||
package org.ruoyi.system.domain;
|
package org.ruoyi.domain;
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.annotation.TableId;
|
import com.baomidou.mybatisplus.annotation.*;
|
||||||
import com.baomidou.mybatisplus.annotation.TableLogic;
|
|
||||||
import com.baomidou.mybatisplus.annotation.TableName;
|
|
||||||
import com.baomidou.mybatisplus.annotation.Version;
|
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import lombok.EqualsAndHashCode;
|
import lombok.EqualsAndHashCode;
|
||||||
import org.ruoyi.common.mybatis.core.domain.BaseEntity;
|
import org.ruoyi.common.mybatis.core.domain.BaseEntity;
|
||||||
@@ -11,10 +8,10 @@ import org.ruoyi.common.mybatis.core.domain.BaseEntity;
|
|||||||
import java.io.Serial;
|
import java.io.Serial;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* gpts管理对象 chat_gpts
|
* 应用管理对象 chat_gpts
|
||||||
*
|
*
|
||||||
* @author Lion Li
|
* @author ageerle
|
||||||
* @date 2024-07-09
|
* @date 2025-04-08
|
||||||
*/
|
*/
|
||||||
@Data
|
@Data
|
||||||
@EqualsAndHashCode(callSuper = true)
|
@EqualsAndHashCode(callSuper = true)
|
||||||
@@ -63,12 +60,12 @@ public class ChatGpts extends BaseEntity {
|
|||||||
/**
|
/**
|
||||||
* 点赞
|
* 点赞
|
||||||
*/
|
*/
|
||||||
private String useCnt;
|
private Long useCnt;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 差评
|
* 差评
|
||||||
*/
|
*/
|
||||||
private String bad;
|
private Long bad;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 类型
|
* 类型
|
||||||
@@ -0,0 +1,68 @@
|
|||||||
|
package org.ruoyi.domain;
|
||||||
|
|
||||||
|
import com.baomidou.mybatisplus.annotation.*;
|
||||||
|
import lombok.Data;
|
||||||
|
import lombok.EqualsAndHashCode;
|
||||||
|
import org.ruoyi.common.mybatis.core.domain.BaseEntity;
|
||||||
|
|
||||||
|
import java.math.BigDecimal;
|
||||||
|
|
||||||
|
import java.io.Serial;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 聊天消息对象 chat_message
|
||||||
|
*
|
||||||
|
* @author ageerle
|
||||||
|
* @date 2025-04-08
|
||||||
|
*/
|
||||||
|
@Data
|
||||||
|
@EqualsAndHashCode(callSuper = true)
|
||||||
|
@TableName("chat_message")
|
||||||
|
public class ChatMessage extends BaseEntity {
|
||||||
|
|
||||||
|
@Serial
|
||||||
|
private static final long serialVersionUID = 1L;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 主键
|
||||||
|
*/
|
||||||
|
@TableId(value = "id")
|
||||||
|
private Long id;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 用户id
|
||||||
|
*/
|
||||||
|
private Long userId;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 消息内容
|
||||||
|
*/
|
||||||
|
private String content;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 对话角色
|
||||||
|
*/
|
||||||
|
private String role;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 扣除金额
|
||||||
|
*/
|
||||||
|
private BigDecimal deductCost;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 累计 Tokens
|
||||||
|
*/
|
||||||
|
private Long totalTokens;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 模型名称
|
||||||
|
*/
|
||||||
|
private String modelName;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 备注
|
||||||
|
*/
|
||||||
|
private String remark;
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
@@ -1,8 +1,7 @@
|
|||||||
package org.ruoyi.system.domain;
|
package org.ruoyi.domain;
|
||||||
|
|
||||||
import com.alibaba.excel.annotation.ExcelProperty;
|
|
||||||
import com.baomidou.mybatisplus.annotation.TableId;
|
import com.baomidou.mybatisplus.annotation.*;
|
||||||
import com.baomidou.mybatisplus.annotation.TableName;
|
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import lombok.EqualsAndHashCode;
|
import lombok.EqualsAndHashCode;
|
||||||
import org.ruoyi.common.mybatis.core.domain.BaseEntity;
|
import org.ruoyi.common.mybatis.core.domain.BaseEntity;
|
||||||
@@ -10,15 +9,15 @@ import org.ruoyi.common.mybatis.core.domain.BaseEntity;
|
|||||||
import java.io.Serial;
|
import java.io.Serial;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 系统模型对象 sys_model
|
* 聊天模型对象 chat_model
|
||||||
*
|
*
|
||||||
* @author Lion Li
|
* @author ageerle
|
||||||
* @date 2024-04-04
|
* @date 2025-04-08
|
||||||
*/
|
*/
|
||||||
@Data
|
@Data
|
||||||
@EqualsAndHashCode(callSuper = true)
|
@EqualsAndHashCode(callSuper = true)
|
||||||
@TableName("chat_model")
|
@TableName("chat_model")
|
||||||
public class SysModel extends BaseEntity {
|
public class ChatModel extends BaseEntity {
|
||||||
|
|
||||||
@Serial
|
@Serial
|
||||||
private static final long serialVersionUID = 1L;
|
private static final long serialVersionUID = 1L;
|
||||||
@@ -32,7 +31,6 @@ public class SysModel extends BaseEntity {
|
|||||||
/**
|
/**
|
||||||
* 模型分类
|
* 模型分类
|
||||||
*/
|
*/
|
||||||
@ExcelProperty(value = "模型分类")
|
|
||||||
private String category;
|
private String category;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -48,7 +46,7 @@ public class SysModel extends BaseEntity {
|
|||||||
/**
|
/**
|
||||||
* 模型价格
|
* 模型价格
|
||||||
*/
|
*/
|
||||||
private double modelPrice;
|
private Long modelPrice;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 计费类型
|
* 计费类型
|
||||||
@@ -60,7 +58,6 @@ public class SysModel extends BaseEntity {
|
|||||||
*/
|
*/
|
||||||
private String modelShow;
|
private String modelShow;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 系统提示词
|
* 系统提示词
|
||||||
*/
|
*/
|
||||||
@@ -81,4 +78,5 @@ public class SysModel extends BaseEntity {
|
|||||||
*/
|
*/
|
||||||
private String remark;
|
private String remark;
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -1,24 +1,24 @@
|
|||||||
package org.ruoyi.system.domain;
|
package org.ruoyi.domain;
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.annotation.TableId;
|
import com.baomidou.mybatisplus.annotation.*;
|
||||||
import com.baomidou.mybatisplus.annotation.TableName;
|
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import lombok.EqualsAndHashCode;
|
import lombok.EqualsAndHashCode;
|
||||||
import org.ruoyi.common.mybatis.core.domain.BaseEntity;
|
import org.ruoyi.common.mybatis.core.domain.BaseEntity;
|
||||||
|
|
||||||
import java.io.Serial;
|
|
||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
|
|
||||||
|
import java.io.Serial;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 套餐管理对象 sys_package_plan
|
* 套餐管理对象 chat_package_plan
|
||||||
*
|
*
|
||||||
* @author Lion Li
|
* @author ageerle
|
||||||
* @date 2024-05-05
|
* @date 2025-04-08
|
||||||
*/
|
*/
|
||||||
@Data
|
@Data
|
||||||
@EqualsAndHashCode(callSuper = true)
|
@EqualsAndHashCode(callSuper = true)
|
||||||
@TableName("chat_package_plan")
|
@TableName("chat_package_plan")
|
||||||
public class SysPackagePlan extends BaseEntity {
|
public class ChatPackagePlan extends BaseEntity {
|
||||||
|
|
||||||
@Serial
|
@Serial
|
||||||
private static final long serialVersionUID = 1L;
|
private static final long serialVersionUID = 1L;
|
||||||
@@ -1,23 +1,24 @@
|
|||||||
package org.ruoyi.system.domain;
|
package org.ruoyi.domain;
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.annotation.*;
|
import com.baomidou.mybatisplus.annotation.*;
|
||||||
import org.ruoyi.common.mybatis.core.domain.BaseEntity;
|
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import lombok.EqualsAndHashCode;
|
import lombok.EqualsAndHashCode;
|
||||||
|
import org.ruoyi.common.mybatis.core.domain.BaseEntity;
|
||||||
|
|
||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
|
|
||||||
import java.io.Serial;
|
import java.io.Serial;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 支付订单对象 payment_orders
|
* 支付订单对象 chat_pay_order
|
||||||
*
|
*
|
||||||
* @author Lion Li
|
* @author ageerle
|
||||||
* @date 2024-04-16
|
* @date 2025-04-08
|
||||||
*/
|
*/
|
||||||
@Data
|
@Data
|
||||||
@EqualsAndHashCode(callSuper = true)
|
@EqualsAndHashCode(callSuper = true)
|
||||||
@TableName("chat_pay_order")
|
@TableName("chat_pay_order")
|
||||||
public class PaymentOrder extends BaseEntity {
|
public class ChatPayOrder extends BaseEntity {
|
||||||
|
|
||||||
@Serial
|
@Serial
|
||||||
private static final long serialVersionUID = 1L;
|
private static final long serialVersionUID = 1L;
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package org.ruoyi.system.domain;
|
package org.ruoyi.domain;
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.annotation.*;
|
import com.baomidou.mybatisplus.annotation.*;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
@@ -11,7 +11,7 @@ import java.io.Serial;
|
|||||||
* 插件管理对象 chat_plugin
|
* 插件管理对象 chat_plugin
|
||||||
*
|
*
|
||||||
* @author ageerle
|
* @author ageerle
|
||||||
* @date 2025-03-30
|
* @date 2025-04-08
|
||||||
*/
|
*/
|
||||||
@Data
|
@Data
|
||||||
@EqualsAndHashCode(callSuper = true)
|
@EqualsAndHashCode(callSuper = true)
|
||||||
@@ -1,22 +1,22 @@
|
|||||||
package org.ruoyi.system.domain;
|
package org.ruoyi.domain;
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.annotation.*;
|
import com.baomidou.mybatisplus.annotation.*;
|
||||||
import org.ruoyi.common.mybatis.core.domain.BaseEntity;
|
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import lombok.EqualsAndHashCode;
|
import lombok.EqualsAndHashCode;
|
||||||
|
import org.ruoyi.common.mybatis.core.domain.BaseEntity;
|
||||||
|
|
||||||
import java.io.Serial;
|
import java.io.Serial;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 微信机器人对象 wx_rob_config
|
* 聊天机器人配置对象 chat_rob_config
|
||||||
*
|
*
|
||||||
* @author Lion Li
|
* @author ageerle
|
||||||
* @date 2024-05-01
|
* @date 2025-04-08
|
||||||
*/
|
*/
|
||||||
@Data
|
@Data
|
||||||
@EqualsAndHashCode(callSuper = true)
|
@EqualsAndHashCode(callSuper = true)
|
||||||
@TableName("chat_rob_config")
|
@TableName("chat_rob_config")
|
||||||
public class WxRobConfig extends BaseEntity {
|
public class ChatRobConfig extends BaseEntity {
|
||||||
|
|
||||||
@Serial
|
@Serial
|
||||||
private static final long serialVersionUID = 1L;
|
private static final long serialVersionUID = 1L;
|
||||||
@@ -28,7 +28,7 @@ public class WxRobConfig extends BaseEntity {
|
|||||||
private Long id;
|
private Long id;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 用户id
|
* 所属用户
|
||||||
*/
|
*/
|
||||||
private Long userId;
|
private Long userId;
|
||||||
|
|
||||||
@@ -42,11 +42,6 @@ public class WxRobConfig extends BaseEntity {
|
|||||||
*/
|
*/
|
||||||
private String uniqueKey;
|
private String uniqueKey;
|
||||||
|
|
||||||
/**
|
|
||||||
* 备注（微信号）
|
|
||||||
*/
|
|
||||||
private String remark;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 默认好友回复开关
|
* 默认好友回复开关
|
||||||
*/
|
*/
|
||||||
@@ -57,10 +52,15 @@ public class WxRobConfig extends BaseEntity {
|
|||||||
*/
|
*/
|
||||||
private String defaultGroup;
|
private String defaultGroup;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 机器启用1禁用0
|
* 机器人状态 0正常 1启用
|
||||||
*/
|
*/
|
||||||
private String enable;
|
private String enable;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 备注
|
||||||
|
*/
|
||||||
|
private String remark;
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -1,11 +1,11 @@
|
|||||||
package org.ruoyi.system.domain;
|
package org.ruoyi.domain;
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.annotation.TableName;
|
import com.baomidou.mybatisplus.annotation.TableName;
|
||||||
import org.ruoyi.common.core.validate.AddGroup;
|
|
||||||
import org.ruoyi.common.core.validate.EditGroup;
|
|
||||||
import jakarta.validation.constraints.NotBlank;
|
import jakarta.validation.constraints.NotBlank;
|
||||||
import jakarta.validation.constraints.NotNull;
|
import jakarta.validation.constraints.NotNull;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
import org.ruoyi.common.core.validate.AddGroup;
|
||||||
|
import org.ruoyi.common.core.validate.EditGroup;
|
||||||
|
|
||||||
import java.io.Serial;
|
import java.io.Serial;
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
@@ -0,0 +1,51 @@
|
|||||||
|
package org.ruoyi.domain;
|
||||||
|
|
||||||
|
import com.baomidou.mybatisplus.annotation.*;
|
||||||
|
import lombok.Data;
|
||||||
|
import lombok.EqualsAndHashCode;
|
||||||
|
import org.ruoyi.common.mybatis.core.domain.BaseEntity;
|
||||||
|
|
||||||
|
import java.io.Serial;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 用户token使用详情对象 chat_usage_token
|
||||||
|
*
|
||||||
|
* @author ageerle
|
||||||
|
* @date 2025-04-08
|
||||||
|
*/
|
||||||
|
@Data
|
||||||
|
@EqualsAndHashCode(callSuper = true)
|
||||||
|
@TableName("chat_usage_token")
|
||||||
|
public class ChatUsageToken extends BaseEntity {
|
||||||
|
|
||||||
|
@Serial
|
||||||
|
private static final long serialVersionUID = 1L;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 主键
|
||||||
|
*/
|
||||||
|
@TableId(value = "id")
|
||||||
|
private Long id;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 用户
|
||||||
|
*/
|
||||||
|
private Long userId;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 待结算token
|
||||||
|
*/
|
||||||
|
private Integer token;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 模型名称
|
||||||
|
*/
|
||||||
|
private String modelName;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 累计使用token
|
||||||
|
*/
|
||||||
|
private String totalToken;
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package org.ruoyi.system.domain;
|
package org.ruoyi.domain;
|
||||||
|
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.annotation.TableId;
|
import com.baomidou.mybatisplus.annotation.TableId;
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user