feat: 调整知识库模块

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

pom.xml

@@ -244,18 +244,6 @@
                 <version>${tencent.sms.version}</version>
             </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>
                 <groupId>org.redisson</groupId>
                 <artifactId>redisson-spring-boot-starter</artifactId>
@@ -321,10 +309,15 @@
                 <version>${revision}</version>
             </dependency>
 
+            <dependency>
+                <groupId>org.ruoyi</groupId>
+                <artifactId>ruoyi-knowledge-api</artifactId>
+                <version>${revision}</version>
+            </dependency>
 
             <dependency>
                 <groupId>org.ruoyi</groupId>
-                <artifactId>ruoyi-knowledge</artifactId>
+                <artifactId>ruoyi-system-api</artifactId>
                 <version>${revision}</version>
             </dependency>
 
@@ -344,10 +337,11 @@
     </dependencyManagement>
 
     <modules>
-        <module>ruoyi-admin</module>
         <module>ruoyi-common</module>
         <module>ruoyi-modules</module>
+        <module>ruoyi-modules-api</module>
     </modules>
+
     <packaging>pom</packaging>
 
     <build>

ruoyi-admin/Dockerfile

@@ -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"]
-
-

ruoyi-admin/pom.xml

@@ -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>

ruoyi-admin/src/main/java/org/ruoyi/controller/KnowledgeController.java

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

ruoyi-common/ruoyi-common-bom/pom.xml

@@ -166,15 +166,12 @@
                 <version>${revision}</version>
             </dependency>
 
-            <!-- AI绘画 -->
             <dependency>
                 <groupId>org.ruoyi</groupId>
                 <artifactId>ruoyi-chat</artifactId>
                 <version>${revision}</version>
             </dependency>
 
-
-
             <!-- 支付模块 -->
             <dependency>
                 <groupId>org.ruoyi</groupId>
@@ -182,6 +179,7 @@
                 <version>${revision}</version>
             </dependency>
         </dependencies>
+
     </dependencyManagement>
 
 </project>

ruoyi-common/ruoyi-common-chat/pom.xml

@@ -98,10 +98,6 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-        </dependency>
 
         <dependency>
             <groupId>cn.bigmodel.openapi</groupId>

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

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

ruoyi-common/ruoyi-common-chat/src/main/java/org/ruoyi/common/chat/entity/chat/Message.java

@@ -2,6 +2,7 @@ package org.ruoyi.common.chat.entity.chat;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 import org.ruoyi.common.chat.entity.chat.tool.ToolCalls;
 
@@ -20,6 +21,8 @@ import java.util.List;
 public class Message extends BaseMessage implements Serializable {
 
     private Object content;
+    @JsonProperty("reasoning_content")
+    private String reasoningContent;
 
     public static Builder builder() {
         return new Builder();

ruoyi-common/ruoyi-common-core/pom.xml

@@ -47,25 +47,11 @@
             <artifactId>jakarta.servlet-api</artifactId>
         </dependency>
 
+        <!-- hutool工具模块 -->
         <dependency>
             <groupId>cn.hutool</groupId>
-            <artifactId>hutool-core</artifactId>
+            <artifactId>hutool-all</artifactId>
-        </dependency>
+            <version>5.8.24</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>

ruoyi-common/ruoyi-common-satoken/src/main/java/org/ruoyi/common/satoken/utils/LoginHelper.java

@@ -2,6 +2,7 @@ package org.ruoyi.common.satoken.utils;
 
 import cn.dev33.satoken.context.SaHolder;
 import cn.dev33.satoken.context.model.SaStorage;
+import cn.dev33.satoken.session.SaSession;
 import cn.dev33.satoken.stp.SaLoginModel;
 import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.convert.Convert;
@@ -73,8 +74,11 @@ public class LoginHelper {
         if (loginUser != null) {
             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;
     }
 

ruoyi-modules-api/pom.xml

@@ -0,0 +1,80 @@
+<?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-ai</artifactId>
+        <version>1.0.0</version>
+    </parent>
+
+    <artifactId>ruoyi-modules-api</artifactId>
+    <packaging>pom</packaging>
+    <modules>
+        <module>ruoyi-chat-api</module>
+        <module>ruoyi-device-api</module>
+        <module>ruoyi-knowledge-api</module>
+        <module>ruoyi-system-api</module>
+        <module>ruoyi-weixin-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>
+
+
+    </dependencies>
+
+</project>

ruoyi-modules-api/ruoyi-chat-api/pom.xml

@@ -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>1.0.0</version>
+    </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>

ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/domain/ChatAgentManage.java

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

ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/domain/ChatAppStore.java

@@ -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.EqualsAndHashCode;
+import org.ruoyi.common.mybatis.core.domain.BaseEntity;
 
 import java.io.Serial;
 
 /**
- * 应用市场
+ * 应用商店对象 chat_app_store
  *
- * @author Lion Li
+ * @author ageerle
- * @date 2024-03-19
+ * @date 2025-04-08
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -23,7 +22,7 @@ public class ChatAppStore extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 主键
+     * id
      */
     @TableId(value = "id")
     private Long id;
@@ -39,16 +38,15 @@ public class ChatAppStore extends BaseEntity {
     private String description;
 
     /**
-     * 头像
+     * logo
      */
     private String avatar;
 
     /**
-     * 应用地址
+     * 地址
      */
     private String appUrl;
 
-
     /**
      * 备注
      */

ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/domain/ChatConfig.java

@@ -1,26 +1,23 @@
-package org.ruoyi.system.domain;
+package org.ruoyi.domain;
 
-import com.baomidou.mybatisplus.annotation.TableId;
+
-import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.ruoyi.common.sensitive.annotation.Sensitive;
+import org.ruoyi.common.mybatis.core.domain.BaseEntity;
-import org.ruoyi.common.sensitive.core.SensitiveStrategy;
-import org.ruoyi.common.tenant.core.TenantEntity;
 
 import java.io.Serial;
 
 /**
- * 对话配置信息对象 chat_config
+ * 配置信息对象 chat_config
  *
- * @author Lion Li
+ * @author ageerle
- * @date 2024-04-13
+ * @date 2025-04-08
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
 @TableName("chat_config")
-public class ChatConfig extends TenantEntity {
+public class ChatConfig extends BaseEntity {
 
     @Serial
     private static final long serialVersionUID = 1L;
@@ -44,7 +41,6 @@ public class ChatConfig extends TenantEntity {
     /**
      * 配置值
      */
-    @Sensitive(strategy = SensitiveStrategy.SKY)
     private String configValue;
 
     /**
@@ -57,6 +53,12 @@ public class ChatConfig extends TenantEntity {
      */
     private String remark;
 
+    /**
+     * 版本
+     */
+    @Version
+    private Long version;
+
     /**
      * 删除标志（0代表存在 1代表删除）
      */

ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/domain/ChatGpts.java

@@ -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.EqualsAndHashCode;
 import org.ruoyi.common.mybatis.core.domain.BaseEntity;
@@ -11,10 +8,10 @@ import org.ruoyi.common.mybatis.core.domain.BaseEntity;
 import java.io.Serial;
 
 /**
- * gpts管理对象 chat_gpts
+ * 应用管理对象 chat_gpts
  *
- * @author Lion Li
+ * @author ageerle
- * @date 2024-07-09
+ * @date 2025-04-08
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -63,12 +60,12 @@ public class ChatGpts extends BaseEntity {
     /**
      * 点赞
      */
-    private String useCnt;
+    private Long useCnt;
 
     /**
      * 差评
      */
-    private String bad;
+    private Long bad;
 
     /**
      * 类型

ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/domain/ChatMessage.java

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

ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/domain/ChatModel.java

@@ -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.EqualsAndHashCode;
 import org.ruoyi.common.mybatis.core.domain.BaseEntity;
@@ -10,15 +9,15 @@ import org.ruoyi.common.mybatis.core.domain.BaseEntity;
 import java.io.Serial;
 
 /**
- * 系统模型对象 sys_model
+ * 聊天模型对象 chat_model
  *
- * @author Lion Li
+ * @author ageerle
- * @date 2024-04-04
+ * @date 2025-04-08
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
 @TableName("chat_model")
-public class SysModel extends BaseEntity {
+public class ChatModel extends BaseEntity {
 
     @Serial
     private static final long serialVersionUID = 1L;
@@ -32,7 +31,6 @@ public class SysModel extends BaseEntity {
     /**
      * 模型分类
      */
-    @ExcelProperty(value = "模型分类")
     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;
 
-
     /**
      * 系统提示词
      */
@@ -81,4 +78,5 @@ public class SysModel extends BaseEntity {
      */
     private String remark;
 
+
 }

ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/domain/ChatPackagePlan.java

@@ -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.EqualsAndHashCode;
 import org.ruoyi.common.mybatis.core.domain.BaseEntity;
 
-import java.io.Serial;
 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
 @EqualsAndHashCode(callSuper = true)
 @TableName("chat_package_plan")
-public class SysPackagePlan extends BaseEntity {
+public class ChatPackagePlan extends BaseEntity {
 
     @Serial
     private static final long serialVersionUID = 1L;

ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/domain/ChatPayOrder.java

@@ -1,23 +1,24 @@
-package org.ruoyi.system.domain;
+package org.ruoyi.domain;
 
 import com.baomidou.mybatisplus.annotation.*;
-import org.ruoyi.common.mybatis.core.domain.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.ruoyi.common.mybatis.core.domain.BaseEntity;
+
 import java.math.BigDecimal;
 
 import java.io.Serial;
 
 /**
- * 支付订单对象 payment_orders
+ * 支付订单对象 chat_pay_order
  *
- * @author Lion Li
+ * @author ageerle
- * @date 2024-04-16
+ * @date 2025-04-08
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
 @TableName("chat_pay_order")
-public class PaymentOrder extends BaseEntity {
+public class ChatPayOrder extends BaseEntity {
 
     @Serial
     private static final long serialVersionUID = 1L;

ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/domain/ChatPlugin.java

@@ -1,4 +1,4 @@
-package org.ruoyi.system.domain;
+package org.ruoyi.domain;
 
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
@@ -11,7 +11,7 @@ import java.io.Serial;
  * 插件管理对象 chat_plugin
  *
  * @author ageerle
- * @date 2025-03-30
+ * @date 2025-04-08
  */
 @Data
 @EqualsAndHashCode(callSuper = true)

ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/domain/ChatRobConfig.java

@@ -1,22 +1,22 @@
-package org.ruoyi.system.domain;
+package org.ruoyi.domain;
 
 import com.baomidou.mybatisplus.annotation.*;
-import org.ruoyi.common.mybatis.core.domain.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.ruoyi.common.mybatis.core.domain.BaseEntity;
 
 import java.io.Serial;
 
 /**
- * 微信机器人对象 wx_rob_config
+ * 聊天机器人配置对象 chat_rob_config
  *
- * @author Lion Li
+ * @author ageerle
- * @date 2024-05-01
+ * @date 2025-04-08
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
 @TableName("chat_rob_config")
-public class WxRobConfig extends BaseEntity {
+public class ChatRobConfig extends BaseEntity {
 
     @Serial
     private static final long serialVersionUID = 1L;
@@ -28,7 +28,7 @@ public class WxRobConfig extends BaseEntity {
     private Long id;
 
     /**
-     * 用户id
+     * 所属用户
      */
     private Long userId;
 
@@ -42,11 +42,6 @@ public class WxRobConfig extends BaseEntity {
      */
     private String uniqueKey;
 
-    /**
-     * 备注（微信号）
-     */
-    private String remark;
-
     /**
      * 默认好友回复开关
      */
@@ -57,10 +52,15 @@ public class WxRobConfig extends BaseEntity {
      */
     private String defaultGroup;
 
-
     /**
-     * 机器启用1禁用0
+     * 机器人状态  0正常 1启用
      */
     private String enable;
 
+    /**
+     * 备注
+     */
+    private String remark;
+
+
 }

ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/domain/ChatToken.java

@@ -1,11 +1,11 @@
-package org.ruoyi.system.domain;
+package org.ruoyi.domain;
 
 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.NotNull;
 import lombok.Data;
+import org.ruoyi.common.core.validate.AddGroup;
+import org.ruoyi.common.core.validate.EditGroup;
 
 import java.io.Serial;
 import java.io.Serializable;

ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/domain/ChatUsageToken.java

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

ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/domain/ChatVisitorUsage.java

@@ -1,4 +1,4 @@
-package org.ruoyi.system.domain;
+package org.ruoyi.domain;
 
 
 import com.baomidou.mybatisplus.annotation.TableId;

ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/domain/ChatVoucher.java

@@ -1,9 +1,10 @@
-package org.ruoyi.system.domain;
+package org.ruoyi.domain;
 
 import com.baomidou.mybatisplus.annotation.*;
-import org.ruoyi.common.mybatis.core.domain.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import org.ruoyi.common.mybatis.core.domain.BaseEntity;
+
 import java.math.BigDecimal;
 
 import java.io.Serial;
@@ -11,8 +12,8 @@ import java.io.Serial;
 /**
  * 用户兑换记录对象 chat_voucher
  *
- * @author Lion Li
+ * @author ageerle
- * @date 2024-05-03
+ * @date 2025-04-08
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -28,11 +29,6 @@ public class ChatVoucher extends BaseEntity {
     @TableId(value = "id")
     private Long id;
 
-    /**
-     * 用户id
-     */
-    private Long userId;
-
     /**
      * 兑换码
      */
@@ -43,6 +39,11 @@ public class ChatVoucher extends BaseEntity {
      */
     private BigDecimal amount;
 
+    /**
+     * 用户id
+     */
+    private Long userId;
+
     /**
      * 兑换状态
      */

ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/domain/bo/ChatAgentManageBo.java

@@ -0,0 +1,96 @@
+package org.ruoyi.domain.bo;
+
+import org.ruoyi.common.core.validate.AddGroup;
+import org.ruoyi.common.core.validate.EditGroup;
+import org.ruoyi.system.domain.ChatAgentManage;
+import org.ruoyi.common.mybatis.core.domain.BaseEntity;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+
+/**
+ * 智能体管理业务对象 chat_agent_manage
+ *
+ * @author ageerle
+ * @date 2025-04-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = ChatAgentManage.class, reverseConvertGenerate = false)
+public class ChatAgentManageBo extends BaseEntity {
+
+    /**
+     * 主键id
+     */
+    @NotNull(message = "主键id不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 应用名称
+     */
+    @NotBlank(message = "应用名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String appName;
+
+    /**
+     * 应用类型
+     */
+    @NotBlank(message = "应用类型不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String appType;
+
+    /**
+     * 应用头像
+     */
+    @NotBlank(message = "应用头像不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String appIcon;
+
+    /**
+     * 应用描述
+     */
+    @NotBlank(message = "应用描述不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String appDescription;
+
+    /**
+     * 开场介绍
+     */
+    @NotBlank(message = "开场介绍不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String introduction;
+
+    /**
+     * 模型
+     */
+    @NotBlank(message = "模型不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String model;
+
+    /**
+     * 对话可选模型
+     */
+    @NotBlank(message = "对话可选模型不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String conversationModel;
+
+    /**
+     * 应用设定
+     */
+    @NotBlank(message = "应用设定不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String applicationSettings;
+
+    /**
+     * 插件id
+     */
+    @NotBlank(message = "插件id不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String pluginId;
+
+    /**
+     * 知识库id
+     */
+    @NotNull(message = "知识库id不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long knowledgeId;
+
+    /**
+     * 备注
+     */
+    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String remark;
+
+
+}

ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/domain/bo/ChatAppStoreBo.java

@@ -0,0 +1,60 @@
+package org.ruoyi.domain.bo;
+
+import org.ruoyi.common.core.validate.AddGroup;
+import org.ruoyi.common.core.validate.EditGroup;
+import org.ruoyi.system.domain.ChatAppStore;
+import org.ruoyi.common.mybatis.core.domain.BaseEntity;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+
+/**
+ * 应用商店业务对象 chat_app_store
+ *
+ * @author ageerle
+ * @date 2025-04-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = ChatAppStore.class, reverseConvertGenerate = false)
+public class ChatAppStoreBo extends BaseEntity {
+
+    /**
+     * id
+     */
+    @NotNull(message = "id不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 名称
+     */
+    @NotBlank(message = "名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String name;
+
+    /**
+     * 描述
+     */
+    @NotBlank(message = "描述不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String description;
+
+    /**
+     * logo
+     */
+    @NotBlank(message = "logo不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String avatar;
+
+    /**
+     * 地址
+     */
+    @NotBlank(message = "地址不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String appUrl;
+
+    /**
+     * 备注
+     */
+    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String remark;
+
+
+}

ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/domain/bo/ChatConfigBo.java

@@ -1,23 +1,19 @@
-package org.ruoyi.system.domain.bo;
+package org.ruoyi.domain.bo;
 
-import io.github.linpeilie.annotations.AutoMapper;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
 import org.ruoyi.common.core.validate.AddGroup;
 import org.ruoyi.common.core.validate.EditGroup;
-import org.ruoyi.common.mybatis.core.domain.BaseEntity;
-import org.ruoyi.common.sensitive.annotation.Sensitive;
-import org.ruoyi.common.sensitive.core.SensitiveStrategy;
 import org.ruoyi.system.domain.ChatConfig;
+import org.ruoyi.common.mybatis.core.domain.BaseEntity;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
 
 /**
- * 对话配置信息
+ * 配置信息业务对象 chat_config
-业务对象 chat_config
  *
- * @author Lion Li
+ * @author ageerle
- * @date 2024-04-13
+ * @date 2025-04-08
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -45,14 +41,13 @@ public class ChatConfigBo extends BaseEntity {
     /**
      * 配置值
      */
-    @Sensitive(strategy = SensitiveStrategy.SKY)
     @NotBlank(message = "配置值不能为空", groups = { AddGroup.class, EditGroup.class })
     private String configValue;
 
     /**
      * 说明
      */
-    @NotBlank(message = "参数说明不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotBlank(message = "说明不能为空", groups = { AddGroup.class, EditGroup.class })
     private String configDict;
 
     /**

ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/domain/bo/ChatGptsBo.java

@@ -1,20 +1,19 @@
-package org.ruoyi.system.domain.bo;
+package org.ruoyi.domain.bo;
 
-import io.github.linpeilie.annotations.AutoMapper;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
 import org.ruoyi.common.core.validate.AddGroup;
 import org.ruoyi.common.core.validate.EditGroup;
-import org.ruoyi.common.mybatis.core.domain.BaseEntity;
 import org.ruoyi.system.domain.ChatGpts;
+import org.ruoyi.common.mybatis.core.domain.BaseEntity;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
 
 /**
- * gpts管理业务对象 chat_gpts
+ * 应用管理业务对象 chat_gpts
  *
- * @author Lion Li
+ * @author ageerle
- * @date 2024-07-09
+ * @date 2025-04-08
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -42,46 +41,56 @@ public class ChatGptsBo extends BaseEntity {
     /**
      * gpts图标
      */
+    @NotBlank(message = "gpts图标不能为空", groups = { AddGroup.class, EditGroup.class })
     private String logo;
 
     /**
      * gpts描述
      */
+    @NotBlank(message = "gpts描述不能为空", groups = { AddGroup.class, EditGroup.class })
     private String info;
 
     /**
      * 作者id
      */
+    @NotBlank(message = "作者id不能为空", groups = { AddGroup.class, EditGroup.class })
     private String authorId;
 
     /**
      * 作者名称
      */
+    @NotBlank(message = "作者名称不能为空", groups = { AddGroup.class, EditGroup.class })
     private String authorName;
 
     /**
      * 点赞
      */
-    private String useCnt;
+    @NotNull(message = "点赞不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long useCnt;
 
     /**
      * 差评
      */
-    private String bad;
+    @NotNull(message = "差评不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long bad;
 
     /**
      * 类型
      */
+    @NotBlank(message = "类型不能为空", groups = { AddGroup.class, EditGroup.class })
     private String type;
 
     /**
      * 备注
      */
+    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
     private String remark;
 
     /**
      * 更新IP
      */
+    @NotBlank(message = "更新IP不能为空", groups = { AddGroup.class, EditGroup.class })
     private String updateIp;
 
+
 }

ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/domain/bo/ChatMessageBo.java

@@ -1,29 +1,25 @@
-package org.ruoyi.system.domain;
+package org.ruoyi.domain.bo;
 
-import com.baomidou.mybatisplus.annotation.TableName;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
 import org.ruoyi.common.core.validate.AddGroup;
 import org.ruoyi.common.core.validate.EditGroup;
+import org.ruoyi.system.domain.ChatMessage;
 import org.ruoyi.common.mybatis.core.domain.BaseEntity;
-
+import io.github.linpeilie.annotations.AutoMapper;
-import java.io.Serial;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+import java.math.BigDecimal;
 
 /**
- * 聊天消息对象 chat_message
+ * 聊天消息业务对象 chat_message
  *
- * @author Lion Li
+ * @author ageerle
- * @date 2023-11-26
+ * @date 2025-04-08
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TableName("chat_message")
+@AutoMapper(target = ChatMessage.class, reverseConvertGenerate = false)
-public class ChatMessage extends BaseEntity {
+public class ChatMessageBo extends BaseEntity {
-
-    @Serial
-    private static final long serialVersionUID = 1L;
 
     /**
      * 主键
@@ -32,16 +28,10 @@ public class ChatMessage extends BaseEntity {
     private Long id;
 
     /**
-     * 用户ID
+     * 用户id
      */
-    @NotBlank(message = "用户ID", groups = { AddGroup.class, EditGroup.class })
+    @NotNull(message = "用户id不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Long UserId;
+    private Long userId;
-
-    /**
-     * 对话角色
-     */
-    private String role;
-
 
     /**
      * 消息内容
@@ -49,17 +39,25 @@ public class ChatMessage extends BaseEntity {
     @NotBlank(message = "消息内容不能为空", groups = { AddGroup.class, EditGroup.class })
     private String content;
 
+    /**
+     * 对话角色
+     */
+    @NotBlank(message = "对话角色不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String role;
 
     /**
-     * 扣除费用
+     * 扣除金额
+
+
      */
-    private Double deductCost;
+    @NotNull(message = "扣除金额不能为空", groups = { AddGroup.class, EditGroup.class })
+    private BigDecimal deductCost;
 
     /**
      * 累计 Tokens
      */
     @NotNull(message = "累计 Tokens不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Integer totalTokens;
+    private Long totalTokens;
 
     /**
      * 模型名称
@@ -73,4 +71,5 @@ public class ChatMessage extends BaseEntity {
     @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
     private String remark;
 
+
 }

ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/domain/bo/ChatModelBo.java

@@ -1,26 +1,24 @@
-package org.ruoyi.system.domain.bo;
+package org.ruoyi.domain.bo;
 
-import com.alibaba.excel.annotation.ExcelProperty;
-import io.github.linpeilie.annotations.AutoMapper;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
 import org.ruoyi.common.core.validate.AddGroup;
 import org.ruoyi.common.core.validate.EditGroup;
+import org.ruoyi.system.domain.ChatModel;
 import org.ruoyi.common.mybatis.core.domain.BaseEntity;
-import org.ruoyi.system.domain.SysModel;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
 
 /**
- * 系统模型业务对象 sys_model
+ * 聊天模型业务对象 chat_model
  *
- * @author Lion Li
+ * @author ageerle
- * @date 2024-04-04
+ * @date 2025-04-08
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@AutoMapper(target = SysModel.class, reverseConvertGenerate = false)
+@AutoMapper(target = ChatModel.class, reverseConvertGenerate = false)
-public class SysModelBo extends BaseEntity {
+public class ChatModelBo extends BaseEntity {
 
     /**
      * 主键
@@ -31,7 +29,7 @@ public class SysModelBo extends BaseEntity {
     /**
      * 模型分类
      */
-    @ExcelProperty(value = "模型分类")
+    @NotBlank(message = "模型分类不能为空", groups = { AddGroup.class, EditGroup.class })
     private String category;
 
     /**
@@ -40,7 +38,6 @@ public class SysModelBo extends BaseEntity {
     @NotBlank(message = "模型名称不能为空", groups = { AddGroup.class, EditGroup.class })
     private String modelName;
 
-
     /**
      * 模型描述
      */
@@ -51,34 +48,38 @@ public class SysModelBo extends BaseEntity {
      * 模型价格
      */
     @NotNull(message = "模型价格不能为空", groups = { AddGroup.class, EditGroup.class })
-    private double modelPrice;
+    private Long modelPrice;
 
     /**
-     * 计费类型 (1 token扣费; 2 次数扣费 )
+     * 计费类型
      */
     @NotBlank(message = "计费类型不能为空", groups = { AddGroup.class, EditGroup.class })
     private String modelType;
 
     /**
-     * 模型状态  (0 显示; 1 隐藏 )
+     * 是否显示
      */
+    @NotBlank(message = "是否显示不能为空", groups = { AddGroup.class, EditGroup.class })
     private String modelShow;
 
-
     /**
      * 系统提示词
      */
+    @NotBlank(message = "系统提示词不能为空", groups = { AddGroup.class, EditGroup.class })
     private String systemPrompt;
 
     /**
      * 请求地址
      */
+    @NotBlank(message = "请求地址不能为空", groups = { AddGroup.class, EditGroup.class })
     private String apiHost;
 
     /**
-     * 请求密钥
+     * 密钥
      */
+    @NotBlank(message = "密钥不能为空", groups = { AddGroup.class, EditGroup.class })
     private String apiKey;
+
     /**
      * 备注
      */

ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/domain/bo/ChatPackagePlanBo.java

@@ -1,8 +1,8 @@
-package org.ruoyi.system.domain.bo;
+package org.ruoyi.domain.bo;
 
 import org.ruoyi.common.core.validate.AddGroup;
 import org.ruoyi.common.core.validate.EditGroup;
-import org.ruoyi.system.domain.SysPackagePlan;
+import org.ruoyi.system.domain.ChatPackagePlan;
 import org.ruoyi.common.mybatis.core.domain.BaseEntity;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
@@ -11,15 +11,15 @@ import jakarta.validation.constraints.*;
 import java.math.BigDecimal;
 
 /**
- * 套餐管理业务对象 sys_package_plan
+ * 套餐管理业务对象 chat_package_plan
  *
- * @author Lion Li
+ * @author ageerle
- * @date 2024-05-05
+ * @date 2025-04-08
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@AutoMapper(target = SysPackagePlan.class, reverseConvertGenerate = false)
+@AutoMapper(target = ChatPackagePlan.class, reverseConvertGenerate = false)
-public class SysPackagePlanBo extends BaseEntity {
+public class ChatPackagePlanBo extends BaseEntity {
 
     /**
      * 主键

ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/domain/bo/ChatPayOrderBo.java

@@ -1,27 +1,25 @@
-package org.ruoyi.system.domain.bo;
+package org.ruoyi.domain.bo;
 
-import io.github.linpeilie.annotations.AutoMapper;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
 import org.ruoyi.common.core.validate.AddGroup;
 import org.ruoyi.common.core.validate.EditGroup;
+import org.ruoyi.system.domain.ChatPayOrder;
 import org.ruoyi.common.mybatis.core.domain.BaseEntity;
-import org.ruoyi.system.domain.PaymentOrder;
+import io.github.linpeilie.annotations.AutoMapper;
-
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
 import java.math.BigDecimal;
 
 /**
- * 支付订单业务对象 payment_orders
+ * 支付订单业务对象 chat_pay_order
  *
- * @author Lion Li
+ * @author ageerle
- * @date 2024-04-16
+ * @date 2025-04-08
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@AutoMapper(target = PaymentOrder.class, reverseConvertGenerate = false)
+@AutoMapper(target = ChatPayOrder.class, reverseConvertGenerate = false)
-public class PaymentOrdersBo extends BaseEntity {
+public class ChatPayOrderBo extends BaseEntity {
 
     /**
      * 主键
@@ -72,5 +70,4 @@ public class PaymentOrdersBo extends BaseEntity {
     private String remark;
 
 
-
 }

ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/domain/bo/ChatPluginBo.java

@@ -1,4 +1,4 @@
-package org.ruoyi.system.domain.bo;
+package org.ruoyi.domain.bo;
 
 import org.ruoyi.common.core.validate.AddGroup;
 import org.ruoyi.common.core.validate.EditGroup;
@@ -13,7 +13,7 @@ import jakarta.validation.constraints.*;
  * 插件管理业务对象 chat_plugin
  *
  * @author ageerle
- * @date 2025-03-30
+ * @date 2025-04-08
  */
 @Data
 @EqualsAndHashCode(callSuper = true)

ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/domain/bo/ChatRobConfigBo.java

@@ -0,0 +1,72 @@
+package org.ruoyi.domain.bo;
+
+import org.ruoyi.common.core.validate.AddGroup;
+import org.ruoyi.common.core.validate.EditGroup;
+import org.ruoyi.domain.ChatRobConfig;
+import org.ruoyi.common.mybatis.core.domain.BaseEntity;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+
+/**
+ * 聊天机器人配置业务对象 chat_rob_config
+ *
+ * @author ageerle
+ * @date 2025-04-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = ChatRobConfig.class, reverseConvertGenerate = false)
+public class ChatRobConfigBo extends BaseEntity {
+
+    /**
+     * 主键
+     */
+    @NotNull(message = "主键不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 所属用户
+     */
+    @NotNull(message = "所属用户不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long userId;
+
+    /**
+     * 机器人名称
+     */
+    @NotBlank(message = "机器人名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String botName;
+
+    /**
+     * 机器唯一码
+     */
+    @NotBlank(message = "机器唯一码不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String uniqueKey;
+
+    /**
+     * 默认好友回复开关
+     */
+    @NotBlank(message = "默认好友回复开关不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String defaultFriend;
+
+    /**
+     * 默认群回复开关
+     */
+    @NotBlank(message = "默认群回复开关不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String defaultGroup;
+
+    /**
+     * 机器人状态  0正常 1启用
+     */
+    @NotBlank(message = "机器人状态  0正常 1启用不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String enable;
+
+    /**
+     * 备注
+     */
+    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String remark;
+
+
+}

ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/domain/bo/ChatUsageTokenBo.java

@@ -0,0 +1,54 @@
+package org.ruoyi.domain.bo;
+
+import org.ruoyi.common.core.validate.AddGroup;
+import org.ruoyi.common.core.validate.EditGroup;
+import org.ruoyi.domain.ChatUsageToken;
+import org.ruoyi.common.mybatis.core.domain.BaseEntity;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+
+/**
+ * 用户token使用详情业务对象 chat_usage_token
+ *
+ * @author ageerle
+ * @date 2025-04-08
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = ChatUsageToken.class, reverseConvertGenerate = false)
+public class ChatUsageTokenBo extends BaseEntity {
+
+    /**
+     * 主键
+     */
+    @NotNull(message = "主键不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 用户
+     */
+    @NotNull(message = "用户不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long userId;
+
+    /**
+     * 待结算token
+     */
+    @NotNull(message = "待结算token不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Integer token;
+
+    /**
+     * 模型名称
+     */
+    @NotBlank(message = "模型名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String modelName;
+
+    /**
+     * 累计使用token
+     */
+    @NotBlank(message = "累计使用token不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String totalToken;
+
+
+}

ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/domain/bo/ChatVisitorUsageBo.java

@@ -1,4 +1,4 @@
-package org.ruoyi.system.domain.bo;
+package org.ruoyi.domain.bo;
 
 import io.github.linpeilie.annotations.AutoMapper;
 import jakarta.validation.constraints.NotBlank;
@@ -8,7 +8,8 @@ import lombok.EqualsAndHashCode;
 import org.ruoyi.common.core.validate.AddGroup;
 import org.ruoyi.common.core.validate.EditGroup;
 import org.ruoyi.common.mybatis.core.domain.BaseEntity;
-import org.ruoyi.system.domain.ChatVisitorUsage;
+import org.ruoyi.domain.ChatVisitorUsage;
+
 
 /**
  * 访客管理业务对象 chat_visitor_usage

ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/domain/bo/ChatVoucherBo.java

@@ -1,21 +1,20 @@
-package org.ruoyi.system.domain.bo;
+package org.ruoyi.domain.bo;
 
-import io.github.linpeilie.annotations.AutoMapper;
-import jakarta.validation.constraints.NotNull;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
 import org.ruoyi.common.core.validate.AddGroup;
 import org.ruoyi.common.core.validate.EditGroup;
+import org.ruoyi.domain.ChatVoucher;
 import org.ruoyi.common.mybatis.core.domain.BaseEntity;
-import org.ruoyi.system.domain.ChatVoucher;
+import io.github.linpeilie.annotations.AutoMapper;
-
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
 import java.math.BigDecimal;
 
 /**
  * 用户兑换记录业务对象 chat_voucher
  *
- * @author Lion Li
+ * @author ageerle
- * @date 2024-05-03
+ * @date 2025-04-08
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -28,14 +27,10 @@ public class ChatVoucherBo extends BaseEntity {
     @NotNull(message = "主键不能为空", groups = { EditGroup.class })
     private Long id;
 
-    /**
-     * 用户id
-     */
-    private Long userId;
-
     /**
      * 兑换码
      */
+    @NotBlank(message = "兑换码不能为空", groups = { AddGroup.class, EditGroup.class })
     private String code;
 
     /**
@@ -44,24 +39,34 @@ public class ChatVoucherBo extends BaseEntity {
     @NotNull(message = "兑换金额不能为空", groups = { AddGroup.class, EditGroup.class })
     private BigDecimal amount;
 
+    /**
+     * 用户id
+     */
+    @NotNull(message = "用户id不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long userId;
+
     /**
      * 兑换状态
      */
+    @NotBlank(message = "兑换状态不能为空", groups = { AddGroup.class, EditGroup.class })
     private String status;
 
     /**
      * 兑换前余额
      */
-    private Double balanceBefore;
+    @NotNull(message = "兑换前余额不能为空", groups = { AddGroup.class, EditGroup.class })
+    private BigDecimal balanceBefore;
 
     /**
      * 兑换后余额
      */
-    private Double balanceAfter;
+    @NotNull(message = "兑换后余额不能为空", groups = { AddGroup.class, EditGroup.class })
+    private BigDecimal balanceAfter;
 
     /**
      * 备注
      */
+    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
     private String remark;
 
 

ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/domain/request/TranslationRequest.java

@@ -1,4 +1,4 @@
-package org.ruoyi.system.domain.request.translation;
+package org.ruoyi.domain.request;
 
 import lombok.Data;
 

ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/domain/vo/CacheListInfoVo.java

@@ -0,0 +1,23 @@
+package org.ruoyi.domain.vo;
+
+import lombok.Data;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+
+/**
+ * 缓存监控列表信息
+ *
+ * @author Michelle.Chung
+ */
+@Data
+public class CacheListInfoVo {
+
+    private Properties info;
+
+    private Long dbSize;
+
+    private List<Map<String, String>> commandStats;
+
+}

ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/domain/vo/CaptchaVo.java

@@ -0,0 +1,25 @@
+package org.ruoyi.domain.vo;
+
+import lombok.Data;
+
+/**
+ * 验证码信息
+ *
+ * @author Michelle.Chung
+ */
+@Data
+public class CaptchaVo {
+
+    /**
+     * 是否开启验证码
+     */
+    private Boolean captchaEnabled = true;
+
+    private String uuid;
+
+    /**
+     * 验证码图片
+     */
+    private String img;
+
+}

ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/domain/vo/ChatAgentManageVo.java

@@ -0,0 +1,104 @@
+package org.ruoyi.system.domain.vo;
+
+import org.ruoyi.system.domain.ChatAgentManage;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import annotation.excel.common.org.ruoyi.ExcelDictFormat;
+import convert.excel.common.org.ruoyi.ExcelDictConvert;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+
+/**
+ * 智能体管理视图对象 chat_agent_manage
+ *
+ * @author ageerle
+ * @date 2025-04-08
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = ChatAgentManage.class)
+public class ChatAgentManageVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    @ExcelProperty(value = "主键id")
+    private Long id;
+
+    /**
+     * 应用名称
+     */
+    @ExcelProperty(value = "应用名称")
+    private String appName;
+
+    /**
+     * 应用类型
+     */
+    @ExcelProperty(value = "应用类型")
+    private String appType;
+
+    /**
+     * 应用头像
+     */
+    @ExcelProperty(value = "应用头像")
+    private String appIcon;
+
+    /**
+     * 应用描述
+     */
+    @ExcelProperty(value = "应用描述")
+    private String appDescription;
+
+    /**
+     * 开场介绍
+     */
+    @ExcelProperty(value = "开场介绍")
+    private String introduction;
+
+    /**
+     * 模型
+     */
+    @ExcelProperty(value = "模型")
+    private String model;
+
+    /**
+     * 对话可选模型
+     */
+    @ExcelProperty(value = "对话可选模型")
+    private String conversationModel;
+
+    /**
+     * 应用设定
+     */
+    @ExcelProperty(value = "应用设定")
+    private String applicationSettings;
+
+    /**
+     * 插件id
+     */
+    @ExcelProperty(value = "插件id")
+    private String pluginId;
+
+    /**
+     * 知识库id
+     */
+    @ExcelProperty(value = "知识库id")
+    private Long knowledgeId;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+
+}

ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/domain/vo/ChatAppStoreVo.java

@@ -1,21 +1,23 @@
 package org.ruoyi.system.domain.vo;
 
+import org.ruoyi.system.domain.ChatAppStore;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
-import org.ruoyi.system.domain.ChatAppStore;
 
 import java.io.Serial;
 import java.io.Serializable;
 
 
 
+
 /**
- * 应用市场视图对象
+ * 应用商店视图对象 chat_app_store
  *
- * @author Lion Li
+ * @author ageerle
- * @date 2024-03-19
+ * @date 2025-04-08
  */
 @Data
 @ExcelIgnoreUnannotated
@@ -32,27 +34,27 @@ public class ChatAppStoreVo implements Serializable {
     private Long id;
 
     /**
-     * 角色名称
+     * 名称
      */
     @ExcelProperty(value = "名称")
     private String name;
 
     /**
-     * 角色描述
+     * 描述
      */
     @ExcelProperty(value = "描述")
     private String description;
 
     /**
-     * 头像
+     * logo
      */
-    @ExcelProperty(value = "头像")
+    @ExcelProperty(value = "logo")
     private String avatar;
 
     /**
-     * 音频地址
+     * 地址
      */
-    @ExcelProperty(value = "应用地址")
+    @ExcelProperty(value = "地址")
     private String appUrl;
 
     /**

ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/domain/vo/ChatConfigVo.java

@@ -1,24 +1,23 @@
-package org.ruoyi.system.domain.vo;
+package org.ruoyi.domain.vo;
 
+import org.ruoyi.system.domain.ChatConfig;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
-import org.ruoyi.common.sensitive.annotation.Sensitive;
-import org.ruoyi.common.sensitive.core.SensitiveStrategy;
-import org.ruoyi.system.domain.ChatConfig;
 
 import java.io.Serial;
 import java.io.Serializable;
 
 
 
+
 /**
- * 对话配置信息
+ * 配置信息视图对象 chat_config
-视图对象 chat_config
  *
- * @author Lion Li
+ * @author ageerle
- * @date 2024-04-13
+ * @date 2025-04-08
  */
 @Data
 @ExcelIgnoreUnannotated
@@ -50,7 +49,6 @@ public class ChatConfigVo implements Serializable {
      * 配置值
      */
     @ExcelProperty(value = "配置值")
-    @Sensitive(strategy = SensitiveStrategy.SKY)
     private String configValue;
 
     /**

ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/domain/vo/ChatGptsVo.java

@@ -1,20 +1,23 @@
-package org.ruoyi.system.domain.vo;
+package org.ruoyi.domain.vo;
 
+import org.ruoyi.system.domain.ChatGpts;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
-import org.ruoyi.system.domain.ChatGpts;
 
 import java.io.Serial;
 import java.io.Serializable;
 
 
+
+
 /**
- * gpts管理视图对象 chat_gpts
+ * 应用管理视图对象 chat_gpts
  *
- * @author Lion Li
+ * @author ageerle
- * @date 2024-07-09
+ * @date 2025-04-08
  */
 @Data
 @ExcelIgnoreUnannotated
@@ -70,13 +73,13 @@ public class ChatGptsVo implements Serializable {
      * 点赞
      */
     @ExcelProperty(value = "点赞")
-    private String useCnt;
+    private Long useCnt;
 
     /**
      * 差评
      */
     @ExcelProperty(value = "差评")
-    private String bad;
+    private Long bad;
 
     /**
      * 类型

ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/domain/vo/ChatMessageVo.java

@@ -0,0 +1,80 @@
+package org.ruoyi.domain.vo;
+
+import java.math.BigDecimal;
+import org.ruoyi.system.domain.ChatMessage;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+
+
+
+/**
+ * 聊天消息视图对象 chat_message
+ *
+ * @author ageerle
+ * @date 2025-04-08
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = ChatMessage.class)
+public class ChatMessageVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @ExcelProperty(value = "主键")
+    private Long id;
+
+    /**
+     * 用户id
+     */
+    @ExcelProperty(value = "用户id")
+    private Long userId;
+
+    /**
+     * 消息内容
+     */
+    @ExcelProperty(value = "消息内容")
+    private String content;
+
+    /**
+     * 对话角色
+     */
+    @ExcelProperty(value = "对话角色")
+    private String role;
+
+    /**
+     * 扣除金额
+     */
+    @ExcelProperty(value = "扣除金额")
+    private BigDecimal deductCost;
+
+    /**
+     * 累计 Tokens
+     */
+    @ExcelProperty(value = "累计 Tokens")
+    private Long totalTokens;
+
+    /**
+     * 模型名称
+     */
+    @ExcelProperty(value = "模型名称")
+    private String modelName;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+
+}

ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/domain/vo/ChatModelVo.java

@@ -1,27 +1,28 @@
-package org.ruoyi.system.domain.vo;
+package org.ruoyi.domain.vo;
 
+import org.ruoyi.system.domain.ChatModel;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
-import org.ruoyi.common.sensitive.annotation.Sensitive;
-import org.ruoyi.common.sensitive.core.SensitiveStrategy;
-import org.ruoyi.system.domain.SysModel;
 
 import java.io.Serial;
 import java.io.Serializable;
 
 
+
+
 /**
- * 系统模型视图对象 sys_model
+ * 聊天模型视图对象 chat_model
  *
- * @author Lion Li
+ * @author ageerle
- * @date 2024-04-04
+ * @date 2025-04-08
  */
 @Data
 @ExcelIgnoreUnannotated
-@AutoMapper(target = SysModel.class)
+@AutoMapper(target = ChatModel.class)
-public class SysModelVo implements Serializable {
+public class ChatModelVo implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 1L;
@@ -44,7 +45,6 @@ public class SysModelVo implements Serializable {
     @ExcelProperty(value = "模型名称")
     private String modelName;
 
-
     /**
      * 模型描述
      */
@@ -55,7 +55,7 @@ public class SysModelVo implements Serializable {
      * 模型价格
      */
     @ExcelProperty(value = "模型价格")
-    private double modelPrice;
+    private Long modelPrice;
 
     /**
      * 计费类型
@@ -66,23 +66,25 @@ public class SysModelVo implements Serializable {
     /**
      * 是否显示
      */
+    @ExcelProperty(value = "是否显示")
     private String modelShow;
 
-
     /**
      * 系统提示词
      */
+    @ExcelProperty(value = "系统提示词")
     private String systemPrompt;
 
     /**
      * 请求地址
      */
+    @ExcelProperty(value = "请求地址")
     private String apiHost;
 
     /**
-     * 模型名称
+     * 密钥
      */
-    @Sensitive(strategy = SensitiveStrategy.ID_CARD)
+    @ExcelProperty(value = "密钥")
     private String apiKey;
 
     /**
@@ -91,4 +93,5 @@ public class SysModelVo implements Serializable {
     @ExcelProperty(value = "备注")
     private String remark;
 
+
 }

ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/domain/vo/ChatPackagePlanVo.java

@@ -1,9 +1,10 @@
-package org.ruoyi.system.domain.vo;
+package org.ruoyi.domain.vo;
 
 import java.math.BigDecimal;
-import org.ruoyi.system.domain.SysPackagePlan;
+import org.ruoyi.system.domain.ChatPackagePlan;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 
@@ -11,16 +12,18 @@ import java.io.Serial;
 import java.io.Serializable;
 
 
+
+
 /**
- * 套餐管理视图对象 sys_package_plan
+ * 套餐管理视图对象 chat_package_plan
  *
- * @author Lion Li
+ * @author ageerle
- * @date 2024-05-05
+ * @date 2025-04-08
  */
 @Data
 @ExcelIgnoreUnannotated
-@AutoMapper(target = SysPackagePlan.class)
+@AutoMapper(target = ChatPackagePlan.class)
-public class SysPackagePlanVo implements Serializable {
+public class ChatPackagePlanVo implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 1L;

ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/domain/vo/ChatPayOrderVo.java

@@ -1,27 +1,29 @@
-package org.ruoyi.system.domain.vo;
+package org.ruoyi.domain.vo;
 
+import java.math.BigDecimal;
+import org.ruoyi.system.domain.ChatPayOrder;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
-import org.ruoyi.system.domain.PaymentOrder;
 
 import java.io.Serial;
 import java.io.Serializable;
-import java.math.BigDecimal;
+
-import java.util.Date;
+
 
 
 /**
- * 支付订单视图对象 payment_orders
+ * 支付订单视图对象 chat_pay_order
  *
- * @author Lion Li
+ * @author ageerle
- * @date 2024-04-16
+ * @date 2025-04-08
  */
 @Data
 @ExcelIgnoreUnannotated
-@AutoMapper(target = PaymentOrder.class)
+@AutoMapper(target = ChatPayOrder.class)
-public class PaymentOrdersVo implements Serializable {
+public class ChatPayOrderVo implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 1L;
@@ -68,26 +70,11 @@ public class PaymentOrdersVo implements Serializable {
     @ExcelProperty(value = "用户ID")
     private Long userId;
 
-    /**
-     * 用户ID
-     */
-    @ExcelProperty(value = "用户名称")
-    private String userName;
-
     /**
      * 备注
      */
     @ExcelProperty(value = "备注")
     private String remark;
 
-    /**
-     * 二维码网络地址
-     */
-    private String url;
-
-    /**
-     * 创建时间
-     */
-    private Date createTime;
 
 }