Merge remote-tracking branch 'origin/main'

fix: 修复脱敏后的apikey也被更新了
Merge branch 'main' of https://github.com/ageerle/ruoyi-ai
2026-04-09 01:37:32 +00:00 · 2025-05-27 17:55:44 +08:00 · 2025-05-27 17:55:34 +08:00 · 2025-05-26 22:45:18 +08:00 · 2025-05-26 22:43:54 +08:00 · 2025-05-26 22:41:55 +08:00
352 changed files with 3192 additions and 10633 deletions
--- a/README.md
+++ b/README.md
@@ -38,7 +38,7 @@

 ### 拉取镜像(最低配置2H2G):
   ```bash
-     script/docker/ruoyiai目录下执行: docker-compose up -d
+     script/deploy/deploy目录下执行: docker-compose up -d
  ```

 ### 通过脚本启动(最低配置4H4G):
@@ -51,7 +51,7 @@
 2. **克隆项目**
   ```bash
   git clone https://github.com/ageerle/ruoyi-ai
-   cd ruoyi-ai/docker-deploy/one-step-script/
+   cd ruoyi-ai/script/deploy/one-step-script
   ```

 3. **启动部署脚本**
@@ -97,7 +97,6 @@
 - [项目演示](#项目演示)
  - [管理端](#管理端)
  - [用户端](#用户端)
-  - [小程序端](#小程序端)
 - [开发环境](#开发环境)
 - [项目结构](#项目结构)
  - [ruoyi-ai](#ruoyi-ai)
@@ -112,22 +111,20 @@

 ### 系统体验
 - 用户端：https://web.pandarobot.chat
+- 演示账号: demo 密码：demo123
 - 管理端：https://admin.pandarobot.chat
- 用户名: admin 密码：admin123
- 温馨提醒：体验前需准备测试key在后台管理配置,体验完成记得删除key信息。
+- 演示账号: admin 密码：admin123
 - 商业版：体验商业版请联系下方小助手获取演示地址（预计6月份上线）。

 ### 源码地址
 [1]github
 - 前端服务-用户端: https://github.com/ageerle/ruoyi-web
 - 前端服务-管理端: https://github.com/ageerle/ruoyi-admin
- 前端服务-小程序端: https://github.com/ageerle/ruoyi-uniapp
 - 后端服务：https://github.com/ageerle/ruoyi-ai

 [2]gitcode
 - 前端服务-用户端：https://gitcode.com/ageerle/ruoyi-web
 - 前端服务-管理端:  https://gitcode.com/ageerle/ruoyi-admin
- 前端服务-小程序端:  https://gitcode.com/ageerle/ruoyi-uniapp
 - 后端服务：https://gitcode.com/ageerle/ruoyi-ai

 ### 配套文档
@@ -136,7 +133,7 @@

 ### 核心功能与技术亮点
 #### 1. 全栈式开源系统
- 全套开源系统：提供完整的前端应用、后台管理以及小程序应用，基于MIT协议，开箱即用。
+- 全套开源系统：提供完整的前端应用、后台管理,基于MIT协议，开箱即用。
 #### 2. 本地化 RAG 方案
 -  基于 **Langchain4j** 框架，支持 Milvus/Weaviate/Qdrant 向量库，结合 BGE-large-zh-v1.5 本地向量化模型 实现高效文档检索与知识库构建。
 -  支持 本地 LLM 接入，结合私有知识库实现安全可控的问答系统，避免依赖云端服务的隐私风险。
@@ -160,13 +157,6 @@
  <img src="image/mcp-04.png" alt="drawing" style="width: 600px; height: 300px; border: 2px solid #ddd; border-radius: 8px; box-shadow: 0 4px 8px rgba(0,0,0,0.1);"/>
 </div>

-#### 管理端
-<div style="display: flex; flex-wrap: wrap; gap: 20px; justify-content: center;">
-  <img src="image/02.png" alt="drawing" style="width: 600px; height: 300px; border: 2px solid #ddd; border-radius: 8px; box-shadow: 0 4px 8px rgba(0,0,0,0.1);"/>
-  <img src="image/03.png" alt="drawing" style="width: 600px; height: 300px; border: 2px solid #ddd; border-radius: 8px; box-shadow: 0 4px 8px rgba(0,0,0,0.1);"/>
-  <img src="image/04.png" alt="drawing" style="width: 600px; height: 300px; border: 2px solid #ddd; border-radius: 8px; box-shadow: 0 4px 8px rgba(0,0,0,0.1);"/>
-  <img src="image/05.png" alt="drawing" style="width: 600px; height: 300px; border: 2px solid #ddd; border-radius: 8px; box-shadow: 0 4px 8px rgba(0,0,0,0.1);"/>
-</div>

 #### 用户端
 <div style="display: flex; flex-wrap: wrap; gap: 20px; justify-content: center;">
@@ -176,12 +166,15 @@
  <img src="image/11.png" alt="drawing" style="width: 600px; height: 300px; border: 2px solid #ddd; border-radius: 8px; box-shadow: 0 4px 8px rgba(0,0,0,0.1);"/>
 </div>

-#### 小程序端
-<div style="display: flex; flex-wrap: wrap; gap: 20px; justify-content: flex-start;">
-  <img src="image/06.png" alt="drawing" style="width: 320px; height: 600px; border: 2px solid #ddd; border-radius: 8px; box-shadow: 0 4px 8px rgba(0,0,0,0.1);"/>
-  <img src="image/07.png" alt="drawing" style="width: 320px; height: 600px; border: 2px solid #ddd; border-radius: 8px; box-shadow: 0 4px 8px rgba(0,0,0,0.1);"/>
+#### 管理端
+<div style="display: flex; flex-wrap: wrap; gap: 20px; justify-content: center;">
+  <img src="image/02.png" alt="drawing" style="width: 600px; height: 300px; border: 2px solid #ddd; border-radius: 8px; box-shadow: 0 4px 8px rgba(0,0,0,0.1);"/>
+  <img src="image/03.png" alt="drawing" style="width: 600px; height: 300px; border: 2px solid #ddd; border-radius: 8px; box-shadow: 0 4px 8px rgba(0,0,0,0.1);"/>
+  <img src="image/04.png" alt="drawing" style="width: 600px; height: 300px; border: 2px solid #ddd; border-radius: 8px; box-shadow: 0 4px 8px rgba(0,0,0,0.1);"/>
+  <img src="image/05.png" alt="drawing" style="width: 600px; height: 300px; border: 2px solid #ddd; border-radius: 8px; box-shadow: 0 4px 8px rgba(0,0,0,0.1);"/>
 </div>

+
 ### 开发环境

 1. jdk 17
--- a/docker-deploy/deploy/copy-mysql-init-script.sh
+++ b/docker-deploy/deploy/copy-mysql-init-script.sh
@@ -1,6 +0,0 @@
-#!/bin/bash
-rm -f /root/ruoyi-ai-docker/deploy/mysql-init/*.sql
-cp /root/ruoyi-ai-docker/source-code/ruoyi-ai-backend/script/sql/ruoyi-ai.sql /root/ruoyi-ai-docker/deploy/mysql-init/01_ruoyi-ai.sql
-cp /root/ruoyi-ai-docker/source-code/ruoyi-ai-backend/script/sql/update/20250407.sql /root/ruoyi-ai-docker/deploy/mysql-init/02_update_20250407.sql
-cp /root/ruoyi-ai-docker/source-code/ruoyi-ai-backend/script/sql/update/20250505.sql /root/ruoyi-ai-docker/deploy/mysql-init/03_update_20250505.sql
-cp /root/ruoyi-ai-docker/source-code/ruoyi-ai-backend/script/sql/update/20250509.sql /root/ruoyi-ai-docker/deploy/mysql-init/04_update_20250509.sql
--- a/docker-deploy/deploy/mysql-init/02_update_20250407.sql
+++ b/docker-deploy/deploy/mysql-init/02_update_20250407.sql
@@ -1,4 +0,0 @@
-INSERT INTO `chat_model` (`id`, `tenant_id`, `category`, `model_name`, `model_describe`, `model_price`, `model_type`, `model_show`, `system_prompt`, `api_host`, `api_key`, `create_dept`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (1907575746601119746, '000000', 'vector', 'text-embedding-3-small', 'text-embedding-3-small', 0, '2', '0', NULL, 'https://api.pandarobot.chat/', 'sk-cdBlIaZcufccm2RaDe547cBd054d49C7B0782eCa72A0052b', 103, 1, '2025-04-03 07:27:54', 1, '2025-04-03 07:27:54', 'text-embedding-3-small');
-INSERT INTO `chat_model` (`id`, `tenant_id`, `category`, `model_name`, `model_describe`, `model_price`, `model_type`, `model_show`, `system_prompt`, `api_host`, `api_key`, `create_dept`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (1907576007017066497, '000000', 'vector', 'quentinz/bge-large-zh-v1.5', 'bge-large-zh-v1.5', 0, '2', '0', NULL, 'http://127.0.0.1:11434/', 'cdBlIaZcufccm2RaDe547cBd054d49C7B0782eCa72A0052b', 103, 1, '2025-04-03 07:28:56', 1, '2025-04-03 07:28:56', 'bge-large-zh-v1.5');
-INSERT INTO `chat_model` (`id`, `tenant_id`, `category`, `model_name`, `model_describe`, `model_price`, `model_type`, `model_show`, `system_prompt`, `api_host`, `api_key`, `create_dept`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (1907576806191362049, '000000', 'vector', 'nomic-embed-text', 'nomic-embed-text', 0, '2', '0', NULL, 'http://127.0.0.1:11434/', 'nomic-embed-text', 103, 1, '2025-04-03 07:32:06', 1, '2025-04-03 07:32:06', 'nomic-embed-text');
-INSERT INTO `chat_model` (`id`, `tenant_id`, `category`, `model_name`, `model_describe`, `model_price`, `model_type`, `model_show`, `system_prompt`, `api_host`, `api_key`, `create_dept`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (1907577073490161665, '000000', 'vector', 'snowflake-arctic-embed', 'snowflake-arctic-embed', 0, '2', '0', NULL, 'http://127.0.0.1:11434/', 'snowflake-arctic-embed', 103, 1, '2025-04-03 07:33:10', 1, '2025-04-03 07:33:10', 'snowflake-arctic-embed');
--- a/docker-deploy/deploy/mysql-init/03_update_20250505.sql
+++ b/docker-deploy/deploy/mysql-init/03_update_20250505.sql
@@ -1,42 +0,0 @@
-/*
- Navicat MySQL Data Transfer
-
- Source Server         : 129.211.24.7
- Source Server Type    : MySQL
- Source Server Version : 50744
- Source Host           : 129.211.24.7:3306
- Source Schema         : ry-vue
-
- Target Server Type    : MySQL
- Target Server Version : 50744
- File Encoding         : 65001
-
- Date: 05/05/2025 15:01:08
-*/
-
-SET NAMES utf8mb4;
-SET FOREIGN_KEY_CHECKS = 0;
-
-- ----------------------------
-- Table structure for chat_session
-- ----------------------------
-DROP TABLE IF EXISTS `chat_session`;
-CREATE TABLE `chat_session`  (
-  `id` bigint(20) NOT NULL COMMENT '主键',
-  `user_id` bigint(20) NULL DEFAULT NULL COMMENT '用户id',
-  `session_title` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '会话标题',
-  `session_content` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '会话内容',
-  `create_dept` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '部门',
-  `create_by` bigint(20) NULL DEFAULT NULL COMMENT '创建者',
-  `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
-  `update_by` bigint(20) NULL DEFAULT NULL COMMENT '更新者',
-  `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
-  `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注',
-  PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '会话管理' ROW_FORMAT = Dynamic;
-
-SET FOREIGN_KEY_CHECKS = 1;
-
-ALTER TABLE `chat_message`
-    ADD COLUMN `session_id` bigint(20) NULL COMMENT '会话id' AFTER `id`;
-
--- a/docker-deploy/deploy/mysql-init/04_update_20250509.sql
+++ b/docker-deploy/deploy/mysql-init/04_update_20250509.sql
@@ -1,4 +0,0 @@
-ALTER TABLE `chat_model`
-    ADD COLUMN `api_url` varchar(50) NULL COMMENT '请求后缀' AFTER `api_key`;
-
-INSERT INTO `chat_config` (`id`, `category`, `config_name`, `config_value`, `config_dict`, `create_dept`, `create_time`, `create_by`, `update_by`, `update_time`, `remark`, `version`, `del_flag`, `update_ip`, `tenant_id`) VALUES (1779450794872414211, 'chat', 'apiUrl', 'v1/chat/completions', 'API 请求后缀', 103, '2024-04-14 18:05:05', '1', '1', '2025-04-23 22:29:04', NULL, NULL, '0', NULL, 0);
--- a/docker-deploy/deploy/update_ruoyi-qi-sql.sh
+++ b/docker-deploy/deploy/update_ruoyi-qi-sql.sh
@@ -1,2 +0,0 @@
-#!/bin/bash
-sed -i 's#127.0.0.1:6038#weaviate:8080#g' ./mysql-init/01_ruoyi-ai.sql
--- a/docker-deploy/one-step-script/mysql-init/02_update_20250407.sql
+++ b/docker-deploy/one-step-script/mysql-init/02_update_20250407.sql
@@ -1,4 +0,0 @@
-INSERT INTO `chat_model` (`id`, `tenant_id`, `category`, `model_name`, `model_describe`, `model_price`, `model_type`, `model_show`, `system_prompt`, `api_host`, `api_key`, `create_dept`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (1907575746601119746, '000000', 'vector', 'text-embedding-3-small', 'text-embedding-3-small', 0, '2', '0', NULL, 'https://api.pandarobot.chat/', 'sk-cdBlIaZcufccm2RaDe547cBd054d49C7B0782eCa72A0052b', 103, 1, '2025-04-03 07:27:54', 1, '2025-04-03 07:27:54', 'text-embedding-3-small');
-INSERT INTO `chat_model` (`id`, `tenant_id`, `category`, `model_name`, `model_describe`, `model_price`, `model_type`, `model_show`, `system_prompt`, `api_host`, `api_key`, `create_dept`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (1907576007017066497, '000000', 'vector', 'quentinz/bge-large-zh-v1.5', 'bge-large-zh-v1.5', 0, '2', '0', NULL, 'http://127.0.0.1:11434/', 'cdBlIaZcufccm2RaDe547cBd054d49C7B0782eCa72A0052b', 103, 1, '2025-04-03 07:28:56', 1, '2025-04-03 07:28:56', 'bge-large-zh-v1.5');
-INSERT INTO `chat_model` (`id`, `tenant_id`, `category`, `model_name`, `model_describe`, `model_price`, `model_type`, `model_show`, `system_prompt`, `api_host`, `api_key`, `create_dept`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (1907576806191362049, '000000', 'vector', 'nomic-embed-text', 'nomic-embed-text', 0, '2', '0', NULL, 'http://127.0.0.1:11434/', 'nomic-embed-text', 103, 1, '2025-04-03 07:32:06', 1, '2025-04-03 07:32:06', 'nomic-embed-text');
-INSERT INTO `chat_model` (`id`, `tenant_id`, `category`, `model_name`, `model_describe`, `model_price`, `model_type`, `model_show`, `system_prompt`, `api_host`, `api_key`, `create_dept`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (1907577073490161665, '000000', 'vector', 'snowflake-arctic-embed', 'snowflake-arctic-embed', 0, '2', '0', NULL, 'http://127.0.0.1:11434/', 'snowflake-arctic-embed', 103, 1, '2025-04-03 07:33:10', 1, '2025-04-03 07:33:10', 'snowflake-arctic-embed');
--- a/docker-deploy/one-step-script/mysql-init/03_update_20250505.sql
+++ b/docker-deploy/one-step-script/mysql-init/03_update_20250505.sql
@@ -1,42 +0,0 @@
-/*
- Navicat MySQL Data Transfer
-
- Source Server         : 129.211.24.7
- Source Server Type    : MySQL
- Source Server Version : 50744
- Source Host           : 129.211.24.7:3306
- Source Schema         : ry-vue
-
- Target Server Type    : MySQL
- Target Server Version : 50744
- File Encoding         : 65001
-
- Date: 05/05/2025 15:01:08
-*/
-
-SET NAMES utf8mb4;
-SET FOREIGN_KEY_CHECKS = 0;
-
-- ----------------------------
-- Table structure for chat_session
-- ----------------------------
-DROP TABLE IF EXISTS `chat_session`;
-CREATE TABLE `chat_session`  (
-  `id` bigint(20) NOT NULL COMMENT '主键',
-  `user_id` bigint(20) NULL DEFAULT NULL COMMENT '用户id',
-  `session_title` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '会话标题',
-  `session_content` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '会话内容',
-  `create_dept` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '部门',
-  `create_by` bigint(20) NULL DEFAULT NULL COMMENT '创建者',
-  `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
-  `update_by` bigint(20) NULL DEFAULT NULL COMMENT '更新者',
-  `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
-  `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注',
-  PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '会话管理' ROW_FORMAT = Dynamic;
-
-SET FOREIGN_KEY_CHECKS = 1;
-
-ALTER TABLE `chat_message`
-    ADD COLUMN `session_id` bigint(20) NULL COMMENT '会话id' AFTER `id`;
-
--- a/docker-deploy/one-step-script/mysql-init/04_update_20250509.sql
+++ b/docker-deploy/one-step-script/mysql-init/04_update_20250509.sql
@@ -1,4 +0,0 @@
-ALTER TABLE `chat_model`
-    ADD COLUMN `api_url` varchar(50) NULL COMMENT '请求后缀' AFTER `api_key`;
-
-INSERT INTO `chat_config` (`id`, `category`, `config_name`, `config_value`, `config_dict`, `create_dept`, `create_time`, `create_by`, `update_by`, `update_time`, `remark`, `version`, `del_flag`, `update_ip`, `tenant_id`) VALUES (1779450794872414211, 'chat', 'apiUrl', 'v1/chat/completions', 'API 请求后缀', 103, '2024-04-14 18:05:05', '1', '1', '2025-04-23 22:29:04', NULL, NULL, '0', NULL, 0);
--- a/image/08.png
+++ b/image/08.png
--- a/image/09.png
+++ b/image/09.png
--- a/image/10.png
+++ b/image/10.png
--- a/image/11.png
+++ b/image/11.png
--- a/pom.xml
+++ b/pom.xml
@@ -54,10 +54,6 @@
        <maven-compiler-plugin.verison>3.11.0</maven-compiler-plugin.verison>
        <maven-surefire-plugin.version>3.0.0</maven-surefire-plugin.version>
        <flatten-maven-plugin.version>1.3.0</flatten-maven-plugin.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-cp.version>4.6.0</weixin-java-cp.version>
-        <weixin-java-cp.version>4.6.0</weixin-java-cp.version>
    </properties>

    <profiles>
@@ -336,13 +332,6 @@
                <artifactId>ruoyi-generator</artifactId>
                <version>${revision}</version>
            </dependency>
-
-            <dependency>
-                <groupId>org.ruoyi</groupId>
-                <artifactId>ruoyi-wechat</artifactId>
-                <version>${revision}</version>
-            </dependency>
-
        </dependencies>
    </dependencyManagement>

--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -57,11 +57,6 @@
            <artifactId>ruoyi-generator</artifactId>
        </dependency>

-        <dependency>
-            <groupId>org.ruoyi</groupId>
-            <artifactId>ruoyi-wechat</artifactId>
-        </dependency>
-
    </dependencies>

    <build>
--- a/ruoyi-admin/src/main/java/org/ruoyi/controller/AuthController.java
+++ b/ruoyi-admin/src/main/java/org/ruoyi/controller/AuthController.java
@@ -2,21 +2,16 @@ package org.ruoyi.controller;

 import cn.dev33.satoken.annotation.SaIgnore;
 import cn.hutool.core.collection.CollUtil;
+import jakarta.servlet.http.HttpServletRequest;
+import lombok.RequiredArgsConstructor;
 import org.ruoyi.common.core.constant.Constants;
 import org.ruoyi.common.core.domain.R;
-import org.ruoyi.common.core.domain.model.EmailLoginBody;
-import org.ruoyi.common.core.domain.model.LoginBody;
-import org.ruoyi.common.core.domain.model.RegisterBody;
-import org.ruoyi.common.core.domain.model.SmsLoginBody;
-import org.ruoyi.common.core.domain.model.VisitorLoginBody;
+import org.ruoyi.common.core.domain.model.*;
 import org.ruoyi.common.core.utils.MapstructUtils;
 import org.ruoyi.common.core.utils.StreamUtils;
 import org.ruoyi.common.core.utils.StringUtils;
 import org.ruoyi.common.satoken.utils.LoginHelper;
 import org.ruoyi.common.tenant.helper.TenantHelper;
-
-import jakarta.servlet.http.HttpServletRequest;
-import lombok.RequiredArgsConstructor;
 import org.ruoyi.system.domain.bo.SysTenantBo;
 import org.ruoyi.system.domain.vo.LoginTenantVo;
 import org.ruoyi.system.domain.vo.LoginVo;
--- a/ruoyi-admin/src/main/java/org/ruoyi/controller/CaptchaController.java
+++ b/ruoyi-admin/src/main/java/org/ruoyi/controller/CaptchaController.java
@@ -67,7 +67,7 @@ public class CaptchaController {
        String key = GlobalConstants.CAPTCHA_CODE_KEY + phonenumber;
        String code = RandomUtil.randomNumbers(4);
        RedisUtils.setCacheObject(key, code, Duration.ofMinutes(Constants.CAPTCHA_EXPIRATION));
-        // 验证码模板id 自行处理 (查数据库或写死均可)
+        // 验证码模板id
        String templateId = "";
        Map<String, String> map = new HashMap<>(1);
        map.put("code", code);
--- a/ruoyi-admin/src/main/resources/application-dev.yml
+++ b/ruoyi-admin/src/main/resources/application-dev.yml
@@ -1,12 +1,3 @@
--- # 监控中心配置
-spring.boot.admin.client:
-  # 增加客户端开关
-  enabled: false
-  url: http://localhost:9090/admin
-  instance:
-    service-host-type: IP
-  username: ruoyi
-  password: 123456

 --- # 数据源配置
 spring:
@@ -27,7 +18,7 @@ spring:
          driverClassName: com.mysql.cj.jdbc.Driver
          url: jdbc:mysql://127.0.0.1:3306/ruoyi-ai?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
          username: ruoyi-ai
-          password: xxx
+          password: ruoyi-ai

      hikari:
        # 最大连接池数量
@@ -94,11 +85,4 @@ sms:
  # 腾讯专用
  sdkAppId:

-pdf:
-  extract:
-    service:
-      url: http://localhost:8080
-    ai-api:
-      url: https://api.pandarobot.chat/v1/chat/completions
-      key: sk-xxxx

--- a/ruoyi-admin/src/main/resources/application-prod.yml
+++ b/ruoyi-admin/src/main/resources/application-prod.yml
@@ -1,182 +0,0 @@
--- # 临时文件存储位置 避免临时文件被系统清理报错
-spring.servlet.multipart.location: /ruoyi/server/temp
-
--- # 监控中心配置
-spring.boot.admin.client:
-  # 增加客户端开关
-  enabled: false
-  url: http://localhost:9090/admin
-  instance:
-    service-host-type: IP
-  username: ruoyi
-  password: 123456
-
--- # xxl-job 配置
-xxl.job:
-  # 执行器开关
-  enabled: false
-  # 调度中心地址：如调度中心集群部署存在多个地址则用逗号分隔。
-  admin-addresses: http://localhost:9100/xxl-job-admin
-  # 执行器通讯TOKEN：非空时启用
-  access-token: xxl-job
-  executor:
-    # 执行器AppName：执行器心跳注册分组依据；为空则关闭自动注册
-    appname: xxl-job-executor
-    # 执行器端口号 执行器从9101开始往后写
-    port: 9101
-    # 执行器注册：默认IP:PORT
-    address:
-    # 执行器IP：默认自动获取IP
-    ip:
-    # 执行器运行日志文件存储磁盘路径
-    logpath: ./logs/xxl-job
-    # 执行器日志文件保存天数：大于3生效
-    logretentiondays: 30
-
--- # 数据源配置
-spring:
-  datasource:
-    type: com.zaxxer.hikari.HikariDataSource
-    # 动态数据源文档 https://www.kancloud.cn/tracy5546/dynamic-datasource/content
-    dynamic:
-      # 性能分析插件(有性能损耗 不建议生产环境使用)
-      p6spy: false
-      # 设置默认的数据源或者数据源组,默认值即为 master
-      primary: master
-      # 严格模式 匹配不到数据源则报错
-      strict: true
-      datasource:
-        # 主库数据源
-        master:
-          type: ${spring.datasource.type}
-          driverClassName: com.mysql.cj.jdbc.Driver
-          # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562
-          # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题)
-          url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
-          username: root
-          password: root
-        # 从库数据源
-        slave:
-          lazy: true
-          type: ${spring.datasource.type}
-          driverClassName: com.mysql.cj.jdbc.Driver
-          url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
-          username:
-          password:
-#        oracle:
-#          type: ${spring.datasource.type}
-#          driverClassName: oracle.jdbc.OracleDriver
-#          url: jdbc:oracle:thin:@//localhost:1521/XE
-#          username: ROOT
-#          password: root
-#          hikari:
-#            connectionTestQuery: SELECT 1 FROM DUAL
-#        postgres:
-#          type: ${spring.datasource.type}
-#          driverClassName: org.postgresql.Driver
-#          url: jdbc:postgresql://localhost:5432/postgres?useUnicode=true&characterEncoding=utf8&useSSL=true&autoReconnect=true&reWriteBatchedInserts=true
-#          username: root
-#          password: root
-#        sqlserver:
-#          type: ${spring.datasource.type}
-#          driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
-#          url: jdbc:sqlserver://localhost:1433;DatabaseName=tempdb;SelectMethod=cursor;encrypt=false;rewriteBatchedStatements=true
-#          username: SA
-#          password: root
-      hikari:
-        # 最大连接池数量
-        maxPoolSize: 20
-        # 最小空闲线程数量
-        minIdle: 10
-        # 配置获取连接等待超时的时间
-        connectionTimeout: 30000
-        # 校验超时时间
-        validationTimeout: 5000
-        # 空闲连接存活最大时间，默认10分钟
-        idleTimeout: 600000
-        # 此属性控制池中连接的最长生命周期，值0表示无限生命周期，默认30分钟
-        maxLifetime: 1800000
-        # 连接测试query（配置检测连接是否有效）
-        connectionTestQuery: SELECT 1
-        # 多久检查一次连接的活性
-        keepaliveTime: 30000
-
--- # redis 单机配置(单机与集群只能开启一个另一个需要注释掉)
-spring.data:
-  redis:
-    # 地址
-    host: localhost
-    # 端口，默认为6379
-    port: 6379
-    # 数据库索引
-    database: 0
-    # 密码(如没有密码请注释掉)
-    # password:
-    # 连接超时时间
-    timeout: 10s
-    # 是否开启ssl
-    ssl: false
-
-redisson:
-  # redis key前缀
-  keyPrefix:
-  # 线程池数量
-  threads: 16
-  # Netty线程池数量
-  nettyThreads: 32
-  # 单节点配置
-  singleServerConfig:
-    # 客户端名称
-    clientName: ${ruoyi.name}
-    # 最小空闲连接数
-    connectionMinimumIdleSize: 32
-    # 连接池大小
-    connectionPoolSize: 64
-    # 连接空闲超时，单位：毫秒
-    idleConnectionTimeout: 10000
-    # 命令等待超时，单位：毫秒
-    timeout: 3000
-    # 发布和订阅连接池大小
-    subscriptionConnectionPoolSize: 50
-
--- # mail 邮件发送
-mail:
-  enabled: false
-  host: smtp.163.com
-  port: 465
-  # 是否需要用户名密码验证
-  auth: true
-  # 发送方，遵循RFC-822标准
-  from: xxx@163.com
-  # 用户名（注意：如果使用foxmail邮箱，此处user为qq号）
-  user: xxx@163.com
-  # 密码（注意，某些邮箱需要为SMTP服务单独设置密码，详情查看相关帮助）
-  pass: xxxxxxxxxx
-  # 使用 STARTTLS安全连接，STARTTLS是对纯文本通信协议的扩展。
-  starttlsEnable: true
-  # 使用SSL安全连接
-  sslEnable: true
-  # SMTP超时时长，单位毫秒，缺省值不超时
-  timeout: 0
-  # Socket连接超时值，单位毫秒，缺省值不超时
-  connectionTimeout: 0
-
--- # sms 短信
-sms:
-  enabled: false
-  # 阿里云 dysmsapi.aliyuncs.com
-  # 腾讯云 sms.tencentcloudapi.com
-  endpoint: "dysmsapi.aliyuncs.com"
-  accessKeyId: xxxxxxx
-  accessKeySecret: xxxxxx
-  signName: 测试
-  # 腾讯专用
-  sdkAppId:
-
-pdf:
-  extract:
-    service:
-      url: http://localhost:8080
-    ai-api:
-      url: https://api.pandarobot.chat/v1/chat/completions
-      key: sk-XXXXXX
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -120,6 +120,8 @@ sa-token:
 security:
  # 排除路径
  excludes:
+    # 获取模型信息
+    - /system/model/modelList
    # 支付回调
    - /pay/returnUrl
    - /pay/notifyUrl
@@ -128,7 +130,9 @@ security:
    # 重置密码
    - /auth/reset/password
    # 聊天接口
-    - /chat
+    - /chat/send
+    # 文件上传
+    - /chat/upload
    # 静态资源
    - /*.html
    - /**/*.html
@@ -291,26 +295,6 @@ websocket:
  # 设置访问源地址
  allowedOrigins: '*'

-# 微信小程序配置信息
-wx:
-  miniapp:
-    configs:
-      - appid: # 你的appid
-        secret: # 你的secret
-        token: #微信小程序消息服务器配置的token
-        aesKey: #微信小程序消息服务器配置的EncodingAESKey
-        msgDataFormat: JSON
-
-  #  企业微信应用
-wechat:
-  cp:
-    corpId:
-    appConfigs:
-      - agentId:
-        secret: ''
-        token:   ''
-        aesKey: ''
-
 spring:
  ai:
    openai:
--- a/ruoyi-common/ruoyi-common-chat/src/main/java/org/ruoyi/common/chat/listener/WebSocketEventListener.java
+++ b/ruoyi-common/ruoyi-common-chat/src/main/java/org/ruoyi/common/chat/listener/WebSocketEventListener.java
@@ -7,9 +7,7 @@ import okhttp3.Response;
 import okhttp3.ResponseBody;
 import okhttp3.sse.EventSource;
 import okhttp3.sse.EventSourceListener;
-import org.ruoyi.common.chat.constant.OpenAIConst;
 import org.ruoyi.common.chat.entity.chat.ChatCompletionResponse;
-import org.ruoyi.common.chat.entity.chat.Message;
 import org.springframework.web.socket.TextMessage;
 import org.springframework.web.socket.WebSocketSession;

@@ -63,7 +61,7 @@ public class WebSocketEventListener extends EventSourceListener {
            delta = mapper.writeValueAsString(completionResponse.getChoices().get(0).getDelta());
        }catch (Exception e){
            log.error("转换失败{}",e.getMessage());
-        }   
+        }
        session.sendMessage(new TextMessage(delta));
    }

--- a/ruoyi-common/ruoyi-common-chat/src/main/java/org/ruoyi/common/chat/openai/OpenAiClient.java
+++ b/ruoyi-common/ruoyi-common-chat/src/main/java/org/ruoyi/common/chat/openai/OpenAiClient.java
@@ -10,6 +10,7 @@ import okhttp3.MediaType;
 import okhttp3.MultipartBody;
 import okhttp3.OkHttpClient;
 import okhttp3.RequestBody;
+import org.jetbrains.annotations.NotNull;
 import org.ruoyi.common.chat.constant.OpenAIConst;
 import org.ruoyi.common.chat.entity.billing.BillingUsage;
 import org.ruoyi.common.chat.entity.billing.Subscription;
@@ -45,7 +46,6 @@ import org.ruoyi.common.chat.openai.interceptor.OpenAiAuthInterceptor;
 import org.ruoyi.common.chat.openai.plugin.PluginAbstract;
 import org.ruoyi.common.chat.openai.plugin.PluginParam;
 import org.ruoyi.common.core.exception.base.BaseException;
-import org.jetbrains.annotations.NotNull;
 import retrofit2.Retrofit;
 import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory;
 import retrofit2.converter.jackson.JacksonConverterFactory;
--- a/ruoyi-common/ruoyi-common-chat/src/main/java/org/ruoyi/common/chat/openai/OpenAiStreamClient.java
+++ b/ruoyi-common/ruoyi-common-chat/src/main/java/org/ruoyi/common/chat/openai/OpenAiStreamClient.java
@@ -13,6 +13,7 @@ import okhttp3.*;
 import okhttp3.sse.EventSource;
 import okhttp3.sse.EventSourceListener;
 import okhttp3.sse.EventSources;
+import org.jetbrains.annotations.NotNull;
 import org.ruoyi.common.chat.constant.OpenAIConst;
 import org.ruoyi.common.chat.entity.Tts.TextToSpeech;
 import org.ruoyi.common.chat.entity.billing.BillingUsage;
@@ -27,7 +28,6 @@ import org.ruoyi.common.chat.entity.images.ImageResponse;
 import org.ruoyi.common.chat.entity.models.Model;
 import org.ruoyi.common.chat.entity.models.ModelResponse;
 import org.ruoyi.common.chat.entity.whisper.Transcriptions;
-import org.ruoyi.common.chat.entity.whisper.Translations;
 import org.ruoyi.common.chat.entity.whisper.WhisperResponse;
 import org.ruoyi.common.chat.openai.exception.CommonError;
 import org.ruoyi.common.chat.openai.function.KeyRandomStrategy;
@@ -40,7 +40,6 @@ import org.ruoyi.common.chat.openai.plugin.PluginParam;
 import org.ruoyi.common.chat.sse.DefaultPluginListener;
 import org.ruoyi.common.chat.sse.PluginListener;
 import org.ruoyi.common.core.exception.base.BaseException;
-import org.jetbrains.annotations.NotNull;
 import retrofit2.Call;
 import retrofit2.Retrofit;
 import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory;
@@ -145,13 +144,15 @@ public class OpenAiStreamClient {
                .build();
        }
        okHttpClient = builder.okHttpClient;
+        if (apiHost.endsWith("/")) {
+            this.openAiApi = new Retrofit.Builder()
+                    .baseUrl(apiHost)
+                    .client(okHttpClient)
+                    .addCallAdapterFactory(RxJava2CallAdapterFactory.create())
+                    .addConverterFactory(JacksonConverterFactory.create())
+                    .build().create(OpenAiApi.class);
+        }

-//        this.openAiApi = new Retrofit.Builder()
-//            .baseUrl(apiHost)
-//            .client(okHttpClient)
-//            .addCallAdapterFactory(RxJava2CallAdapterFactory.create())
-//            .addConverterFactory(JacksonConverterFactory.create())
-//            .build().create(OpenAiApi.class);
    }

    /**
--- a/ruoyi-common/ruoyi-common-chat/src/main/java/org/ruoyi/common/chat/request/ChatRequest.java
+++ b/ruoyi-common/ruoyi-common-chat/src/main/java/org/ruoyi/common/chat/request/ChatRequest.java
@@ -36,16 +36,6 @@ public class ChatRequest {
     */
    private Boolean stream = Boolean.TRUE;

-    /**
-     *  是否开启联网搜索(0关闭 1开启)
-     */
-    private Boolean search = Boolean.FALSE;
-
-    /**
-     *  是否开启mcp
-     */
-    private Boolean isMcp = Boolean.FALSE;
-
    /**
     * 知识库id
     */
@@ -56,7 +46,6 @@ public class ChatRequest {
     */
    private Long userId;

-
    /**
     * 会话id
     */
@@ -72,16 +61,4 @@ public class ChatRequest {
     */
    private String role;

-
-    /**
-     * 上下文的条数
-     */
-    private Integer contentNumber = 10;
-
-    /**
-     * 是否携带上下文
-     */
-    private Boolean usingContext = Boolean.TRUE;
-
-
 }
--- a/ruoyi-common/ruoyi-common-chat/src/main/java/org/ruoyi/common/chat/sse/DefaultPluginListener.java
+++ b/ruoyi-common/ruoyi-common-chat/src/main/java/org/ruoyi/common/chat/sse/DefaultPluginListener.java
@@ -1,7 +1,6 @@
 package org.ruoyi.common.chat.sse;

 import lombok.extern.slf4j.Slf4j;
-
 import okhttp3.sse.EventSourceListener;
 import org.ruoyi.common.chat.entity.chat.ChatCompletion;
 import org.ruoyi.common.chat.openai.OpenAiStreamClient;
--- a/ruoyi-common/ruoyi-common-chat/src/main/java/org/ruoyi/common/chat/utils/TikTokensUtil.java
+++ b/ruoyi-common/ruoyi-common-chat/src/main/java/org/ruoyi/common/chat/utils/TikTokensUtil.java
@@ -7,10 +7,10 @@ import com.knuddels.jtokkit.api.EncodingRegistry;
 import com.knuddels.jtokkit.api.EncodingType;
 import com.knuddels.jtokkit.api.ModelType;
 import lombok.extern.slf4j.Slf4j;
+import org.jetbrains.annotations.NotNull;
 import org.ruoyi.common.chat.entity.chat.ChatCompletion;
 import org.ruoyi.common.chat.entity.chat.FunctionCall;
 import org.ruoyi.common.chat.entity.chat.Message;
-import org.jetbrains.annotations.NotNull;

 import java.util.*;

--- a/ruoyi-common/ruoyi-common-core/pom.xml
+++ b/ruoyi-common/ruoyi-common-core/pom.xml
@@ -82,24 +82,6 @@
            <artifactId>ip2region</artifactId>
        </dependency>

-        <dependency>
-            <groupId>com.github.binarywang</groupId>
-            <artifactId>weixin-java-cp</artifactId>
-            <version>${weixin-java-cp.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.github.binarywang</groupId>
-            <artifactId>weixin-java-miniapp</artifactId>
-            <version>${weixin-java-miniapp.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.github.binarywang</groupId>
-            <artifactId>weixin-java-pay</artifactId>
-            <version>${weixin-java-pay.version}</version>
-        </dependency>
-
        <!-- JSON工具类 -->
        <dependency>
            <groupId>com.fasterxml.jackson.core</groupId>
--- a/ruoyi-common/ruoyi-common-core/src/main/java/org/ruoyi/common/core/factory/RegexPatternPoolFactory.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/ruoyi/common/core/factory/RegexPatternPoolFactory.java
@@ -3,7 +3,6 @@ package org.ruoyi.common.core.factory;
 import cn.hutool.core.lang.PatternPool;
 import org.ruoyi.common.core.constant.RegexConstants;

-
 import java.util.regex.Pattern;

 /**
--- a/ruoyi-common/ruoyi-common-core/src/main/java/org/ruoyi/common/core/utils/ip/RegionUtils.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/ruoyi/common/core/utils/ip/RegionUtils.java
@@ -4,9 +4,9 @@ import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.io.resource.ClassPathResource;
 import cn.hutool.core.util.ObjectUtil;
 import lombok.extern.slf4j.Slf4j;
+import org.lionsoul.ip2region.xdb.Searcher;
 import org.ruoyi.common.core.exception.ServiceException;
 import org.ruoyi.common.core.utils.file.FileUtils;
-import org.lionsoul.ip2region.xdb.Searcher;

 import java.io.File;

--- a/ruoyi-common/ruoyi-common-mail/src/main/java/org/ruoyi/common/mail/config/MailConfig.java
+++ b/ruoyi-common/ruoyi-common-mail/src/main/java/org/ruoyi/common/mail/config/MailConfig.java
@@ -25,10 +25,8 @@ public class MailConfig {

    @Bean
    public MailAccount mailAccount() {
-        if (account == null) {
-            account = new MailAccount();
-            updateMailAccount();
-        }
+        account = new MailAccount();
+        updateMailAccount();
        return account;
    }

--- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/ruoyi/config/MybatisPlusConfig.java
+++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/ruoyi/config/MybatisPlusConfig.java
@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.inner.OptimisticLockerInnerInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.inner.TenantLineInnerInterceptor;
+import org.mybatis.spring.annotation.MapperScan;
 import org.ruoyi.aspect.DataPermissionAspect;
 import org.ruoyi.common.core.factory.YmlPropertySourceFactory;
 import org.ruoyi.common.core.utils.SpringUtils;
@@ -16,7 +17,6 @@ import org.ruoyi.handler.InjectionMetaObjectHandler;
 import org.ruoyi.handler.MybatisExceptionHandler;
 import org.ruoyi.handler.PlusPostInitTableInfoHandler;
 import org.ruoyi.interceptor.PlusDataPermissionInterceptor;
-import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.beans.BeansException;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.PropertySource;
--- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/ruoyi/core/mapper/BaseMapperPlus.java
+++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/ruoyi/core/mapper/BaseMapperPlus.java
@@ -14,7 +14,6 @@ import org.apache.ibatis.logging.LogFactory;
 import org.ruoyi.common.core.utils.MapstructUtils;
 import org.ruoyi.common.core.utils.StreamUtils;

-
 import java.io.Serializable;
 import java.util.Collection;
 import java.util.List;
--- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/ruoyi/handler/InjectionMetaObjectHandler.java
+++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/ruoyi/handler/InjectionMetaObjectHandler.java
@@ -11,7 +11,6 @@ import org.ruoyi.common.core.utils.ObjectUtils;
 import org.ruoyi.common.satoken.utils.LoginHelper;
 import org.ruoyi.core.domain.BaseEntity;

-
 import java.util.Date;

 /**
--- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/ruoyi/handler/MybatisExceptionHandler.java
+++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/ruoyi/handler/MybatisExceptionHandler.java
@@ -2,7 +2,6 @@ package org.ruoyi.handler;

 import jakarta.servlet.http.HttpServletRequest;
 import lombok.extern.slf4j.Slf4j;
-
 import org.mybatis.spring.MyBatisSystemException;
 import org.ruoyi.common.core.domain.R;
 import org.ruoyi.common.core.utils.StringUtils;
--- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/ruoyi/handler/PlusDataPermissionHandler.java
+++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/ruoyi/handler/PlusDataPermissionHandler.java
@@ -11,7 +11,6 @@ import net.sf.jsqlparser.expression.operators.conditional.AndExpression;
 import net.sf.jsqlparser.expression.operators.relational.ParenthesedExpressionList;
 import net.sf.jsqlparser.parser.CCJSqlParserUtil;
 import org.apache.ibatis.io.Resources;
-
 import org.ruoyi.annotation.DataColumn;
 import org.ruoyi.annotation.DataPermission;
 import org.ruoyi.common.core.domain.dto.RoleDTO;
@@ -23,7 +22,6 @@ import org.ruoyi.common.core.utils.StringUtils;
 import org.ruoyi.common.satoken.utils.LoginHelper;
 import org.ruoyi.enums.DataScopeType;
 import org.ruoyi.helper.DataPermissionHelper;
-
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.expression.BeanFactoryResolver;
 import org.springframework.core.io.Resource;
--- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/ruoyi/helper/DataBaseHelper.java
+++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/ruoyi/helper/DataBaseHelper.java
@@ -4,7 +4,6 @@ import cn.hutool.core.convert.Convert;
 import com.baomidou.dynamic.datasource.DynamicRoutingDataSource;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
-
 import org.ruoyi.common.core.exception.ServiceException;
 import org.ruoyi.common.core.utils.SpringUtils;
 import org.ruoyi.enums.DataBaseType;
--- a/ruoyi-common/ruoyi-common-pay/pom.xml
+++ b/ruoyi-common/ruoyi-common-pay/pom.xml
@@ -32,12 +32,6 @@
            <version>${zxing.version}</version>
        </dependency>

-
-        <dependency>
-            <groupId>com.stripe</groupId>
-            <artifactId>stripe-java</artifactId>
-            <version>${stripe.version}</version>
-        </dependency>
    </dependencies>

 </project>
--- a/ruoyi-common/ruoyi-common-pay/src/main/java/org/ruoyi/common/config/PayInit.java
+++ b/ruoyi-common/ruoyi-common-pay/src/main/java/org/ruoyi/common/config/PayInit.java
@@ -1,12 +1,10 @@
 package org.ruoyi.common.config;

-import org.ruoyi.common.core.service.ConfigService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.ruoyi.common.core.service.ConfigService;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Scope;
-import org.springframework.scheduling.annotation.Scheduled;

 /**
 * 支付配置信息
--- a/ruoyi-common/ruoyi-common-pay/src/main/java/org/ruoyi/common/config/WxPayConfiguration.java
+++ b/ruoyi-common/ruoyi-common-pay/src/main/java/org/ruoyi/common/config/WxPayConfiguration.java
@@ -1,47 +0,0 @@
-package org.ruoyi.common.config;
-
-import com.github.binarywang.wxpay.config.WxPayConfig;
-import com.github.binarywang.wxpay.service.WxPayService;
-import com.github.binarywang.wxpay.service.impl.WxPayServiceImpl;
-
-import org.ruoyi.common.core.service.ConfigService;
-import jakarta.annotation.PostConstruct;
-import lombok.RequiredArgsConstructor;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * @author Binary Wang
- */
-@Configuration
-@RequiredArgsConstructor
-public class WxPayConfiguration {
-
-    private final ConfigService configService;
-
-    private WxPayService wxPayService;
-
-    @PostConstruct
-    public void init() {
-        WxPayConfig payConfig = new WxPayConfig();
-        payConfig.setAppId(StringUtils.trimToNull(getKey("appId")));
-        payConfig.setMchId(StringUtils.trimToNull(getKey("mchId")));
-        payConfig.setMchKey(StringUtils.trimToNull(getKey("appSecret")));
-        payConfig.setUseSandboxEnv(false);
-        wxPayService = new WxPayServiceImpl();
-        wxPayService.setConfig(payConfig);
-    }
-
-    @Bean
-    @ConditionalOnMissingBean
-    public WxPayService wxService() {
-        return wxPayService;
-    }
-
-    public String getKey(String key) {
-        return configService.getConfigValue("weixin", key);
-    }
-
-}
--- a/ruoyi-common/ruoyi-common-pay/src/main/java/org/ruoyi/common/listener/ConfigChangeListener.java
+++ b/ruoyi-common/ruoyi-common-pay/src/main/java/org/ruoyi/common/listener/ConfigChangeListener.java
@@ -1,37 +0,0 @@
-package org.ruoyi.common.listener;
-
-import com.github.binarywang.wxpay.config.WxPayConfig;
-import com.github.binarywang.wxpay.service.WxPayService;
-import org.ruoyi.common.core.event.ConfigChangeEvent;
-import org.ruoyi.common.core.service.ConfigService;
-import org.ruoyi.common.core.utils.StringUtils;
-import org.jetbrains.annotations.NotNull;
-import org.springframework.context.ApplicationListener;
-import org.springframework.stereotype.Component;
-
-/**
- *  创建一个监听器，用于处理配置变化事件
- *
- * @author ageerle@163.com
- * date 2024/5/19
- */
-@Component
-public class ConfigChangeListener implements ApplicationListener<ConfigChangeEvent> {
-    private final WxPayService wxPayService;
-    private final ConfigService configService;
-
-    public ConfigChangeListener(WxPayService wxPayService, ConfigService configService) {
-        this.wxPayService = wxPayService;
-        this.configService = configService;
-    }
-
-    @Override
-    public void onApplicationEvent(@NotNull ConfigChangeEvent event) {
-        WxPayConfig newConfig = new WxPayConfig();
-        newConfig.setAppId(StringUtils.trimToNull(configService.getConfigValue("weixin", "appId")));
-        newConfig.setMchId(StringUtils.trimToNull(configService.getConfigValue("weixin", "mchId")));
-        newConfig.setMchKey(StringUtils.trimToNull(configService.getConfigValue("weixin", "mchKey")));
-        newConfig.setUseSandboxEnv(false);
-        wxPayService.setConfig(newConfig);
-    }
-}
--- a/ruoyi-common/ruoyi-common-pay/src/main/java/org/ruoyi/common/service/impl/PayServiceImpl.java
+++ b/ruoyi-common/ruoyi-common-pay/src/main/java/org/ruoyi/common/service/impl/PayServiceImpl.java
@@ -2,12 +2,11 @@ package org.ruoyi.common.service.impl;

 import cn.hutool.http.HttpUtil;
 import cn.hutool.json.JSONObject;
-
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.ruoyi.common.config.PayConfig;
 import org.ruoyi.common.service.PayService;
 import org.ruoyi.common.utils.MD5Util;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

 import java.util.HashMap;
--- a/ruoyi-common/ruoyi-common-ratelimiter/src/main/java/org/ruoyi/common/ratelimiter/aspectj/RateLimiterAspect.java
+++ b/ruoyi-common/ruoyi-common-ratelimiter/src/main/java/org/ruoyi/common/ratelimiter/aspectj/RateLimiterAspect.java
@@ -6,6 +6,7 @@ import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Before;
 import org.aspectj.lang.reflect.MethodSignature;
+import org.redisson.api.RateType;
 import org.ruoyi.common.core.constant.GlobalConstants;
 import org.ruoyi.common.core.exception.ServiceException;
 import org.ruoyi.common.core.utils.MessageUtils;
@@ -14,7 +15,6 @@ import org.ruoyi.common.core.utils.StringUtils;
 import org.ruoyi.common.ratelimiter.annotation.RateLimiter;
 import org.ruoyi.common.ratelimiter.enums.LimitType;
 import org.ruoyi.common.redis.utils.RedisUtils;
-import org.redisson.api.RateType;
 import org.springframework.core.DefaultParameterNameDiscoverer;
 import org.springframework.core.ParameterNameDiscoverer;
 import org.springframework.expression.EvaluationContext;
--- a/ruoyi-common/ruoyi-common-redis/src/main/java/org/ruoyi/common/redis/config/RedisConfig.java
+++ b/ruoyi-common/ruoyi-common-redis/src/main/java/org/ruoyi/common/redis/config/RedisConfig.java
@@ -2,12 +2,12 @@ package org.ruoyi.common.redis.config;

 import cn.hutool.core.util.ObjectUtil;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import org.ruoyi.common.redis.config.properties.RedissonProperties;
-import org.ruoyi.common.redis.handler.KeyPrefixHandler;
-import org.ruoyi.common.redis.manager.PlusSpringCacheManager;
 import lombok.extern.slf4j.Slf4j;
 import org.redisson.codec.JsonJacksonCodec;
 import org.redisson.spring.starter.RedissonAutoConfigurationCustomizer;
+import org.ruoyi.common.redis.config.properties.RedissonProperties;
+import org.ruoyi.common.redis.handler.KeyPrefixHandler;
+import org.ruoyi.common.redis.manager.PlusSpringCacheManager;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
--- a/ruoyi-common/ruoyi-common-redis/src/main/java/org/ruoyi/common/redis/handler/KeyPrefixHandler.java
+++ b/ruoyi-common/ruoyi-common-redis/src/main/java/org/ruoyi/common/redis/handler/KeyPrefixHandler.java
@@ -1,7 +1,7 @@
 package org.ruoyi.common.redis.handler;

-import org.ruoyi.common.core.utils.StringUtils;
 import org.redisson.api.NameMapper;
+import org.ruoyi.common.core.utils.StringUtils;

 /**
 * redis缓存key前缀处理
--- a/ruoyi-common/ruoyi-common-redis/src/main/java/org/ruoyi/common/redis/manager/PlusSpringCacheManager.java
+++ b/ruoyi-common/ruoyi-common-redis/src/main/java/org/ruoyi/common/redis/manager/PlusSpringCacheManager.java
@@ -15,11 +15,11 @@
 */
 package org.ruoyi.common.redis.manager;

-import org.ruoyi.common.redis.utils.RedisUtils;
 import org.redisson.api.RMap;
 import org.redisson.api.RMapCache;
 import org.redisson.spring.cache.CacheConfig;
 import org.redisson.spring.cache.RedissonCache;
+import org.ruoyi.common.redis.utils.RedisUtils;
 import org.springframework.boot.convert.DurationStyle;
 import org.springframework.cache.Cache;
 import org.springframework.cache.CacheManager;
--- a/ruoyi-common/ruoyi-common-redis/src/main/java/org/ruoyi/common/redis/utils/CacheUtils.java
+++ b/ruoyi-common/ruoyi-common-redis/src/main/java/org/ruoyi/common/redis/utils/CacheUtils.java
@@ -1,9 +1,9 @@
 package org.ruoyi.common.redis.utils;

-import org.ruoyi.common.core.utils.SpringUtils;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 import org.redisson.api.RMap;
+import org.ruoyi.common.core.utils.SpringUtils;
 import org.springframework.cache.Cache;
 import org.springframework.cache.CacheManager;

--- a/ruoyi-common/ruoyi-common-redis/src/main/java/org/ruoyi/common/redis/utils/QueueUtils.java
+++ b/ruoyi-common/ruoyi-common-redis/src/main/java/org/ruoyi/common/redis/utils/QueueUtils.java
@@ -2,8 +2,8 @@ package org.ruoyi.common.redis.utils;

 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
-import org.ruoyi.common.core.utils.SpringUtils;
 import org.redisson.api.*;
+import org.ruoyi.common.core.utils.SpringUtils;

 import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
--- a/ruoyi-common/ruoyi-common-redis/src/main/java/org/ruoyi/common/redis/utils/RedisUtils.java
+++ b/ruoyi-common/ruoyi-common-redis/src/main/java/org/ruoyi/common/redis/utils/RedisUtils.java
@@ -2,8 +2,8 @@ package org.ruoyi.common.redis.utils;

 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
-import org.ruoyi.common.core.utils.SpringUtils;
 import org.redisson.api.*;
+import org.ruoyi.common.core.utils.SpringUtils;

 import java.time.Duration;
 import java.util.Collection;
--- a/ruoyi-common/ruoyi-common-security/src/main/java/org/ruoyi/common/security/handler/AllUrlHandler.java
+++ b/ruoyi-common/ruoyi-common-security/src/main/java/org/ruoyi/common/security/handler/AllUrlHandler.java
@@ -8,7 +8,10 @@ import org.springframework.web.method.HandlerMethod;
 import org.springframework.web.servlet.mvc.method.RequestMappingInfo;
 import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping;

-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;

--- a/ruoyi-common/ruoyi-common-tenant/src/main/java/org/ruoyi/common/tenant/config/TenantConfig.java
+++ b/ruoyi-common/ruoyi-common-tenant/src/main/java/org/ruoyi/common/tenant/config/TenantConfig.java
@@ -5,8 +5,10 @@ import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.inner.InnerInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.inner.TenantLineInnerInterceptor;
+import org.redisson.config.ClusterServersConfig;
+import org.redisson.config.SingleServerConfig;
+import org.redisson.spring.starter.RedissonAutoConfigurationCustomizer;
 import org.ruoyi.common.core.utils.reflect.ReflectUtils;
-
 import org.ruoyi.common.redis.config.RedisConfig;
 import org.ruoyi.common.redis.config.properties.RedissonProperties;
 import org.ruoyi.common.tenant.core.TenantSaTokenDao;
@@ -14,9 +16,6 @@ import org.ruoyi.common.tenant.handle.PlusTenantLineHandler;
 import org.ruoyi.common.tenant.handle.TenantKeyPrefixHandler;
 import org.ruoyi.common.tenant.manager.TenantSpringCacheManager;
 import org.ruoyi.common.tenant.properties.TenantProperties;
-import org.redisson.config.ClusterServersConfig;
-import org.redisson.config.SingleServerConfig;
-import org.redisson.spring.starter.RedissonAutoConfigurationCustomizer;
 import org.ruoyi.config.MybatisPlusConfig;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
ageerle	bd94a3eae8	Merge remote-tracking branch 'origin/main'	2025-05-27 17:55:44 +08:00
ageerle	fcdcf534f1	fix: 修复脱敏后的apikey也被更新了	2025-05-27 17:55:34 +08:00
lindaxia	deefb6cc0b	Merge branch 'main' of https://github.com/ageerle/ruoyi-ai	2025-05-26 22:45:18 +08:00
lindaxia	fa96c3d12f	feat: 更新deploy脚本	2025-05-26 22:43:54 +08:00
ageerle	77069fdecd	feat: 移除聊天、会话角色校验	2025-05-26 22:41:55 +08:00
ageerle	db4a264a52	Merge remote-tracking branch 'origin/main'	2025-05-26 22:40:17 +08:00
ageerle	70ae7ea8f1	feat: 向量库查询删除逻辑调整	2025-05-26 22:40:01 +08:00
lindaxia	6a93856d90	feat: 更新deploy脚本	2025-05-26 22:24:17 +08:00
lindaxia	71cae94815	Revert "lindaxia" This reverts commit `a2905d08f9`.	2025-05-26 22:20:51 +08:00
lindaxia	a2905d08f9	lindaxia feat: 更新deploy	2025-05-26 22:16:23 +08:00
ageerle	463ad6c583	Merge remote-tracking branch 'origin/main'	2025-05-26 12:56:45 +08:00
ageerle	abcde9e36e	refactor: 1. 移除图片附件模块 2. 优化import	2025-05-26 12:56:28 +08:00
ageerle	8e723f5b78	Update README.md	2025-05-26 10:21:09 +08:00
ageerle	2021fb5071	feat: 修改项目介绍	2025-05-26 10:15:19 +08:00
ageerle	ecbab7df7b	Update README.md	2025-05-26 10:10:00 +08:00
ageerle	d6fcaa0a11	Update README.md	2025-05-26 10:09:28 +08:00
ageerle	58faded4ff	Update README.md	2025-05-26 10:09:02 +08:00
ageerle	7cc7af70f0	Update README.md	2025-05-26 10:07:47 +08:00
ageerle	4312a729a2	feat: 会话管理返回创建时间	2025-05-26 09:32:53 +08:00
ageer	5d972d66f4	fix: 代码优化	2025-05-25 14:42:22 +08:00
ageerle	1bff2791a6	Merge pull request #108 from liudalian/20250520 集成国产大模型 ds、zhipu、qianwen	2025-05-25 14:36:23 +08:00
菩提取一叶	a76769e540	add:集成国产大模型 ds、zhipu、qianwen	2025-05-25 14:30:05 +08:00
ageer	bedffffd86	fix: 修复对话时无法上传文件	2025-05-24 23:59:40 +08:00
ageer	2884c37599	feat: 移除微信支付	2025-05-24 23:07:59 +08:00
ageer	c25749c9ca	feat: 更新sql脚本	2025-05-24 23:02:59 +08:00
ageer	147b3fd8f5	feat: 查询ppt apikey	2025-05-24 20:06:19 +08:00
ageerle	373424bd01	feat(更新日志): 更新日志 1. 移除个人微信模块 2. 移除直播模块 3. 移除gpts模块 4. 移除应用商店模块 5. 移除套餐管理模块 6. 移除兑换管理模块 ## 微信相关小程序相关功能迁移至企业版微信公众号/微信机器人迁移至企业版微信支付迁移至企业版 ## 功能模块智能体模块迁移至企业版插件管理改为MCP应用并迁移至企业版知识库： excel解析迁移至企业版 pdf图片解析迁移至企业版 milvus qdrant扩展迁移至企业版	2025-05-24 16:18:18 +08:00