commit b236048a24e5c17d7721d047606041a25f43fce5
Author: dev <182542500@qq.com>
Date:   Sun Feb 22 12:12:02 2026 +0800

    first commit

diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000..c328ada
Binary files /dev/null and b/.DS_Store differ
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..61a9f09
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,57 @@
+######################################################################
+# Build Tools
+
+.gradle
+/build/
+!gradle/wrapper/gradle-wrapper.jar
+
+target/
+!.mvn/wrapper/maven-wrapper.jar
+
+######################################################################
+# IDE
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### JRebel ###
+rebel.xml
+
+### NetBeans ###
+nbproject/private/
+build/*
+nbbuild/
+nbdist/
+.nb-gradle/
+
+### Visual Studio Code ###
+.vscode
+
+### TRAE  ###
+.trae
+
+######################################################################
+# Others
+*.log
+*.xml.versionsBackup
+*.swp
+
+!*/build/*.java
+!*/build/*.html
+!*/build/*.xml
+
+.flattened-pom.xml
+.flattened-pom *.xml
+
+logs/
\ No newline at end of file
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..49bf69a
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2025 pengles
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..c001e6a
--- /dev/null
+++ b/README.md
@@ -0,0 +1,687 @@
+# PoJie
+
+<div align="center">
+
+[![License](https://img.shields.io/badge/License-MIT-blue.svg)](https://gitee.com/dromara/RuoYi-Vue-Plus/blob/5.X/LICENSE)
+[![Spring Boot](https://img.shields.io/badge/Spring%20Boot-3.4.7-brightgreen.svg)](https://spring.io/projects/spring-boot)
+[![JDK-17](https://img.shields.io/badge/JDK-17-green.svg)](https://openjdk.org/projects/jdk/17/)
+[![JDK-21](https://img.shields.io/badge/JDK-21-green.svg)](https://openjdk.org/projects/jdk/21/)
+[![MyBatis-Plus](https://img.shields.io/badge/MyBatis--Plus-3.5.12-blue.svg)](https://baomidou.com/)
+[![Sa-Token](https://img.shields.io/badge/Sa--Token-1.44.0-orange.svg)](https://sa-token.cc/)
+[![LangChain4j](https://img.shields.io/badge/LangChain4j-0.36.2-purple.svg)](https://github.com/langchain4j/langchain4j)
+[![Spring AI](https://img.shields.io/badge/Spring%20AI-1.0.0--M5-green.svg)](https://spring.io/projects/spring-ai)
+
+
+*集成多种AI框架，提供统一的AI服务管理平台*
+
+[在线预览](#) · [使用文档](#) · [更新日志](#)
+
+</div>
+
+## 📖 平台简介
+
+**PoJie** 是一款基于 **Spring Boot 3.4.7** + **JDK 17/21** 的AI增强企业级快速开发平台，在 RuoYi-Vue-Plus 的基础上深度集成了多种AI框架和服务，打造统一的AI服务管理平台。
+
+### 🎯 核心特色
+
+- 🤖 **统一AI服务**：集成Spring AI、LangChain4j等主流AI框架，提供统一的AI服务接口
+- 🔌 **多Provider支持**：支持OpenAI、ChatGLM、通义千问、智谱AI等多种AI服务提供商
+- 💬 **智能对话**：支持单轮对话、多轮对话、流式响应和记忆管理
+- 📚 **知识库集成**：内置知识库服务，支持RAG（检索增强生成）
+- ⚖️ **智能编排**：多Provider负载均衡、故障转移和智能路由
+- 🛡️ **高可用性**：熔断器保护、限流控制、健康检查和自动重试
+- 📊 **AI监控**：实时性能监控、使用统计分析、成本追踪和质量评估
+- 🔐 **权限管理**：使用Sa-Token实现权限控制，支持多种认证方式
+- 🔗 **第三方登录**：集成JustAuth支持微信、钉钉等多种第三方认证
+- 💾 **数据库支持**：原生支持MySQL、Oracle、PostgreSQL、SQLServer等主流数据库
+- 🚀 **缓存优化**：使用Redisson作为Redis客户端，提供更丰富的分布式功能
+- 📈 **监控体系**：集成Spring Boot Admin，实现全方位监控
+- 🛠️ **代码生成**：提供智能化代码生成工具，支持多数据源
+- 💰 **支付集成**：内置支付宝、微信支付等主流支付方式
+
+## 功能特性
+
+### AI核心模块
+- **统一AI服务**：作为系统的AI大脑，统一管理和编排所有AI Provider
+- **多框架集成**：支持Spring AI、LangChain4j等主流AI框架
+- **智能对话**：单轮对话、多轮对话、流式响应、记忆管理
+- **知识库服务**：内置知识库，支持RAG检索增强生成
+- **AI Provider管理**：支持OpenAI、ChatGLM、通义千问、智谱AI等多种服务商
+- **智能编排**：负载均衡、故障转移、智能路由、并行处理
+- **AI监控**：实时性能监控、使用统计、成本追踪、质量评估
+
+### 系统核心模块
+- **系统管理（ruoyi-system）**：用户、角色、菜单、部门、字典等基础管理功能
+- **移动端模块（ruoyi-app）**：支持Web和移动端用户统一管理，提供移动端专用API
+- **权限控制**：基于Sa-Token的多维度权限管理体系，支持RBAC权限模型
+- **工作流（ruoyi-workflow）**：支持复杂的审批流程管理（Warm-Flow工作流引擎）
+- **文件存储**：集成MinIO实现分布式文件存储，支持多种OSS存储方式
+- **消息推送**：支持WebSocket和SSE实时消息推送
+- **聊天系统（ruoyi-chat）**：完整的聊天功能，支持AI助手集成、会话管理、消息历史
+
+### 业务模块
+- **商城模块（ruoyi-mall）**：完整的电商业务模块
+  - 商品中心：商品、SKU、分类、品牌、属性管理
+  - 交易中心：购物车、订单、售后管理
+  - 营销中心：活动、拼团、秒杀、砍价
+  - 优惠券中心：优惠券发放、核销、过期处理
+  - 统计中心：交易分析、会员分析
+- **支付模块（ruoyi-pay）**：集成支付宝、微信支付等主流支付方式
+- **微信公众号（ruoyi-mp）**：微信公众号开发支持
+
+### 开发工具
+- **代码生成器**：根据表结构一键生成CRUD代码
+- **Excel处理**：基于FastExcel实现高效的Excel操作
+- **日志监控**：完整的操作日志和登录日志记录
+- **接口文档**：使用SpringDoc自动生成API文档
+- **AI开发工具**：LangChain4j集成工具、AI服务测试工具
+
+### 安全特性
+- **数据脱敏**：敏感信息自动脱敏处理
+- **数据加密**：支持多种加密算法保障数据安全
+- **接口安全**：动态AES+RSA加密传输
+- **防重提交**：分布式环境下防重复提交
+- **XSS防护**：内置跨站脚本攻击防护
+- **AI安全**：API密钥安全管理、AI服务访问控制
+
+### 运维支持
+- **多数据源管理**：支持动态切换不同数据库
+- **邮件服务**：集成邮件发送功能
+- **短信服务**：支持多种短信平台
+- **定时任务**：分布式任务调度系统（SnailJob）
+- **系统监控**：实时监控服务状态和性能指标
+- **AI运维**：AI服务健康检查、性能监控、故障告警
+
+## 🏗️ 技术架构
+
+### 核心技术栈
+
+| 分类 | 技术 | 版本 | 说明 |
+|------|------|------|------|
+| **基础框架** | Spring Boot | 3.4.7 | 核心框架 |
+| **开发环境** | JDK | 17/21 | Java开发环境 |
+| **Web容器** | Undertow | - | 高性能Web容器 |
+| **权限认证** | Sa-Token | 1.44.0 | 轻量级权限框架 |
+| **ORM框架** | MyBatis-Plus | 3.5.12 | 持久层框架 |
+| **缓存中间件** | Redisson | 3.50.0 | Redis客户端 |
+| **数据库连接池** | HikariCP | - | 高性能连接池 |
+| **工具类库** | Hutool | 5.8.38 | Java工具包 |
+| **API文档** | SpringDoc | 2.8.8 | OpenAPI 3.0 |
+| **Excel处理** | FastExcel | 1.2.0 | 高性能Excel |
+| **第三方登录** | JustAuth | 1.16.7 | 第三方认证 |
+| **工作流引擎** | Warm-Flow | 1.7.4 | 国产工作流 |
+| **任务调度** | SnailJob | 1.5.0 | 分布式任务 |
+| **对象映射** | MapStruct Plus | 1.4.8 | 对象转换 |
+| **监控管理** | Spring Boot Admin | 3.4.7 | 应用监控 |
+
+### AI技术栈
+
+| 分类 | 技术 | 版本 | 说明 |
+|------|------|------|------|
+| **AI框架** | Spring AI | 1.0.0-M5 | Spring官方AI框架 |
+| **AI框架** | LangChain4j | 0.36.2 | Java版LangChain |
+| **AI服务** | OpenAI | - | GPT系列模型 |
+| **AI服务** | Azure OpenAI | - | Azure托管OpenAI |
+| **AI服务** | ChatGLM | - | 智谱AI对话模型 |
+| **AI服务** | 通义千问 | - | 阿里云大语言模型 |
+| **AI服务** | 智谱AI | - | 智谱AI平台 |
+| **AI平台** | Coze | 0.4.2 | 字节跳动AI Bot |
+| **AI平台** | Dify | 1.1.7 | 开源LLM应用平台 |
+| **HTTP客户端** | OkHttp | 4.12.0 | AI服务HTTP客户端 |
+
+### 数据库支持
+
+| 数据库 | 支持情况 | 说明 |
+|--------|----------|------|
+| MySQL | ✅ 原生支持 | 主要推荐 |
+| Oracle | ✅ 原生支持 | 企业级 |
+| PostgreSQL | ✅ 原生支持 | 开源数据库 |
+| SQL Server | ✅ 原生支持 | 微软数据库 |
+| 达梦数据库 | ✅ 支持 | 国产数据库 |
+| 金仓数据库 | ✅ 支持 | 国产数据库 |
+
+## 🚀 快速开始
+
+### 环境要求
+
+- **JDK**: 17+ (推荐 JDK 21) **⚠️ 必须使用JDK 17+**
+- **Maven**: 3.6+
+- **MySQL**: 5.7+ / 8.0+
+- **Redis**: 5.0+
+- **Node.js**: 16+ (前端开发)
+- **AI服务**: OpenAI API Key 或其他AI服务商密钥
+
+### 安装步骤
+
+#### 1. 克隆项目
+
+```bash
+# 克隆仓库（示例）
+git clone https://gitee.com/pengles/PoJie.git
+cd PoJie
+```
+
+#### 2. 数据库初始化
+
+**方式一：使用 MySQL 命令行**
+
+```sql
+-- 1. 创建数据库
+CREATE DATABASE ruoyi_vue_plus DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;
+USE ruoyi_vue_plus;
+
+-- 2. 导入数据库脚本（按顺序执行，路径相对于项目根目录）
+SOURCE script/sql/ry_vue.sql;           -- 基础脚本（必须）
+SOURCE script/sql/ry_ai.sql;            -- AI模块脚本（如使用AI功能）
+SOURCE script/sql/ry_chat.sql;          -- 聊天模块脚本（如使用聊天功能）
+SOURCE script/sql/ry_knowledge.sql;     -- 知识库脚本（如使用知识库功能）
+SOURCE script/sql/ry_workflow.sql;      -- 工作流脚本（如使用工作流功能）
+SOURCE script/sql/ry_mall.sql;          -- 商城脚本（如使用商城功能）
+SOURCE script/sql/ry_pay.sql;           -- 支付脚本（如使用支付功能）
+SOURCE script/sql/ry_app.sql;           -- 移动端脚本（如使用移动端功能）
+SOURCE script/sql/ry_job.sql;           -- 定时任务脚本（如使用定时任务）
+```
+
+**方式二：使用图形化工具（Navicat、DBeaver、DataGrip 等）**
+
+1. 创建数据库 `ruoyi_vue_plus`，字符集选择 `utf8mb4`，排序规则选择 `utf8mb4_general_ci`
+2. 按顺序执行 `script/sql/` 目录下的 SQL 文件：
+   - `ry_vue.sql`（必须，基础脚本）
+   - `ry_ai.sql`（如使用 AI 功能）
+   - `ry_chat.sql`（如使用聊天功能）
+   - `ry_knowledge.sql`（如使用知识库功能）
+   - `ry_workflow.sql`（如使用工作流功能）
+   - `ry_mall.sql`（如使用商城功能）
+   - `ry_pay.sql`（如使用支付功能）
+   - `ry_app.sql`（如使用移动端功能）
+   - `ry_job.sql`（如使用定时任务）
+
+> **注意**：
+> - `ry_vue.sql` 为基础脚本，必须最先执行
+> - 其他脚本根据实际使用的功能模块选择执行
+> - 建议在生产环境执行前先备份数据库
+
+#### 3. 配置AI服务
+
+**重要：配置AI服务API密钥**
+
+```bash
+# 设置环境变量（推荐方式）
+# Windows
+set OPENAI_API_KEY=your-openai-api-key
+set ZHIPU_API_KEY=your-zhipu-api-key
+set QWEN_API_KEY=your-qwen-api-key
+
+# Linux/Mac
+export OPENAI_API_KEY=your-openai-api-key
+export ZHIPU_API_KEY=your-zhipu-api-key
+export QWEN_API_KEY=your-qwen-api-key
+```
+
+#### 4. 修改配置文件
+
+编辑 `ruoyi-server/src/main/resources/application-dev.yml`：
+
+**基础配置（必须）**
+
+```yaml
+spring:
+  # 数据源配置
+  datasource:
+    dynamic:
+      primary: master
+      datasource:
+        master:
+          url: jdbc:mysql://localhost:3306/ruoyi_vue_plus?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useSSL=false&allowPublicKeyRetrieval=true
+          username: root
+          password: your_password
+          driver-class-name: com.mysql.cj.jdbc.Driver
+          
+  # Redis配置
+  data:
+    redis:
+      host: localhost
+      port: 6379
+      password: # 如有密码请填写
+      database: 0
+      timeout: 10s
+      lettuce:
+        pool:
+          max-active: 8
+          max-wait: -1ms
+          max-idle: 8
+          min-idle: 0
+```
+
+**AI服务配置（可选，如使用AI功能）**
+
+```yaml
+# AI模块配置（application-ai.yml 或 application-dev.yml）
+ruoyi:
+  ai:
+    enabled: true
+    default-provider: openai  # 默认AI提供商：openai、zhipu、qwen、chatglm等
+    providers:
+      openai:
+        enabled: true
+        api-key: ${OPENAI_API_KEY:your-openai-api-key}
+        base-url: https://api.openai.com/v1
+        model: gpt-3.5-turbo
+        temperature: 0.7
+        max-tokens: 2000
+      zhipu:
+        enabled: false
+        api-key: ${ZHIPU_API_KEY:}
+        base-url: https://open.bigmodel.cn/api/paas/v4
+        model: glm-4
+      qwen:
+        enabled: false
+        api-key: ${QWEN_API_KEY:}
+        base-url: https://dashscope.aliyuncs.com/compatible-mode/v1
+        model: qwen-turbo
+```
+
+> **配置说明**：
+> - 数据库密码和Redis密码建议使用环境变量配置
+> - AI服务的API密钥强烈建议使用环境变量配置，避免泄露
+> - 更多配置项请参考 `application.yml` 和 `application-ai.yml` 文件
+> - 各模块的详细配置请参考对应模块的 README 文档
+
+#### 5. 启动应用
+
+**方式一：Maven启动（推荐用于开发）**
+
+```bash
+# 进入项目根目录
+cd PoJie
+
+# 编译项目
+mvn clean compile
+
+# 启动应用
+mvn spring-boot:run -pl ruoyi-server -am
+
+# 或使用简化命令
+mvn -q -pl ruoyi-server -am spring-boot:run -DskipTests
+```
+
+**方式二：IDE启动（推荐用于开发调试）**
+
+1. 使用 IDEA 或 Eclipse 导入 Maven 项目
+2. 找到 `ruoyi-server/src/main/java/org/dromara/RuoYiApplication.java`
+3. 右键运行 `main` 方法
+4. 或配置运行配置，设置工作目录为 `ruoyi-server`
+
+**方式三：JAR包启动（推荐用于生产）**
+
+```bash
+# 进入项目根目录
+cd PoJie
+
+# 打包（跳过测试）
+mvn clean package -DskipTests
+
+# 启动JAR包
+java -jar ruoyi-server/target/ruoyi-server.jar
+
+# 或指定配置文件
+java -jar ruoyi-server/target/ruoyi-server.jar --spring.profiles.active=prod
+
+# 后台启动（Linux）
+nohup java -jar ruoyi-server/target/ruoyi-server.jar > app.log 2>&1 &
+```
+
+**方式四：Docker启动（推荐用于生产）**
+
+```bash
+# 使用Docker Compose启动（包含MySQL、Redis等）
+cd script/docker
+docker-compose up -d
+
+# 构建应用镜像（需要Dockerfile）
+docker build -t pojie:latest .
+docker run -d -p 8080:8080 --name pojie pojie:latest
+```
+
+> **启动注意事项**：
+> - 确保 MySQL 和 Redis 服务已启动
+> - 检查端口 8080 是否被占用
+> - 查看启动日志确认服务启动成功
+> - 如遇到端口冲突，可在配置文件中修改 `server.port`
+
+#### 6. 访问系统
+
+启动成功后，访问以下地址：
+
+| 服务 | 地址 | 说明 |
+|------|------|------|
+| **系统首页** | http://localhost:8080 | 系统入口（需要前端配合） |
+| **API文档（Swagger）** | http://localhost:8080/swagger-ui/index.html | Swagger UI 接口文档 |
+| **API文档（Knife4j）** | http://localhost:8080/doc.html | Knife4j 增强文档（如已集成） |
+| **监控中心** | http://localhost:8080/admin | Spring Boot Admin 监控 |
+| **健康检查** | http://localhost:8080/actuator/health | Spring Boot Actuator |
+| **AI服务健康检查** | http://localhost:8080/ai/health | AI模块健康状态（如启用） |
+| **LangChain4j服务** | http://localhost:8080/ai/langchain4j/health | LangChain4j服务状态（如启用） |
+
+**默认登录账号**：
+- 用户名：`admin`
+- 密码：`admin123`
+
+> **注意**：首次登录后建议立即修改默认密码
+
+#### 7. 验证AI功能（可选）
+
+如果已配置AI服务，可以通过以下方式验证：
+
+1. **测试AI聊天接口**：
+   ```bash
+   curl -X POST http://localhost:8080/ai/chat \
+     -H "Content-Type: application/json" \
+     -H "Authorization: Bearer your-token" \
+     -d '{"message": "你好，请介绍一下自己"}'
+   ```
+
+2. **查看支持的AI模型列表**：
+   ```bash
+   curl http://localhost:8080/ai/models
+   ```
+
+3. **检查AI服务健康状态**：
+   访问 http://localhost:8080/ai/health
+
+4. **通过API文档测试**：
+   访问 Swagger UI 或 Knife4j 文档，找到AI相关接口进行测试
+
+## 💡 使用示例
+
+### AI服务开发
+
+#### 统一AI服务接口
+- 提供统一的AI聊天接口，支持多种AI Provider
+- 支持同步和异步（流式）响应模式
+- 集成请求验证和响应封装
+- 支持多模型切换和配置管理
+
+#### LangChain4j服务使用
+- 单轮对话：直接调用AI模型进行问答
+- 带记忆的对话：支持上下文记忆的连续对话
+- 流式对话：实时返回AI生成内容
+- 模型管理：获取和切换支持的AI模型
+
+### 移动端API开发
+- 移动端用户登录和认证
+- 用户信息管理和权限控制
+- 移动端专用的API接口设计
+- 支持多种登录方式（账号密码、第三方登录等）
+
+
+### 分布式文件存储
+- 支持多种文件存储方式（本地、阿里云OSS、腾讯云COS、七牛云等）
+- 提供统一的文件上传和下载接口
+- 支持文件预览和在线编辑
+- 集成文件安全检查和病毒扫描
+
+### 实时消息推送
+- 基于SSE（Server-Sent Events）的实时消息推送
+- 支持用户连接管理和消息广播
+- 集成WebSocket支持双向通信
+- 提供消息队列和持久化存储
+
+### 多数据源支持
+- 支持动态数据源切换和管理
+- 提供主从数据库读写分离
+- 支持分布式事务处理
+- 集成数据源监控和健康检查
+
+### 权限控制
+- 基于Sa-Token的轻量级权限框架
+- 支持RBAC权限模型
+- 提供细粒度的权限控制
+- 集成操作日志和审计功能
+
+## 📁 项目结构
+
+```
+PoJie/
+├── ruoyi-common/                          # 公共模块
+│   ├── ruoyi-common-bom/                  # BOM依赖管理
+│   ├── ruoyi-common-core/                 # 核心工具类
+│   ├── ruoyi-common-doc/                  # 接口文档配置（SpringDoc）
+│   ├── ruoyi-common-excel/                # Excel处理（FastExcel）
+│   ├── ruoyi-common-mybatis/              # MyBatis-Plus配置
+│   ├── ruoyi-common-redis/                # Redis配置（Redisson）
+│   ├── ruoyi-common-satoken/              # 权限认证（Sa-Token）
+│   ├── ruoyi-common-oss/                  # 对象存储（MinIO/OSS）
+│   ├── ruoyi-common-sms/                  # 短信服务
+│   ├── ruoyi-common-mail/                 # 邮件服务
+│   ├── ruoyi-common-websocket/            # WebSocket支持
+│   ├── ruoyi-common-sse/                  # SSE服务器推送
+│   ├── ruoyi-common-encrypt/              # 数据加密
+│   ├── ruoyi-common-idempotent/           # 幂等性控制
+│   ├── ruoyi-common-ratelimiter/          # 限流控制
+│   ├── ruoyi-common-log/                  # 日志记录
+│   ├── ruoyi-common-security/             # 安全配置
+│   ├── ruoyi-common-sensitive/            # 敏感数据脱敏
+│   ├── ruoyi-common-social/               # 第三方登录（JustAuth）
+│   ├── ruoyi-common-translation/          # 数据翻译
+│   ├── ruoyi-common-web/                  # Web通用配置
+│   ├── ruoyi-common-json/                 # JSON处理
+│   └── ruoyi-common-job/                  # 任务调度
+├── ruoyi-modules/                         # 业务模块
+│   ├── ruoyi-system/                      # 系统管理模块
+│   ├── ruoyi-member/                      # 移动端模块
+│   ├── ruoyi-chat/                        # 聊天模块
+│   ├── ruoyi-ai/                          # AI核心模块
+│   ├── ruoyi-knowledge/                   # 知识库模块
+│   ├── ruoyi-workflow/                    # 工作流模块（Warm-Flow）
+│   ├── ruoyi-mall/                        # 商城模块（聚合模块）
+│   │   ├── ruoyi-mall-product/            # 商品中心
+│   │   ├── ruoyi-mall-trade/              # 交易中心
+│   │   ├── ruoyi-mall-coupon/             # 优惠券中心
+│   │   ├── ruoyi-mall-promotion/          # 营销中心
+│   │   └── ruoyi-mall-statistics/         # 统计中心
+│   ├── ruoyi-pay/                         # 支付模块
+│   ├── ruoyi-generator/                   # 代码生成器
+│   ├── ruoyi-job/                         # 定时任务模块（SnailJob）
+│   └── ruoyi-mp/                          # 微信公众号模块
+├── ruoyi-extend/                          # 扩展模块
+│   ├── ruoyi-monitor-admin/               # 监控中心（Spring Boot Admin）
+│   └── ruoyi-snailjob-server/             # 分布式任务调度服务端
+├── ruoyi-server/                          # 服务启动模块
+│   ├── src/main/java/
+│   │   └── org/dromara/
+│   │       └── RuoYiApplication.java      # 启动类
+│   └── src/main/resources/
+│       ├── application.yml                # 主配置文件
+│       ├── application-dev.yml            # 开发环境配置
+│       ├── application-prod.yml           # 生产环境配置
+│       └── application-ai.yml             # AI模块配置
+├── script/                                # 脚本文件
+│   ├── sql/                               # 数据库脚本
+│   │   ├── ry_vue.sql                    # 基础数据库脚本（必须）
+│   │   ├── ry_ai.sql                     # AI模块数据库脚本
+│   │   ├── ry_chat.sql                   # 聊天模块数据库脚本
+│   │   ├── ry_knowledge.sql              # 知识库模块数据库脚本
+│   │   ├── ry_workflow.sql               # 工作流模块数据库脚本
+│   │   ├── ry_mall.sql                   # 商城模块数据库脚本
+│   │   ├── ry_pay.sql                    # 支付模块数据库脚本
+│   │   ├── ry_app.sql                    # 移动端模块数据库脚本
+│   │   └── ry_job.sql                    # 定时任务数据库脚本
+│   ├── docker/                            # Docker配置
+│   │   ├── docker-compose.yml            # Docker Compose配置
+│   │   ├── database.yml                  # 数据库Docker配置
+│   │   └── redis/                        # Redis配置
+│   └── bin/                               # 启动脚本
+└── docs/                                  # 项目文档（可选）
+    ├── AI_INTEGRATION_GUIDE.md            # AI集成指南
+    ├── LANGCHAIN4J_INTEGRATION_GUIDE.md   # LangChain4j集成指南
+    └── DEPLOYMENT_GUIDE.md                # 部署指南
+```
+
+## 🔧 开发指南
+
+### 环境配置
+
+1. **开发环境**
+   - JDK 17+ (必须)
+   - Maven 3.6+
+   - MySQL 8.0+
+   - Redis 6.0+
+   - Node.js 16+
+2. **AI服务配置**
+   - OpenAI API Key (推荐)
+   - 智谱AI API Key (可选)
+   - 通义千问API Key (可选)
+   - Azure OpenAI配置 (可选)
+
+### AI模块开发
+
+#### 1. 添加新的AI Provider
+- 实现AiProvider接口，定义Provider名称和核心方法
+- 添加@Component注解和条件配置注解
+- 实现chat()和streamChat()方法
+- 处理请求参数和响应格式
+
+#### 2. 配置新Provider
+- 在application.yml中添加Provider配置
+- 设置enabled、api-key、base-url、model等参数
+- 支持环境变量和配置文件两种方式
+
+#### 3. LangChain4j扩展开发
+- 注入ChatLanguageModel进行AI对话
+- 实现自定义聊天服务和流式响应
+- 支持记忆管理和上下文处理
+- 集成监控和异常处理机制
+
+### 代码生成器使用
+
+1. 访问系统管理 -> 代码生成
+2. 选择要生成的数据表
+3. 配置生成信息
+4. 下载生成的代码
+
+### 新增业务模块
+
+1. 在 `ruoyi-modules` 下创建新模块
+2. 添加模块依赖到主pom.xml
+3. 配置模块的Controller、Service、Mapper
+4. 添加相应的权限配置
+
+### 代码规范
+
+- 遵循阿里巴巴Java开发手册
+- 使用统一的代码格式化配置
+- 添加必要的单元测试
+- 更新相关文档
+- AI相关代码需要添加详细的使用说明
+
+### 数据库设计
+
+- 统一的表前缀和命名规范
+- 合理的索引设计
+- 数据字典维护
+- AI相关表结构设计规范：
+  - `ai_*` 表前缀用于AI核心功能
+  - `chat_*` 表前缀用于聊天相关
+  - `knowledge_*` 表前缀用于知识库
+
+### API文档规范
+
+使用 `@Operation`、`@Tag`、`@Parameter` 等注解标注API信息：
+
+```java
+@Tag(name = "用户管理")
+@RestController
+public class UserController {
+    
+    @Operation(summary = "获取用户信息", description = "根据用户ID获取用户详细信息")
+    @GetMapping("/{id}")
+    public R<UserVo> getUser(@Parameter(description = "用户ID") @PathVariable Long id) {
+        return R.ok(userService.getById(id));
+    }
+}
+```
+
+## 🤝 贡献指南
+
+我们欢迎所有形式的贡献，包括但不限于：
+
+- 🐛 **Bug报告**：发现问题请提交Issue
+- 💡 **功能建议**：有好的想法请告诉我们
+- 📝 **文档改进**：帮助完善文档
+- 🔧 **代码贡献**：提交Pull Request
+- 🤖 **AI Provider集成**：添加新的AI服务提供商
+- 🧠 **AI算法优化**：改进AI服务性能和质量
+- 📚 **知识库功能扩展**：增强RAG和知识管理功能
+
+### 贡献流程
+
+1. Fork 本仓库
+2. 创建特性分支 (`git checkout -b feature/AmazingFeature`)
+3. 提交更改 (`git commit -m 'Add some AmazingFeature'`)
+4. 推送到分支 (`git push origin feature/AmazingFeature`)
+5. 开启 Pull Request
+
+### AI相关贡献指南
+
+#### 新增AI Provider
+
+1. **实现Provider接口**
+   - 继承AiProvider接口并实现所有必要方法
+   - 定义Provider名称和基本配置
+
+2. **添加配置类**
+   - 创建配置属性类，使用@ConfigurationProperties注解
+   - 定义API密钥、基础URL、模型等配置项
+
+3. **编写单元测试**
+   - 为新Provider编写完整的单元测试
+   - 测试聊天功能、流式响应、异常处理等
+
+4. **更新文档**
+   - 在 `docs/AI_INTEGRATION_GUIDE.md` 中添加使用说明
+   - 更新 `README.md` 中的支持列表
+
+#### LangChain4j扩展贡献
+
+1. **扩展现有功能**
+   - 添加新的模型支持
+   - 优化对话记忆管理
+   - 增强流式响应处理
+
+2. **性能优化**
+   - 连接池优化
+   - 缓存策略改进
+   - 异步处理优化
+
+### 代码规范
+
+- 遵循阿里巴巴Java开发手册
+- 使用统一的代码格式化配置
+- 添加必要的单元测试
+- 更新相关文档
+- AI相关代码需要包含详细的JavaDoc注释
+- 提供配置示例和使用说明
+
+## 📞 联系我们
+
+- **项目地址**：https://gitee.com/pengles/PoJie
+- **问题反馈**：https://gitee.com/pengles/PoJie/issues
+- **QQ交流群**：待建立
+- **微信交流群**：待建立
+
+🌟 **开源精神让我们共同进步，感谢每一位开发者的贡献和分享！**
+
+## 📄 许可证
+
+本项目采用 [MIT 许可证](./LICENSE)，详见 LICENSE 文件。
+
+---
+
+<div align="center">
+
+**如果这个项目对你有帮助，请给个 ⭐ Star 支持一下！**
+
+Made with ❤️ by PoJie Team
+
+</div>
diff --git a/UPDATE.md b/UPDATE.md
new file mode 100644
index 0000000..91639d1
--- /dev/null
+++ b/UPDATE.md
@@ -0,0 +1,229 @@
+# 项目升级与优化方案（UPDATE）
+
+> **版本**: v1.1.0 (2025-01-XX)
+> 
+> **更新日志**: 
+> - v1.1.0: 新增商城模块完善章节，记录商城系统模块拆分与功能实现进展
+> - v1.0.0: 初始版本，聚焦认证安全与系统优化
+
+---
+
+## 目标与范围
+- **目标**: 在不改变主业务的前提下，增强认证安全、可扩展性、性能稳定性与可观测能力，同时提升开发者体验与交付效率
+- **范围**: Sys 后台端、App 用户端、MP 公众号、公共组件（认证策略、会话、缓存、日志、CI/CD、文档与测试）、商城系统模块拆分与完善
+
+---
+
+## 总体原则
+- **最小入侵、增量演进**: 不推倒重来，尽量通过服务层与拦截器/过滤器扩展
+- **枚举化与集中化**: 统一策略路由、Key 规范、限流与加密开关
+- **可观测先行**: 指标、告警、健康检查与日志字段统一，便于稳定运营
+- **先方案后实现**: 每个子项包含明确的改动点、验证方法与风险控制
+
+---
+
+## 认证与安全（高优先）
+
+### grantType 枚举化与策略映射
+- **内容**: 用枚举或常量表统一 Sys/App 的 grantType 与策略映射，移除魔法字符串
+- **改动点**: 策略注册与查找入口、客户端配置校验
+- **验证**: 枚举覆盖所有现有策略，错误入参返回一致错误码
+
+### 风险登录与强制改密
+- **内容**: 登录成功后比对 IP 归属地变化（日志/邮件告警）；密码超期标记 Session，拦截除改密外所有接口
+- **改动点**: 在登录服务增加策略执行方法；新增 WebMvc 拦截器
+- **验证**: 模拟超期与非超期用户行为；确保拦截仅放行改密与登出
+
+### 验证码策略（保持现状）
+- **内容**: 当前阶段 App 密码策略不启用验证码，保持与现状一致；但保留验证码校验逻辑与开关，后续在前端加密与交互链路完善后可一键开启，与 Sys 保持一致
+- **改动点**: 不改动 App 端验证码逻辑（保留关闭状态）；保留校验方法与配置开关（示例：app.auth.captcha.enabled=false）
+- **验证**: 无功能改动；后续启用时按开关置为 true 并执行联调（验证码生成/校验、错误次数累加与锁定、生效范围与白名单）
+- **准备项**: 前端加密到位、验证码生成与传输链路打通、联调用例与回归清单就绪
+
+### 接口加密与防刷
+- **内容**: App 端在前端加密准备就绪后启用 ApiEncrypt；登录/验证码/二维码轮询加限流
+- **改动点**: 控制器方法注解与网关规则
+- **验证**: 压测防刷路径、请求速率下服务稳定性
+
+---
+
+## App 信息补全（高优先）
+- **内容**: 登录后资料未完善仅放行白名单接口（个人信息查询、绑定手机号），其他接口返回 403_INFO_INCOMPLETE
+- **改动点**: 新增 App 过滤器 + 配置项白名单；登录成功后写入 Session 标记
+- **验证**: 未完善资料用户访问白名单成功、非白名单拦截；完善后恢复正常
+
+---
+
+## 会话管理与事件（中优先）
+- **内容**: 完善第 6 章会话 API（活跃列表、终止、心跳续期、SSE 事件）；令牌 TTL 与 Redis TTL 同步，避免“僵尸会话”
+- **改动点**: App 会话服务持久化实现；统一 Key 前缀与 TTL
+- **验证**: 多设备并发登录、心跳续期、终止事件推送的端到端验证
+
+---
+
+## 第三方授权与绑定（中优先）
+- **内容**: justauth 登录与绑定流程的鲁棒化（source 与 state 校验、重复绑定幂等）；MP 二维码的 scene_str 规范（sys_user:{userId}）
+- **改动点**: 社交授权回调控制器、绑定服务的重复校验；MP 配置与二维码接口
+- **验证**: 常见平台的授权成功/失败、重复绑定、解绑与重新绑定
+
+---
+
+## 数据层与性能（中优先）
+
+### MyBatis-Plus 警告修复
+- **内容**: 为缺少 @TableId 的实体（如 AppUserRole）补注解，恢复 ById 系列方法可用
+- **验证**: 编译无警告且 CRUD 正常
+
+### 索引与热点查询优化
+- **内容**: 用户、角色关联、社交绑定等常查表加必要索引；分页与条件查询走服务层统一封装
+- **验证**: 压测主要查询场景，慢查与扫描下降
+
+---
+
+## 可观测与告警（中优先）
+
+### 指标与健康检查
+- **内容**: 暴露登录成功率、锁定次数、验证码命中率、会话活跃数；完善 actuator 健康检查
+- **改动点**: Micrometer 指标埋点；Spring Boot Admin 端点配置
+- **验证**: 仪表板查看与阈值告警验证
+
+### 日志与链路追踪
+- **内容**: 统一日志字段（traceId、userId、clientId、grantType）；社交授权与二维码流程关键点日志
+- **验证**: 问题复盘路径明确、跨模块调用链可追踪
+
+---
+
+## 开发者体验与文档（中优先）
+
+### 文档
+- **内容**: 在登录综合指南中加入响应结构说明与“grantType→策略类→入口路径”对照表；升级与优化指南形成统一入口
+- **验证**: 联调工程师可按文档快速定位与调用
+
+### 测试
+- **内容**: 策略单测覆盖验证码开关、停用用户、第三方失败分支；集成测试覆盖 /auth/login、/app/auth/login 的典型入参与响应
+- **验证**: 持续集成跑通、关键路径不回归
+
+---
+
+## 交付与构建（低优先但必要）
+
+### CI/CD 稳定性
+- **内容**: 分模块并行构建与独立重试；对 clean 阶段的目标目录锁定增加占用检测；缓存 Maven 仓库
+- **验证**: 全量构建时间缩短、偶发失败模块可重试成功
+
+### 配置与密钥管理
+- **内容**: 区分 dev/prod 配置；禁止密钥进入日志；构建衍生文件与敏感清单进入 .gitignore
+- **验证**: 审计通过、漏洞扫描无高危项
+
+---
+
+## 风险与回滚
+- **风险**: 
+  - 拦截策略误拦截、授权流程改动影响兼容
+  - 商城模块拆分可能影响现有代码调用（已采用渐进式迁移策略，保留原有代码）
+- **回滚**: 
+  - 按模块独立开关与配置回退；拦截器与过滤器具备开关与白名单；社交绑定保留幂等校验
+  - 商城模块：保留原有代码在 `ruoyi-mall/src` 目录，新功能在新子模块开发，可平滑回退
+
+---
+
+## 阶段产出与验证
+
+### 阶段 1（高优先）：grantType 枚举、风险登录与强制改密、App 信息补全过滤器、验证码一致化
+- **验证**: 编译通过、用例跑通、预览可访问，关键接口行为与文档一致
+
+### 阶段 2（中优先）：会话 API、第三方授权鲁棒化、数据层优化、指标与健康检查
+- **验证**: 压测与监控数据达标、授权与绑定流程无异常
+
+### 阶段 3（持续）：测试完善、CI/CD 优化、文档与示例更新
+
+### 阶段 4（已完成）：商城系统模块拆分与核心功能实现 ✅
+- **验证**: 各子模块功能完整、API接口可用、数据库表结构正确、文档完善
+- **成果**: 
+  - 5 个子模块基础结构完整
+  - 商品中心、交易中心、优惠券中心功能完整实现
+  - 营销中心活动管理和秒杀功能实现
+  - 完整的 API 接口和文档
+
+---
+
+## 商城系统模块拆分与完善（高优先，已完成核心功能）✅
+
+### 模块结构重构
+- **内容**: 按照领域驱动设计原则，将 `ruoyi-mall` 模块拆分为 5 个子模块，实现模块化架构
+- **改动点**: 
+  - 创建子模块目录结构（product、trade、coupon、promotion、statistics）
+  - 配置各子模块的 Maven 依赖关系
+  - 创建各子模块的 AutoConfiguration 类和 spring.factories
+  - 扩展数据库表结构，支持完整业务场景
+- **验证**: 各子模块可独立编译、自动配置生效、数据库表结构完整
+
+### 商品中心模块 (ruoyi-mall-product) ✅
+- **已完成功能**:
+  - ✅ 商品(SPU)和SKU的完整CRUD操作
+  - ✅ 商品分类管理（三级分类树形结构）
+  - ✅ 品牌管理
+  - ✅ 商品上架/下架、浏览量和销量统计
+- **数据库表**: `mall_product`, `mall_sku`, `mall_category`, `mall_brand`
+- **API接口**: 管理端和移动端完整的商品、分类、品牌接口
+
+### 交易中心模块 (ruoyi-mall-trade) ✅
+- **已完成功能**:
+  - ✅ 购物车管理（添加、删除、数量修改、选中状态）
+  - ✅ 订单管理（创建、查询、取消、状态流转）
+  - ✅ 售后管理（退款、退货、换货申请及审核流程）
+  - ✅ 订单评价（评价提交、审核、回复）
+  - ✅ 订单支付集成（与支付中心集成）
+- **数据库表**: `mall_cart`, `mall_order`, `mall_order_item`, `mall_after_sale`, `mall_order_evaluate`, `mall_order_coupon`
+- **API接口**: 完整的订单、售后、评价管理接口
+
+### 优惠券中心模块 (ruoyi-mall-coupon) ✅
+- **已完成功能**:
+  - ✅ 优惠券管理（满减、折扣、现金券类型）
+  - ✅ 用户优惠券（领券、使用、退还）
+  - ✅ 优惠券过期处理（定时任务方法已实现）
+- **数据库表**: `mall_coupon`, `mall_coupon_user`
+- **API接口**: 完整的优惠券和用户优惠券管理接口
+
+### 营销中心模块 (ruoyi-mall-promotion) ⚠️
+- **已完成功能**:
+  - ✅ 营销活动管理（活动类型、规则配置、时间管理）
+  - ✅ 秒杀功能（秒杀活动创建、库存管理、状态管理）
+- **部分实现**:
+  - ⚠️ 拼团功能（表结构已创建，业务逻辑待实现）
+  - ⚠️ 砍价功能（表结构已创建，业务逻辑待实现）
+- **数据库表**: `mall_promotion`, `mall_seckill`, `mall_group_buy`, `mall_group_buy_order`, `mall_bargain`, `mall_bargain_record`, `mall_bargain_help`
+
+### 统计中心模块 (ruoyi-mall-statistics) ⚠️
+- **状态**: 框架已创建，基础结构完善
+- **待实现**: 交易分析、会员分析、商品分析、营销分析等统计功能
+
+### 文档完善 ✅
+- ✅ 各子模块 README.md 文档完整
+- ✅ 模块结构说明文档（MODULE_STRUCTURE.md）
+- ✅ API接口详细说明
+- ✅ 数据库表结构说明
+
+---
+
+## 行动清单（优先顺序）
+
+### 已完成 ✅
+- ✅ 商城模块结构拆分与基础功能实现
+- ✅ 商品中心模块完整实现（商品、SKU、分类、品牌）
+- ✅ 交易中心模块完整实现（订单、售后、评价）
+- ✅ 优惠券中心模块完整实现
+- ✅ 营销中心模块部分实现（活动管理、秒杀）
+
+### 进行中 / 待完成
+1. 实现风险登录检测与强制改密拦截（Sys）
+2. 统一 App 信息补全过滤器与白名单
+3. 修复 MyBatis-Plus 警告（补充缺失的 @TableId）
+4. 统一 grantType 枚举化与策略映射表
+5. App 启用验证码开关，与 Sys 行为一致
+6. 完善会话指标与健康检查，接入告警
+7. 补充集成测试与 Postman 集合，提高联调效率
+8. CI 并行构建与清理增强，提升交付稳定性
+9. 完善营销中心模块（拼团、砍价功能实现）
+10. 实现统计中心模块数据分析功能
+11. 商城模块代码迁移（将现有代码迁移到新子模块结构，可选）
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..eacda03
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,719 @@
+<?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>
+
+    <groupId>org.dromara</groupId>
+    <artifactId>PoJie</artifactId>
+    <version>${revision}</version>
+
+    <name>PoJie</name>
+    <url>https://gitee.com/pengles/PoJie</url>
+    <description>PoJie管理系统</description>
+
+    <properties>
+        <revision>5.4.1</revision>
+        <spring-boot.version>3.4.7</spring-boot.version>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <java.version>17</java.version>
+        <mybatis.version>3.5.16</mybatis.version>
+        <springdoc.version>2.8.14</springdoc.version>
+        <therapi-javadoc.version>0.15.0</therapi-javadoc.version>
+        <fastexcel.version>1.3.0</fastexcel.version>
+        <velocity.version>2.3</velocity.version>
+        <satoken.version>1.44.0</satoken.version>
+        <mybatis-plus.version>3.5.12</mybatis-plus.version>
+        <p6spy.version>3.9.1</p6spy.version>
+        <hutool.version>5.8.40</hutool.version>
+        <spring-boot-admin.version>3.4.7</spring-boot-admin.version>
+        <redisson.version>3.52.0</redisson.version>
+        <lock4j.version>2.2.7</lock4j.version>
+        <dynamic-ds.version>4.3.1</dynamic-ds.version>
+        <snailjob.version>1.6.0</snailjob.version>
+        <mapstruct-plus.version>1.5.0</mapstruct-plus.version>
+        <mapstruct-plus.lombok.version>0.2.0</mapstruct-plus.lombok.version>
+        <lombok.version>1.18.36</lombok.version>
+        <bouncycastle.version>1.80</bouncycastle.version>
+        <justauth.version>1.16.7</justauth.version>
+        <!-- 离线IP地址定位库 -->
+        <ip2region.version>2.7.0</ip2region.version>
+        <!-- OSS 配置 -->
+        <aws.sdk.version>2.28.22</aws.sdk.version>
+        <!-- SMS 配置 -->
+        <sms4j.version>3.3.4</sms4j.version>
+        <!-- 限制框架中的fastjson版本 -->
+        <fastjson.version>1.2.83</fastjson.version>
+        <!-- 面向运行时的D-ORM依赖 -->
+        <anyline.version>8.7.2-20250603</anyline.version>
+        <!-- 工作流配置 -->
+        <warm-flow.version>1.7.4</warm-flow.version>
+        <!-- 支付宝SDK配置 -->
+        <alipay-sdk.version>4.34.86.ALL</alipay-sdk.version>
+        <!-- 微信相关配置 -->
+        <weixin-java-mp.version>4.7.0</weixin-java-mp.version>
+        <weixin-java-miniapp.version>4.7.0</weixin-java-miniapp.version>
+        <wechatpay-java.version>0.2.12</wechatpay-java.version>
+        <!-- Apache POI 配置 -->
+        <poi.version>5.2.4</poi.version>
+        <!-- iText PDF 配置 -->
+        <itext.version>8.0.2</itext.version>
+        
+        <!-- AI 相关配置 -->
+        <spring-ai.pom.version>1.0.1</spring-ai.pom.version>
+        <langchain4j.pom.version>1.3.0-beta9</langchain4j.pom.version>
+
+        <okhttp.version>4.12.0</okhttp.version>
+
+        <!-- 插件版本 -->
+        <maven-jar-plugin.version>3.4.2</maven-jar-plugin.version>
+        <maven-war-plugin.version>3.4.0</maven-war-plugin.version>
+        <maven-compiler-plugin.version>3.14.0</maven-compiler-plugin.version>
+        <maven-surefire-plugin.version>3.5.3</maven-surefire-plugin.version>
+        <flatten-maven-plugin.version>1.3.0</flatten-maven-plugin.version>
+        <!-- 打包默认跳过测试 -->
+        <skipTests>true</skipTests>
+    </properties>
+
+    <profiles>
+        <profile>
+            <id>local</id>
+            <properties>
+                <!-- 环境标识，需要与配置文件的名称相对应 -->
+                <profiles.active>local</profiles.active>
+                <logging.level>info</logging.level>
+                <monitor.username>ruoyi</monitor.username>
+                <monitor.password>123456</monitor.password>
+            </properties>
+        </profile>
+        <profile>
+            <id>dev</id>
+            <properties>
+                <!-- 环境标识，需要与配置文件的名称相对应 -->
+                <profiles.active>dev</profiles.active>
+                <logging.level>info</logging.level>
+                <monitor.username>ruoyi</monitor.username>
+                <monitor.password>123456</monitor.password>
+            </properties>
+            <activation>
+                <!-- 默认环境 -->
+                <activeByDefault>true</activeByDefault>
+            </activation>
+        </profile>
+        <profile>
+            <id>prod</id>
+            <properties>
+                <profiles.active>prod</profiles.active>
+                <logging.level>warn</logging.level>
+                <monitor.username>ruoyi</monitor.username>
+                <monitor.password>123456</monitor.password>
+            </properties>
+        </profile>
+    </profiles>
+
+    <!-- 依赖声明 -->
+    <dependencyManagement>
+        <dependencies>
+
+            <!-- SpringBoot的依赖配置-->
+            <dependency>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-dependencies</artifactId>
+                <version>${spring-boot.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+
+            <!-- hutool 的依赖配置-->
+            <dependency>
+                <groupId>cn.hutool</groupId>
+                <artifactId>hutool-bom</artifactId>
+                <version>${hutool.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+
+            <!-- Warm-Flow国产工作流引擎, 在线文档：http://warm-flow.cn/ -->
+            <dependency>
+                <groupId>org.dromara.warm</groupId>
+                <artifactId>warm-flow-mybatis-plus-sb3-starter</artifactId>
+                <version>${warm-flow.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.dromara.warm</groupId>
+                <artifactId>warm-flow-plugin-ui-sb-web</artifactId>
+                <version>${warm-flow.version}</version>
+            </dependency>
+
+            <!-- JustAuth 的依赖配置-->
+            <dependency>
+                <groupId>me.zhyd.oauth</groupId>
+                <artifactId>JustAuth</artifactId>
+                <version>${justauth.version}</version>
+            </dependency>
+
+            <!-- common 的依赖配置-->
+            <dependency>
+                <groupId>org.dromara</groupId>
+                <artifactId>ruoyi-common-bom</artifactId>
+                <version>${revision}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>org.springdoc</groupId>
+                <artifactId>springdoc-openapi-starter-webmvc-api</artifactId>
+                <version>${springdoc.version}</version>
+            </dependency>
+            
+            <dependency>
+                <groupId>org.springdoc</groupId>
+                <artifactId>springdoc-openapi-starter-common</artifactId>
+                <version>${springdoc.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.github.therapi</groupId>
+                <artifactId>therapi-runtime-javadoc</artifactId>
+                <version>${therapi-javadoc.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.projectlombok</groupId>
+                <artifactId>lombok</artifactId>
+                <version>${lombok.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>cn.idev.excel</groupId>
+                <artifactId>fastexcel</artifactId>
+                <version>${fastexcel.version}</version>
+            </dependency>
+
+            <!-- velocity代码生成使用模板 -->
+            <dependency>
+                <groupId>org.apache.velocity</groupId>
+                <artifactId>velocity-engine-core</artifactId>
+                <version>${velocity.version}</version>
+            </dependency>
+
+            <!-- Sa-Token 权限认证, 在线文档：http://sa-token.dev33.cn/ -->
+            <dependency>
+                <groupId>cn.dev33</groupId>
+                <artifactId>sa-token-spring-boot3-starter</artifactId>
+                <version>${satoken.version}</version>
+            </dependency>
+            <!-- Sa-Token 整合 jwt -->
+            <dependency>
+                <groupId>cn.dev33</groupId>
+                <artifactId>sa-token-jwt</artifactId>
+                <version>${satoken.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>cn.hutool</groupId>
+                        <artifactId>hutool-all</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+            <dependency>
+                <groupId>cn.dev33</groupId>
+                <artifactId>sa-token-core</artifactId>
+                <version>${satoken.version}</version>
+            </dependency>
+
+            <!-- dynamic-datasource 多数据源-->
+            <dependency>
+                <groupId>com.baomidou</groupId>
+                <artifactId>dynamic-datasource-spring-boot3-starter</artifactId>
+                <version>${dynamic-ds.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.mybatis</groupId>
+                <artifactId>mybatis</artifactId>
+                <version>${mybatis.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.baomidou</groupId>
+                <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
+                <version>${mybatis-plus.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.baomidou</groupId>
+                <artifactId>mybatis-plus-jsqlparser</artifactId>
+                <version>${mybatis-plus.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.baomidou</groupId>
+                <artifactId>mybatis-plus-annotation</artifactId>
+                <version>${mybatis-plus.version}</version>
+            </dependency>
+
+            <!-- sql性能分析插件 -->
+            <dependency>
+                <groupId>p6spy</groupId>
+                <artifactId>p6spy</artifactId>
+                <version>${p6spy.version}</version>
+            </dependency>
+
+            <!--  AWS SDK for Java 2.x  -->
+            <dependency>
+                <groupId>software.amazon.awssdk</groupId>
+                <artifactId>s3</artifactId>
+                <version>${aws.sdk.version}</version>
+            </dependency>
+            <!-- 基于 AWS CRT 的 S3 客户端的性能增强的 S3 传输管理器 -->
+            <dependency>
+                <groupId>software.amazon.awssdk</groupId>
+                <artifactId>s3-transfer-manager</artifactId>
+                <version>${aws.sdk.version}</version>
+            </dependency>
+            <!-- 将基于 Netty 的 HTTP 客户端从类路径中移除 -->
+            <dependency>
+                <groupId>software.amazon.awssdk</groupId>
+                <artifactId>netty-nio-client</artifactId>
+                <version>${aws.sdk.version}</version>
+            </dependency>
+            <!--短信sms4j-->
+            <dependency>
+                <groupId>org.dromara.sms4j</groupId>
+                <artifactId>sms4j-spring-boot-starter</artifactId>
+                <version>${sms4j.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>
+                <version>${redisson.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.baomidou</groupId>
+                <artifactId>lock4j-redisson-spring-boot-starter</artifactId>
+                <version>${lock4j.version}</version>
+            </dependency>
+
+            <!-- SnailJob Client -->
+            <dependency>
+                <groupId>com.aizuda</groupId>
+                <artifactId>snail-job-client-starter</artifactId>
+                <version>${snailjob.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.aizuda</groupId>
+                <artifactId>snail-job-client-job-core</artifactId>
+                <version>${snailjob.version}</version>
+            </dependency>
+
+            <!-- 加密包引入 -->
+            <dependency>
+                <groupId>org.bouncycastle</groupId>
+                <artifactId>bcprov-jdk15to18</artifactId>
+                <version>${bouncycastle.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>io.github.linpeilie</groupId>
+                <artifactId>mapstruct-plus-spring-boot-starter</artifactId>
+                <version>${mapstruct-plus.version}</version>
+            </dependency>
+
+            <!-- 离线IP地址定位库 ip2region -->
+            <dependency>
+                <groupId>org.lionsoul</groupId>
+                <artifactId>ip2region</artifactId>
+                <version>${ip2region.version}</version>
+            </dependency>
+
+            <!-- 微信小程序 SDK -->
+            <dependency>
+                <groupId>com.github.binarywang</groupId>
+                <artifactId>weixin-java-miniapp</artifactId>
+                <version>${weixin-java-miniapp.version}</version>
+            </dependency>
+
+            <!-- 微信公众号 SDK -->
+            <dependency>
+                <groupId>com.github.binarywang</groupId>
+                <artifactId>weixin-java-mp</artifactId>
+                <version>${weixin-java-mp.version}</version>
+            </dependency>
+
+            <!-- 微信支付 SDK -->
+            <dependency>
+                <groupId>com.github.wechatpay-apiv3</groupId>
+                <artifactId>wechatpay-java</artifactId>
+                <version>${wechatpay-java.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.alibaba</groupId>
+                <artifactId>fastjson</artifactId>
+                <version>${fastjson.version}</version>
+            </dependency>
+
+            <!-- 支付宝SDK -->
+            <dependency>
+                <groupId>com.alipay.sdk</groupId>
+                <artifactId>alipay-sdk-java</artifactId>
+                <version>${alipay-sdk.version}</version>
+            </dependency>
+
+            <!-- Apache POI for document processing -->
+            <dependency>
+                <groupId>org.apache.poi</groupId>
+                <artifactId>poi</artifactId>
+                <version>${poi.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.poi</groupId>
+                <artifactId>poi-ooxml</artifactId>
+                <version>${poi.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.poi</groupId>
+                <artifactId>poi-scratchpad</artifactId>
+                <version>${poi.version}</version>
+            </dependency>
+
+            <!-- iText for PDF processing -->
+            <dependency>
+                <groupId>com.itextpdf</groupId>
+                <artifactId>kernel</artifactId>
+                <version>${itext.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.itextpdf</groupId>
+                <artifactId>layout</artifactId>
+                <version>${itext.version}</version>
+            </dependency>
+
+            <!-- Spring AI BOM -->
+            <dependency>
+                <groupId>org.springframework.ai</groupId>
+                <artifactId>spring-ai-bom</artifactId>
+                <version>${spring-ai.pom.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+
+            <!-- Spring AI Dependencies -->
+            <dependency>
+                <groupId>org.springframework.ai</groupId>
+                <artifactId>spring-ai-core</artifactId>
+            </dependency>
+            <dependency>
+                <groupId>org.springframework.ai</groupId>
+                <artifactId>spring-ai-openai-spring-boot-starter</artifactId>
+            </dependency>
+
+            <!-- LangChain4j BOM -->
+            <dependency>
+                <groupId>dev.langchain4j</groupId>
+                <artifactId>langchain4j-community-bom</artifactId>
+                <version>${langchain4j.pom.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+
+            <!-- LangChain4j Dependencies -->
+            <dependency>
+                <groupId>dev.langchain4j</groupId>
+                <artifactId>langchain4j</artifactId>
+            </dependency>
+            <dependency>
+                <groupId>dev.langchain4j</groupId>
+                <artifactId>langchain4j-spring-boot-starter</artifactId>
+            </dependency>
+            <dependency>
+                <groupId>dev.langchain4j</groupId>
+                <artifactId>langchain4j-azure-open-ai</artifactId>
+            </dependency>
+            <dependency>
+                <groupId>dev.langchain4j</groupId>
+                <artifactId>langchain4j-zhipu-ai</artifactId>
+            </dependency>
+            <dependency>
+                <groupId>dev.langchain4j</groupId>
+                <artifactId>langchain4j-dashscope</artifactId>
+            </dependency>
+            
+            <!-- HTTP Client Dependencies -->
+            <dependency>
+                <groupId>com.squareup.okhttp3</groupId>
+                <artifactId>okhttp</artifactId>
+                <version>${okhttp.version}</version>
+            </dependency>
+            
+            <dependency>
+                <groupId>com.squareup.okhttp3</groupId>
+                <artifactId>okhttp-sse</artifactId>
+                <version>${okhttp.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.dromara</groupId>
+                <artifactId>ruoyi-ai</artifactId>
+                <version>${revision}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.dromara</groupId>
+                <artifactId>ruoyi-system</artifactId>
+                <version>${revision}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.dromara</groupId>
+                <artifactId>ruoyi-chat</artifactId>
+                <version>${revision}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.dromara</groupId>
+                <artifactId>ruoyi-job</artifactId>
+                <version>${revision}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.dromara</groupId>
+                <artifactId>ruoyi-generator</artifactId>
+                <version>${revision}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.dromara</groupId>
+                <artifactId>ruoyi-knowledge</artifactId>
+                <version>${revision}</version>
+            </dependency>
+
+            <!--  工作流模块  -->
+            <dependency>
+                <groupId>org.dromara</groupId>
+                <artifactId>ruoyi-workflow</artifactId>
+                <version>${revision}</version>
+            </dependency>
+
+            <!--  微信公众号模块  -->
+            <dependency>
+                <groupId>org.dromara</groupId>
+                <artifactId>ruoyi-mp</artifactId>
+                <version>${revision}</version>
+            </dependency>
+
+            <!--  会员模块  -->
+            <dependency>
+                <groupId>org.dromara</groupId>
+                <artifactId>ruoyi-member</artifactId>
+                <version>${revision}</version>
+            </dependency>
+
+            <!--  支付模块  -->
+            <dependency>
+                <groupId>org.dromara</groupId>
+                <artifactId>ruoyi-pay</artifactId>
+                <version>${revision}</version>
+            </dependency>
+
+            <!--  商城模块  -->
+            <dependency>
+                <groupId>org.dromara</groupId>
+                <artifactId>ruoyi-mall</artifactId>
+                <version>${revision}</version>
+            </dependency>
+
+        </dependencies>
+    </dependencyManagement>
+
+    <modules>
+        <module>ruoyi-common</module>
+        <module>ruoyi-extend</module>
+        <module>ruoyi-modules</module>
+        <module>ruoyi-server</module>
+    </modules>
+    <packaging>pom</packaging>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>${maven-compiler-plugin.version}</version>
+                <configuration>
+                    <source>${java.version}</source>
+                    <target>${java.version}</target>
+                    <encoding>${project.build.sourceEncoding}</encoding>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>com.github.therapi</groupId>
+                            <artifactId>therapi-runtime-javadoc-scribe</artifactId>
+                            <version>${therapi-javadoc.version}</version>
+                        </path>
+                        <path>
+                            <groupId>org.projectlombok</groupId>
+                            <artifactId>lombok</artifactId>
+                            <version>${lombok.version}</version>
+                        </path>
+                        <path>
+                            <groupId>org.springframework.boot</groupId>
+                            <artifactId>spring-boot-configuration-processor</artifactId>
+                            <version>${spring-boot.version}</version>
+                        </path>
+                        <path>
+                            <groupId>io.github.linpeilie</groupId>
+                            <artifactId>mapstruct-plus-processor</artifactId>
+                            <version>${mapstruct-plus.version}</version>
+                        </path>
+                        <path>
+                            <groupId>org.projectlombok</groupId>
+                            <artifactId>lombok-mapstruct-binding</artifactId>
+                            <version>${mapstruct-plus.lombok.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                    <compilerArgs>
+                        <arg>-parameters</arg>
+                    </compilerArgs>
+                </configuration>
+            </plugin>
+            <!-- 单元测试使用 -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>${maven-surefire-plugin.version}</version>
+                <configuration>
+                    <argLine>-Dfile.encoding=UTF-8</argLine>
+                    <!-- 根据打包环境执行对应的@Tag测试方法 -->
+                    <groups>${profiles.active}</groups>
+                    <!-- 排除标签 -->
+                    <excludedGroups>exclude</excludedGroups>
+                </configuration>
+            </plugin>
+            <!-- 统一版本号管理 -->
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>flatten-maven-plugin</artifactId>
+                <version>${flatten-maven-plugin.version}</version>
+                <configuration>
+                    <updatePomFile>true</updatePomFile>
+                    <flattenMode>resolveCiFriendliesOnly</flattenMode>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>flatten</id>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>flatten</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>flatten.clean</id>
+                        <phase>clean</phase>
+                        <goals>
+                            <goal>clean</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <!-- 关闭过滤 -->
+                <filtering>false</filtering>
+            </resource>
+            <resource>
+                <directory>src/main/resources</directory>
+                <!-- 引入所有 匹配文件进行过滤 -->
+                <includes>
+                    <include>application*</include>
+                    <include>bootstrap*</include>
+                    <include>banner*</include>
+                </includes>
+                <!-- 启用过滤 即该资源中的变量将会被过滤器中的值替换 -->
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+    </build>
+
+    <repositories>
+<!--        <repository>-->
+<!--            <id>aliyun-spring</id>-->
+<!--            <name>Aliyun Spring Repository</name>-->
+<!--            <url>https://maven.aliyun.com/repository/spring</url>-->
+<!--            <releases>-->
+<!--                <enabled>true</enabled>-->
+<!--            </releases>-->
+<!--            <snapshots>-->
+<!--                <enabled>true</enabled>-->
+<!--            </snapshots>-->
+<!--        </repository>-->
+        <repository>
+            <id>central</id>
+            <name>Maven Central</name>
+            <url>https://repo1.maven.org/maven2</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+        </repository>
+        <repository>
+            <id>public</id>
+            <name>huawei nexus</name>
+            <url>https://mirrors.huaweicloud.com/repository/maven/</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+        </repository>
+        <repository>
+            <id>spring-milestones</id>
+            <name>Spring Milestones</name>
+            <url>https://repo.spring.io/milestone</url>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+        <repository>
+            <id>spring-snapshots</id>
+            <name>Spring Snapshots</name>
+            <url>https://repo.spring.io/snapshot</url>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+        </repository>
+    </repositories>
+
+    <pluginRepositories>
+        <pluginRepository>
+            <id>public</id>
+            <name>huawei nexus</name>
+            <url>https://mirrors.huaweicloud.com/repository/maven/</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </pluginRepository>
+    </pluginRepositories>
+
+</project>
+
diff --git a/ruoyi-common/.DS_Store b/ruoyi-common/.DS_Store
new file mode 100644
index 0000000..f689641
Binary files /dev/null and b/ruoyi-common/.DS_Store differ
diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml
new file mode 100644
index 0000000..b92f4c0
--- /dev/null
+++ b/ruoyi-common/pom.xml
@@ -0,0 +1,45 @@
+<?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>
+        <groupId>org.dromara</groupId>
+        <artifactId>PoJie</artifactId>
+        <version>${revision}</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <modules>
+        <module>ruoyi-common-bom</module>
+        <module>ruoyi-common-social</module>
+        <module>ruoyi-common-core</module>
+        <module>ruoyi-common-doc</module>
+        <module>ruoyi-common-excel</module>
+        <module>ruoyi-common-idempotent</module>
+        <module>ruoyi-common-job</module>
+        <module>ruoyi-common-log</module>
+        <module>ruoyi-common-mail</module>
+        <module>ruoyi-common-mybatis</module>
+        <module>ruoyi-common-oss</module>
+        <module>ruoyi-common-ratelimiter</module>
+        <module>ruoyi-common-redis</module>
+        <module>ruoyi-common-satoken</module>
+        <module>ruoyi-common-security</module>
+        <module>ruoyi-common-sms</module>
+        <module>ruoyi-common-web</module>
+        <module>ruoyi-common-translation</module>
+        <module>ruoyi-common-json</module>
+        <module>ruoyi-common-encrypt</module>
+        <module>ruoyi-common-sensitive</module>
+        <module>ruoyi-common-websocket</module>
+        <module>ruoyi-common-sse</module>
+    </modules>
+
+    <artifactId>ruoyi-common</artifactId>
+    <packaging>pom</packaging>
+
+    <description>
+        common 通用模块
+    </description>
+
+</project>
diff --git a/ruoyi-common/ruoyi-common-bom/pom.xml b/ruoyi-common/ruoyi-common-bom/pom.xml
new file mode 100644
index 0000000..94a0908
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-bom/pom.xml
@@ -0,0 +1,178 @@
+<?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>
+
+    <groupId>org.dromara</groupId>
+    <artifactId>ruoyi-common-bom</artifactId>
+    <version>${revision}</version>
+    <packaging>pom</packaging>
+
+    <description>
+        ruoyi-common-bom common依赖项
+    </description>
+
+    <properties>
+        <revision>5.4.1</revision>
+    </properties>
+
+    <dependencyManagement>
+        <dependencies>
+            <!-- 核心模块 -->
+            <dependency>
+                <groupId>org.dromara</groupId>
+                <artifactId>ruoyi-common-core</artifactId>
+                <version>${revision}</version>
+            </dependency>
+
+            <!-- 接口模块 -->
+            <dependency>
+                <groupId>org.dromara</groupId>
+                <artifactId>ruoyi-common-doc</artifactId>
+                <version>${revision}</version>
+            </dependency>
+
+            <!-- excel -->
+            <dependency>
+                <groupId>org.dromara</groupId>
+                <artifactId>ruoyi-common-excel</artifactId>
+                <version>${revision}</version>
+            </dependency>
+
+            <!-- 幂等 -->
+            <dependency>
+                <groupId>org.dromara</groupId>
+                <artifactId>ruoyi-common-idempotent</artifactId>
+                <version>${revision}</version>
+            </dependency>
+
+            <!-- 调度模块 -->
+            <dependency>
+                <groupId>org.dromara</groupId>
+                <artifactId>ruoyi-common-job</artifactId>
+                <version>${revision}</version>
+            </dependency>
+
+            <!-- 日志记录 -->
+            <dependency>
+                <groupId>org.dromara</groupId>
+                <artifactId>ruoyi-common-log</artifactId>
+                <version>${revision}</version>
+            </dependency>
+
+            <!-- 邮件服务 -->
+            <dependency>
+                <groupId>org.dromara</groupId>
+                <artifactId>ruoyi-common-mail</artifactId>
+                <version>${revision}</version>
+            </dependency>
+
+            <!-- 数据库服务 -->
+            <dependency>
+                <groupId>org.dromara</groupId>
+                <artifactId>ruoyi-common-mybatis</artifactId>
+                <version>${revision}</version>
+            </dependency>
+
+            <!-- OSS -->
+            <dependency>
+                <groupId>org.dromara</groupId>
+                <artifactId>ruoyi-common-oss</artifactId>
+                <version>${revision}</version>
+            </dependency>
+
+            <!-- 限流 -->
+            <dependency>
+                <groupId>org.dromara</groupId>
+                <artifactId>ruoyi-common-ratelimiter</artifactId>
+                <version>${revision}</version>
+            </dependency>
+
+            <!-- 缓存服务 -->
+            <dependency>
+                <groupId>org.dromara</groupId>
+                <artifactId>ruoyi-common-redis</artifactId>
+                <version>${revision}</version>
+            </dependency>
+
+            <!-- satoken -->
+            <dependency>
+                <groupId>org.dromara</groupId>
+                <artifactId>ruoyi-common-satoken</artifactId>
+                <version>${revision}</version>
+            </dependency>
+
+            <!-- 安全模块 -->
+            <dependency>
+                <groupId>org.dromara</groupId>
+                <artifactId>ruoyi-common-security</artifactId>
+                <version>${revision}</version>
+            </dependency>
+
+            <!-- 短信模块 -->
+            <dependency>
+                <groupId>org.dromara</groupId>
+                <artifactId>ruoyi-common-sms</artifactId>
+                <version>${revision}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.dromara</groupId>
+                <artifactId>ruoyi-common-social</artifactId>
+                <version>${revision}</version>
+            </dependency>
+
+            <!-- web服务 -->
+            <dependency>
+                <groupId>org.dromara</groupId>
+                <artifactId>ruoyi-common-web</artifactId>
+                <version>${revision}</version>
+            </dependency>
+
+            <!-- 翻译模块 -->
+            <dependency>
+                <groupId>org.dromara</groupId>
+                <artifactId>ruoyi-common-translation</artifactId>
+                <version>${revision}</version>
+            </dependency>
+
+            <!-- 脱敏模块 -->
+            <dependency>
+                <groupId>org.dromara</groupId>
+                <artifactId>ruoyi-common-sensitive</artifactId>
+                <version>${revision}</version>
+            </dependency>
+
+            <!-- 序列化模块 -->
+            <dependency>
+                <groupId>org.dromara</groupId>
+                <artifactId>ruoyi-common-json</artifactId>
+                <version>${revision}</version>
+            </dependency>
+
+            <!-- 数据库加解密模块 -->
+            <dependency>
+                <groupId>org.dromara</groupId>
+                <artifactId>ruoyi-common-encrypt</artifactId>
+                <version>${revision}</version>
+            </dependency>
+
+            <!-- WebSocket模块 -->
+            <dependency>
+                <groupId>org.dromara</groupId>
+                <artifactId>ruoyi-common-websocket</artifactId>
+                <version>${revision}</version>
+            </dependency>
+
+            <!-- SSE模块 -->
+            <dependency>
+                <groupId>org.dromara</groupId>
+                <artifactId>ruoyi-common-sse</artifactId>
+                <version>${revision}</version>
+            </dependency>
+
+        </dependencies>
+    </dependencyManagement>
+
+</project>
diff --git a/ruoyi-common/ruoyi-common-core/pom.xml b/ruoyi-common/ruoyi-common-core/pom.xml
new file mode 100644
index 0000000..d74f44e
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/pom.xml
@@ -0,0 +1,111 @@
+<?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>
+        <groupId>org.dromara</groupId>
+        <artifactId>ruoyi-common</artifactId>
+        <version>${revision}</version>
+    </parent>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>16</source>
+                    <target>16</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>ruoyi-common-core</artifactId>
+
+    <description>
+        ruoyi-common-core 核心模块
+    </description>
+
+    <dependencies>
+        <!-- Spring框架基本的核心工具 -->
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context-support</artifactId>
+        </dependency>
+
+        <!-- SpringWeb模块 -->
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-web</artifactId>
+        </dependency>
+
+        <!-- 自定义验证注解 -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-aop</artifactId>
+        </dependency>
+
+        <!--常用工具类 -->
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+        </dependency>
+
+        <!-- servlet包 -->
+        <dependency>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-core</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-http</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-extra</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
+
+        <!--  自动生成YML配置关联JSON文件  -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-configuration-processor</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-properties-migrator</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.github.linpeilie</groupId>
+            <artifactId>mapstruct-plus-spring-boot-starter</artifactId>
+        </dependency>
+
+        <!-- 离线IP地址定位库 -->
+        <dependency>
+            <groupId>org.lionsoul</groupId>
+            <artifactId>ip2region</artifactId>
+        </dependency>
+
+    </dependencies>
+
+</project>
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/ApplicationConfig.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/ApplicationConfig.java
new file mode 100644
index 0000000..bcf5d41
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/ApplicationConfig.java
@@ -0,0 +1,17 @@
+package org.dromara.common.core.config;
+
+import org.springframework.boot.autoconfigure.AutoConfiguration;
+import org.springframework.context.annotation.EnableAspectJAutoProxy;
+import org.springframework.scheduling.annotation.EnableAsync;
+
+/**
+ * 程序注解配置
+ *
+ * @author pengles
+ */
+@AutoConfiguration
+@EnableAspectJAutoProxy
+@EnableAsync(proxyTargetClass = true)
+public class ApplicationConfig {
+
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/AsyncConfig.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/AsyncConfig.java
new file mode 100644
index 0000000..6427ad5
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/AsyncConfig.java
@@ -0,0 +1,52 @@
+package org.dromara.common.core.config;
+
+import cn.hutool.core.util.ArrayUtil;
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.utils.SpringUtils;
+import org.springframework.aop.interceptor.AsyncUncaughtExceptionHandler;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
+import org.springframework.core.task.VirtualThreadTaskExecutor;
+import org.springframework.scheduling.annotation.AsyncConfigurer;
+
+import java.util.Arrays;
+import java.util.concurrent.Executor;
+
+/**
+ * 异步配置
+ * <p>
+ * 如果未使用虚拟线程则生效
+ *
+ * @author pengles
+ */
+@AutoConfiguration
+public class AsyncConfig implements AsyncConfigurer {
+
+    /**
+     * 自定义 @Async 注解使用系统线程池
+     */
+    @Override
+    public Executor getAsyncExecutor() {
+        if(SpringUtils.isVirtual()) {
+            return new VirtualThreadTaskExecutor("async-");
+        }
+        return SpringUtils.getBean("scheduledExecutorService");
+    }
+
+    /**
+     * 异步执行异常处理
+     */
+    @Override
+    public AsyncUncaughtExceptionHandler getAsyncUncaughtExceptionHandler() {
+        return (throwable, method, objects) -> {
+            throwable.printStackTrace();
+            StringBuilder sb = new StringBuilder();
+            sb.append("Exception message - ").append(throwable.getMessage())
+                .append(", Method name - ").append(method.getName());
+            if (ArrayUtil.isNotEmpty(objects)) {
+                sb.append(", Parameter value - ").append(Arrays.toString(objects));
+            }
+            throw new ServiceException(sb.toString());
+        };
+    }
+
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/ThreadPoolConfig.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/ThreadPoolConfig.java
new file mode 100644
index 0000000..d0cfbaf
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/ThreadPoolConfig.java
@@ -0,0 +1,87 @@
+package org.dromara.common.core.config;
+
+import jakarta.annotation.PreDestroy;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.concurrent.BasicThreadFactory;
+import org.dromara.common.core.config.properties.ThreadPoolProperties;
+import org.dromara.common.core.utils.SpringUtils;
+import org.dromara.common.core.utils.Threads;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.core.task.VirtualThreadTaskExecutor;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
+
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
+import java.util.concurrent.ThreadPoolExecutor;
+
+/**
+ * 线程池配置
+ *
+ * @author pengles
+ **/
+@Slf4j
+@AutoConfiguration
+@EnableConfigurationProperties(ThreadPoolProperties.class)
+public class ThreadPoolConfig {
+
+    /**
+     * 核心线程数 = cpu 核心数 + 1
+     */
+    private final int core = Runtime.getRuntime().availableProcessors() + 1;
+
+    private ScheduledExecutorService scheduledExecutorService;
+
+    @Bean(name = "threadPoolTaskExecutor")
+    @ConditionalOnProperty(prefix = "thread-pool", name = "enabled", havingValue = "true")
+    public ThreadPoolTaskExecutor threadPoolTaskExecutor(ThreadPoolProperties threadPoolProperties) {
+        ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
+        executor.setCorePoolSize(core);
+        executor.setMaxPoolSize(core * 2);
+        executor.setQueueCapacity(threadPoolProperties.getQueueCapacity());
+        executor.setKeepAliveSeconds(threadPoolProperties.getKeepAliveSeconds());
+        executor.setRejectedExecutionHandler(new ThreadPoolExecutor.CallerRunsPolicy());
+        return executor;
+    }
+
+    /**
+     * 执行周期性或定时任务
+     */
+    @Bean(name = "scheduledExecutorService")
+    protected ScheduledExecutorService scheduledExecutorService() {
+        // daemon 必须为 true
+        BasicThreadFactory.Builder builder = new BasicThreadFactory.Builder().daemon(true);
+        if (SpringUtils.isVirtual()) {
+            builder.namingPattern("virtual-schedule-pool-%d").wrappedFactory(new VirtualThreadTaskExecutor().getVirtualThreadFactory());
+        } else {
+            builder.namingPattern("schedule-pool-%d");
+        }
+        ScheduledThreadPoolExecutor scheduledThreadPoolExecutor = new ScheduledThreadPoolExecutor(core,
+            builder.build(),
+            new ThreadPoolExecutor.CallerRunsPolicy()) {
+            @Override
+            protected void afterExecute(Runnable r, Throwable t) {
+                super.afterExecute(r, t);
+                Threads.printException(r, t);
+            }
+        };
+        this.scheduledExecutorService = scheduledThreadPoolExecutor;
+        return scheduledThreadPoolExecutor;
+    }
+
+    /**
+     * 销毁事件
+     */
+    @PreDestroy
+    public void destroy() {
+        try {
+            log.info("====关闭后台任务任务线程池====");
+            Threads.shutdownAndAwaitTermination(scheduledExecutorService);
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/ValidatorConfig.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/ValidatorConfig.java
new file mode 100644
index 0000000..2b8343d
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/ValidatorConfig.java
@@ -0,0 +1,41 @@
+package org.dromara.common.core.config;
+
+import jakarta.validation.Validator;
+import org.hibernate.validator.HibernateValidator;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
+import org.springframework.boot.autoconfigure.validation.ValidationAutoConfiguration;
+import org.springframework.context.MessageSource;
+import org.springframework.context.annotation.Bean;
+import org.springframework.validation.beanvalidation.LocalValidatorFactoryBean;
+
+import java.util.Properties;
+
+/**
+ * 校验框架配置类
+ *
+ * @author pengles
+ */
+@AutoConfiguration(before = ValidationAutoConfiguration.class)
+public class ValidatorConfig {
+
+    /**
+     * 配置校验框架 快速失败模式
+     */
+    @Bean
+    public Validator validator(MessageSource messageSource) {
+        try (LocalValidatorFactoryBean factoryBean = new LocalValidatorFactoryBean()) {
+            // 国际化
+            factoryBean.setValidationMessageSource(messageSource);
+            // 设置使用 HibernateValidator 校验器
+            factoryBean.setProviderClass(HibernateValidator.class);
+            Properties properties = new Properties();
+            // 设置快速失败模式（fail-fast），即校验过程中一旦遇到失败，立即停止并返回错误
+            properties.setProperty("hibernate.validator.fail_fast", "true");
+            factoryBean.setValidationProperties(properties);
+            // 加载配置
+            factoryBean.afterPropertiesSet();
+            return factoryBean.getValidator();
+        }
+    }
+
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/properties/ThreadPoolProperties.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/properties/ThreadPoolProperties.java
new file mode 100644
index 0000000..334b242
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/config/properties/ThreadPoolProperties.java
@@ -0,0 +1,30 @@
+package org.dromara.common.core.config.properties;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+/**
+ * 线程池 配置属性
+ *
+ * @author pengles
+ */
+@Data
+@ConfigurationProperties(prefix = "thread-pool")
+public class ThreadPoolProperties {
+
+    /**
+     * 是否开启线程池
+     */
+    private boolean enabled;
+
+    /**
+     * 队列最大长度
+     */
+    private int queueCapacity;
+
+    /**
+     * 线程池维护线程所允许的空闲时间
+     */
+    private int keepAliveSeconds;
+
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/CacheConstants.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/CacheConstants.java
new file mode 100644
index 0000000..fc246cc
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/CacheConstants.java
@@ -0,0 +1,30 @@
+package org.dromara.common.core.constant;
+
+/**
+ * 缓存的key 常量
+ *
+ * @author pengles
+ */
+public interface CacheConstants {
+
+    /**
+     * 在线用户 redis key
+     */
+    String ONLINE_TOKEN_KEY = "online_tokens:";
+
+    /**
+     * 参数管理 cache key
+     */
+    String SYS_CONFIG_KEY = "sys_config:";
+
+    /**
+     * 字典管理 cache key
+     */
+    String SYS_DICT_KEY = "sys_dict:";
+
+    /**
+     * 登录账户密码错误次数 redis key
+     */
+    String PWD_ERR_CNT_KEY = "pwd_err_cnt:";
+
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/CacheNames.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/CacheNames.java
new file mode 100644
index 0000000..279ebb6
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/CacheNames.java
@@ -0,0 +1,83 @@
+package org.dromara.common.core.constant;
+
+/**
+ * 缓存组名称常量
+ * <p>
+ * key 格式为 cacheNames#ttl#maxIdleTime#maxSize
+ * <p>
+ * ttl 过期时间 如果设置为0则不过期 默认为0
+ * maxIdleTime 最大空闲时间 根据LRU算法清理空闲数据 如果设置为0则不检测 默认为0
+ * maxSize 组最大长度 根据LRU算法清理溢出数据 如果设置为0则无限长 默认为0
+ * <p>
+ * 例子: test#60s、test#0#60s、test#0#1m#1000、test#1h#0#500
+ *
+ * @author pengles
+ */
+public interface CacheNames {
+
+    /**
+     * 演示案例
+     */
+    String DEMO_CACHE = "demo:cache#60s#10m#20";
+
+    /**
+     * 系统配置
+     */
+    String SYS_CONFIG = "sys_config";
+
+    /**
+     * 数据字典
+     */
+    String SYS_DICT = "sys_dict";
+
+    /**
+     * 数据字典类型
+     */
+    String SYS_DICT_TYPE = "sys_dict_type";
+
+    /**
+     * 客户端
+     */
+    String SYS_CLIENT = GlobalConstants.GLOBAL_REDIS_KEY + "sys_client#30d";
+
+    /**
+     * 用户账户
+     */
+    String SYS_USER_NAME = "sys_user_name#30d";
+
+    /**
+     * 用户名称
+     */
+    String SYS_NICKNAME = "sys_nickname#30d";
+
+    /**
+     * 部门
+     */
+    String SYS_DEPT = "sys_dept#30d";
+
+    /**
+     * OSS内容
+     */
+    String SYS_OSS = "sys_oss#30d";
+
+    /**
+     * 角色自定义权限
+     */
+    String SYS_ROLE_CUSTOM = "sys_role_custom#30d";
+
+    /**
+     * 部门及以下权限
+     */
+    String SYS_DEPT_AND_CHILD = "sys_dept_and_child#30d";
+
+    /**
+     * OSS配置
+     */
+    String SYS_OSS_CONFIG = GlobalConstants.GLOBAL_REDIS_KEY + "sys_oss_config";
+
+    /**
+     * 在线用户
+     */
+    String ONLINE_TOKEN = "online_tokens";
+
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/Constants.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/Constants.java
new file mode 100644
index 0000000..f47654c
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/Constants.java
@@ -0,0 +1,76 @@
+package org.dromara.common.core.constant;
+
+/**
+ * 通用常量信息
+ *
+ * @author pengles
+ */
+public interface Constants {
+
+    /**
+     * UTF-8 字符集
+     */
+    String UTF8 = "UTF-8";
+
+    /**
+     * GBK 字符集
+     */
+    String GBK = "GBK";
+
+    /**
+     * www主域
+     */
+    String WWW = "www.";
+
+    /**
+     * http请求
+     */
+    String HTTP = "http://";
+
+    /**
+     * https请求
+     */
+    String HTTPS = "https://";
+
+    /**
+     * 通用成功标识
+     */
+    String SUCCESS = "0";
+
+    /**
+     * 通用失败标识
+     */
+    String FAIL = "1";
+
+    /**
+     * 登录成功
+     */
+    String LOGIN_SUCCESS = "Success";
+
+    /**
+     * 注销
+     */
+    String LOGOUT = "Logout";
+
+    /**
+     * 注册
+     */
+    String REGISTER = "Register";
+
+    /**
+     * 登录失败
+     */
+    String LOGIN_FAIL = "Error";
+
+    /**
+     * 验证码有效期（分钟）
+     */
+    Integer CAPTCHA_EXPIRATION = 2;
+
+    /**
+     * 顶级父级id
+     */
+    Long TOP_PARENT_ID = 0L;
+
+}
+
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/GlobalConstants.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/GlobalConstants.java
new file mode 100644
index 0000000..65868c0
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/GlobalConstants.java
@@ -0,0 +1,34 @@
+package org.dromara.common.core.constant;
+
+/**
+ * 全局的key常量 (业务无关的key)
+ *
+ * @author pengles
+ */
+public interface GlobalConstants {
+
+    /**
+     * 全局 redis key (业务无关的key)
+     */
+    String GLOBAL_REDIS_KEY = "global:";
+
+    /**
+     * 验证码 redis key
+     */
+    String CAPTCHA_CODE_KEY = GLOBAL_REDIS_KEY + "captcha_codes:";
+
+    /**
+     * 防重提交 redis key
+     */
+    String REPEAT_SUBMIT_KEY = GLOBAL_REDIS_KEY + "repeat_submit:";
+
+    /**
+     * 限流 redis key
+     */
+    String RATE_LIMIT_KEY = GLOBAL_REDIS_KEY + "rate_limit:";
+
+    /**
+     * 三方认证 redis key
+     */
+    String SOCIAL_AUTH_CODE_KEY = GLOBAL_REDIS_KEY + "social_auth_codes:";
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/HttpStatus.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/HttpStatus.java
new file mode 100644
index 0000000..70c3383
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/HttpStatus.java
@@ -0,0 +1,93 @@
+package org.dromara.common.core.constant;
+
+/**
+ * 返回状态码
+ *
+ * @author pengles
+ */
+public interface HttpStatus {
+    /**
+     * 操作成功
+     */
+    int SUCCESS = 200;
+
+    /**
+     * 对象创建成功
+     */
+    int CREATED = 201;
+
+    /**
+     * 请求已经被接受
+     */
+    int ACCEPTED = 202;
+
+    /**
+     * 操作已经执行成功，但是没有返回数据
+     */
+    int NO_CONTENT = 204;
+
+    /**
+     * 资源已被移除
+     */
+    int MOVED_PERM = 301;
+
+    /**
+     * 重定向
+     */
+    int SEE_OTHER = 303;
+
+    /**
+     * 资源没有被修改
+     */
+    int NOT_MODIFIED = 304;
+
+    /**
+     * 参数列表错误（缺少，格式不匹配）
+     */
+    int BAD_REQUEST = 400;
+
+    /**
+     * 未授权
+     */
+    int UNAUTHORIZED = 401;
+
+    /**
+     * 访问受限，授权过期
+     */
+    int FORBIDDEN = 403;
+
+    /**
+     * 资源，服务未找到
+     */
+    int NOT_FOUND = 404;
+
+    /**
+     * 不允许的http方法
+     */
+    int BAD_METHOD = 405;
+
+    /**
+     * 资源冲突，或者资源被锁
+     */
+    int CONFLICT = 409;
+
+    /**
+     * 不支持的数据，媒体类型
+     */
+    int UNSUPPORTED_TYPE = 415;
+
+    /**
+     * 系统内部错误
+     */
+    int ERROR = 500;
+
+    /**
+     * 接口未实现
+     */
+    int NOT_IMPLEMENTED = 501;
+
+    /**
+     * 系统警告消息
+     */
+    int WARN = 601;
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/RegexConstants.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/RegexConstants.java
new file mode 100644
index 0000000..f1e04f7
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/RegexConstants.java
@@ -0,0 +1,59 @@
+package org.dromara.common.core.constant;
+
+import cn.hutool.core.lang.RegexPool;
+
+/**
+ * 常用正则表达式字符串
+ * <p>
+ * 常用正则表达式集合，更多正则见: https://any86.github.io/any-rule/
+ *
+ * @author Feng
+ */
+public interface RegexConstants extends RegexPool {
+
+    /**
+     * 字典类型必须以字母开头，且只能为（小写字母，数字，下滑线）
+     */
+    String DICTIONARY_TYPE = "^[a-z][a-z0-9_]*$";
+
+    /**
+     * 权限标识必须符合以下格式：
+     * 1. 标准格式：xxx:yyy:zzz
+     * - 第一部分（xxx）：只能包含字母、数字和下划线（_），不能使用 `*`
+     * - 第二部分（yyy）：可以包含字母、数字、下划线（_）和 `*`
+     * - 第三部分（zzz）：可以包含字母、数字、下划线（_）和 `*`
+     * 2. 允许空字符串（""），表示没有权限标识
+     */
+    String PERMISSION_STRING = "^$|^[a-zA-Z0-9_]+:[a-zA-Z0-9_*]+:[a-zA-Z0-9_*]+$";
+
+    /**
+     * 身份证号码（后6位）
+     */
+    String ID_CARD_LAST_6 = "^(([0-2][1-9])|10|20|30|31)\\d{3}[0-9Xx]$";
+
+    /**
+     * QQ号码
+     */
+    String QQ_NUMBER = "^[1-9][0-9]\\d{4,9}$";
+
+    /**
+     * 邮政编码
+     */
+    String POSTAL_CODE = "^[1-9]\\d{5}$";
+
+    /**
+     * 注册账号
+     */
+    String ACCOUNT = "^[a-zA-Z][a-zA-Z0-9_]{4,15}$";
+
+    /**
+     * 密码：包含至少8个字符，包括大写字母、小写字母、数字和特殊字符
+     */
+    String PASSWORD = "^(?=.*[a-z])(?=.*[A-Z])(?=.*\\d)(?=.*[@$!%*?&])[A-Za-z\\d@$!%*?&]{8,}$";
+
+    /**
+     * 通用状态（0表示正常，1表示停用）
+     */
+    String STATUS = "^[01]$";
+
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/SystemConstants.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/SystemConstants.java
new file mode 100644
index 0000000..0220b46
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/SystemConstants.java
@@ -0,0 +1,95 @@
+package org.dromara.common.core.constant;
+
+/**
+ * 系统常量信息
+ *
+ * @author pengles
+ */
+public interface SystemConstants {
+
+    /**
+     * 正常状态
+     */
+    String NORMAL = "0";
+
+    /**
+     * 异常状态
+     */
+    String DISABLE = "1";
+
+    /**
+     * 是否为系统默认（是）
+     */
+    String YES = "Y";
+
+    /**
+     * 是否为系统默认（否）
+     */
+    String NO = "N";
+
+    /**
+     * 是否菜单外链（是）
+     */
+    String YES_FRAME = "0";
+
+    /**
+     * 是否菜单外链（否）
+     */
+    String NO_FRAME = "1";
+
+    /**
+     * 菜单类型（目录）
+     */
+    String TYPE_DIR = "M";
+
+    /**
+     * 菜单类型（菜单）
+     */
+    String TYPE_MENU = "C";
+
+    /**
+     * 菜单类型（按钮）
+     */
+    String TYPE_BUTTON = "F";
+
+    /**
+     * Layout组件标识
+     */
+    String LAYOUT = "Layout";
+
+    /**
+     * ParentView组件标识
+     */
+    String PARENT_VIEW = "ParentView";
+
+    /**
+     * InnerLink组件标识
+     */
+    String INNER_LINK = "InnerLink";
+
+    /**
+     * 超级管理员角色 roleKey
+     */
+    String SUPER_ADMIN_ROLE_KEY = "superadmin";
+
+    /**
+     * 管理员角色 roleKey （保留 roleKey）
+     */
+    String ADMIN_ROLE_KEY = "admin";
+
+    /**
+     * 超级管理员ID
+     */
+    Long SUPER_ADMIN_ID = 1L;
+
+    /**
+     * 根部门祖级列表
+     */
+    String ROOT_DEPT_ANCESTORS = "0";
+
+    /**
+     * 默认部门 ID
+     */
+    Long DEFAULT_DEPT_ID = 100L;
+
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/UserConstants.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/UserConstants.java
new file mode 100644
index 0000000..8323bb8
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/constant/UserConstants.java
@@ -0,0 +1,118 @@
+package org.dromara.common.core.constant;
+
+/**
+ * 用户常量信息
+ *
+ * @author pengles
+ */
+public interface UserConstants {
+
+    /**
+     * 平台内系统用户的唯一标志
+     */
+    String SYS_USER = "SYS_USER";
+
+    /**
+     * App用户类型
+     */
+    String APP_USER_TYPE = "APP_USER";
+
+    /**
+     * 正常状态
+     */
+    String NORMAL = "0";
+
+    /**
+     * 异常状态
+     */
+    String EXCEPTION = "1";
+
+    /**
+     * 用户封禁状态
+     */
+    String USER_DISABLE = "1";
+
+    /**
+     * 角色封禁状态
+     */
+    String ROLE_DISABLE = "1";
+
+    /**
+     * 部门正常状态
+     */
+    String DEPT_NORMAL = "0";
+
+    /**
+     * 部门停用状态
+     */
+    String DEPT_DISABLE = "1";
+
+    /**
+     * 字典正常状态
+     */
+    String DICT_NORMAL = "0";
+
+    /**
+     * 是否为系统默认（是）
+     */
+    String YES = "Y";
+
+    /**
+     * 是否菜单外链（是）
+     */
+    String YES_FRAME = "0";
+
+    /**
+     * 是否菜单外链（否）
+     */
+    String NO_FRAME = "1";
+
+    /**
+     * 菜单类型（目录）
+     */
+    String TYPE_DIR = "M";
+
+    /**
+     * 菜单类型（菜单）
+     */
+    String TYPE_MENU = "C";
+
+    /**
+     * 菜单类型（按钮）
+     */
+    String TYPE_BUTTON = "F";
+
+    /**
+     * Layout组件标识
+     */
+    String LAYOUT = "Layout";
+
+    /**
+     * ParentView组件标识
+     */
+    String PARENT_VIEW = "ParentView";
+
+    /**
+     * InnerLink组件标识
+     */
+    String INNER_LINK = "InnerLink";
+
+    /**
+     * 校验返回结果码
+     */
+    String UNIQUE = "0";
+    String NOT_UNIQUE = "1";
+
+    /**
+     * 用户名长度限制
+     */
+    int USERNAME_MIN_LENGTH = 2;
+    int USERNAME_MAX_LENGTH = 20;
+
+    /**
+     * 密码长度限制
+     */
+    int PASSWORD_MIN_LENGTH = 5;
+    int PASSWORD_MAX_LENGTH = 20;
+
+}
\ No newline at end of file
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/R.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/R.java
new file mode 100644
index 0000000..81a287f
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/R.java
@@ -0,0 +1,122 @@
+package org.dromara.common.core.domain;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.dromara.common.core.constant.HttpStatus;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 响应信息主体
+ *
+ * @author pengles
+ */
+@Data
+@NoArgsConstructor
+public class R<T> implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 成功
+     */
+    public static final int SUCCESS = 200;
+
+    /**
+     * 失败
+     */
+    public static final int FAIL = 500;
+
+    private int code;
+
+    private String msg;
+
+    private T data;
+
+    public static <T> R<T> ok() {
+        return restResult(null, SUCCESS, "操作成功");
+    }
+
+    public static <T> R<T> ok(T data) {
+        return restResult(data, SUCCESS, "操作成功");
+    }
+
+    public static <T> R<T> ok(Boolean success) {
+        return restResult(null, success ? SUCCESS : FAIL, success ? "操作成功" : "操作失败");
+    }
+
+    public static <T> R<T> ok(Boolean success, String msg) {
+        return restResult(null, success ? SUCCESS : FAIL, msg);
+    }
+
+    public static <T> R<T> ok(Boolean success, T data) {
+        return restResult(data, success ? SUCCESS : FAIL, success ? "操作成功" : "操作失败");
+    }
+
+    public static <T> R<T> ok(String msg) {
+        return restResult(null, SUCCESS, msg);
+    }
+
+    public static <T> R<T> ok(String msg, T data) {
+        return restResult(data, SUCCESS, msg);
+    }
+
+    public static <T> R<T> fail() {
+        return restResult(null, FAIL, "操作失败");
+    }
+
+    public static <T> R<T> fail(String msg) {
+        return restResult(null, FAIL, msg);
+    }
+
+    public static <T> R<T> fail(T data) {
+        return restResult(data, FAIL, "操作失败");
+    }
+
+    public static <T> R<T> fail(String msg, T data) {
+        return restResult(data, FAIL, msg);
+    }
+
+    public static <T> R<T> fail(int code, String msg) {
+        return restResult(null, code, msg);
+    }
+
+    /**
+     * 返回警告消息
+     *
+     * @param msg 返回内容
+     * @return 警告消息
+     */
+    public static <T> R<T> warn(String msg) {
+        return restResult(null, HttpStatus.WARN, msg);
+    }
+
+    /**
+     * 返回警告消息
+     *
+     * @param msg 返回内容
+     * @param data 数据对象
+     * @return 警告消息
+     */
+    public static <T> R<T> warn(String msg, T data) {
+        return restResult(data, HttpStatus.WARN, msg);
+    }
+
+    private static <T> R<T> restResult(T data, int code, String msg) {
+        R<T> r = new R<>();
+        r.setCode(code);
+        r.setData(data);
+        r.setMsg(msg);
+        return r;
+    }
+
+    public static <T> Boolean isError(R<T> ret) {
+        return !isSuccess(ret);
+    }
+
+    public static <T> Boolean isSuccess(R<T> ret) {
+        return R.SUCCESS == ret.getCode();
+    }
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/CompleteTaskDTO.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/CompleteTaskDTO.java
new file mode 100644
index 0000000..2e63f8a
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/CompleteTaskDTO.java
@@ -0,0 +1,71 @@
+package org.dromara.common.core.domain.dto;
+
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * 办理任务请求对象
+ *
+ * @author may
+ */
+@Data
+public class CompleteTaskDTO implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 任务id
+     */
+    private Long taskId;
+
+    /**
+     * 附件id
+     */
+    private String fileId;
+
+    /**
+     * 抄送人员
+     */
+    private List<FlowCopyDTO> flowCopyList;
+
+    /**
+     * 消息类型
+     */
+    private List<String> messageType;
+
+    /**
+     * 办理意见
+     */
+    private String message;
+
+    /**
+     * 消息通知
+     */
+    private String notice;
+
+    /**
+     * 流程变量
+     */
+    private Map<String, Object> variables;
+
+    /**
+     * 扩展变量(此处为逗号分隔的ossId)
+     */
+    private String ext;
+
+    public Map<String, Object> getVariables() {
+        if (variables == null) {
+            return new HashMap<>(16);
+        }
+        variables.entrySet().removeIf(entry -> Objects.isNull(entry.getValue()));
+        return variables;
+    }
+
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/DeptDTO.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/DeptDTO.java
new file mode 100644
index 0000000..7b748b0
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/DeptDTO.java
@@ -0,0 +1,36 @@
+package org.dromara.common.core.domain.dto;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 部门
+ *
+ * @author AprilWind
+ */
+@Data
+@NoArgsConstructor
+public class DeptDTO implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 部门ID
+     */
+    private Long deptId;
+
+    /**
+     * 父部门ID
+     */
+    private Long parentId;
+
+    /**
+     * 部门名称
+     */
+    private String deptName;
+
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/DictDataDTO.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/DictDataDTO.java
new file mode 100644
index 0000000..dff1a75
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/DictDataDTO.java
@@ -0,0 +1,41 @@
+package org.dromara.common.core.domain.dto;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 字典数据DTO
+ *
+ * @author AprilWind
+ */
+@Data
+@NoArgsConstructor
+public class DictDataDTO implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 字典标签
+     */
+    private String dictLabel;
+
+    /**
+     * 字典键值
+     */
+    private String dictValue;
+
+    /**
+     * 是否默认（Y是 N否）
+     */
+    private String isDefault;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/DictTypeDTO.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/DictTypeDTO.java
new file mode 100644
index 0000000..43ab142
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/DictTypeDTO.java
@@ -0,0 +1,41 @@
+package org.dromara.common.core.domain.dto;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 字典类型DTO
+ *
+ * @author AprilWind
+ */
+@Data
+@NoArgsConstructor
+public class DictTypeDTO implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 字典主键
+     */
+    private Long dictId;
+
+    /**
+     * 字典名称
+     */
+    private String dictName;
+
+    /**
+     * 字典类型
+     */
+    private String dictType;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/FlowCopyDTO.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/FlowCopyDTO.java
new file mode 100644
index 0000000..2f20b21
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/FlowCopyDTO.java
@@ -0,0 +1,30 @@
+package org.dromara.common.core.domain.dto;
+
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+
+/**
+ * 抄送
+ *
+ * @author may
+ */
+@Data
+public class FlowCopyDTO implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 用户id
+     */
+    private Long userId;
+
+    /**
+     * 用户名称
+     */
+    private String userName;
+
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/OssDTO.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/OssDTO.java
new file mode 100644
index 0000000..823af0c
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/OssDTO.java
@@ -0,0 +1,46 @@
+package org.dromara.common.core.domain.dto;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * OSS对象
+ *
+ * @author pengles
+ */
+@Data
+@NoArgsConstructor
+public class OssDTO implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 对象存储主键
+     */
+    private Long ossId;
+
+    /**
+     * 文件名
+     */
+    private String fileName;
+
+    /**
+     * 原名
+     */
+    private String originalName;
+
+    /**
+     * 文件后缀名
+     */
+    private String fileSuffix;
+
+    /**
+     * URL地址
+     */
+    private String url;
+
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/PostDTO.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/PostDTO.java
new file mode 100644
index 0000000..7536ee3
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/PostDTO.java
@@ -0,0 +1,46 @@
+package org.dromara.common.core.domain.dto;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 岗位
+ *
+ * @author AprilWind
+ */
+@Data
+@NoArgsConstructor
+public class PostDTO implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 岗位ID
+     */
+    private Long postId;
+
+    /**
+     * 部门id
+     */
+    private Long deptId;
+
+    /**
+     * 岗位编码
+     */
+    private String postCode;
+
+    /**
+     * 岗位名称
+     */
+    private String postName;
+
+    /**
+     * 岗位类别编码
+     */
+    private String postCategory;
+
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/RoleDTO.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/RoleDTO.java
new file mode 100644
index 0000000..70e81de
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/RoleDTO.java
@@ -0,0 +1,42 @@
+package org.dromara.common.core.domain.dto;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 角色
+ *
+ * @author pengles
+ */
+
+@Data
+@NoArgsConstructor
+public class RoleDTO implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 角色ID
+     */
+    private Long roleId;
+
+    /**
+     * 角色名称
+     */
+    private String roleName;
+
+    /**
+     * 角色权限
+     */
+    private String roleKey;
+
+    /**
+     * 数据范围（1：全部数据权限 2：自定数据权限 3：本部门数据权限 4：本部门及以下数据权限 5：仅本人数据权限 6：部门及以下或本人数据权限）
+     */
+    private String dataScope;
+
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/StartProcessDTO.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/StartProcessDTO.java
new file mode 100644
index 0000000..3934ada
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/StartProcessDTO.java
@@ -0,0 +1,45 @@
+package org.dromara.common.core.domain.dto;
+
+
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * 启动流程对象
+ *
+ * @author may
+ */
+@Data
+public class StartProcessDTO implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 业务唯一值id
+     */
+    private String businessId;
+
+    /**
+     * 流程定义编码
+     */
+    private String flowCode;
+
+    /**
+     * 流程变量，前端会提交一个元素{'entity': {业务详情数据对象}}
+     */
+    private Map<String, Object> variables;
+
+    public Map<String, Object> getVariables() {
+        if (variables == null) {
+            return new HashMap<>(16);
+        }
+        variables.entrySet().removeIf(entry -> Objects.isNull(entry.getValue()));
+        return variables;
+    }
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/StartProcessReturnDTO.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/StartProcessReturnDTO.java
new file mode 100644
index 0000000..8a4bda3
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/StartProcessReturnDTO.java
@@ -0,0 +1,30 @@
+package org.dromara.common.core.domain.dto;
+
+
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 启动流程返回对象
+ *
+ * @author pengles
+ */
+@Data
+public class StartProcessReturnDTO implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 流程实例id
+     */
+    private Long processInstanceId;
+
+    /**
+     * 任务id
+     */
+    private Long taskId;
+
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/TaskAssigneeDTO.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/TaskAssigneeDTO.java
new file mode 100644
index 0000000..85893e1
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/TaskAssigneeDTO.java
@@ -0,0 +1,101 @@
+package org.dromara.common.core.domain.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+/**
+ * 任务受让人
+ *
+ * @author AprilWind
+ */
+@Data
+@NoArgsConstructor
+public class TaskAssigneeDTO implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 总大小
+     */
+    private Long total = 0L;
+
+    /**
+     *
+     */
+    private List<TaskHandler> list;
+
+    public TaskAssigneeDTO(Long total, List<TaskHandler> list) {
+        this.total = total;
+        this.list = list;
+    }
+
+    /**
+     * 将源列表转换为 TaskHandler 列表
+     *
+     * @param <T>              通用类型
+     * @param sourceList       待转换的源列表
+     * @param storageId        提取 storageId 的函数
+     * @param handlerCode      提取 handlerCode 的函数
+     * @param handlerName      提取 handlerName 的函数
+     * @param groupName        提取 groupName 的函数
+     * @param createTimeMapper 提取 createTime 的函数
+     * @return 转换后的 TaskHandler 列表
+     */
+    public static <T> List<TaskHandler> convertToHandlerList(
+        List<T> sourceList,
+        Function<T, Long> storageId,
+        Function<T, String> handlerCode,
+        Function<T, String> handlerName,
+        Function<T, Long> groupName,
+        Function<T, Date> createTimeMapper) {
+        return sourceList.stream()
+            .map(item -> new TaskHandler(
+                String.valueOf(storageId.apply(item)),
+                handlerCode.apply(item),
+                handlerName.apply(item),
+                groupName != null ? String.valueOf(groupName.apply(item)) : null,
+                createTimeMapper.apply(item)
+            )).collect(Collectors.toList());
+    }
+
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public static class TaskHandler {
+
+        /**
+         * 主键
+         */
+        private String storageId;
+
+        /**
+         * 权限编码
+         */
+        private String handlerCode;
+
+        /**
+         * 权限名称
+         */
+        private String handlerName;
+
+        /**
+         * 权限分组
+         */
+        private String groupName;
+
+        /**
+         * 创建时间
+         */
+        private Date createTime;
+    }
+
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/UserDTO.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/UserDTO.java
new file mode 100644
index 0000000..2e5dbc8
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/UserDTO.java
@@ -0,0 +1,73 @@
+package org.dromara.common.core.domain.dto;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 用户
+ *
+ * @author pengles
+ */
+@Data
+@NoArgsConstructor
+public class UserDTO implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 用户ID
+     */
+    private Long userId;
+
+    /**
+     * 部门ID
+     */
+    private Long deptId;
+
+    /**
+     * 用户账号
+     */
+    private String userName;
+
+    /**
+     * 用户昵称
+     */
+    private String nickName;
+
+    /**
+     * 用户类型（sys_user系统用户）
+     */
+    private String userType;
+
+    /**
+     * 用户邮箱
+     */
+    private String email;
+
+    /**
+     * 手机号码
+     */
+    private String phonenumber;
+
+    /**
+     * 用户性别（0男 1女 2未知）
+     */
+    private String sex;
+
+    /**
+     * 帐号状态（0正常 1停用）
+     */
+    private String status;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/UserOnlineDTO.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/UserOnlineDTO.java
new file mode 100644
index 0000000..b74905c
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/UserOnlineDTO.java
@@ -0,0 +1,72 @@
+package org.dromara.common.core.domain.dto;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 当前在线会话
+ *
+ * @author pengles
+ */
+
+@Data
+@NoArgsConstructor
+public class UserOnlineDTO implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 会话编号
+     */
+    private String tokenId;
+
+    /**
+     * 部门名称
+     */
+    private String deptName;
+
+    /**
+     * 用户名称
+     */
+    private String userName;
+
+    /**
+     * 客户端
+     */
+    private String clientKey;
+
+    /**
+     * 设备类型
+     */
+    private String deviceType;
+
+    /**
+     * 登录IP地址
+     */
+    private String ipaddr;
+
+    /**
+     * 登录地址
+     */
+    private String loginLocation;
+
+    /**
+     * 浏览器类型
+     */
+    private String browser;
+
+    /**
+     * 操作系统
+     */
+    private String os;
+
+    /**
+     * 登录时间
+     */
+    private Long loginTime;
+
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/event/ProcessDeleteEvent.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/event/ProcessDeleteEvent.java
new file mode 100644
index 0000000..03e7867
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/event/ProcessDeleteEvent.java
@@ -0,0 +1,29 @@
+package org.dromara.common.core.domain.event;
+
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 删除流程监听
+ *
+ * @author AprilWind
+ */
+@Data
+public class ProcessDeleteEvent implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 流程定义编码
+     */
+    private String flowCode;
+
+    /**
+     * 业务id
+     */
+    private String businessId;
+
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/event/ProcessEvent.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/event/ProcessEvent.java
new file mode 100644
index 0000000..1973d21
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/event/ProcessEvent.java
@@ -0,0 +1,60 @@
+package org.dromara.common.core.domain.event;
+
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Map;
+
+/**
+ * 总体流程监听
+ *
+ * @author may
+ */
+@Data
+public class ProcessEvent implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 流程定义编码
+     */
+    private String flowCode;
+
+    /**
+     * 业务id
+     */
+    private String businessId;
+
+    /**
+     * 节点类型（0开始节点 1中间节点 2结束节点 3互斥网关 4并行网关）
+     */
+    private Integer nodeType;
+
+    /**
+     * 流程节点编码
+     */
+    private String nodeCode;
+
+    /**
+     * 流程节点名称
+     */
+    private String nodeName;
+
+    /**
+     * 流程状态
+     */
+    private String status;
+
+    /**
+     * 办理参数
+     */
+    private Map<String, Object> params;
+
+    /**
+     * 当为true时为申请人节点办理
+     */
+    private Boolean submit;
+
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/event/ProcessTaskEvent.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/event/ProcessTaskEvent.java
new file mode 100644
index 0000000..b13f157
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/event/ProcessTaskEvent.java
@@ -0,0 +1,54 @@
+package org.dromara.common.core.domain.event;
+
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 流程任务监听
+ *
+ * @author may
+ */
+@Data
+public class ProcessTaskEvent implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 流程定义编码
+     */
+    private String flowCode;
+
+    /**
+     * 节点类型（0开始节点 1中间节点 2结束节点 3互斥网关 4并行网关）
+     */
+    private Integer nodeType;
+
+    /**
+     * 流程节点编码
+     */
+    private String nodeCode;
+
+    /**
+     * 流程节点名称
+     */
+    private String nodeName;
+
+    /**
+     * 任务id
+     */
+    private Long taskId;
+
+    /**
+     * 业务id
+     */
+    private String businessId;
+
+    /**
+     * 流程状态
+     */
+    private String status;
+
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/EmailLoginBody.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/EmailLoginBody.java
new file mode 100644
index 0000000..9dc69a3
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/EmailLoginBody.java
@@ -0,0 +1,31 @@
+package org.dromara.common.core.domain.model;
+
+import jakarta.validation.constraints.Email;
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 邮件登录对象
+ *
+ * @author pengles
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class EmailLoginBody extends LoginBody {
+
+    /**
+     * 邮箱
+     */
+    @NotBlank(message = "{user.email.not.blank}")
+    @Email(message = "{user.email.not.valid}")
+    private String email;
+
+    /**
+     * 邮箱code
+     */
+    @NotBlank(message = "{email.code.not.blank}")
+    private String emailCode;
+
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/LoginBody.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/LoginBody.java
new file mode 100644
index 0000000..41e5de4
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/LoginBody.java
@@ -0,0 +1,43 @@
+package org.dromara.common.core.domain.model;
+
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 用户登录对象
+ *
+ * @author pengles
+ */
+
+@Data
+public class LoginBody implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户端id
+     */
+    @NotBlank(message = "{auth.clientid.not.blank}")
+    private String clientId;
+
+    /**
+     * 授权类型
+     */
+    @NotBlank(message = "{auth.grant.type.not.blank}")
+    private String grantType;
+
+    /**
+     * 验证码
+     */
+    private String code;
+
+    /**
+     * 唯一标识
+     */
+    private String uuid;
+
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/LoginUser.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/LoginUser.java
new file mode 100644
index 0000000..84cf224
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/LoginUser.java
@@ -0,0 +1,143 @@
+package org.dromara.common.core.domain.model;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.dromara.common.core.domain.dto.PostDTO;
+import org.dromara.common.core.domain.dto.RoleDTO;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * 登录用户身份权限
+ *
+ * @author pengles
+ */
+@Data
+@NoArgsConstructor
+public class LoginUser implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 用户ID
+     */
+    private Long userId;
+
+    /**
+     * 部门ID
+     */
+    private Long deptId;
+
+    /**
+     * 部门类别编码
+     */
+    private String deptCategory;
+
+    /**
+     * 部门名
+     */
+    private String deptName;
+
+    /**
+     * 用户唯一标识
+     */
+    private String token;
+
+    /**
+     * 用户类型
+     */
+    private String userType;
+
+    /**
+     * 登录时间
+     */
+    private Long loginTime;
+
+    /**
+     * 过期时间
+     */
+    private Long expireTime;
+
+    /**
+     * 登录IP地址
+     */
+    private String ipaddr;
+
+    /**
+     * 登录地点
+     */
+    private String loginLocation;
+
+    /**
+     * 浏览器类型
+     */
+    private String browser;
+
+    /**
+     * 操作系统
+     */
+    private String os;
+
+    /**
+     * 菜单权限
+     */
+    private Set<String> menuPermission;
+
+    /**
+     * 角色权限
+     */
+    private Set<String> rolePermission;
+
+    /**
+     * 用户名
+     */
+    private String username;
+
+    /**
+     * 用户昵称
+     */
+    private String nickname;
+
+    /**
+     * 角色对象
+     */
+    private List<RoleDTO> roles;
+
+    /**
+     * 岗位对象
+     */
+    private List<PostDTO> posts;
+
+    /**
+     * 数据权限 当前角色ID
+     */
+    private Long roleId;
+
+    /**
+     * 客户端
+     */
+    private String clientKey;
+
+    /**
+     * 设备类型
+     */
+    private String deviceType;
+
+    /**
+     * 获取登录id
+     */
+    public String getLoginId() {
+        if (userType == null) {
+            throw new IllegalArgumentException("用户类型不能为空");
+        }
+        if (userId == null) {
+            throw new IllegalArgumentException("用户ID不能为空");
+        }
+        return userType + ":" + userId;
+    }
+
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/PasswordLoginBody.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/PasswordLoginBody.java
new file mode 100644
index 0000000..40f2aa5
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/PasswordLoginBody.java
@@ -0,0 +1,31 @@
+package org.dromara.common.core.domain.model;
+
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.validator.constraints.Length;
+
+/**
+ * 密码登录对象
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class PasswordLoginBody extends LoginBody {
+
+    /**
+     * 用户名
+     */
+    @NotBlank(message = "{user.username.not.blank}")
+    @Length(min = 2, max = 30, message = "{user.username.length.valid}")
+    private String username;
+
+    /**
+     * 用户密码
+     */
+    @NotBlank(message = "{user.password.not.blank}")
+    @Length(min = 5, max = 30, message = "{user.password.length.valid}")
+    private String password;
+
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/RegisterBody.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/RegisterBody.java
new file mode 100644
index 0000000..d37174a
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/RegisterBody.java
@@ -0,0 +1,33 @@
+package org.dromara.common.core.domain.model;
+
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.validator.constraints.Length;
+
+/**
+ * 用户注册对象
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class RegisterBody extends LoginBody {
+
+    /**
+     * 用户名
+     */
+    @NotBlank(message = "{user.username.not.blank}")
+    @Length(min = 2, max = 30, message = "{user.username.length.valid}")
+    private String username;
+
+    /**
+     * 用户密码
+     */
+    @NotBlank(message = "{user.password.not.blank}")
+    @Length(min = 5, max = 30, message = "{user.password.length.valid}")
+    private String password;
+
+    private String userType;
+
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/SmsLoginBody.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/SmsLoginBody.java
new file mode 100644
index 0000000..28bff61
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/SmsLoginBody.java
@@ -0,0 +1,29 @@
+package org.dromara.common.core.domain.model;
+
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 短信登录对象
+ *
+ * @author pengles
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class SmsLoginBody extends LoginBody {
+
+    /**
+     * 手机号
+     */
+    @NotBlank(message = "{user.phonenumber.not.blank}")
+    private String phonenumber;
+
+    /**
+     * 短信code
+     */
+    @NotBlank(message = "{sms.code.not.blank}")
+    private String smsCode;
+
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/SocialLoginBody.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/SocialLoginBody.java
new file mode 100644
index 0000000..dabf4a6
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/SocialLoginBody.java
@@ -0,0 +1,35 @@
+package org.dromara.common.core.domain.model;
+
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 三方登录对象
+ *
+ * @author pengles
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class SocialLoginBody extends LoginBody {
+
+    /**
+     * 第三方登录平台
+     */
+    @NotBlank(message = "{social.source.not.blank}")
+    private String source;
+
+    /**
+     * 第三方登录code
+     */
+    @NotBlank(message = "{social.code.not.blank}")
+    private String socialCode;
+
+    /**
+     * 第三方登录socialState
+     */
+    @NotBlank(message = "{social.state.not.blank}")
+    private String socialState;
+
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/TaskAssigneeBody.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/TaskAssigneeBody.java
new file mode 100644
index 0000000..0cbed2f
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/TaskAssigneeBody.java
@@ -0,0 +1,56 @@
+package org.dromara.common.core.domain.model;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 任务受让人
+ *
+ * @author AprilWind
+ */
+@Data
+@NoArgsConstructor
+public class TaskAssigneeBody implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 权限编码
+     */
+    private String handlerCode;
+
+    /**
+     * 权限名称
+     */
+    private String handlerName;
+
+    /**
+     * 权限分组
+     */
+    private String groupId;
+
+    /**
+     * 开始时间
+     */
+    private String beginTime;
+
+    /**
+     * 结束时间
+     */
+    private String endTime;
+
+    /**
+     * 当前页
+     */
+    private Integer pageNum = 1;
+
+    /**
+     * 每页显示条数
+     */
+    private Integer pageSize = 10;
+
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/XcxLoginBody.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/XcxLoginBody.java
new file mode 100644
index 0000000..01fbd53
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/XcxLoginBody.java
@@ -0,0 +1,28 @@
+package org.dromara.common.core.domain.model;
+
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 三方登录对象
+ *
+ * @author pengles
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class XcxLoginBody extends LoginBody {
+
+    /**
+     * 小程序id(多个小程序时使用)
+     */
+    private String appid;
+
+    /**
+     * 小程序code
+     */
+    @NotBlank(message = "{xcx.code.not.blank}")
+    private String code;
+
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/XcxLoginUser.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/XcxLoginUser.java
new file mode 100644
index 0000000..f741d1c
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/XcxLoginUser.java
@@ -0,0 +1,32 @@
+package org.dromara.common.core.domain.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+import java.io.Serial;
+
+/**
+ * 小程序登录用户身份权限
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@NoArgsConstructor
+public class XcxLoginUser extends LoginUser {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * openid
+     */
+    private String openid;
+
+    /**
+     * unionId
+     */
+    private String unionId;
+
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/BusinessStatusEnum.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/BusinessStatusEnum.java
new file mode 100644
index 0000000..c1660ee
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/BusinessStatusEnum.java
@@ -0,0 +1,215 @@
+package org.dromara.common.core.enums;
+
+import cn.hutool.core.util.StrUtil;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.utils.StringUtils;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+/**
+ * 业务状态枚举
+ *
+ * @author may
+ */
+@Getter
+@AllArgsConstructor
+public enum BusinessStatusEnum {
+
+    /**
+     * 已撤销
+     */
+    CANCEL("cancel", "已撤销"),
+
+    /**
+     * 草稿
+     */
+    DRAFT("draft", "草稿"),
+
+    /**
+     * 待审核
+     */
+    WAITING("waiting", "待审核"),
+
+    /**
+     * 已完成
+     */
+    FINISH("finish", "已完成"),
+
+    /**
+     * 已作废
+     */
+    INVALID("invalid", "已作废"),
+
+    /**
+     * 已退回
+     */
+    BACK("back", "已退回"),
+
+    /**
+     * 已终止
+     */
+    TERMINATION("termination", "已终止");
+
+    /**
+     * 状态
+     */
+    private final String status;
+
+    /**
+     * 描述
+     */
+    private final String desc;
+
+    private static final Map<String, BusinessStatusEnum> STATUS_MAP = Arrays.stream(BusinessStatusEnum.values())
+        .collect(Collectors.toConcurrentMap(BusinessStatusEnum::getStatus, Function.identity()));
+
+    /**
+     * 根据状态获取对应的 BusinessStatusEnum 枚举
+     *
+     * @param status 业务状态码
+     * @return 对应的 BusinessStatusEnum 枚举，如果找不到则返回 null
+     */
+    public static BusinessStatusEnum getByStatus(String status) {
+        // 使用 STATUS_MAP 获取对应的枚举，若找不到则返回 null
+        return STATUS_MAP.get(status);
+    }
+
+    /**
+     * 根据状态获取对应的业务状态描述信息
+     *
+     * @param status 业务状态码
+     * @return 返回业务状态描述，若状态码为空或未找到对应的枚举，返回空字符串
+     */
+    public static String findByStatus(String status) {
+        if (StringUtils.isBlank(status)) {
+            return StrUtil.EMPTY;
+        }
+        BusinessStatusEnum statusEnum = STATUS_MAP.get(status);
+        return (statusEnum != null) ? statusEnum.getDesc() : StrUtil.EMPTY;
+    }
+
+    /**
+     * 判断是否为指定的状态之一：草稿、已撤销或已退回
+     *
+     * @param status 要检查的状态
+     * @return 如果状态为草稿、已撤销或已退回之一，则返回 true；否则返回 false
+     */
+    public static boolean isDraftOrCancelOrBack(String status) {
+        return DRAFT.status.equals(status) || CANCEL.status.equals(status) || BACK.status.equals(status);
+    }
+
+    /**
+     * 判断是否为撤销，退回，作废，终止
+     *
+     * @param status status
+     * @return 结果
+     */
+    public static boolean initialState(String status) {
+        return CANCEL.status.equals(status) || BACK.status.equals(status) || INVALID.status.equals(status) || TERMINATION.status.equals(status);
+    }
+
+    /**
+     * 获取运行中的实例状态列表
+     *
+     * @return 包含运行中实例状态的不可变列表
+     * （包含 DRAFT、WAITING、BACK 和 CANCEL 状态）
+     */
+    public static List<String> runningStatus() {
+        return Arrays.asList(DRAFT.status, WAITING.status, BACK.status, CANCEL.status);
+    }
+
+    /**
+     * 获取结束实例的状态列表
+     *
+     * @return 包含结束实例状态的不可变列表
+     * （包含 FINISH、INVALID 和 TERMINATION 状态）
+     */
+    public static List<String> finishStatus() {
+        return Arrays.asList(FINISH.status, INVALID.status, TERMINATION.status);
+    }
+
+    /**
+     * 启动流程校验
+     *
+     * @param status 状态
+     */
+    public static void checkStartStatus(String status) {
+        if (WAITING.getStatus().equals(status)) {
+            throw new ServiceException("该单据已提交过申请,正在审批中！");
+        } else if (FINISH.getStatus().equals(status)) {
+            throw new ServiceException("该单据已完成申请！");
+        } else if (INVALID.getStatus().equals(status)) {
+            throw new ServiceException("该单据已作废！");
+        } else if (TERMINATION.getStatus().equals(status)) {
+            throw new ServiceException("该单据已终止！");
+        } else if (StringUtils.isBlank(status)) {
+            throw new ServiceException("流程状态为空！");
+        }
+    }
+
+    /**
+     * 撤销流程校验
+     *
+     * @param status 状态
+     */
+    public static void checkCancelStatus(String status) {
+        if (CANCEL.getStatus().equals(status)) {
+            throw new ServiceException("该单据已撤销！");
+        } else if (FINISH.getStatus().equals(status)) {
+            throw new ServiceException("该单据已完成申请！");
+        } else if (INVALID.getStatus().equals(status)) {
+            throw new ServiceException("该单据已作废！");
+        } else if (TERMINATION.getStatus().equals(status)) {
+            throw new ServiceException("该单据已终止！");
+        } else if (BACK.getStatus().equals(status)) {
+            throw new ServiceException("该单据已退回！");
+        } else if (StringUtils.isBlank(status)) {
+            throw new ServiceException("流程状态为空！");
+        }
+    }
+
+    /**
+     * 驳回流程校验
+     *
+     * @param status 状态
+     */
+    public static void checkBackStatus(String status) {
+        if (BACK.getStatus().equals(status)) {
+            throw new ServiceException("该单据已退回！");
+        } else if (FINISH.getStatus().equals(status)) {
+            throw new ServiceException("该单据已完成申请！");
+        } else if (INVALID.getStatus().equals(status)) {
+            throw new ServiceException("该单据已作废！");
+        } else if (TERMINATION.getStatus().equals(status)) {
+            throw new ServiceException("该单据已终止！");
+        } else if (CANCEL.getStatus().equals(status)) {
+            throw new ServiceException("该单据已撤销！");
+        } else if (StringUtils.isBlank(status)) {
+            throw new ServiceException("流程状态为空！");
+        }
+    }
+
+    /**
+     * 作废,终止流程校验
+     *
+     * @param status 状态
+     */
+    public static void checkInvalidStatus(String status) {
+        if (FINISH.getStatus().equals(status)) {
+            throw new ServiceException("该单据已完成申请！");
+        } else if (INVALID.getStatus().equals(status)) {
+            throw new ServiceException("该单据已作废！");
+        } else if (TERMINATION.getStatus().equals(status)) {
+            throw new ServiceException("该单据已终止！");
+        } else if (StringUtils.isBlank(status)) {
+            throw new ServiceException("流程状态为空！");
+        }
+    }
+
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/DeviceType.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/DeviceType.java
new file mode 100644
index 0000000..0fefa6b
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/DeviceType.java
@@ -0,0 +1,39 @@
+package org.dromara.common.core.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 设备类型
+ *
+ * @author pengles
+ */
+@Getter
+@AllArgsConstructor
+public enum DeviceType {
+
+    /**
+     * pc端
+     */
+    PC("pc"),
+
+    /**
+     * app端
+     */
+    APP("app"),
+
+    /**
+     * 小程序端
+     */
+    XCX("xcx"),
+
+    /**
+     * 第三方社交登录平台
+     */
+    SOCIAL("social");
+
+    /**
+     * 设备标识
+     */
+    private final String device;
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/FormatsType.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/FormatsType.java
new file mode 100644
index 0000000..8d4b6d9
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/FormatsType.java
@@ -0,0 +1,146 @@
+package org.dromara.common.core.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import org.dromara.common.core.utils.StringUtils;
+
+/*
+ * 日期格式
+ * "yyyy"：4位数的年份，例如：2023年表示为"2023"。
+ * "yy"：2位数的年份，例如：2023年表示为"23"。
+ * "MM"：2位数的月份，取值范围为01到12，例如：7月表示为"07"。
+ * "M"：不带前导零的月份，取值范围为1到12，例如：7月表示为"7"。
+ * "dd"：2位数的日期，取值范围为01到31，例如：22日表示为"22"。
+ * "d"：不带前导零的日期，取值范围为1到31，例如：22日表示为"22"。
+ * "EEEE"：星期的全名，例如：星期三表示为"Wednesday"。
+ * "E"：星期的缩写，例如：星期三表示为"Wed"。
+ * "DDD" 或 "D"：一年中的第几天，取值范围为001到366，例如：第200天表示为"200"。
+ * 时间格式
+ * "HH"：24小时制的小时数，取值范围为00到23，例如：下午5点表示为"17"。
+ * "hh"：12小时制的小时数，取值范围为01到12，例如：下午5点表示为"05"。
+ * "mm"：分钟数，取值范围为00到59，例如：30分钟表示为"30"。
+ * "ss"：秒数，取值范围为00到59，例如：45秒表示为"45"。
+ * "SSS"：毫秒数，取值范围为000到999，例如：123毫秒表示为"123"。
+ */
+
+/**
+ * 日期格式与时间格式枚举
+ */
+@Getter
+@AllArgsConstructor
+public enum FormatsType {
+
+    /**
+     * 例如：2023年表示为"23"
+     */
+    YY("yy"),
+
+    /**
+     * 例如：2023年表示为"2023"
+     */
+    YYYY("yyyy"),
+
+    /**
+     * 例例如，2023年7月可以表示为 "2023-07"
+     */
+    YYYY_MM("yyyy-MM"),
+
+    /**
+     * 例如，日期 "2023年7月22日" 可以表示为 "2023-07-22"
+     */
+    YYYY_MM_DD("yyyy-MM-dd"),
+
+    /**
+     * 例如，当前时间如果是 "2023年7月22日下午3点30分"，则可以表示为 "2023-07-22 15:30"
+     */
+    YYYY_MM_DD_HH_MM("yyyy-MM-dd HH:mm"),
+
+    /**
+     * 例如，当前时间如果是 "2023年7月22日下午3点30分45秒"，则可以表示为 "2023-07-22 15:30:45"
+     */
+    YYYY_MM_DD_HH_MM_SS("yyyy-MM-dd HH:mm:ss"),
+
+    /**
+     * 例如：下午3点30分45秒，表示为 "15:30:45"
+     */
+    HH_MM_SS("HH:mm:ss"),
+
+    /**
+     * 例例如，2023年7月可以表示为 "2023/07"
+     */
+    YYYY_MM_SLASH("yyyy/MM"),
+
+    /**
+     * 例如，日期 "2023年7月22日" 可以表示为 "2023/07/22"
+     */
+    YYYY_MM_DD_SLASH("yyyy/MM/dd"),
+
+    /**
+     * 例如，当前时间如果是 "2023年7月22日下午3点30分45秒"，则可以表示为 "2023/07/22 15:30:45"
+     */
+    YYYY_MM_DD_HH_MM_SLASH("yyyy/MM/dd HH:mm"),
+
+    /**
+     * 例如，当前时间如果是 "2023年7月22日下午3点30分45秒"，则可以表示为 "2023/07/22 15:30:45"
+     */
+    YYYY_MM_DD_HH_MM_SS_SLASH("yyyy/MM/dd HH:mm:ss"),
+
+    /**
+     * 例例如，2023年7月可以表示为 "2023.07"
+     */
+    YYYY_MM_DOT("yyyy.MM"),
+
+    /**
+     * 例如，日期 "2023年7月22日" 可以表示为 "2023.07.22"
+     */
+    YYYY_MM_DD_DOT("yyyy.MM.dd"),
+
+    /**
+     * 例如，当前时间如果是 "2023年7月22日下午3点30分"，则可以表示为 "2023.07.22 15:30"
+     */
+    YYYY_MM_DD_HH_MM_DOT("yyyy.MM.dd HH:mm"),
+
+    /**
+     * 例如，当前时间如果是 "2023年7月22日下午3点30分45秒"，则可以表示为 "2023.07.22 15:30:45"
+     */
+    YYYY_MM_DD_HH_MM_SS_DOT("yyyy.MM.dd HH:mm:ss"),
+
+    /**
+     * 例如，2023年7月可以表示为 "202307"
+     */
+    YYYYMM("yyyyMM"),
+
+    /**
+     * 例如，2023年7月22日可以表示为 "20230722"
+     */
+    YYYYMMDD("yyyyMMdd"),
+
+    /**
+     * 例如，2023年7月22日下午3点可以表示为 "2023072215"
+     */
+    YYYYMMDDHH("yyyyMMddHH"),
+
+    /**
+     * 例如，2023年7月22日下午3点30分可以表示为 "202307221530"
+     */
+    YYYYMMDDHHMM("yyyyMMddHHmm"),
+
+    /**
+     * 例如，2023年7月22日下午3点30分45秒可以表示为 "20230722153045"
+     */
+    YYYYMMDDHHMMSS("yyyyMMddHHmmss");
+
+    /**
+     * 时间格式
+     */
+    private final String timeFormat;
+
+    public static FormatsType getFormatsType(String str) {
+        for (FormatsType value : values()) {
+            if (StringUtils.contains(str, value.getTimeFormat())) {
+                return value;
+            }
+        }
+        throw new RuntimeException("'FormatsType' not found By " + str);
+    }
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/LoginType.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/LoginType.java
new file mode 100644
index 0000000..af69d08
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/LoginType.java
@@ -0,0 +1,44 @@
+package org.dromara.common.core.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 登录类型
+ *
+ * @author pengles
+ */
+@Getter
+@AllArgsConstructor
+public enum LoginType {
+
+    /**
+     * 密码登录
+     */
+    PASSWORD("user.password.retry.limit.exceed", "user.password.retry.limit.count"),
+
+    /**
+     * 短信登录
+     */
+    SMS("sms.code.retry.limit.exceed", "sms.code.retry.limit.count"),
+
+    /**
+     * 邮箱登录
+     */
+    EMAIL("email.code.retry.limit.exceed", "email.code.retry.limit.count"),
+
+    /**
+     * 小程序登录
+     */
+    XCX("", "");
+
+    /**
+     * 登录重试超出限制提示
+     */
+    final String retryLimitExceed;
+
+    /**
+     * 登录重试限制计数提示
+     */
+    final String retryLimitCount;
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/UserStatus.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/UserStatus.java
new file mode 100644
index 0000000..e8547e7
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/UserStatus.java
@@ -0,0 +1,30 @@
+package org.dromara.common.core.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 用户状态
+ *
+ * @author pengles
+ */
+@Getter
+@AllArgsConstructor
+public enum UserStatus {
+    /**
+     * 正常
+     */
+    OK("0", "正常"),
+    /**
+     * 停用
+     */
+    DISABLE("1", "停用"),
+    /**
+     * 删除
+     */
+    DELETED("2", "删除");
+
+    private final String code;
+    private final String info;
+
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/UserType.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/UserType.java
new file mode 100644
index 0000000..0cc5a4d
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/UserType.java
@@ -0,0 +1,39 @@
+package org.dromara.common.core.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import org.dromara.common.core.utils.StringUtils;
+
+/**
+ * 用户类型
+ *
+ * @author pengles
+ */
+@Getter
+@AllArgsConstructor
+public enum UserType {
+
+    /**
+     * 后台系统用户
+     */
+    SYS_USER("sys_user"),
+
+    /**
+     * 移动客户端用户
+     */
+    APP_USER("app_user");
+
+    /**
+     * 用户类型标识（用于 token、权限识别等）
+     */
+    private final String userType;
+
+    public static UserType getUserType(String str) {
+        for (UserType value : values()) {
+            if (StringUtils.contains(str, value.getUserType())) {
+                return value;
+            }
+        }
+        throw new RuntimeException("'UserType' not found By " + str);
+    }
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/ServiceException.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/ServiceException.java
new file mode 100644
index 0000000..27b1022
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/ServiceException.java
@@ -0,0 +1,67 @@
+package org.dromara.common.core.exception;
+
+import cn.hutool.core.text.StrFormatter;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+import java.io.Serial;
+
+/**
+ * 业务异常（支持占位符 {} ）
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@NoArgsConstructor
+@AllArgsConstructor
+public final class ServiceException extends RuntimeException {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 错误码
+     */
+    private Integer code;
+
+    /**
+     * 错误提示
+     */
+    private String message;
+
+    /**
+     * 错误明细，内部调试错误
+     */
+    private String detailMessage;
+
+    public ServiceException(String message) {
+        this.message = message;
+    }
+
+    public ServiceException(String message, Integer code) {
+        this.message = message;
+        this.code = code;
+    }
+
+    public ServiceException(String message, Object... args) {
+        this.message = StrFormatter.format(message, args);
+    }
+
+    @Override
+    public String getMessage() {
+        return message;
+    }
+
+    public ServiceException setMessage(String message) {
+        this.message = message;
+        return this;
+    }
+
+    public ServiceException setDetailMessage(String detailMessage) {
+        this.detailMessage = detailMessage;
+        return this;
+    }
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/SseException.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/SseException.java
new file mode 100644
index 0000000..a76e16d
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/SseException.java
@@ -0,0 +1,62 @@
+package org.dromara.common.core.exception;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+import java.io.Serial;
+
+/**
+ * sse 特制异常
+ *
+ * @author LionLi
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@NoArgsConstructor
+@AllArgsConstructor
+public final class SseException extends RuntimeException {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 错误码
+     */
+    private Integer code;
+
+    /**
+     * 错误提示
+     */
+    private String message;
+
+    /**
+     * 错误明细，内部调试错误
+     */
+    private String detailMessage;
+
+    public SseException(String message) {
+        this.message = message;
+    }
+
+    public SseException(String message, Integer code) {
+        this.message = message;
+        this.code = code;
+    }
+
+    @Override
+    public String getMessage() {
+        return message;
+    }
+
+    public SseException setMessage(String message) {
+        this.message = message;
+        return this;
+    }
+
+    public SseException setDetailMessage(String detailMessage) {
+        this.detailMessage = detailMessage;
+        return this;
+    }
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/base/BaseException.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/base/BaseException.java
new file mode 100644
index 0000000..2b97014
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/base/BaseException.java
@@ -0,0 +1,74 @@
+package org.dromara.common.core.exception.base;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import org.dromara.common.core.utils.MessageUtils;
+import org.dromara.common.core.utils.StringUtils;
+
+import java.io.Serial;
+
+/**
+ * 基础异常
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@NoArgsConstructor
+@AllArgsConstructor
+public class BaseException extends RuntimeException {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 所属模块
+     */
+    private String module;
+
+    /**
+     * 错误码
+     */
+    private String code;
+
+    /**
+     * 错误码对应的参数
+     */
+    private Object[] args;
+
+    /**
+     * 错误消息
+     */
+    private String defaultMessage;
+
+    public BaseException(String module, String code, Object[] args) {
+        this(module, code, args, null);
+    }
+
+    public BaseException(String module, String defaultMessage) {
+        this(module, null, null, defaultMessage);
+    }
+
+    public BaseException(String code, Object[] args) {
+        this(null, code, args, null);
+    }
+
+    public BaseException(String defaultMessage) {
+        this(null, null, null, defaultMessage);
+    }
+
+    @Override
+    public String getMessage() {
+        String message = null;
+        if (!StringUtils.isEmpty(code)) {
+            message = MessageUtils.message(code, args);
+        }
+        if (message == null) {
+            message = defaultMessage;
+        }
+        return message;
+    }
+
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/file/FileException.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/file/FileException.java
new file mode 100644
index 0000000..7110be1
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/file/FileException.java
@@ -0,0 +1,21 @@
+package org.dromara.common.core.exception.file;
+
+import org.dromara.common.core.exception.base.BaseException;
+
+import java.io.Serial;
+
+/**
+ * 文件信息异常类
+ *
+ * @author pengles
+ */
+public class FileException extends BaseException {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    public FileException(String code, Object[] args) {
+        super("file", code, args, null);
+    }
+
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/file/FileNameLengthLimitExceededException.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/file/FileNameLengthLimitExceededException.java
new file mode 100644
index 0000000..d6269a1
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/file/FileNameLengthLimitExceededException.java
@@ -0,0 +1,18 @@
+package org.dromara.common.core.exception.file;
+
+import java.io.Serial;
+
+/**
+ * 文件名称超长限制异常类
+ *
+ * @author pengles
+ */
+public class FileNameLengthLimitExceededException extends FileException {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    public FileNameLengthLimitExceededException(int defaultFileNameLength) {
+        super("upload.filename.exceed.length", new Object[]{defaultFileNameLength});
+    }
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/file/FileSizeLimitExceededException.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/file/FileSizeLimitExceededException.java
new file mode 100644
index 0000000..e990a92
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/file/FileSizeLimitExceededException.java
@@ -0,0 +1,18 @@
+package org.dromara.common.core.exception.file;
+
+import java.io.Serial;
+
+/**
+ * 文件名大小限制异常类
+ *
+ * @author pengles
+ */
+public class FileSizeLimitExceededException extends FileException {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    public FileSizeLimitExceededException(long defaultMaxSize) {
+        super("upload.exceed.maxSize", new Object[]{defaultMaxSize});
+    }
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/user/CaptchaException.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/user/CaptchaException.java
new file mode 100644
index 0000000..af64b41
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/user/CaptchaException.java
@@ -0,0 +1,18 @@
+package org.dromara.common.core.exception.user;
+
+import java.io.Serial;
+
+/**
+ * 验证码错误异常类
+ *
+ * @author pengles
+ */
+public class CaptchaException extends UserException {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    public CaptchaException() {
+        super("user.jcaptcha.error");
+    }
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/user/CaptchaExpireException.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/user/CaptchaExpireException.java
new file mode 100644
index 0000000..6168782
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/user/CaptchaExpireException.java
@@ -0,0 +1,18 @@
+package org.dromara.common.core.exception.user;
+
+import java.io.Serial;
+
+/**
+ * 验证码失效异常类
+ *
+ * @author pengles
+ */
+public class CaptchaExpireException extends UserException {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    public CaptchaExpireException() {
+        super("user.jcaptcha.expire");
+    }
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/user/UserException.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/user/UserException.java
new file mode 100644
index 0000000..9a806c0
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/exception/user/UserException.java
@@ -0,0 +1,20 @@
+package org.dromara.common.core.exception.user;
+
+import org.dromara.common.core.exception.base.BaseException;
+
+import java.io.Serial;
+
+/**
+ * 用户信息异常类
+ *
+ * @author pengles
+ */
+public class UserException extends BaseException {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    public UserException(String code, Object... args) {
+        super("user", code, args, null);
+    }
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/factory/RegexPatternPoolFactory.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/factory/RegexPatternPoolFactory.java
new file mode 100644
index 0000000..fd907d2
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/factory/RegexPatternPoolFactory.java
@@ -0,0 +1,52 @@
+package org.dromara.common.core.factory;
+
+import cn.hutool.core.lang.PatternPool;
+import org.dromara.common.core.constant.RegexConstants;
+
+import java.util.regex.Pattern;
+
+/**
+ * 正则表达式模式池工厂
+ * <p>初始化的时候将正则表达式加入缓存池当中</p>
+ * <p>提高正则表达式的性能，避免重复编译相同的正则表达式</p>
+ *
+ * @author 21001
+ */
+public class RegexPatternPoolFactory extends PatternPool {
+
+    /**
+     * 字典类型必须以字母开头，且只能为（小写字母，数字，下滑线）
+     */
+    public static final Pattern DICTIONARY_TYPE = get(RegexConstants.DICTIONARY_TYPE);
+
+    /**
+     * 身份证号码（后6位）
+     */
+    public static final Pattern ID_CARD_LAST_6 = get(RegexConstants.ID_CARD_LAST_6);
+
+    /**
+     * QQ号码
+     */
+    public static final Pattern QQ_NUMBER = get(RegexConstants.QQ_NUMBER);
+
+    /**
+     * 邮政编码
+     */
+    public static final Pattern POSTAL_CODE = get(RegexConstants.POSTAL_CODE);
+
+    /**
+     * 注册账号
+     */
+    public static final Pattern ACCOUNT = get(RegexConstants.ACCOUNT);
+
+    /**
+     * 密码：包含至少8个字符，包括大写字母、小写字母、数字和特殊字符
+     */
+    public static final Pattern PASSWORD = get(RegexConstants.PASSWORD);
+
+    /**
+     * 通用状态（0表示正常，1表示停用）
+     */
+    public static final Pattern STATUS = get(RegexConstants.STATUS);
+
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/factory/YmlPropertySourceFactory.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/factory/YmlPropertySourceFactory.java
new file mode 100644
index 0000000..5135a81
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/factory/YmlPropertySourceFactory.java
@@ -0,0 +1,31 @@
+package org.dromara.common.core.factory;
+
+import org.dromara.common.core.utils.StringUtils;
+import org.springframework.beans.factory.config.YamlPropertiesFactoryBean;
+import org.springframework.core.env.PropertiesPropertySource;
+import org.springframework.core.env.PropertySource;
+import org.springframework.core.io.support.DefaultPropertySourceFactory;
+import org.springframework.core.io.support.EncodedResource;
+
+import java.io.IOException;
+
+/**
+ * yml 配置源工厂
+ *
+ * @author pengles
+ */
+public class YmlPropertySourceFactory extends DefaultPropertySourceFactory {
+
+    @Override
+    public PropertySource<?> createPropertySource(String name, EncodedResource resource) throws IOException {
+        String sourceName = resource.getResource().getFilename();
+        if (StringUtils.isNotBlank(sourceName) && StringUtils.endsWithAny(sourceName, ".yml", ".yaml")) {
+            YamlPropertiesFactoryBean factory = new YamlPropertiesFactoryBean();
+            factory.setResources(resource.getResource());
+            factory.afterPropertiesSet();
+            return new PropertiesPropertySource(sourceName, factory.getObject());
+        }
+        return super.createPropertySource(name, resource);
+    }
+
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/ConfigService.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/ConfigService.java
new file mode 100644
index 0000000..37cbbcf
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/ConfigService.java
@@ -0,0 +1,18 @@
+package org.dromara.common.core.service;
+
+/**
+ * 通用 参数配置服务
+ *
+ * @author pengles
+ */
+public interface ConfigService {
+
+    /**
+     * 根据参数 key 获取参数值
+     *
+     * @param configKey 参数 key
+     * @return 参数值
+     */
+    String getConfigValue(String configKey);
+
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/DeptService.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/DeptService.java
new file mode 100644
index 0000000..f477caf
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/DeptService.java
@@ -0,0 +1,37 @@
+package org.dromara.common.core.service;
+
+import org.dromara.common.core.domain.dto.DeptDTO;
+
+import java.util.List;
+
+/**
+ * 通用 部门服务
+ *
+ * @author pengles
+ */
+public interface DeptService {
+
+    /**
+     * 通过部门ID查询部门名称
+     *
+     * @param deptIds 部门ID串逗号分隔
+     * @return 部门名称串逗号分隔
+     */
+    String selectDeptNameByIds(String deptIds);
+
+    /**
+     * 根据部门ID查询部门负责人
+     *
+     * @param deptId 部门ID，用于指定需要查询的部门
+     * @return 返回该部门的负责人ID
+     */
+    Long selectDeptLeaderById(Long deptId);
+
+    /**
+     * 查询部门
+     *
+     * @return 部门列表
+     */
+    List<DeptDTO> selectDeptsByList();
+
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/DictService.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/DictService.java
new file mode 100644
index 0000000..2e67183
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/DictService.java
@@ -0,0 +1,87 @@
+package org.dromara.common.core.service;
+
+import org.dromara.common.core.domain.dto.DictDataDTO;
+import org.dromara.common.core.domain.dto.DictTypeDTO;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 通用 字典服务
+ *
+ * @author pengles
+ */
+public interface DictService {
+
+    /**
+     * 分隔符
+     */
+    String SEPARATOR = ",";
+
+    /**
+     * 根据字典类型和字典值获取字典标签
+     *
+     * @param dictType  字典类型
+     * @param dictValue 字典值
+     * @return 字典标签
+     */
+    default String getDictLabel(String dictType, String dictValue) {
+        return getDictLabel(dictType, dictValue, SEPARATOR);
+    }
+
+    /**
+     * 根据字典类型和字典标签获取字典值
+     *
+     * @param dictType  字典类型
+     * @param dictLabel 字典标签
+     * @return 字典值
+     */
+    default String getDictValue(String dictType, String dictLabel) {
+        return getDictValue(dictType, dictLabel, SEPARATOR);
+    }
+
+    /**
+     * 根据字典类型和字典值获取字典标签
+     *
+     * @param dictType  字典类型
+     * @param dictValue 字典值
+     * @param separator 分隔符
+     * @return 字典标签
+     */
+    String getDictLabel(String dictType, String dictValue, String separator);
+
+    /**
+     * 根据字典类型和字典标签获取字典值
+     *
+     * @param dictType  字典类型
+     * @param dictLabel 字典标签
+     * @param separator 分隔符
+     * @return 字典值
+     */
+    String getDictValue(String dictType, String dictLabel, String separator);
+
+    /**
+     * 获取字典下所有的字典值与标签
+     *
+     * @param dictType 字典类型
+     * @return dictValue为key，dictLabel为值组成的Map
+     */
+    Map<String, String> getAllDictByDictType(String dictType);
+
+    /**
+     * 根据字典类型查询详细信息
+     *
+     * @param dictType 字典类型
+     * @return 字典类型详细信息
+     */
+    DictTypeDTO getDictType(String dictType);
+
+    /**
+     * 根据字典类型查询字典数据列表
+     *
+     * @param dictType 字典类型
+     * @return 字典数据列表
+     */
+    List<DictDataDTO> getDictData(String dictType);
+
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/OssService.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/OssService.java
new file mode 100644
index 0000000..703ebf3
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/OssService.java
@@ -0,0 +1,29 @@
+package org.dromara.common.core.service;
+
+import org.dromara.common.core.domain.dto.OssDTO;
+
+import java.util.List;
+
+/**
+ * 通用 OSS服务
+ *
+ * @author pengles
+ */
+public interface OssService {
+
+    /**
+     * 通过ossId查询对应的url
+     *
+     * @param ossIds ossId串逗号分隔
+     * @return url串逗号分隔
+     */
+    String selectUrlByIds(String ossIds);
+
+    /**
+     * 通过ossId查询列表
+     *
+     * @param ossIds ossId串逗号分隔
+     * @return 列表
+     */
+    List<OssDTO> selectByIds(String ossIds);
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/PermissionService.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/PermissionService.java
new file mode 100644
index 0000000..893f0a9
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/PermissionService.java
@@ -0,0 +1,28 @@
+package org.dromara.common.core.service;
+
+import java.util.Set;
+
+/**
+ * 用户权限处理
+ *
+ * @author pengles
+ */
+public interface PermissionService {
+
+    /**
+     * 获取角色数据权限
+     *
+     * @param userId  用户id
+     * @return 角色权限信息
+     */
+    Set<String> getRolePermission(Long userId);
+
+    /**
+     * 获取菜单数据权限
+     *
+     * @param userId  用户id
+     * @return 菜单权限信息
+     */
+    Set<String> getMenuPermission(Long userId);
+
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/PostService.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/PostService.java
new file mode 100644
index 0000000..41d4e83
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/PostService.java
@@ -0,0 +1,10 @@
+package org.dromara.common.core.service;
+
+/**
+ * 通用 岗位服务
+ *
+ * @author AprilWind
+ */
+public interface PostService {
+
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/RoleService.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/RoleService.java
new file mode 100644
index 0000000..ba62c82
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/RoleService.java
@@ -0,0 +1,10 @@
+package org.dromara.common.core.service;
+
+/**
+ * 通用 角色服务
+ *
+ * @author AprilWind
+ */
+public interface RoleService {
+
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/TaskAssigneeService.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/TaskAssigneeService.java
new file mode 100644
index 0000000..1c1f8a0
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/TaskAssigneeService.java
@@ -0,0 +1,45 @@
+package org.dromara.common.core.service;
+
+import org.dromara.common.core.domain.dto.TaskAssigneeDTO;
+import org.dromara.common.core.domain.model.TaskAssigneeBody;
+
+/**
+ * 工作流设计器获取任务执行人
+ *
+ * @author pengles
+ */
+public interface TaskAssigneeService {
+
+    /**
+     * 查询角色并返回任务指派的列表，支持分页
+     *
+     * @param taskQuery 查询条件
+     * @return 办理人
+     */
+    TaskAssigneeDTO selectRolesByTaskAssigneeList(TaskAssigneeBody taskQuery);
+
+    /**
+     * 查询岗位并返回任务指派的列表，支持分页
+     *
+     * @param taskQuery 查询条件
+     * @return 办理人
+     */
+    TaskAssigneeDTO selectPostsByTaskAssigneeList(TaskAssigneeBody taskQuery);
+
+    /**
+     * 查询部门并返回任务指派的列表，支持分页
+     *
+     * @param taskQuery 查询条件
+     * @return 办理人
+     */
+    TaskAssigneeDTO selectDeptsByTaskAssigneeList(TaskAssigneeBody taskQuery);
+
+    /**
+     * 查询用户并返回任务指派的列表，支持分页
+     *
+     * @param taskQuery 查询条件
+     * @return 办理人
+     */
+    TaskAssigneeDTO selectUsersByTaskAssigneeList(TaskAssigneeBody taskQuery);
+
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/UserService.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/UserService.java
new file mode 100644
index 0000000..991928b
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/UserService.java
@@ -0,0 +1,127 @@
+package org.dromara.common.core.service;
+
+import org.dromara.common.core.domain.dto.UserDTO;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 通用 用户服务
+ *
+ * @author pengles
+ */
+public interface UserService {
+
+    /**
+     * 通过用户ID查询用户账户
+     *
+     * @param userId 用户ID
+     * @return 用户账户
+     */
+    String selectUserNameById(Long userId);
+
+    /**
+     * 通过用户ID查询用户账户
+     *
+     * @param userId 用户ID
+     * @return 用户名称
+     */
+    String selectNicknameById(Long userId);
+
+    /**
+     * 通过用户ID查询用户账户
+     *
+     * @param userIds 用户ID 多个用逗号隔开
+     * @return 用户名称
+     */
+    String selectNicknameByIds(String userIds);
+
+    /**
+     * 通过用户ID查询用户手机号
+     *
+     * @param userId 用户id
+     * @return 用户手机号
+     */
+    String selectPhonenumberById(Long userId);
+
+    /**
+     * 通过用户ID查询用户邮箱
+     *
+     * @param userId 用户id
+     * @return 用户邮箱
+     */
+    String selectEmailById(Long userId);
+
+    /**
+     * 通过用户ID查询用户列表
+     *
+     * @param userIds 用户ids
+     * @return 用户列表
+     */
+    List<UserDTO> selectListByIds(List<Long> userIds);
+
+    /**
+     * 通过角色ID查询用户ID
+     *
+     * @param roleIds 角色ids
+     * @return 用户ids
+     */
+    List<Long> selectUserIdsByRoleIds(List<Long> roleIds);
+
+    /**
+     * 通过角色ID查询用户
+     *
+     * @param roleIds 角色ids
+     * @return 用户
+     */
+    List<UserDTO> selectUsersByRoleIds(List<Long> roleIds);
+
+    /**
+     * 通过部门ID查询用户
+     *
+     * @param deptIds 部门ids
+     * @return 用户
+     */
+    List<UserDTO> selectUsersByDeptIds(List<Long> deptIds);
+
+    /**
+     * 通过岗位ID查询用户
+     *
+     * @param postIds 岗位ids
+     * @return 用户
+     */
+    List<UserDTO> selectUsersByPostIds(List<Long> postIds);
+
+    /**
+     * 根据用户 ID 列表查询用户名称映射关系
+     *
+     * @param userIds 用户 ID 列表
+     * @return Map，其中 key 为用户 ID，value 为对应的用户名称
+     */
+    Map<Long, String> selectUserNamesByIds(List<Long> userIds);
+
+    /**
+     * 根据角色 ID 列表查询角色名称映射关系
+     *
+     * @param roleIds 角色 ID 列表
+     * @return Map，其中 key 为角色 ID，value 为对应的角色名称
+     */
+    Map<Long, String> selectRoleNamesByIds(List<Long> roleIds);
+
+    /**
+     * 根据部门 ID 列表查询部门名称映射关系
+     *
+     * @param deptIds 部门 ID 列表
+     * @return Map，其中 key 为部门 ID，value 为对应的部门名称
+     */
+    Map<Long, String> selectDeptNamesByIds(List<Long> deptIds);
+
+    /**
+     * 根据岗位 ID 列表查询岗位名称映射关系
+     *
+     * @param postIds 岗位 ID 列表
+     * @return Map，其中 key 为岗位 ID，value 为对应的岗位名称
+     */
+    Map<Long, String> selectPostNamesByIds(List<Long> postIds);
+
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/WorkflowService.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/WorkflowService.java
new file mode 100644
index 0000000..23dedca
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/service/WorkflowService.java
@@ -0,0 +1,88 @@
+package org.dromara.common.core.service;
+
+import org.dromara.common.core.domain.dto.CompleteTaskDTO;
+import org.dromara.common.core.domain.dto.StartProcessDTO;
+import org.dromara.common.core.domain.dto.StartProcessReturnDTO;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 通用 工作流服务
+ *
+ * @author may
+ */
+public interface WorkflowService {
+
+    /**
+     * 运行中的实例 删除程实例，删除历史记录，删除业务与流程关联信息
+     *
+     * @param businessIds 业务id
+     * @return 结果
+     */
+    boolean deleteInstance(List<Long> businessIds);
+
+    /**
+     * 获取当前流程状态
+     *
+     * @param taskId 任务id
+     * @return 状态
+     */
+    String getBusinessStatusByTaskId(Long taskId);
+
+    /**
+     * 获取当前流程状态
+     *
+     * @param businessId 业务id
+     * @return 状态
+     */
+    String getBusinessStatus(String businessId);
+
+    /**
+     * 设置流程变量
+     *
+     * @param instanceId 流程实例id
+     * @param variable   流程变量
+     */
+    void setVariable(Long instanceId, Map<String, Object> variable);
+
+    /**
+     * 获取流程变量
+     *
+     * @param instanceId 流程实例id
+     */
+    Map<String, Object> instanceVariable(Long instanceId);
+
+    /**
+     * 按照业务id查询流程实例id
+     *
+     * @param businessId 业务id
+     * @return 结果
+     */
+    Long getInstanceIdByBusinessId(String businessId);
+
+    /**
+     * 启动流程
+     *
+     * @param startProcess 参数
+     * @return 结果
+     */
+    StartProcessReturnDTO startWorkFlow(StartProcessDTO startProcess);
+
+    /**
+     * 办理任务
+     * 系统后台发起审批 无用户信息 需要忽略权限
+     * completeTask.getVariables().put("ignore", true);
+     *
+     * @param completeTask 参数
+     */
+    boolean completeTask(CompleteTaskDTO completeTask);
+
+    /**
+     * 办理任务
+     *
+     * @param taskId  任务ID
+     * @param message 办理意见
+     */
+    boolean completeTask(Long taskId, String message);
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/DateUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/DateUtils.java
new file mode 100644
index 0000000..897554b
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/DateUtils.java
@@ -0,0 +1,300 @@
+package org.dromara.common.core.utils;
+
+import org.apache.commons.lang3.time.DateFormatUtils;
+import org.dromara.common.core.enums.FormatsType;
+import org.dromara.common.core.exception.ServiceException;
+
+import java.lang.management.ManagementFactory;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.time.*;
+import java.util.Date;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * 时间工具类
+ *
+ * @author pengles
+ */
+public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
+    private static final String[] PARSE_PATTERNS = {
+        "yyyy-MM-dd", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm", "yyyy-MM",
+        "yyyy/MM/dd", "yyyy/MM/dd HH:mm:ss", "yyyy/MM/dd HH:mm", "yyyy/MM",
+        "yyyy.MM.dd", "yyyy.MM.dd HH:mm:ss", "yyyy.MM.dd HH:mm", "yyyy.MM"};
+
+    @Deprecated
+    private DateUtils() {
+    }
+
+    /**
+     * 获取当前日期和时间
+     *
+     * @return 当前日期和时间的 Date 对象表示
+     */
+    public static Date getNowDate() {
+        return new Date();
+    }
+
+    /**
+     * 获取当前日期的字符串表示，格式为YYYY-MM-DD
+     *
+     * @return 当前日期的字符串表示
+     */
+    public static String getDate() {
+        return dateTimeNow(FormatsType.YYYY_MM_DD);
+    }
+
+    /**
+     * 获取当前日期的字符串表示，格式为yyyyMMdd
+     *
+     * @return 当前日期的字符串表示
+     */
+    public static String getCurrentDate() {
+        return DateFormatUtils.format(new Date(), FormatsType.YYYYMMDD.getTimeFormat());
+    }
+
+    /**
+     * 获取当前日期的路径格式字符串，格式为"yyyy/MM/dd"
+     *
+     * @return 当前日期的路径格式字符串
+     */
+    public static String datePath() {
+        Date now = new Date();
+        return DateFormatUtils.format(now, FormatsType.YYYY_MM_DD_SLASH.getTimeFormat());
+    }
+
+    /**
+     * 获取当前时间的字符串表示，格式为YYYY-MM-DD HH:MM:SS
+     *
+     * @return 当前时间的字符串表示
+     */
+    public static String getTime() {
+        return dateTimeNow(FormatsType.YYYY_MM_DD_HH_MM_SS);
+    }
+
+    /**
+     * 获取当前时间的字符串表示，格式为 "HH:MM:SS"
+     *
+     * @return 当前时间的字符串表示，格式为 "HH:MM:SS"
+     */
+    public static String getTimeWithHourMinuteSecond() {
+        return dateTimeNow(FormatsType.HH_MM_SS);
+    }
+
+    /**
+     * 获取当前日期和时间的字符串表示，格式为YYYYMMDDHHMMSS
+     *
+     * @return 当前日期和时间的字符串表示
+     */
+    public static String dateTimeNow() {
+        return dateTimeNow(FormatsType.YYYYMMDDHHMMSS);
+    }
+
+    /**
+     * 获取当前日期和时间的指定格式的字符串表示
+     *
+     * @param format 日期时间格式，例如"YYYY-MM-DD HH:MM:SS"
+     * @return 当前日期和时间的字符串表示
+     */
+    public static String dateTimeNow(final FormatsType format) {
+        return parseDateToStr(format, new Date());
+    }
+
+    /**
+     * 将指定日期格式化为 YYYY-MM-DD 格式的字符串
+     *
+     * @param date 要格式化的日期对象
+     * @return 格式化后的日期字符串
+     */
+    public static String formatDate(final Date date) {
+        return parseDateToStr(FormatsType.YYYY_MM_DD, date);
+    }
+
+    /**
+     * 将指定日期格式化为 YYYY-MM-DD HH:MM:SS 格式的字符串
+     *
+     * @param date 要格式化的日期对象
+     * @return 格式化后的日期时间字符串
+     */
+    public static String formatDateTime(final Date date) {
+        return parseDateToStr(FormatsType.YYYY_MM_DD_HH_MM_SS, date);
+    }
+
+    /**
+     * 将指定日期按照指定格式进行格式化
+     *
+     * @param format 要使用的日期时间格式，例如"YYYY-MM-DD HH:MM:SS"
+     * @param date   要格式化的日期对象
+     * @return 格式化后的日期时间字符串
+     */
+    public static String parseDateToStr(final FormatsType format, final Date date) {
+        return new SimpleDateFormat(format.getTimeFormat()).format(date);
+    }
+
+    /**
+     * 将指定格式的日期时间字符串转换为 Date 对象
+     *
+     * @param format 要解析的日期时间格式，例如"YYYY-MM-DD HH:MM:SS"
+     * @param ts     要解析的日期时间字符串
+     * @return 解析后的 Date 对象
+     * @throws RuntimeException 如果解析过程中发生异常
+     */
+    public static Date parseDateTime(final FormatsType format, final String ts) {
+        try {
+            return new SimpleDateFormat(format.getTimeFormat()).parse(ts);
+        } catch (ParseException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    /**
+     * 将对象转换为日期对象
+     *
+     * @param str 要转换的对象，通常是字符串
+     * @return 转换后的日期对象，如果转换失败或输入为null，则返回null
+     */
+    public static Date parseDate(Object str) {
+        if (str == null) {
+            return null;
+        }
+        try {
+            return parseDate(str.toString(), PARSE_PATTERNS);
+        } catch (ParseException e) {
+            return null;
+        }
+    }
+
+    /**
+     * 获取服务器启动时间
+     *
+     * @return 服务器启动时间的 Date 对象表示
+     */
+    public static Date getServerStartDate() {
+        long time = ManagementFactory.getRuntimeMXBean().getStartTime();
+        return new Date(time);
+    }
+
+    /**
+     * 计算两个时间之间的时间差，并以指定单位返回（绝对值）
+     *
+     * @param start 起始时间
+     * @param end   结束时间
+     * @param unit  所需返回的时间单位（DAYS、HOURS、MINUTES、SECONDS、MILLISECONDS、MICROSECONDS、NANOSECONDS）
+     * @return 时间差的绝对值，以指定单位表示
+     */
+    public static long difference(Date start, Date end, TimeUnit unit) {
+        // 计算时间差，单位为毫秒，取绝对值避免负数
+        long diffInMillis = Math.abs(end.getTime() - start.getTime());
+
+        // 根据目标单位转换时间差
+        return switch (unit) {
+            case DAYS -> diffInMillis / TimeUnit.DAYS.toMillis(1);
+            case HOURS -> diffInMillis / TimeUnit.HOURS.toMillis(1);
+            case MINUTES -> diffInMillis / TimeUnit.MINUTES.toMillis(1);
+            case SECONDS -> diffInMillis / TimeUnit.SECONDS.toMillis(1);
+            case MILLISECONDS -> diffInMillis;
+            case MICROSECONDS -> TimeUnit.MILLISECONDS.toMicros(diffInMillis);
+            case NANOSECONDS -> TimeUnit.MILLISECONDS.toNanos(diffInMillis);
+        };
+    }
+
+    /**
+     * 计算两个日期之间的时间差，并以天、小时和分钟的格式返回
+     *
+     * @param endDate 结束日期
+     * @param nowDate 当前日期
+     * @return 表示时间差的字符串，格式为"天 小时 分钟"
+     */
+    public static String getDatePoor(Date endDate, Date nowDate) {
+        long diffInMillis = endDate.getTime() - nowDate.getTime();
+        long day = TimeUnit.MILLISECONDS.toDays(diffInMillis);
+        long hour = TimeUnit.MILLISECONDS.toHours(diffInMillis) % 24;
+        long min = TimeUnit.MILLISECONDS.toMinutes(diffInMillis) % 60;
+        return String.format("%d天 %d小时 %d分钟", day, hour, min);
+    }
+
+    /**
+     * 计算两个时间点的差值（天、小时、分钟、秒），当值为0时不显示该单位
+     *
+     * @param endDate 结束时间
+     * @param nowDate 当前时间
+     * @return 时间差字符串，格式为 "x天 x小时 x分钟 x秒"，若为 0 则不显示
+     */
+    public static String getTimeDifference(Date endDate, Date nowDate) {
+        long diffInMillis = endDate.getTime() - nowDate.getTime();
+        long day = TimeUnit.MILLISECONDS.toDays(diffInMillis);
+        long hour = TimeUnit.MILLISECONDS.toHours(diffInMillis) % 24;
+        long min = TimeUnit.MILLISECONDS.toMinutes(diffInMillis) % 60;
+        long sec = TimeUnit.MILLISECONDS.toSeconds(diffInMillis) % 60;
+        // 构建时间差字符串，条件是值不为0才显示
+        StringBuilder result = new StringBuilder();
+        if (day > 0) {
+            result.append(String.format("%d天 ", day));
+        }
+        if (hour > 0) {
+            result.append(String.format("%d小时 ", hour));
+        }
+        if (min > 0) {
+            result.append(String.format("%d分钟 ", min));
+        }
+        if (sec > 0) {
+            result.append(String.format("%d秒", sec));
+        }
+        return result.length() > 0 ? result.toString().trim() : "0秒";
+    }
+
+    /**
+     * 将 LocalDateTime 对象转换为 Date 对象
+     *
+     * @param temporalAccessor 要转换的 LocalDateTime 对象
+     * @return 转换后的 Date 对象
+     */
+    public static Date toDate(LocalDateTime temporalAccessor) {
+        ZonedDateTime zdt = temporalAccessor.atZone(ZoneId.systemDefault());
+        return Date.from(zdt.toInstant());
+    }
+
+    /**
+     * 将 LocalDate 对象转换为 Date 对象
+     *
+     * @param temporalAccessor 要转换的 LocalDate 对象
+     * @return 转换后的 Date 对象
+     */
+    public static Date toDate(LocalDate temporalAccessor) {
+        LocalDateTime localDateTime = LocalDateTime.of(temporalAccessor, LocalTime.of(0, 0, 0));
+        ZonedDateTime zdt = localDateTime.atZone(ZoneId.systemDefault());
+        return Date.from(zdt.toInstant());
+    }
+
+    /**
+     * 校验日期范围
+     *
+     * @param startDate 开始日期
+     * @param endDate   结束日期
+     * @param maxValue  最大时间跨度的限制值
+     * @param unit      时间跨度的单位，可选择 "DAYS"、"HOURS" 或 "MINUTES"
+     */
+    public static void validateDateRange(Date startDate, Date endDate, int maxValue, TimeUnit unit) {
+        // 校验结束日期不能早于开始日期
+        if (endDate.before(startDate)) {
+            throw new ServiceException("结束日期不能早于开始日期");
+        }
+
+        // 计算时间跨度
+        long diffInMillis = endDate.getTime() - startDate.getTime();
+
+        // 根据单位转换时间跨度
+        long diff = switch (unit) {
+            case DAYS -> TimeUnit.MILLISECONDS.toDays(diffInMillis);
+            case HOURS -> TimeUnit.MILLISECONDS.toHours(diffInMillis);
+            case MINUTES -> TimeUnit.MILLISECONDS.toMinutes(diffInMillis);
+            default -> throw new IllegalArgumentException("不支持的时间单位");
+        };
+
+        // 校验时间跨度不超过最大限制
+        if (diff > maxValue) {
+            throw new ServiceException("最大时间跨度为 " + maxValue + " " + unit.toString().toLowerCase());
+        }
+    }
+
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/MapstructUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/MapstructUtils.java
new file mode 100644
index 0000000..8cc77d9
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/MapstructUtils.java
@@ -0,0 +1,93 @@
+package org.dromara.common.core.utils;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.map.MapUtil;
+import cn.hutool.core.util.ObjectUtil;
+import io.github.linpeilie.Converter;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Mapstruct 工具类
+ * <p>参考文档：<a href="https://mapstruct.plus/introduction/quick-start.html">mapstruct-plus</a></p>
+ *
+ *
+ * @author pengles
+ */
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public class MapstructUtils {
+
+    private final static Converter CONVERTER = SpringUtils.getBean(Converter.class);
+
+    /**
+     * 将 T 类型对象，转换为 desc 类型的对象并返回
+     *
+     * @param source 数据来源实体
+     * @param desc   描述对象 转换后的对象
+     * @return desc
+     */
+    public static <T, V> V convert(T source, Class<V> desc) {
+        if (ObjectUtil.isNull(source)) {
+            return null;
+        }
+        if (ObjectUtil.isNull(desc)) {
+            return null;
+        }
+        return CONVERTER.convert(source, desc);
+    }
+
+    /**
+     * 将 T 类型对象，按照配置的映射字段规则，给 desc 类型的对象赋值并返回 desc 对象
+     *
+     * @param source 数据来源实体
+     * @param desc   转换后的对象
+     * @return desc
+     */
+    public static <T, V> V convert(T source, V desc) {
+        if (ObjectUtil.isNull(source)) {
+            return null;
+        }
+        if (ObjectUtil.isNull(desc)) {
+            return null;
+        }
+        return CONVERTER.convert(source, desc);
+    }
+
+    /**
+     * 将 T 类型的集合，转换为 desc 类型的集合并返回
+     *
+     * @param sourceList 数据来源实体列表
+     * @param desc       描述对象 转换后的对象
+     * @return desc
+     */
+    public static <T, V> List<V> convert(List<T> sourceList, Class<V> desc) {
+        if (ObjectUtil.isNull(sourceList)) {
+            return null;
+        }
+        if (CollUtil.isEmpty(sourceList)) {
+            return CollUtil.newArrayList();
+        }
+        return CONVERTER.convert(sourceList, desc);
+    }
+
+    /**
+     * 将 Map 转换为 beanClass 类型的集合并返回
+     *
+     * @param map       数据来源
+     * @param beanClass bean类
+     * @return bean对象
+     */
+    public static <T> T convert(Map<String, Object> map, Class<T> beanClass) {
+        if (MapUtil.isEmpty(map)) {
+            return null;
+        }
+        if (ObjectUtil.isNull(beanClass)) {
+            return null;
+        }
+        return CONVERTER.convert(map, beanClass);
+    }
+
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/MessageUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/MessageUtils.java
new file mode 100644
index 0000000..17ea377
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/MessageUtils.java
@@ -0,0 +1,33 @@
+package org.dromara.common.core.utils;
+
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+import org.springframework.context.MessageSource;
+import org.springframework.context.NoSuchMessageException;
+import org.springframework.context.i18n.LocaleContextHolder;
+
+/**
+ * 获取i18n资源文件
+ *
+ * @author pengles
+ */
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public class MessageUtils {
+
+    private static final MessageSource MESSAGE_SOURCE = SpringUtils.getBean(MessageSource.class);
+
+    /**
+     * 根据消息键和参数 获取消息 委托给spring messageSource
+     *
+     * @param code 消息键
+     * @param args 参数
+     * @return 获取国际化翻译值
+     */
+    public static String message(String code, Object... args) {
+        try {
+            return MESSAGE_SOURCE.getMessage(code, args, LocaleContextHolder.getLocale());
+        } catch (NoSuchMessageException e) {
+            return code;
+        }
+    }
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/NetUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/NetUtils.java
new file mode 100644
index 0000000..72fdf40
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/NetUtils.java
@@ -0,0 +1,84 @@
+package org.dromara.common.core.utils;
+
+import cn.hutool.core.lang.PatternPool;
+import cn.hutool.core.net.NetUtil;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.utils.regex.RegexUtils;
+
+import java.net.Inet6Address;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+
+/**
+ * 增强网络相关工具类
+ *
+ * @author 秋辞未寒
+ */
+@Slf4j
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public class NetUtils extends NetUtil {
+
+    /**
+     * 判断是否为IPv6地址
+     *
+     * @param ip IP地址
+     * @return 是否为IPv6地址
+     */
+    public static boolean isIPv6(String ip) {
+        try {
+            // 判断是否为IPv6地址
+            return InetAddress.getByName(ip) instanceof Inet6Address;
+        } catch (UnknownHostException e) {
+            return false;
+        }
+    }
+
+    /**
+     * 判断IPv6地址是否为内网地址
+     * <br><br>
+     * 以下地址将归类为本地地址，如有业务场景有需要，请根据需求自行处理：
+     * <pre>
+     * 通配符地址 0:0:0:0:0:0:0:0
+     * 链路本地地址 fe80::/10
+     * 唯一本地地址 fec0::/10
+     * 环回地址 ::1
+     * </pre>
+     *
+     * @param ip IP地址
+     * @return 是否为内网地址
+     */
+    public static boolean isInnerIPv6(String ip) {
+        try {
+            // 判断是否为IPv6地址
+            if (InetAddress.getByName(ip) instanceof Inet6Address inet6Address) {
+                // isAnyLocalAddress 判断是否为通配符地址，通常不会将其视为内网地址，根据业务场景自行处理判断
+                // isLinkLocalAddress 判断是否为链路本地地址，通常不算内网地址，是否划分归属于内网需要根据业务场景自行处理判断
+                // isLoopbackAddress 判断是否为环回地址，与IPv4的 127.0.0.1 同理，用于表示本机
+                // isSiteLocalAddress 判断是否为本地站点地址，IPv6唯一本地地址（Unique Local Addresses，简称ULA）
+                if (inet6Address.isAnyLocalAddress()
+                    || inet6Address.isLinkLocalAddress()
+                    || inet6Address.isLoopbackAddress()
+                    || inet6Address.isSiteLocalAddress()) {
+                    return true;
+                }
+            }
+        } catch (UnknownHostException e) {
+            // 注意，isInnerIPv6方法和isIPv6方法的适用范围不同，所以此处不能忽略其异常信息。
+            throw new IllegalArgumentException("Invalid IPv6 address!", e);
+        }
+        return false;
+    }
+
+    /**
+     * 判断是否为IPv4地址
+     *
+     * @param ip IP地址
+     * @return 是否为IPv4地址
+     */
+    public static boolean isIPv4(String ip) {
+        return RegexUtils.isMatch(PatternPool.IPV4, ip);
+    }
+
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ObjectUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ObjectUtils.java
new file mode 100644
index 0000000..199fd82
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ObjectUtils.java
@@ -0,0 +1,60 @@
+package org.dromara.common.core.utils;
+
+import cn.hutool.core.util.ObjectUtil;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+
+import java.util.function.Function;
+
+/**
+ * 对象工具类
+ *
+ * @author 秋辞未寒
+ */
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public class ObjectUtils extends ObjectUtil {
+
+    /**
+     * 如果对象不为空，则获取对象中的某个字段 ObjectUtils.notNullGetter(user, User::getName);
+     *
+     * @param obj 对象
+     * @param func 获取方法
+     * @return 对象字段
+     */
+    public static <T, E> E notNullGetter(T obj, Function<T, E> func) {
+        if (isNotNull(obj) && isNotNull(func)) {
+            return func.apply(obj);
+        }
+        return null;
+    }
+
+    /**
+     * 如果对象不为空，则获取对象中的某个字段，否则返回默认值
+     *
+     * @param obj          对象
+     * @param func         获取方法
+     * @param defaultValue 默认值
+     * @return 对象字段
+     */
+    public static <T, E> E notNullGetter(T obj, Function<T, E> func, E defaultValue) {
+        if (isNotNull(obj) && isNotNull(func)) {
+            return func.apply(obj);
+        }
+        return defaultValue;
+    }
+
+    /**
+     * 如果值不为空，则返回值，否则返回默认值
+     *
+     * @param obj          对象
+     * @param defaultValue 默认值
+     * @return 对象字段
+     */
+    public static <T> T notNull(T obj, T defaultValue) {
+        if (isNotNull(obj)) {
+            return obj;
+        }
+        return defaultValue;
+    }
+
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ServletUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ServletUtils.java
new file mode 100644
index 0000000..439c2af
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ServletUtils.java
@@ -0,0 +1,289 @@
+package org.dromara.common.core.utils;
+
+import cn.hutool.core.convert.Convert;
+import cn.hutool.extra.servlet.JakartaServletUtil;
+import cn.hutool.http.HttpStatus;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+import org.springframework.http.MediaType;
+import org.springframework.util.LinkedCaseInsensitiveMap;
+import org.springframework.web.context.request.RequestAttributes;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import java.io.IOException;
+import java.net.URLDecoder;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 客户端工具类，提供获取请求参数、响应处理、头部信息等常用操作
+ *
+ * @author pengles
+ */
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public class ServletUtils extends JakartaServletUtil {
+
+    /**
+     * 获取指定名称的 String 类型的请求参数
+     *
+     * @param name 参数名
+     * @return 参数值
+     */
+    public static String getParameter(String name) {
+        return getRequest().getParameter(name);
+    }
+
+    /**
+     * 获取指定名称的 String 类型的请求参数，若参数不存在，则返回默认值
+     *
+     * @param name         参数名
+     * @param defaultValue 默认值
+     * @return 参数值或默认值
+     */
+    public static String getParameter(String name, String defaultValue) {
+        return Convert.toStr(getRequest().getParameter(name), defaultValue);
+    }
+
+    /**
+     * 获取指定名称的 Integer 类型的请求参数
+     *
+     * @param name 参数名
+     * @return 参数值
+     */
+    public static Integer getParameterToInt(String name) {
+        return Convert.toInt(getRequest().getParameter(name));
+    }
+
+    /**
+     * 获取指定名称的 Integer 类型的请求参数，若参数不存在，则返回默认值
+     *
+     * @param name         参数名
+     * @param defaultValue 默认值
+     * @return 参数值或默认值
+     */
+    public static Integer getParameterToInt(String name, Integer defaultValue) {
+        return Convert.toInt(getRequest().getParameter(name), defaultValue);
+    }
+
+    /**
+     * 获取指定名称的 Boolean 类型的请求参数
+     *
+     * @param name 参数名
+     * @return 参数值
+     */
+    public static Boolean getParameterToBool(String name) {
+        return Convert.toBool(getRequest().getParameter(name));
+    }
+
+    /**
+     * 获取指定名称的 Boolean 类型的请求参数，若参数不存在，则返回默认值
+     *
+     * @param name         参数名
+     * @param defaultValue 默认值
+     * @return 参数值或默认值
+     */
+    public static Boolean getParameterToBool(String name, Boolean defaultValue) {
+        return Convert.toBool(getRequest().getParameter(name), defaultValue);
+    }
+
+    /**
+     * 获取所有请求参数（以 Map 的形式返回）
+     *
+     * @param request 请求对象{@link ServletRequest}
+     * @return 请求参数的 Map，键为参数名，值为参数值数组
+     */
+    public static Map<String, String[]> getParams(ServletRequest request) {
+        final Map<String, String[]> map = request.getParameterMap();
+        return Collections.unmodifiableMap(map);
+    }
+
+    /**
+     * 获取所有请求参数（以 Map 的形式返回，值为字符串形式的拼接）
+     *
+     * @param request 请求对象{@link ServletRequest}
+     * @return 请求参数的 Map，键为参数名，值为拼接后的字符串
+     */
+    public static Map<String, String> getParamMap(ServletRequest request) {
+        Map<String, String> params = new HashMap<>();
+        for (Map.Entry<String, String[]> entry : getParams(request).entrySet()) {
+            params.put(entry.getKey(), StringUtils.join(entry.getValue(), StringUtils.SEPARATOR));
+        }
+        return params;
+    }
+
+    /**
+     * 获取当前 HTTP 请求对象
+     *
+     * @return 当前 HTTP 请求对象
+     */
+    public static HttpServletRequest getRequest() {
+        try {
+            return getRequestAttributes().getRequest();
+        } catch (Exception e) {
+            return null;
+        }
+    }
+
+    /**
+     * 获取当前 HTTP 响应对象
+     *
+     * @return 当前 HTTP 响应对象
+     */
+    public static HttpServletResponse getResponse() {
+        try {
+            return getRequestAttributes().getResponse();
+        } catch (Exception e) {
+            return null;
+        }
+    }
+
+    /**
+     * 获取当前请求的 HttpSession 对象
+     * <p>
+     * 如果当前请求已经关联了一个会话（即已经存在有效的 session ID），
+     * 则返回该会话对象；如果没有关联会话，则会创建一个新的会话对象并返回。
+     * <p>
+     * HttpSession 用于存储会话级别的数据，如用户登录信息、购物车内容等，
+     * 可以在多个请求之间共享会话数据
+     *
+     * @return 当前请求的 HttpSession 对象
+     */
+    public static HttpSession getSession() {
+        return getRequest().getSession();
+    }
+
+    /**
+     * 获取当前请求的请求属性
+     *
+     * @return {@link ServletRequestAttributes} 请求属性对象
+     */
+    public static ServletRequestAttributes getRequestAttributes() {
+        try {
+            RequestAttributes attributes = RequestContextHolder.getRequestAttributes();
+            return (ServletRequestAttributes) attributes;
+        } catch (Exception e) {
+            return null;
+        }
+    }
+
+    /**
+     * 获取指定请求头的值，如果头部为空则返回空字符串
+     *
+     * @param request 请求对象
+     * @param name    头部名称
+     * @return 头部值
+     */
+    public static String getHeader(HttpServletRequest request, String name) {
+        String value = request.getHeader(name);
+        if (StringUtils.isEmpty(value)) {
+            return StringUtils.EMPTY;
+        }
+        return urlDecode(value);
+    }
+
+    /**
+     * 获取所有请求头的 Map，键为头部名称，值为头部值
+     *
+     * @param request 请求对象
+     * @return 请求头的 Map
+     */
+    public static Map<String, String> getHeaders(HttpServletRequest request) {
+        Map<String, String> map = new LinkedCaseInsensitiveMap<>();
+        Enumeration<String> enumeration = request.getHeaderNames();
+        if (enumeration != null) {
+            while (enumeration.hasMoreElements()) {
+                String key = enumeration.nextElement();
+                String value = request.getHeader(key);
+                map.put(key, value);
+            }
+        }
+        return map;
+    }
+
+    /**
+     * 将字符串渲染到客户端（以 JSON 格式返回）
+     *
+     * @param response 渲染对象
+     * @param string   待渲染的字符串
+     */
+    public static void renderString(HttpServletResponse response, String string) {
+        try {
+            response.setStatus(HttpStatus.HTTP_OK);
+            response.setContentType(MediaType.APPLICATION_JSON_VALUE);
+            response.setCharacterEncoding(StandardCharsets.UTF_8.toString());
+            response.getWriter().print(string);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * 判断当前请求是否为 Ajax 异步请求
+     *
+     * @param request 请求对象
+     * @return 是否为 Ajax 请求
+     */
+    public static boolean isAjaxRequest(HttpServletRequest request) {
+
+        // 判断 Accept 头部是否包含 application/json
+        String accept = request.getHeader("accept");
+        if (accept != null && accept.contains(MediaType.APPLICATION_JSON_VALUE)) {
+            return true;
+        }
+
+        // 判断 X-Requested-With 头部是否包含 XMLHttpRequest
+        String xRequestedWith = request.getHeader("X-Requested-With");
+        if (xRequestedWith != null && xRequestedWith.contains("XMLHttpRequest")) {
+            return true;
+        }
+
+        // 判断 URI 后缀是否为 .json 或 .xml
+        String uri = request.getRequestURI();
+        if (StringUtils.equalsAnyIgnoreCase(uri, ".json", ".xml")) {
+            return true;
+        }
+
+        // 判断请求参数 __ajax 是否为 json 或 xml
+        String ajax = request.getParameter("__ajax");
+        return StringUtils.equalsAnyIgnoreCase(ajax, "json", "xml");
+    }
+
+    /**
+     * 获取客户端 IP 地址
+     *
+     * @return 客户端 IP 地址
+     */
+    public static String getClientIP() {
+        return getClientIP(getRequest());
+    }
+
+    /**
+     * 对内容进行 URL 编码
+     *
+     * @param str 内容
+     * @return 编码后的内容
+     */
+    public static String urlEncode(String str) {
+        return URLEncoder.encode(str, StandardCharsets.UTF_8);
+    }
+
+    /**
+     * 对内容进行 URL 解码
+     *
+     * @param str 内容
+     * @return 解码后的内容
+     */
+    public static String urlDecode(String str) {
+        return URLDecoder.decode(str, StandardCharsets.UTF_8);
+    }
+
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/SpringUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/SpringUtils.java
new file mode 100644
index 0000000..f831e3c
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/SpringUtils.java
@@ -0,0 +1,67 @@
+package org.dromara.common.core.utils;
+
+import cn.hutool.extra.spring.SpringUtil;
+import org.springframework.beans.factory.NoSuchBeanDefinitionException;
+import org.springframework.boot.autoconfigure.thread.Threading;
+import org.springframework.context.ApplicationContext;
+import org.springframework.core.env.Environment;
+import org.springframework.stereotype.Component;
+
+/**
+ * spring工具类
+ *
+ * @author pengles
+ */
+@Component
+public final class SpringUtils extends SpringUtil {
+
+    /**
+     * 如果BeanFactory包含一个与所给名称匹配的bean定义，则返回true
+     */
+    public static boolean containsBean(String name) {
+        return getBeanFactory().containsBean(name);
+    }
+
+    /**
+     * 判断以给定名字注册的bean定义是一个singleton还是一个prototype。
+     * 如果与给定名字相应的bean定义没有被找到，将会抛出一个异常（NoSuchBeanDefinitionException）
+     */
+    public static boolean isSingleton(String name) throws NoSuchBeanDefinitionException {
+        return getBeanFactory().isSingleton(name);
+    }
+
+    /**
+     * @return Class 注册对象的类型
+     */
+    public static Class<?> getType(String name) throws NoSuchBeanDefinitionException {
+        return getBeanFactory().getType(name);
+    }
+
+    /**
+     * 如果给定的bean名字在bean定义中有别名，则返回这些别名
+     */
+    public static String[] getAliases(String name) throws NoSuchBeanDefinitionException {
+        return getBeanFactory().getAliases(name);
+    }
+
+    /**
+     * 获取aop代理对象
+     */
+    @SuppressWarnings("unchecked")
+    public static <T> T getAopProxy(T invoker) {
+        return (T) getBean(invoker.getClass());
+    }
+
+
+    /**
+     * 获取spring上下文
+     */
+    public static ApplicationContext context() {
+        return getApplicationContext();
+    }
+
+    public static boolean isVirtual() {
+        return Threading.VIRTUAL.isActive(getBean(Environment.class));
+    }
+
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/StreamUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/StreamUtils.java
new file mode 100644
index 0000000..859e045
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/StreamUtils.java
@@ -0,0 +1,282 @@
+package org.dromara.common.core.utils;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.map.MapUtil;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+
+import java.util.*;
+import java.util.function.BiFunction;
+import java.util.function.Function;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
+
+/**
+ * stream 流工具类
+ *
+ * @author pengles
+ */
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public class StreamUtils {
+
+    /**
+     * 将collection过滤
+     *
+     * @param collection 需要转化的集合
+     * @param function   过滤方法
+     * @return 过滤后的list
+     */
+    public static <E> List<E> filter(Collection<E> collection, Predicate<E> function) {
+        if (CollUtil.isEmpty(collection)) {
+            return CollUtil.newArrayList();
+        }
+        // 注意此处不要使用 .toList() 新语法 因为返回的是不可变List 会导致序列化问题
+        return collection.stream().filter(function).collect(Collectors.toList());
+    }
+
+    /**
+     * 找到流中满足条件的第一个元素
+     *
+     * @param collection 需要查询的集合
+     * @param function   过滤方法
+     * @return 找到符合条件的第一个元素，没有则返回null
+     */
+    public static <E> E findFirst(Collection<E> collection, Predicate<E> function) {
+        if (CollUtil.isEmpty(collection)) {
+            return null;
+        }
+        return collection.stream().filter(function).findFirst().orElse(null);
+    }
+
+    /**
+     * 找到流中任意一个满足条件的元素
+     *
+     * @param collection 需要查询的集合
+     * @param function   过滤方法
+     * @return 找到符合条件的任意一个元素，没有则返回null
+     */
+    public static <E> Optional<E> findAny(Collection<E> collection, Predicate<E> function) {
+        if (CollUtil.isEmpty(collection)) {
+            return Optional.empty();
+        }
+        return collection.stream().filter(function).findAny();
+    }
+
+    /**
+     * 将collection拼接
+     *
+     * @param collection 需要转化的集合
+     * @param function   拼接方法
+     * @return 拼接后的list
+     */
+    public static <E> String join(Collection<E> collection, Function<E, String> function) {
+        return join(collection, function, StringUtils.SEPARATOR);
+    }
+
+    /**
+     * 将collection拼接
+     *
+     * @param collection 需要转化的集合
+     * @param function   拼接方法
+     * @param delimiter  拼接符
+     * @return 拼接后的list
+     */
+    public static <E> String join(Collection<E> collection, Function<E, String> function, CharSequence delimiter) {
+        if (CollUtil.isEmpty(collection)) {
+            return StringUtils.EMPTY;
+        }
+        return collection.stream().map(function).filter(Objects::nonNull).collect(Collectors.joining(delimiter));
+    }
+
+    /**
+     * 将collection排序
+     *
+     * @param collection 需要转化的集合
+     * @param comparing  排序方法
+     * @return 排序后的list
+     */
+    public static <E> List<E> sorted(Collection<E> collection, Comparator<E> comparing) {
+        if (CollUtil.isEmpty(collection)) {
+            return CollUtil.newArrayList();
+        }
+        // 注意此处不要使用 .toList() 新语法 因为返回的是不可变List 会导致序列化问题
+        return collection.stream().filter(Objects::nonNull).sorted(comparing).collect(Collectors.toList());
+    }
+
+    /**
+     * 将collection转化为类型不变的map<br>
+     * <B>{@code Collection<V>  ---->  Map<K,V>}</B>
+     *
+     * @param collection 需要转化的集合
+     * @param key        V类型转化为K类型的lambda方法
+     * @param <V>        collection中的泛型
+     * @param <K>        map中的key类型
+     * @return 转化后的map
+     */
+    public static <V, K> Map<K, V> toIdentityMap(Collection<V> collection, Function<V, K> key) {
+        if (CollUtil.isEmpty(collection)) {
+            return MapUtil.newHashMap();
+        }
+        return collection.stream().filter(Objects::nonNull).collect(Collectors.toMap(key, Function.identity(), (l, r) -> l));
+    }
+
+    /**
+     * 将Collection转化为map(value类型与collection的泛型不同)<br>
+     * <B>{@code Collection<E> -----> Map<K,V>  }</B>
+     *
+     * @param collection 需要转化的集合
+     * @param key        E类型转化为K类型的lambda方法
+     * @param value      E类型转化为V类型的lambda方法
+     * @param <E>        collection中的泛型
+     * @param <K>        map中的key类型
+     * @param <V>        map中的value类型
+     * @return 转化后的map
+     */
+    public static <E, K, V> Map<K, V> toMap(Collection<E> collection, Function<E, K> key, Function<E, V> value) {
+        if (CollUtil.isEmpty(collection)) {
+            return MapUtil.newHashMap();
+        }
+        return collection.stream().filter(Objects::nonNull).collect(Collectors.toMap(key, value, (l, r) -> l));
+    }
+
+    /**
+     * 将collection按照规则(比如有相同的班级id)分类成map<br>
+     * <B>{@code Collection<E> -------> Map<K,List<E>> } </B>
+     *
+     * @param collection 需要分类的集合
+     * @param key        分类的规则
+     * @param <E>        collection中的泛型
+     * @param <K>        map中的key类型
+     * @return 分类后的map
+     */
+    public static <E, K> Map<K, List<E>> groupByKey(Collection<E> collection, Function<E, K> key) {
+        if (CollUtil.isEmpty(collection)) {
+            return MapUtil.newHashMap();
+        }
+        return collection
+            .stream().filter(Objects::nonNull)
+            .collect(Collectors.groupingBy(key, LinkedHashMap::new, Collectors.toList()));
+    }
+
+    /**
+     * 将collection按照两个规则(比如有相同的年级id,班级id)分类成双层map<br>
+     * <B>{@code Collection<E>  --->  Map<T,Map<U,List<E>>> } </B>
+     *
+     * @param collection 需要分类的集合
+     * @param key1       第一个分类的规则
+     * @param key2       第二个分类的规则
+     * @param <E>        集合元素类型
+     * @param <K>        第一个map中的key类型
+     * @param <U>        第二个map中的key类型
+     * @return 分类后的map
+     */
+    public static <E, K, U> Map<K, Map<U, List<E>>> groupBy2Key(Collection<E> collection, Function<E, K> key1, Function<E, U> key2) {
+        if (CollUtil.isEmpty(collection)) {
+            return MapUtil.newHashMap();
+        }
+        return collection
+            .stream().filter(Objects::nonNull)
+            .collect(Collectors.groupingBy(key1, LinkedHashMap::new, Collectors.groupingBy(key2, LinkedHashMap::new, Collectors.toList())));
+    }
+
+    /**
+     * 将collection按照两个规则(比如有相同的年级id,班级id)分类成双层map<br>
+     * <B>{@code Collection<E>  --->  Map<T,Map<U,E>> } </B>
+     *
+     * @param collection 需要分类的集合
+     * @param key1       第一个分类的规则
+     * @param key2       第二个分类的规则
+     * @param <T>        第一个map中的key类型
+     * @param <U>        第二个map中的key类型
+     * @param <E>        collection中的泛型
+     * @return 分类后的map
+     */
+    public static <E, T, U> Map<T, Map<U, E>> group2Map(Collection<E> collection, Function<E, T> key1, Function<E, U> key2) {
+        if (CollUtil.isEmpty(collection) || key1 == null || key2 == null) {
+            return MapUtil.newHashMap();
+        }
+        return collection
+            .stream().filter(Objects::nonNull)
+            .collect(Collectors.groupingBy(key1, LinkedHashMap::new, Collectors.toMap(key2, Function.identity(), (l, r) -> l)));
+    }
+
+    /**
+     * 将collection转化为List集合，但是两者的泛型不同<br>
+     * <B>{@code Collection<E>  ------>  List<T> } </B>
+     *
+     * @param collection 需要转化的集合
+     * @param function   collection中的泛型转化为list泛型的lambda表达式
+     * @param <E>        collection中的泛型
+     * @param <T>        List中的泛型
+     * @return 转化后的list
+     */
+    public static <E, T> List<T> toList(Collection<E> collection, Function<E, T> function) {
+        if (CollUtil.isEmpty(collection)) {
+            return CollUtil.newArrayList();
+        }
+        return collection
+            .stream()
+            .map(function)
+            .filter(Objects::nonNull)
+            // 注意此处不要使用 .toList() 新语法 因为返回的是不可变List 会导致序列化问题
+            .collect(Collectors.toList());
+    }
+
+    /**
+     * 将collection转化为Set集合，但是两者的泛型不同<br>
+     * <B>{@code Collection<E>  ------>  Set<T> } </B>
+     *
+     * @param collection 需要转化的集合
+     * @param function   collection中的泛型转化为set泛型的lambda表达式
+     * @param <E>        collection中的泛型
+     * @param <T>        Set中的泛型
+     * @return 转化后的Set
+     */
+    public static <E, T> Set<T> toSet(Collection<E> collection, Function<E, T> function) {
+        if (CollUtil.isEmpty(collection) || function == null) {
+            return CollUtil.newHashSet();
+        }
+        return collection
+            .stream()
+            .map(function)
+            .filter(Objects::nonNull)
+            .collect(Collectors.toSet());
+    }
+
+
+    /**
+     * 合并两个相同key类型的map
+     *
+     * @param map1  第一个需要合并的 map
+     * @param map2  第二个需要合并的 map
+     * @param merge 合并的lambda，将key  value1 value2合并成最终的类型,注意value可能为空的情况
+     * @param <K>   map中的key类型
+     * @param <X>   第一个 map的value类型
+     * @param <Y>   第二个 map的value类型
+     * @param <V>   最终map的value类型
+     * @return 合并后的map
+     */
+    public static <K, X, Y, V> Map<K, V> merge(Map<K, X> map1, Map<K, Y> map2, BiFunction<X, Y, V> merge) {
+        if (MapUtil.isEmpty(map1) && MapUtil.isEmpty(map2)) {
+            return MapUtil.newHashMap();
+        } else if (MapUtil.isEmpty(map1)) {
+            map1 = MapUtil.newHashMap();
+        } else if (MapUtil.isEmpty(map2)) {
+            map2 = MapUtil.newHashMap();
+        }
+        Set<K> key = new HashSet<>();
+        key.addAll(map1.keySet());
+        key.addAll(map2.keySet());
+        Map<K, V> map = new HashMap<>();
+        for (K t : key) {
+            X x = map1.get(t);
+            Y y = map2.get(t);
+            V z = merge.apply(x, y);
+            if (z != null) {
+                map.put(t, z);
+            }
+        }
+        return map;
+    }
+
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/StringUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/StringUtils.java
new file mode 100644
index 0000000..2637119
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/StringUtils.java
@@ -0,0 +1,365 @@
+package org.dromara.common.core.utils;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.convert.Convert;
+import cn.hutool.core.lang.Validator;
+import cn.hutool.core.util.StrUtil;
+import org.springframework.util.AntPathMatcher;
+
+import java.nio.charset.Charset;
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+/**
+ * 字符串工具类
+ *
+ * @author pengles
+ */
+public class StringUtils extends org.apache.commons.lang3.StringUtils {
+
+    public static final String SEPARATOR = ",";
+
+    public static final String SLASH = "/";
+
+    @Deprecated
+    private StringUtils() {
+    }
+
+    /**
+     * 获取参数不为空值
+     *
+     * @param str defaultValue 要判断的value
+     * @return value 返回值
+     */
+    public static String blankToDefault(String str, String defaultValue) {
+        return StrUtil.blankToDefault(str, defaultValue);
+    }
+
+    /**
+     * * 判断一个字符串是否为空串
+     *
+     * @param str String
+     * @return true：为空 false：非空
+     */
+    public static boolean isEmpty(String str) {
+        return StrUtil.isEmpty(str);
+    }
+
+    /**
+     * * 判断一个字符串是否为非空串
+     *
+     * @param str String
+     * @return true：非空串 false：空串
+     */
+    public static boolean isNotEmpty(String str) {
+        return !isEmpty(str);
+    }
+
+    /**
+     * 去空格
+     */
+    public static String trim(String str) {
+        return StrUtil.trim(str);
+    }
+
+    /**
+     * 截取字符串
+     *
+     * @param str   字符串
+     * @param start 开始
+     * @return 结果
+     */
+    public static String substring(final String str, int start) {
+        return substring(str, start, str.length());
+    }
+
+    /**
+     * 截取字符串
+     *
+     * @param str   字符串
+     * @param start 开始
+     * @param end   结束
+     * @return 结果
+     */
+    public static String substring(final String str, int start, int end) {
+        return StrUtil.sub(str, start, end);
+    }
+
+    /**
+     * 格式化文本, {} 表示占位符<br>
+     * 此方法只是简单将占位符 {} 按照顺序替换为参数<br>
+     * 如果想输出 {} 使用 \\转义 { 即可，如果想输出 {} 之前的 \ 使用双转义符 \\\\ 即可<br>
+     * 例：<br>
+     * 通常使用：format("this is {} for {}", "a", "b") -> this is a for b<br>
+     * 转义{}： format("this is \\{} for {}", "a", "b") -> this is {} for a<br>
+     * 转义\： format("this is \\\\{} for {}", "a", "b") -> this is \a for b<br>
+     *
+     * @param template 文本模板，被替换的部分用 {} 表示
+     * @param params   参数值
+     * @return 格式化后的文本
+     */
+    public static String format(String template, Object... params) {
+        return StrUtil.format(template, params);
+    }
+
+    /**
+     * 是否为http(s)://开头
+     *
+     * @param link 链接
+     * @return 结果
+     */
+    public static boolean ishttp(String link) {
+        return Validator.isUrl(link);
+    }
+
+    /**
+     * 字符串转set
+     *
+     * @param str 字符串
+     * @param sep 分隔符
+     * @return set集合
+     */
+    public static Set<String> str2Set(String str, String sep) {
+        return new HashSet<>(str2List(str, sep, true, false));
+    }
+
+    /**
+     * 字符串转list
+     *
+     * @param str         字符串
+     * @param sep         分隔符
+     * @param filterBlank 过滤纯空白
+     * @param trim        去掉首尾空白
+     * @return list集合
+     */
+    public static List<String> str2List(String str, String sep, boolean filterBlank, boolean trim) {
+        List<String> list = new ArrayList<>();
+        if (isEmpty(str)) {
+            return list;
+        }
+
+        // 过滤空白字符串
+        if (filterBlank && isBlank(str)) {
+            return list;
+        }
+        String[] split = str.split(sep);
+        for (String string : split) {
+            if (filterBlank && isBlank(string)) {
+                continue;
+            }
+            if (trim) {
+                string = trim(string);
+            }
+            list.add(string);
+        }
+
+        return list;
+    }
+
+    /**
+     * 查找指定字符串是否包含指定字符串列表中的任意一个字符串同时串忽略大小写
+     *
+     * @param cs                  指定字符串
+     * @param searchCharSequences 需要检查的字符串数组
+     * @return 是否包含任意一个字符串
+     */
+    public static boolean containsAnyIgnoreCase(CharSequence cs, CharSequence... searchCharSequences) {
+        return StrUtil.containsAnyIgnoreCase(cs, searchCharSequences);
+    }
+
+    /**
+     * 驼峰转下划线命名
+     */
+    public static String toUnderScoreCase(String str) {
+        return StrUtil.toUnderlineCase(str);
+    }
+
+    /**
+     * 是否包含字符串
+     *
+     * @param str  验证字符串
+     * @param strs 字符串组
+     * @return 包含返回true
+     */
+    public static boolean inStringIgnoreCase(String str, String... strs) {
+        return StrUtil.equalsAnyIgnoreCase(str, strs);
+    }
+
+    /**
+     * 将下划线大写方式命名的字符串转换为驼峰式。如果转换前的下划线大写方式命名的字符串为空，则返回空字符串。 例如：HELLO_WORLD->HelloWorld
+     *
+     * @param name 转换前的下划线大写方式命名的字符串
+     * @return 转换后的驼峰式命名的字符串
+     */
+    public static String convertToCamelCase(String name) {
+        return StrUtil.upperFirst(StrUtil.toCamelCase(name));
+    }
+
+    /**
+     * 驼峰式命名法 例如：user_name->userName
+     */
+    public static String toCamelCase(String s) {
+        return StrUtil.toCamelCase(s);
+    }
+
+    /**
+     * 查找指定字符串是否匹配指定字符串列表中的任意一个字符串
+     *
+     * @param str  指定字符串
+     * @param strs 需要检查的字符串数组
+     * @return 是否匹配
+     */
+    public static boolean matches(String str, List<String> strs) {
+        if (isEmpty(str) || CollUtil.isEmpty(strs)) {
+            return false;
+        }
+        for (String pattern : strs) {
+            if (isMatch(pattern, str)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * 判断url是否与规则配置:
+     * ? 表示单个字符;
+     * * 表示一层路径内的任意字符串，不可跨层级;
+     * ** 表示任意层路径;
+     *
+     * @param pattern 匹配规则
+     * @param url     需要匹配的url
+     */
+    public static boolean isMatch(String pattern, String url) {
+        AntPathMatcher matcher = new AntPathMatcher();
+        return matcher.match(pattern, url);
+    }
+
+    /**
+     * 数字左边补齐0，使之达到指定长度。注意，如果数字转换为字符串后，长度大于size，则只保留 最后size个字符。
+     *
+     * @param num  数字对象
+     * @param size 字符串指定长度
+     * @return 返回数字的字符串格式，该字符串为指定长度。
+     */
+    public static String padl(final Number num, final int size) {
+        return padl(num.toString(), size, '0');
+    }
+
+    /**
+     * 字符串左补齐。如果原始字符串s长度大于size，则只保留最后size个字符。
+     *
+     * @param s    原始字符串
+     * @param size 字符串指定长度
+     * @param c    用于补齐的字符
+     * @return 返回指定长度的字符串，由原字符串左补齐或截取得到。
+     */
+    public static String padl(final String s, final int size, final char c) {
+        final StringBuilder sb = new StringBuilder(size);
+        if (s != null) {
+            final int len = s.length();
+            if (s.length() <= size) {
+                sb.append(String.valueOf(c).repeat(size - len));
+                sb.append(s);
+            } else {
+                return s.substring(len - size, len);
+            }
+        } else {
+            sb.append(String.valueOf(c).repeat(Math.max(0, size)));
+        }
+        return sb.toString();
+    }
+
+    /**
+     * 切分字符串(分隔符默认逗号)
+     *
+     * @param str 被切分的字符串
+     * @return 分割后的数据列表
+     */
+    public static List<String> splitList(String str) {
+        return splitTo(str, Convert::toStr);
+    }
+
+    /**
+     * 切分字符串
+     *
+     * @param str       被切分的字符串
+     * @param separator 分隔符
+     * @return 分割后的数据列表
+     */
+    public static List<String> splitList(String str, String separator) {
+        return splitTo(str, separator, Convert::toStr);
+    }
+
+    /**
+     * 切分字符串自定义转换(分隔符默认逗号)
+     *
+     * @param str    被切分的字符串
+     * @param mapper 自定义转换
+     * @return 分割后的数据列表
+     */
+    public static <T> List<T> splitTo(String str, Function<? super Object, T> mapper) {
+        return splitTo(str, SEPARATOR, mapper);
+    }
+
+    /**
+     * 切分字符串自定义转换
+     *
+     * @param str       被切分的字符串
+     * @param separator 分隔符
+     * @param mapper    自定义转换
+     * @return 分割后的数据列表
+     */
+    public static <T> List<T> splitTo(String str, String separator, Function<? super Object, T> mapper) {
+        if (isBlank(str)) {
+            return new ArrayList<>(0);
+        }
+        return StrUtil.split(str, separator)
+            .stream()
+            .filter(Objects::nonNull)
+            .map(mapper)
+            .filter(Objects::nonNull)
+            .collect(Collectors.toList());
+    }
+
+    /**
+     * 不区分大小写检查 CharSequence 是否以指定的前缀开头。
+     *
+     * @param str     要检查的 CharSequence 可能为 null
+     * @param prefixs 要查找的前缀可能为 null
+     * @return 是否包含
+     */
+    public static boolean startWithAnyIgnoreCase(CharSequence str, CharSequence... prefixs) {
+        // 判断是否是以指定字符串开头
+        for (CharSequence prefix : prefixs) {
+            if (StringUtils.startsWithIgnoreCase(str, prefix)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * 将字符串从源字符集转换为目标字符集
+     *
+     * @param input       原始字符串
+     * @param fromCharset 源字符集
+     * @param toCharset   目标字符集
+     * @return 转换后的字符串
+     */
+    public static String convert(String input, Charset fromCharset, Charset toCharset) {
+        if (isBlank(input)) {
+            return input;
+        }
+        try {
+            // 从源字符集获取字节
+            byte[] bytes = input.getBytes(fromCharset);
+            // 使用目标字符集解码
+            return new String(bytes, toCharset);
+        } catch (Exception e) {
+            return input;
+        }
+    }
+
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/Threads.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/Threads.java
new file mode 100644
index 0000000..69d54be
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/Threads.java
@@ -0,0 +1,63 @@
+package org.dromara.common.core.utils;
+
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.concurrent.*;
+
+/**
+ * 线程相关工具类.
+ *
+ * @author pengles
+ */
+@Slf4j
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public class Threads {
+    /**
+     * 停止线程池
+     * 先使用shutdown, 停止接收新任务并尝试完成所有已存在任务.
+     * 如果超时, 则调用shutdownNow, 取消在workQueue中Pending的任务,并中断所有阻塞函数.
+     * 如果仍然超時，則強制退出.
+     * 另对在shutdown时线程本身被调用中断做了处理.
+     */
+    public static void shutdownAndAwaitTermination(ExecutorService pool) {
+        if (pool != null && !pool.isShutdown()) {
+            pool.shutdown();
+            try {
+                if (!pool.awaitTermination(120, TimeUnit.SECONDS)) {
+                    pool.shutdownNow();
+                    if (!pool.awaitTermination(120, TimeUnit.SECONDS)) {
+                        log.info("Pool did not terminate");
+                    }
+                }
+            } catch (InterruptedException ie) {
+                pool.shutdownNow();
+                Thread.currentThread().interrupt();
+            }
+        }
+    }
+
+    /**
+     * 打印线程异常信息
+     */
+    public static void printException(Runnable r, Throwable t) {
+        if (t == null && r instanceof Future<?>) {
+            try {
+                Future<?> future = (Future<?>) r;
+                if (future.isDone()) {
+                    future.get();
+                }
+            } catch (CancellationException ce) {
+                t = ce;
+            } catch (ExecutionException ee) {
+                t = ee.getCause();
+            } catch (InterruptedException ie) {
+                Thread.currentThread().interrupt();
+            }
+        }
+        if (t != null) {
+            log.error(t.getMessage(), t);
+        }
+    }
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/TreeBuildUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/TreeBuildUtils.java
new file mode 100644
index 0000000..c07dae9
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/TreeBuildUtils.java
@@ -0,0 +1,123 @@
+package org.dromara.common.core.utils;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.lang.tree.Tree;
+import cn.hutool.core.lang.tree.TreeNodeConfig;
+import cn.hutool.core.lang.tree.TreeUtil;
+import cn.hutool.core.lang.tree.parser.NodeParser;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+import org.dromara.common.core.utils.reflect.ReflectUtils;
+
+import java.util.List;
+import java.util.Set;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+/**
+ * 扩展 hutool TreeUtil 封装系统树构建
+ *
+ * @author pengles
+ */
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public class TreeBuildUtils extends TreeUtil {
+
+    /**
+     * 根据前端定制差异化字段
+     */
+    public static final TreeNodeConfig DEFAULT_CONFIG = TreeNodeConfig.DEFAULT_CONFIG.setNameKey("label");
+
+    /**
+     * 构建树形结构
+     *
+     * @param <T>        输入节点的类型
+     * @param <K>        节点ID的类型
+     * @param list       节点列表，其中包含了要构建树形结构的所有节点
+     * @param nodeParser 解析器，用于将输入节点转换为树节点
+     * @return 构建好的树形结构列表
+     */
+    public static <T, K> List<Tree<K>> build(List<T> list, NodeParser<T, K> nodeParser) {
+        if (CollUtil.isEmpty(list)) {
+            return CollUtil.newArrayList();
+        }
+        K k = ReflectUtils.invokeGetter(list.get(0), "parentId");
+        return TreeUtil.build(list, k, DEFAULT_CONFIG, nodeParser);
+    }
+
+    /**
+     * 构建树形结构
+     *
+     * @param <T>        输入节点的类型
+     * @param <K>        节点ID的类型
+     * @param parentId   顶级节点
+     * @param list       节点列表，其中包含了要构建树形结构的所有节点
+     * @param nodeParser 解析器，用于将输入节点转换为树节点
+     * @return 构建好的树形结构列表
+     */
+    public static <T, K> List<Tree<K>> build(List<T> list, K parentId, NodeParser<T, K> nodeParser) {
+        if (CollUtil.isEmpty(list)) {
+            return CollUtil.newArrayList();
+        }
+        return TreeUtil.build(list, parentId, DEFAULT_CONFIG, nodeParser);
+    }
+
+    /**
+     * 构建多根节点的树结构（支持多个顶级节点）
+     *
+     * @param list        原始数据列表
+     * @param getId       获取节点 ID 的方法引用，例如：node -> node.getId()
+     * @param getParentId 获取节点父级 ID 的方法引用，例如：node -> node.getParentId()
+     * @param parser      树节点属性映射器，用于将原始节点 T 转为 Tree 节点
+     * @param <T>         原始数据类型（如实体类、DTO 等）
+     * @param <K>         节点 ID 类型（如 Long、String）
+     * @return 构建完成的树形结构（可能包含多个顶级根节点）
+     */
+    public static <T, K> List<Tree<K>> buildMultiRoot(List<T> list, Function<T, K> getId, Function<T, K> getParentId, NodeParser<T, K> parser) {
+        if (CollUtil.isEmpty(list)) {
+            return CollUtil.newArrayList();
+        }
+
+        Set<K> rootParentIds = StreamUtils.toSet(list, getParentId);
+        rootParentIds.removeAll(StreamUtils.toSet(list, getId));
+
+        // 构建每一个根 parentId 下的树，并合并成最终结果列表
+        return rootParentIds.stream()
+            .flatMap(rootParentId -> TreeUtil.build(list, rootParentId, parser).stream())
+            .collect(Collectors.toList());
+    }
+
+    /**
+     * 获取节点列表中所有节点的叶子节点
+     *
+     * @param <K>   节点ID的类型
+     * @param nodes 节点列表
+     * @return 包含所有叶子节点的列表
+     */
+    public static <K> List<Tree<K>> getLeafNodes(List<Tree<K>> nodes) {
+        if (CollUtil.isEmpty(nodes)) {
+            return CollUtil.newArrayList();
+        }
+        return nodes.stream()
+            .flatMap(TreeBuildUtils::extractLeafNodes)
+            .collect(Collectors.toList());
+    }
+
+    /**
+     * 获取指定节点下的所有叶子节点
+     *
+     * @param <K>  节点ID的类型
+     * @param node 要查找叶子节点的根节点
+     * @return 包含所有叶子节点的列表
+     */
+    private static <K> Stream<Tree<K>> extractLeafNodes(Tree<K> node) {
+        if (!node.hasChild()) {
+            return Stream.of(node);
+        } else {
+            // 递归调用，获取所有子节点的叶子节点
+            return node.getChildren().stream()
+                .flatMap(TreeBuildUtils::extractLeafNodes);
+        }
+    }
+
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ValidatorUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ValidatorUtils.java
new file mode 100644
index 0000000..66db70e
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ValidatorUtils.java
@@ -0,0 +1,35 @@
+package org.dromara.common.core.utils;
+
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.ConstraintViolationException;
+import jakarta.validation.Validator;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+
+import java.util.Set;
+
+/**
+ * Validator 校验框架工具
+ *
+ * @author pengles
+ */
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public class ValidatorUtils {
+
+    private static final Validator VALID = SpringUtils.getBean(Validator.class);
+
+    /**
+     * 对给定对象进行参数校验，并根据指定的校验组进行校验
+     *
+     * @param object 要进行校验的对象
+     * @param groups 校验组
+     * @throws ConstraintViolationException 如果校验不通过，则抛出参数校验异常
+     */
+    public static <T> void validate(T object, Class<?>... groups) {
+        Set<ConstraintViolation<T>> validate = VALID.validate(object, groups);
+        if (!validate.isEmpty()) {
+            throw new ConstraintViolationException("参数校验异常", validate);
+        }
+    }
+
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/file/FileUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/file/FileUtils.java
new file mode 100644
index 0000000..48cffad
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/file/FileUtils.java
@@ -0,0 +1,43 @@
+package org.dromara.common.core.utils.file;
+
+import cn.hutool.core.io.FileUtil;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+
+/**
+ * 文件处理工具类
+ *
+ * @author pengles
+ */
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public class FileUtils extends FileUtil {
+
+    /**
+     * 下载文件名重新编码
+     *
+     * @param response     响应对象
+     * @param realFileName 真实文件名
+     */
+    public static void setAttachmentResponseHeader(HttpServletResponse response, String realFileName) {
+        String percentEncodedFileName = percentEncode(realFileName);
+        String contentDispositionValue = "attachment; filename=%s;filename*=utf-8''%s".formatted(percentEncodedFileName, percentEncodedFileName);
+        response.addHeader("Access-Control-Expose-Headers", "Content-Disposition,download-filename");
+        response.setHeader("Content-disposition", contentDispositionValue);
+        response.setHeader("download-filename", percentEncodedFileName);
+    }
+
+    /**
+     * 百分号编码工具方法
+     *
+     * @param s 需要百分号编码的字符串
+     * @return 百分号编码后的字符串
+     */
+    public static String percentEncode(String s) {
+        String encode = URLEncoder.encode(s, StandardCharsets.UTF_8);
+        return encode.replaceAll("\\+", "%20");
+    }
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/file/MimeTypeUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/file/MimeTypeUtils.java
new file mode 100644
index 0000000..4f61ded
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/file/MimeTypeUtils.java
@@ -0,0 +1,40 @@
+package org.dromara.common.core.utils.file;
+
+/**
+ * 媒体类型工具类
+ *
+ * @author pengles
+ */
+public class MimeTypeUtils {
+    public static final String IMAGE_PNG = "image/png";
+
+    public static final String IMAGE_JPG = "image/jpg";
+
+    public static final String IMAGE_JPEG = "image/jpeg";
+
+    public static final String IMAGE_BMP = "image/bmp";
+
+    public static final String IMAGE_GIF = "image/gif";
+
+    public static final String[] IMAGE_EXTENSION = {"bmp", "gif", "jpg", "jpeg", "png"};
+
+    public static final String[] FLASH_EXTENSION = {"swf", "flv"};
+
+    public static final String[] MEDIA_EXTENSION = {"swf", "flv", "mp3", "wav", "wma", "wmv", "mid", "avi", "mpg",
+        "asf", "rm", "rmvb"};
+
+    public static final String[] VIDEO_EXTENSION = {"mp4", "avi", "rmvb"};
+
+    public static final String[] DEFAULT_ALLOWED_EXTENSION = {
+        // 图片
+        "bmp", "gif", "jpg", "jpeg", "png",
+        // word excel powerpoint
+        "doc", "docx", "xls", "xlsx", "ppt", "pptx", "html", "htm", "txt",
+        // 压缩文件
+        "rar", "zip", "gz", "bz2",
+        // 视频格式
+        "mp4", "avi", "rmvb",
+        // pdf
+        "pdf"};
+
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ip/AddressUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ip/AddressUtils.java
new file mode 100644
index 0000000..72027fe
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ip/AddressUtils.java
@@ -0,0 +1,70 @@
+package org.dromara.common.core.utils.ip;
+
+import cn.hutool.http.HtmlUtil;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.utils.NetUtils;
+import org.dromara.common.core.utils.StringUtils;
+
+/**
+ * 获取地址类
+ *
+ * @author pengles
+ */
+@Slf4j
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public class AddressUtils {
+
+    // 未知IP
+    public static final String UNKNOWN_IP = "XX XX";
+    // 内网地址
+    public static final String LOCAL_ADDRESS = "内网IP";
+    // 未知地址
+    public static final String UNKNOWN_ADDRESS = "未知";
+
+    public static String getRealAddressByIP(String ip) {
+        // 处理空串并过滤HTML标签
+        ip = HtmlUtil.cleanHtmlTag(StringUtils.blankToDefault(ip,""));
+        // 判断是否为IPv4
+        if (NetUtils.isIPv4(ip)) {
+            return resolverIPv4Region(ip);
+        }
+        // 判断是否为IPv6
+        if (NetUtils.isIPv6(ip)) {
+            return resolverIPv6Region(ip);
+        }
+        // 如果不是IPv4或IPv6，则返回未知IP
+        return UNKNOWN_IP;
+    }
+
+    /**
+     * 根据IPv4地址查询IP归属行政区域
+     * @param ip ipv4地址
+     * @return 归属行政区域
+     */
+    private static String resolverIPv4Region(String ip){
+        // 内网不查询
+        if (NetUtils.isInnerIP(ip)) {
+            return LOCAL_ADDRESS;
+        }
+        return RegionUtils.getCityInfo(ip);
+    }
+
+    /**
+     * 根据IPv6地址查询IP归属行政区域
+     * @param ip ipv6地址
+     * @return 归属行政区域
+     */
+    private static String resolverIPv6Region(String ip){
+        // 内网不查询
+        if (NetUtils.isInnerIPv6(ip)) {
+            return LOCAL_ADDRESS;
+        }
+        log.warn("ip2region不支持IPV6地址解析：{}", ip);
+        // 不支持IPv6，不再进行没有必要的IP地址信息的解析，直接返回
+        // 如有需要，可自行实现IPv6地址信息解析逻辑，并在这里返回
+        return UNKNOWN_ADDRESS;
+    }
+
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ip/RegionUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ip/RegionUtils.java
new file mode 100644
index 0000000..c9e8678
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/ip/RegionUtils.java
@@ -0,0 +1,51 @@
+package org.dromara.common.core.utils.ip;
+
+import cn.hutool.core.io.resource.NoResourceException;
+import cn.hutool.core.io.resource.ResourceUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.utils.StringUtils;
+import org.lionsoul.ip2region.xdb.Searcher;
+
+/**
+ * 根据ip地址定位工具类，离线方式
+ * 参考地址：<a href="https://gitee.com/lionsoul/ip2region/tree/master/binding/java">集成 ip2region 实现离线IP地址定位库</a>
+ *
+ * @author lishuyan
+ */
+@Slf4j
+public class RegionUtils {
+
+    // IP地址库文件名称
+    public static final String IP_XDB_FILENAME = "ip2region.xdb";
+
+    private static final Searcher SEARCHER;
+
+    static {
+        try {
+            // 1、将 ip2region 数据库文件 xdb 从 ClassPath 加载到内存。
+            // 2、基于加载到内存的 xdb 数据创建一个 Searcher 查询对象。
+            SEARCHER = Searcher.newWithBuffer(ResourceUtil.readBytes(IP_XDB_FILENAME));
+            log.info("RegionUtils初始化成功，加载IP地址库数据成功！");
+        } catch (NoResourceException e) {
+            throw new ServiceException("RegionUtils初始化失败，原因：IP地址库数据不存在！");
+        } catch (Exception e) {
+            throw new ServiceException("RegionUtils初始化失败，原因：" + e.getMessage());
+        }
+    }
+
+    /**
+     * 根据IP地址离线获取城市
+     */
+    public static String getCityInfo(String ip) {
+        try {
+            // 3、执行查询
+            String region = SEARCHER.search(StringUtils.trim(ip));
+            return region.replace("0|", "").replace("|0", "");
+        } catch (Exception e) {
+            log.error("IP地址离线获取城市异常 {}", ip);
+            return "未知";
+        }
+    }
+
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/reflect/ReflectUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/reflect/ReflectUtils.java
new file mode 100644
index 0000000..fcfcef7
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/reflect/ReflectUtils.java
@@ -0,0 +1,56 @@
+package org.dromara.common.core.utils.reflect;
+
+import cn.hutool.core.util.ReflectUtil;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+import org.dromara.common.core.utils.StringUtils;
+
+import java.lang.reflect.Method;
+
+/**
+ * 反射工具类. 提供调用getter/setter方法, 访问私有变量, 调用私有方法, 获取泛型类型Class, 被AOP过的真实类等工具函数.
+ *
+ * @author pengles
+ */
+@SuppressWarnings("rawtypes")
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public class ReflectUtils extends ReflectUtil {
+
+    private static final String SETTER_PREFIX = "set";
+
+    private static final String GETTER_PREFIX = "get";
+
+    /**
+     * 调用Getter方法.
+     * 支持多级，如：对象名.对象名.方法
+     */
+    @SuppressWarnings("unchecked")
+    public static <E> E invokeGetter(Object obj, String propertyName) {
+        Object object = obj;
+        for (String name : StringUtils.split(propertyName, ".")) {
+            String getterMethodName = GETTER_PREFIX + StringUtils.capitalize(name);
+            object = invoke(object, getterMethodName);
+        }
+        return (E) object;
+    }
+
+    /**
+     * 调用Setter方法, 仅匹配方法名。
+     * 支持多级，如：对象名.对象名.方法
+     */
+    public static <E> void invokeSetter(Object obj, String propertyName, E value) {
+        Object object = obj;
+        String[] names = StringUtils.split(propertyName, ".");
+        for (int i = 0; i < names.length; i++) {
+            if (i < names.length - 1) {
+                String getterMethodName = GETTER_PREFIX + StringUtils.capitalize(names[i]);
+                object = invoke(object, getterMethodName);
+            } else {
+                String setterMethodName = SETTER_PREFIX + StringUtils.capitalize(names[i]);
+                Method method = getMethodByName(object.getClass(), setterMethodName);
+                invoke(object, method, value);
+            }
+        }
+    }
+
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/regex/RegexUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/regex/RegexUtils.java
new file mode 100644
index 0000000..6dde129
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/regex/RegexUtils.java
@@ -0,0 +1,31 @@
+package org.dromara.common.core.utils.regex;
+
+
+import cn.hutool.core.util.ReUtil;
+import org.dromara.common.core.constant.RegexConstants;
+
+/**
+ * 正则相关工具类
+ *
+ * @author Feng
+ */
+public final class RegexUtils extends ReUtil {
+
+    /**
+     * 从输入字符串中提取匹配的部分，如果没有匹配则返回默认值
+     *
+     * @param input        要提取的输入字符串
+     * @param regex        用于匹配的正则表达式，可以使用 {@link RegexConstants} 中定义的常量
+     * @param defaultInput 如果没有匹配时返回的默认值
+     * @return 如果找到匹配的部分，则返回匹配的部分，否则返回默认值
+     */
+    public static String extractFromString(String input, String regex, String defaultInput) {
+        try {
+            String str = ReUtil.get(regex, input, 1);
+            return str == null ? defaultInput : str;
+        } catch (Exception e) {
+            return defaultInput;
+        }
+    }
+
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/regex/RegexValidator.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/regex/RegexValidator.java
new file mode 100644
index 0000000..c0dda20
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/regex/RegexValidator.java
@@ -0,0 +1,105 @@
+package org.dromara.common.core.utils.regex;
+
+import cn.hutool.core.exceptions.ValidateException;
+import cn.hutool.core.lang.Validator;
+import org.dromara.common.core.factory.RegexPatternPoolFactory;
+
+import java.util.regex.Pattern;
+
+/**
+ * 正则字段校验器
+ * 主要验证字段非空、是否为满足指定格式等
+ *
+ * @author Feng
+ */
+public class RegexValidator extends Validator {
+
+    /**
+     * 字典类型必须以字母开头，且只能为（小写字母，数字，下滑线）
+     */
+    public static final Pattern DICTIONARY_TYPE = RegexPatternPoolFactory.DICTIONARY_TYPE;
+
+    /**
+     * 身份证号码（后6位）
+     */
+    public static final Pattern ID_CARD_LAST_6 = RegexPatternPoolFactory.ID_CARD_LAST_6;
+
+    /**
+     * QQ号码
+     */
+    public static final Pattern QQ_NUMBER = RegexPatternPoolFactory.QQ_NUMBER;
+
+    /**
+     * 邮政编码
+     */
+    public static final Pattern POSTAL_CODE = RegexPatternPoolFactory.POSTAL_CODE;
+
+    /**
+     * 注册账号
+     */
+    public static final Pattern ACCOUNT = RegexPatternPoolFactory.ACCOUNT;
+
+    /**
+     * 密码：包含至少8个字符，包括大写字母、小写字母、数字和特殊字符
+     */
+    public static final Pattern PASSWORD = RegexPatternPoolFactory.PASSWORD;
+
+    /**
+     * 通用状态（0表示正常，1表示停用）
+     */
+    public static final Pattern STATUS = RegexPatternPoolFactory.STATUS;
+
+
+    /**
+     * 检查输入的账号是否匹配预定义的规则
+     *
+     * @param value 要验证的账号
+     * @return 如果账号符合规则，返回 true；否则，返回 false。
+     */
+    public static boolean isAccount(CharSequence value) {
+        return isMatchRegex(ACCOUNT, value);
+    }
+
+    /**
+     * 验证输入的账号是否符合规则，如果不符合，则抛出 ValidateException 异常
+     *
+     * @param value    要验证的账号
+     * @param errorMsg 验证失败时抛出的异常消息
+     * @param <T>      CharSequence 的子类型
+     * @return 如果验证通过，返回输入的账号
+     * @throws ValidateException 如果验证失败
+     */
+    public static <T extends CharSequence> T validateAccount(T value, String errorMsg) throws ValidateException {
+        if (!isAccount(value)) {
+            throw new ValidateException(errorMsg);
+        }
+        return value;
+    }
+
+    /**
+     * 检查输入的状态是否匹配预定义的规则
+     *
+     * @param value 要验证的状态
+     * @return 如果状态符合规则，返回 true；否则，返回 false。
+     */
+    public static boolean isStatus(CharSequence value) {
+        return isMatchRegex(STATUS, value);
+    }
+
+    /**
+     * 验证输入的状态是否符合规则，如果不符合，则抛出 ValidateException 异常
+     *
+     * @param value    要验证的状态
+     * @param errorMsg 验证失败时抛出的异常消息
+     * @param <T>      CharSequence 的子类型
+     * @return 如果验证通过，返回输入的状态
+     * @throws ValidateException 如果验证失败
+     */
+    public static <T extends CharSequence> T validateStatus(T value, String errorMsg) throws ValidateException {
+        if (!isStatus(value)) {
+            throw new ValidateException(errorMsg);
+        }
+        return value;
+    }
+
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/sql/SqlUtil.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/sql/SqlUtil.java
new file mode 100644
index 0000000..5c83c6b
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/sql/SqlUtil.java
@@ -0,0 +1,56 @@
+package org.dromara.common.core.utils.sql;
+
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+import org.dromara.common.core.utils.StringUtils;
+
+/**
+ * sql操作工具类
+ *
+ * @author pengles
+ */
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public class SqlUtil {
+
+    /**
+     * 定义常用的 sql关键字
+     */
+    public static String SQL_REGEX = "\u000B|and |extractvalue|updatexml|sleep|exec |insert |select |delete |update |drop |count |chr |mid |master |truncate |char |declare |or |union |like |+|/*|user()";
+
+    /**
+     * 仅支持字母、数字、下划线、空格、逗号、小数点（支持多个字段排序）
+     */
+    public static final String SQL_PATTERN = "[a-zA-Z0-9_\\ \\,\\.]+";
+
+    /**
+     * 检查字符，防止注入绕过
+     */
+    public static String escapeOrderBySql(String value) {
+        if (StringUtils.isNotEmpty(value) && !isValidOrderBySql(value)) {
+            throw new IllegalArgumentException("参数不符合规范，不能进行查询");
+        }
+        return value;
+    }
+
+    /**
+     * 验证 order by 语法是否符合规范
+     */
+    public static boolean isValidOrderBySql(String value) {
+        return value.matches(SQL_PATTERN);
+    }
+
+    /**
+     * SQL关键字检查
+     */
+    public static void filterKeyword(String value) {
+        if (StringUtils.isEmpty(value)) {
+            return;
+        }
+        String[] sqlKeywords = StringUtils.split(SQL_REGEX, "\\|");
+        for (String sqlKeyword : sqlKeywords) {
+            if (StringUtils.indexOfIgnoreCase(value, sqlKeyword) > -1) {
+                throw new IllegalArgumentException("参数存在SQL注入风险");
+            }
+        }
+    }
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/AddGroup.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/AddGroup.java
new file mode 100644
index 0000000..4512276
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/AddGroup.java
@@ -0,0 +1,9 @@
+package org.dromara.common.core.validate;
+
+/**
+ * 校验分组 add
+ *
+ * @author pengles
+ */
+public interface AddGroup {
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/EditGroup.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/EditGroup.java
new file mode 100644
index 0000000..365df79
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/EditGroup.java
@@ -0,0 +1,9 @@
+package org.dromara.common.core.validate;
+
+/**
+ * 校验分组 edit
+ *
+ * @author pengles
+ */
+public interface EditGroup {
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/QueryGroup.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/QueryGroup.java
new file mode 100644
index 0000000..f1367b4
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/QueryGroup.java
@@ -0,0 +1,9 @@
+package org.dromara.common.core.validate;
+
+/**
+ * 校验分组 query
+ *
+ * @author pengles
+ */
+public interface QueryGroup {
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/dicts/DictPattern.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/dicts/DictPattern.java
new file mode 100644
index 0000000..73fc4c4
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/dicts/DictPattern.java
@@ -0,0 +1,40 @@
+package org.dromara.common.core.validate.dicts;
+
+import jakarta.validation.Constraint;
+import jakarta.validation.Payload;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * 字典项校验注解
+ *
+ * @author AprilWind
+ */
+@Constraint(validatedBy = DictPatternValidator.class)
+@Target({ElementType.FIELD, ElementType.PARAMETER})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface DictPattern {
+
+    /**
+     * 字典类型，如 "sys_user_sex"
+     */
+    String dictType();
+
+    /**
+     * 分隔符
+     */
+    String separator();
+
+    /**
+     * 默认校验失败提示信息
+     */
+    String message() default "字典值无效";
+
+    Class<?>[] groups() default {};
+
+    Class<? extends Payload>[] payload() default {};
+
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/dicts/DictPatternValidator.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/dicts/DictPatternValidator.java
new file mode 100644
index 0000000..558a343
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/dicts/DictPatternValidator.java
@@ -0,0 +1,55 @@
+package org.dromara.common.core.validate.dicts;
+
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
+import org.dromara.common.core.service.DictService;
+import org.dromara.common.core.utils.SpringUtils;
+import org.dromara.common.core.utils.StringUtils;
+
+/**
+ * 自定义字典值校验器
+ *
+ * @author AprilWind
+ */
+public class DictPatternValidator implements ConstraintValidator<DictPattern, String> {
+
+    /**
+     * 字典类型
+     */
+    private String dictType;
+
+    /**
+     * 分隔符
+     */
+    private String separator = ",";
+
+    /**
+     * 初始化校验器，提取注解上的字典类型
+     *
+     * @param annotation 注解实例
+     */
+    @Override
+    public void initialize(DictPattern annotation) {
+        this.dictType = annotation.dictType();
+        if (StringUtils.isNotBlank(annotation.separator())) {
+            this.separator = annotation.separator();
+        }
+    }
+
+    /**
+     * 校验字段值是否为指定字典类型中的合法值
+     *
+     * @param value   被校验的字段值
+     * @param context 校验上下文（可用于构建错误信息）
+     * @return true 表示校验通过（合法字典值），false 表示不通过
+     */
+    @Override
+    public boolean isValid(String value, ConstraintValidatorContext context) {
+        if (StringUtils.isBlank(dictType) || StringUtils.isBlank(value)) {
+            return false;
+        }
+        String dictLabel = SpringUtils.getBean(DictService.class).getDictLabel(dictType, value, separator);
+        return StringUtils.isNotBlank(dictLabel);
+    }
+
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/enumd/EnumPattern.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/enumd/EnumPattern.java
new file mode 100644
index 0000000..b1ae504
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/enumd/EnumPattern.java
@@ -0,0 +1,51 @@
+package org.dromara.common.core.validate.enumd;
+
+import jakarta.validation.Constraint;
+import jakarta.validation.Payload;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Repeatable;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import static java.lang.annotation.ElementType.*;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+/**
+ * 自定义枚举校验
+ *
+ * @author 秋辞未寒
+ * @date 2024-12-09
+ */
+@Documented
+@Target({METHOD, FIELD, ANNOTATION_TYPE, CONSTRUCTOR, PARAMETER, TYPE_USE})
+@Retention(RUNTIME)
+@Repeatable(EnumPattern.List.class) // 允许在同一元素上多次使用该注解
+@Constraint(validatedBy = {EnumPatternValidator.class})
+public @interface EnumPattern {
+
+    /**
+     * 需要校验的枚举类型
+     */
+    Class<? extends Enum<?>> type();
+
+    /**
+     * 枚举类型校验值字段名称
+     * 需确保该字段实现了 getter 方法
+     */
+    String fieldName();
+
+    String message() default "输入值不在枚举范围内";
+
+    Class<?>[] groups() default {};
+
+    Class<? extends Payload>[] payload() default {};
+
+    @Documented
+    @Target({METHOD, FIELD, ANNOTATION_TYPE, CONSTRUCTOR, PARAMETER, TYPE_USE})
+    @Retention(RUNTIME)
+    @interface List {
+        EnumPattern[] value();
+    }
+
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/enumd/EnumPatternValidator.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/enumd/EnumPatternValidator.java
new file mode 100644
index 0000000..e63f44a
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/enumd/EnumPatternValidator.java
@@ -0,0 +1,37 @@
+package org.dromara.common.core.validate.enumd;
+
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.core.utils.reflect.ReflectUtils;
+
+/**
+ * 自定义枚举校验注解实现
+ *
+ * @author 秋辞未寒
+ * @date 2024-12-09
+ */
+public class EnumPatternValidator implements ConstraintValidator<EnumPattern, String> {
+
+    private EnumPattern annotation;
+
+    @Override
+    public void initialize(EnumPattern annotation) {
+        ConstraintValidator.super.initialize(annotation);
+        this.annotation = annotation;
+    }
+
+    @Override
+    public boolean isValid(String value, ConstraintValidatorContext constraintValidatorContext) {
+        if (StringUtils.isNotBlank(value)) {
+            String fieldName = annotation.fieldName();
+            for (Object e : annotation.type().getEnumConstants()) {
+                if (value.equals(ReflectUtils.invokeGetter(e, fieldName))) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/xss/Xss.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/xss/Xss.java
new file mode 100644
index 0000000..8f75ade
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/xss/Xss.java
@@ -0,0 +1,27 @@
+package org.dromara.common.core.xss;
+
+import jakarta.validation.Constraint;
+import jakarta.validation.Payload;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * 自定义xss校验注解
+ *
+ * @author pengles
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(value = {ElementType.METHOD, ElementType.FIELD, ElementType.CONSTRUCTOR, ElementType.PARAMETER})
+@Constraint(validatedBy = {XssValidator.class})
+public @interface Xss {
+
+    String message() default "不允许任何脚本运行";
+
+    Class<?>[] groups() default {};
+
+    Class<? extends Payload>[] payload() default {};
+
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/xss/XssValidator.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/xss/XssValidator.java
new file mode 100644
index 0000000..155759f
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/xss/XssValidator.java
@@ -0,0 +1,20 @@
+package org.dromara.common.core.xss;
+
+import cn.hutool.core.util.ReUtil;
+import cn.hutool.http.HtmlUtil;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
+
+/**
+ * 自定义xss校验注解实现
+ *
+ * @author pengles
+ */
+public class XssValidator implements ConstraintValidator<Xss, String> {
+
+    @Override
+    public boolean isValid(String value, ConstraintValidatorContext constraintValidatorContext) {
+        return !ReUtil.contains(HtmlUtil.RE_HTML_MARK, value);
+    }
+
+}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
new file mode 100644
index 0000000..43c7fcf
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1,5 @@
+org.dromara.common.core.config.ApplicationConfig
+org.dromara.common.core.config.AsyncConfig
+org.dromara.common.core.config.ThreadPoolConfig
+org.dromara.common.core.config.ValidatorConfig
+org.dromara.common.core.utils.SpringUtils
diff --git a/ruoyi-common/ruoyi-common-doc/pom.xml b/ruoyi-common/ruoyi-common-doc/pom.xml
new file mode 100644
index 0000000..bd50bf7
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-doc/pom.xml
@@ -0,0 +1,52 @@
+<?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>
+        <groupId>org.dromara</groupId>
+        <artifactId>ruoyi-common</artifactId>
+        <version>${revision}</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>ruoyi-common-doc</artifactId>
+
+    <description>
+        ruoyi-common-doc 系统接口
+    </description>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-core</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springdoc</groupId>
+            <artifactId>springdoc-openapi-starter-webmvc-api</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springdoc</groupId>
+                    <artifactId>springdoc-openapi-starter-common</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springdoc</groupId>
+            <artifactId>springdoc-openapi-starter-common</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.github.therapi</groupId>
+            <artifactId>therapi-runtime-javadoc</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fasterxml.jackson.module</groupId>
+            <artifactId>jackson-module-kotlin</artifactId>
+        </dependency>
+
+    </dependencies>
+
+</project>
diff --git a/ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/config/SpringDocConfig.java b/ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/config/SpringDocConfig.java
new file mode 100644
index 0000000..8dee85d
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/config/SpringDocConfig.java
@@ -0,0 +1,126 @@
+package org.dromara.common.doc.config;
+
+import io.swagger.v3.oas.models.OpenAPI;
+import io.swagger.v3.oas.models.Paths;
+import io.swagger.v3.oas.models.info.Info;
+import io.swagger.v3.oas.models.security.SecurityRequirement;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.doc.config.properties.SpringDocProperties;
+import org.dromara.common.doc.handler.OpenApiHandler;
+import org.springdoc.core.configuration.SpringDocConfiguration;
+import org.springdoc.core.customizers.OpenApiBuilderCustomizer;
+import org.springdoc.core.customizers.OpenApiCustomizer;
+import org.springdoc.core.customizers.ServerBaseUrlCustomizer;
+import org.springdoc.core.properties.SpringDocConfigProperties;
+import org.springdoc.core.providers.JavadocProvider;
+import org.springdoc.core.service.OpenAPIService;
+import org.springdoc.core.service.SecurityService;
+import org.springdoc.core.utils.PropertyResolverUtils;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.autoconfigure.web.ServerProperties;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+
+/**
+ * 接口文档配置
+ *
+ * @author pengles
+ */
+@RequiredArgsConstructor
+@AutoConfiguration(before = SpringDocConfiguration.class)
+@EnableConfigurationProperties(SpringDocProperties.class)
+@ConditionalOnProperty(name = "springdoc.api-docs.enabled", havingValue = "true", matchIfMissing = true)
+public class SpringDocConfig {
+
+    private final ServerProperties serverProperties;
+
+    @Bean
+    @ConditionalOnMissingBean(OpenAPI.class)
+    public OpenAPI openApi(SpringDocProperties properties) {
+        OpenAPI openApi = new OpenAPI();
+        // 文档基本信息
+        SpringDocProperties.InfoProperties infoProperties = properties.getInfo();
+        Info info = convertInfo(infoProperties);
+        openApi.info(info);
+        // 扩展文档信息
+        openApi.externalDocs(properties.getExternalDocs());
+        openApi.tags(properties.getTags());
+        openApi.paths(properties.getPaths());
+        openApi.components(properties.getComponents());
+        Set<String> keySet = properties.getComponents().getSecuritySchemes().keySet();
+        List<SecurityRequirement> list = new ArrayList<>();
+        SecurityRequirement securityRequirement = new SecurityRequirement();
+        keySet.forEach(securityRequirement::addList);
+        list.add(securityRequirement);
+        openApi.security(list);
+
+        return openApi;
+    }
+
+    private Info convertInfo(SpringDocProperties.InfoProperties infoProperties) {
+        Info info = new Info();
+        info.setTitle(infoProperties.getTitle());
+        info.setDescription(infoProperties.getDescription());
+        info.setContact(infoProperties.getContact());
+        info.setLicense(infoProperties.getLicense());
+        info.setVersion(infoProperties.getVersion());
+        return info;
+    }
+
+    /**
+     * 自定义 openapi 处理器
+     */
+    @Bean
+    public OpenAPIService openApiBuilder(Optional<OpenAPI> openAPI,
+                                         SecurityService securityParser,
+                                         SpringDocConfigProperties springDocConfigProperties, PropertyResolverUtils propertyResolverUtils,
+                                         Optional<List<OpenApiBuilderCustomizer>> openApiBuilderCustomisers,
+                                         Optional<List<ServerBaseUrlCustomizer>> serverBaseUrlCustomisers, Optional<JavadocProvider> javadocProvider) {
+        return new OpenApiHandler(openAPI, securityParser, springDocConfigProperties, propertyResolverUtils, openApiBuilderCustomisers, serverBaseUrlCustomisers, javadocProvider);
+    }
+
+    /**
+     * 对已经生成好的 OpenApi 进行自定义操作
+     */
+    @Bean
+    public OpenApiCustomizer openApiCustomizer() {
+        String contextPath = serverProperties.getServlet().getContextPath();
+        String finalContextPath;
+        if (StringUtils.isBlank(contextPath) || "/".equals(contextPath)) {
+            finalContextPath = "";
+        } else {
+            finalContextPath = contextPath;
+        }
+        // 对所有路径增加前置上下文路径
+        return openApi -> {
+            Paths oldPaths = openApi.getPaths();
+            if (oldPaths instanceof PlusPaths) {
+                return;
+            }
+            PlusPaths newPaths = new PlusPaths();
+            oldPaths.forEach((k, v) -> newPaths.addPathItem(finalContextPath + k, v));
+            openApi.setPaths(newPaths);
+        };
+    }
+
+    /**
+     * 单独使用一个类便于判断 解决springdoc路径拼接重复问题
+     *
+     * @author pengles
+     */
+    static class PlusPaths extends Paths {
+
+        public PlusPaths() {
+            super();
+        }
+    }
+
+}
diff --git a/ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/config/properties/SpringDocProperties.java b/ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/config/properties/SpringDocProperties.java
new file mode 100644
index 0000000..bc4089c
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/config/properties/SpringDocProperties.java
@@ -0,0 +1,94 @@
+package org.dromara.common.doc.config.properties;
+
+import io.swagger.v3.oas.models.Components;
+import io.swagger.v3.oas.models.ExternalDocumentation;
+import io.swagger.v3.oas.models.Paths;
+import io.swagger.v3.oas.models.info.Contact;
+import io.swagger.v3.oas.models.info.License;
+import io.swagger.v3.oas.models.tags.Tag;
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.context.properties.NestedConfigurationProperty;
+
+import java.util.List;
+
+/**
+ * swagger 配置属性
+ *
+ * @author pengles
+ */
+@Data
+@ConfigurationProperties(prefix = "springdoc")
+public class SpringDocProperties {
+
+    /**
+     * 文档基本信息
+     */
+    @NestedConfigurationProperty
+    private InfoProperties info = new InfoProperties();
+
+    /**
+     * 扩展文档地址
+     */
+    @NestedConfigurationProperty
+    private ExternalDocumentation externalDocs;
+
+    /**
+     * 标签
+     */
+    private List<Tag> tags = null;
+
+    /**
+     * 路径
+     */
+    @NestedConfigurationProperty
+    private Paths paths = null;
+
+    /**
+     * 组件
+     */
+    @NestedConfigurationProperty
+    private Components components = null;
+
+    /**
+     * <p>
+     * 文档的基础属性信息
+     * </p>
+     *
+     * @see io.swagger.v3.oas.models.info.Info
+     *
+     * 为了 springboot 自动生产配置提示信息，所以这里复制一个类出来
+     */
+    @Data
+    public static class InfoProperties {
+
+        /**
+         * 标题
+         */
+        private String title = null;
+
+        /**
+         * 描述
+         */
+        private String description = null;
+
+        /**
+         * 联系人信息
+         */
+        @NestedConfigurationProperty
+        private Contact contact = null;
+
+        /**
+         * 许可证
+         */
+        @NestedConfigurationProperty
+        private License license = null;
+
+        /**
+         * 版本
+         */
+        private String version = null;
+
+    }
+
+}
diff --git a/ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/handler/OpenApiHandler.java b/ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/handler/OpenApiHandler.java
new file mode 100644
index 0000000..56b7369
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-doc/src/main/java/org/dromara/common/doc/handler/OpenApiHandler.java
@@ -0,0 +1,253 @@
+package org.dromara.common.doc.handler;
+
+import cn.hutool.core.io.IoUtil;
+import io.swagger.v3.core.jackson.TypeNameResolver;
+import io.swagger.v3.core.util.AnnotationsUtils;
+import io.swagger.v3.oas.annotations.tags.Tags;
+import io.swagger.v3.oas.models.Components;
+import io.swagger.v3.oas.models.OpenAPI;
+import io.swagger.v3.oas.models.Operation;
+import io.swagger.v3.oas.models.Paths;
+import io.swagger.v3.oas.models.tags.Tag;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.dromara.common.core.utils.StreamUtils;
+import org.springdoc.core.customizers.OpenApiBuilderCustomizer;
+import org.springdoc.core.customizers.ServerBaseUrlCustomizer;
+import org.springdoc.core.properties.SpringDocConfigProperties;
+import org.springdoc.core.providers.JavadocProvider;
+import org.springdoc.core.service.OpenAPIService;
+import org.springdoc.core.service.SecurityService;
+import org.springdoc.core.utils.PropertyResolverUtils;
+import org.springframework.context.ApplicationContext;
+import org.springframework.core.annotation.AnnotatedElementUtils;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.method.HandlerMethod;
+
+import java.io.StringReader;
+import java.lang.reflect.Method;
+import java.util.*;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+/**
+ * 自定义 openapi 处理器
+ * 对源码功能进行修改 增强使用
+ */
+@Slf4j
+@SuppressWarnings("all")
+public class OpenApiHandler extends OpenAPIService {
+
+    /**
+     * The Basic error controller.
+     */
+    private static Class<?> basicErrorController;
+
+    /**
+     * The Security parser.
+     */
+    private final SecurityService securityParser;
+
+    /**
+     * The Mappings map.
+     */
+    private final Map<String, Object> mappingsMap = new HashMap<>();
+
+    /**
+     * The Springdoc tags.
+     */
+    private final Map<HandlerMethod, Tag> springdocTags = new HashMap<>();
+
+    /**
+     * The Open api builder customisers.
+     */
+    private final Optional<List<OpenApiBuilderCustomizer>> openApiBuilderCustomisers;
+
+    /**
+     * The server base URL customisers.
+     */
+    private final Optional<List<ServerBaseUrlCustomizer>> serverBaseUrlCustomizers;
+
+    /**
+     * The Spring doc config properties.
+     */
+    private final SpringDocConfigProperties springDocConfigProperties;
+
+    /**
+     * The Cached open api map.
+     */
+    private final Map<String, OpenAPI> cachedOpenAPI = new HashMap<>();
+
+    /**
+     * The Property resolver utils.
+     */
+    private final PropertyResolverUtils propertyResolverUtils;
+
+    /**
+     * The javadoc provider.
+     */
+    private final Optional<JavadocProvider> javadocProvider;
+
+    /**
+     * The Context.
+     */
+    private ApplicationContext context;
+
+    /**
+     * The Open api.
+     */
+    private OpenAPI openAPI;
+
+    /**
+     * The Is servers present.
+     */
+    private boolean isServersPresent;
+
+    /**
+     * The Server base url.
+     */
+    private String serverBaseUrl;
+
+    /**
+     * Instantiates a new Open api builder.
+     *
+     * @param openAPI                   the open api
+     * @param securityParser            the security parser
+     * @param springDocConfigProperties the spring doc config properties
+     * @param propertyResolverUtils     the property resolver utils
+     * @param openApiBuilderCustomizers the open api builder customisers
+     * @param serverBaseUrlCustomizers  the server base url customizers
+     * @param javadocProvider           the javadoc provider
+     */
+    public OpenApiHandler(Optional<OpenAPI> openAPI, SecurityService securityParser,
+                          SpringDocConfigProperties springDocConfigProperties, PropertyResolverUtils propertyResolverUtils,
+                          Optional<List<OpenApiBuilderCustomizer>> openApiBuilderCustomizers,
+                          Optional<List<ServerBaseUrlCustomizer>> serverBaseUrlCustomizers,
+                          Optional<JavadocProvider> javadocProvider) {
+        super(openAPI, securityParser, springDocConfigProperties, propertyResolverUtils, openApiBuilderCustomizers, serverBaseUrlCustomizers, javadocProvider);
+        if (openAPI.isPresent()) {
+            this.openAPI = openAPI.get();
+            if (this.openAPI.getComponents() == null)
+                this.openAPI.setComponents(new Components());
+            if (this.openAPI.getPaths() == null)
+                this.openAPI.setPaths(new Paths());
+            if (!CollectionUtils.isEmpty(this.openAPI.getServers()))
+                this.isServersPresent = true;
+        }
+        this.propertyResolverUtils = propertyResolverUtils;
+        this.securityParser = securityParser;
+        this.springDocConfigProperties = springDocConfigProperties;
+        this.openApiBuilderCustomisers = openApiBuilderCustomizers;
+        this.serverBaseUrlCustomizers = serverBaseUrlCustomizers;
+        this.javadocProvider = javadocProvider;
+        if (springDocConfigProperties.isUseFqn())
+            TypeNameResolver.std.setUseFqn(true);
+    }
+
+    @Override
+    public Operation buildTags(HandlerMethod handlerMethod, Operation operation, OpenAPI openAPI, Locale locale) {
+
+        Set<Tag> tags = new HashSet<>();
+        Set<String> tagsStr = new HashSet<>();
+
+        buildTagsFromMethod(handlerMethod.getMethod(), tags, tagsStr, locale);
+        buildTagsFromClass(handlerMethod.getBeanType(), tags, tagsStr, locale);
+
+        if (!CollectionUtils.isEmpty(tagsStr))
+            tagsStr = tagsStr.stream()
+                .map(str -> propertyResolverUtils.resolve(str, locale))
+                .collect(Collectors.toSet());
+
+        if (springdocTags.containsKey(handlerMethod)) {
+            io.swagger.v3.oas.models.tags.Tag tag = springdocTags.get(handlerMethod);
+            tagsStr.add(tag.getName());
+            if (openAPI.getTags() == null || !openAPI.getTags().contains(tag)) {
+                openAPI.addTagsItem(tag);
+            }
+        }
+
+        if (!CollectionUtils.isEmpty(tagsStr)) {
+            if (CollectionUtils.isEmpty(operation.getTags()))
+                operation.setTags(new ArrayList<>(tagsStr));
+            else {
+                Set<String> operationTagsSet = new HashSet<>(operation.getTags());
+                operationTagsSet.addAll(tagsStr);
+                operation.getTags().clear();
+                operation.getTags().addAll(operationTagsSet);
+            }
+        }
+
+        if (isAutoTagClasses(operation)) {
+
+
+            if (javadocProvider.isPresent()) {
+                String description = javadocProvider.get().getClassJavadoc(handlerMethod.getBeanType());
+                if (StringUtils.isNotBlank(description)) {
+                    io.swagger.v3.oas.models.tags.Tag tag = new io.swagger.v3.oas.models.tags.Tag();
+
+                    // 自定义部分 修改使用java注释当tag名
+                    List<String> list = IoUtil.readLines(new StringReader(description), new ArrayList<>());
+                    // tag.setName(tagAutoName);
+                    tag.setName(list.get(0));
+                    operation.addTagsItem(list.get(0));
+
+                    tag.setDescription(description);
+                    if (openAPI.getTags() == null || !openAPI.getTags().contains(tag)) {
+                        openAPI.addTagsItem(tag);
+                    }
+                }
+            } else {
+                String tagAutoName = splitCamelCase(handlerMethod.getBeanType().getSimpleName());
+                operation.addTagsItem(tagAutoName);
+            }
+        }
+
+        if (!CollectionUtils.isEmpty(tags)) {
+            // Existing tags
+            List<io.swagger.v3.oas.models.tags.Tag> openApiTags = openAPI.getTags();
+            if (!CollectionUtils.isEmpty(openApiTags))
+                tags.addAll(openApiTags);
+            openAPI.setTags(new ArrayList<>(tags));
+        }
+
+        // Handle SecurityRequirement at operation level
+        io.swagger.v3.oas.annotations.security.SecurityRequirement[] securityRequirements = securityParser
+            .getSecurityRequirements(handlerMethod);
+        if (securityRequirements != null) {
+            if (securityRequirements.length == 0)
+                operation.setSecurity(Collections.emptyList());
+            else
+                securityParser.buildSecurityRequirement(securityRequirements, operation);
+        }
+
+        return operation;
+    }
+
+    private void buildTagsFromMethod(Method method, Set<io.swagger.v3.oas.models.tags.Tag> tags, Set<String> tagsStr, Locale locale) {
+        // method tags
+        Set<Tags> tagsSet = AnnotatedElementUtils
+            .findAllMergedAnnotations(method, Tags.class);
+        Set<io.swagger.v3.oas.annotations.tags.Tag> methodTags = tagsSet.stream()
+            .flatMap(x -> Stream.of(x.value())).collect(Collectors.toSet());
+        methodTags.addAll(AnnotatedElementUtils.findAllMergedAnnotations(method, io.swagger.v3.oas.annotations.tags.Tag.class));
+        if (!CollectionUtils.isEmpty(methodTags)) {
+            tagsStr.addAll(StreamUtils.toSet(methodTags, tag -> propertyResolverUtils.resolve(tag.name(), locale)));
+            List<io.swagger.v3.oas.annotations.tags.Tag> allTags = new ArrayList<>(methodTags);
+            addTags(allTags, tags, locale);
+        }
+    }
+
+    private void addTags(List<io.swagger.v3.oas.annotations.tags.Tag> sourceTags, Set<io.swagger.v3.oas.models.tags.Tag> tags, Locale locale) {
+        Optional<Set<io.swagger.v3.oas.models.tags.Tag>> optionalTagSet = AnnotationsUtils
+            .getTags(sourceTags.toArray(new io.swagger.v3.oas.annotations.tags.Tag[0]), true);
+        optionalTagSet.ifPresent(tagsSet -> {
+            tagsSet.forEach(tag -> {
+                tag.name(propertyResolverUtils.resolve(tag.getName(), locale));
+                tag.description(propertyResolverUtils.resolve(tag.getDescription(), locale));
+                if (tags.stream().noneMatch(t -> t.getName().equals(tag.getName())))
+                    tags.add(tag);
+            });
+        });
+    }
+
+}
diff --git a/ruoyi-common/ruoyi-common-doc/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-doc/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
new file mode 100644
index 0000000..fe11e76
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-doc/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1 @@
+org.dromara.common.doc.config.SpringDocConfig
diff --git a/ruoyi-common/ruoyi-common-encrypt/pom.xml b/ruoyi-common/ruoyi-common-encrypt/pom.xml
new file mode 100644
index 0000000..ed4910e
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-encrypt/pom.xml
@@ -0,0 +1,54 @@
+<?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>
+        <groupId>org.dromara</groupId>
+        <artifactId>ruoyi-common</artifactId>
+        <version>${revision}</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>ruoyi-common-encrypt</artifactId>
+
+    <description>
+        ruoyi-common-encrypt 数据加解密模块
+    </description>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-core</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.bouncycastle</groupId>
+            <artifactId>bcprov-jdk15to18</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-crypto</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-webmvc</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
+            <optional>true</optional>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.mybatis</groupId>
+                    <artifactId>mybatis-spring</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+    </dependencies>
+
+</project>
diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/annotation/ApiEncrypt.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/annotation/ApiEncrypt.java
new file mode 100644
index 0000000..803c253
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/annotation/ApiEncrypt.java
@@ -0,0 +1,20 @@
+package org.dromara.common.encrypt.annotation;
+
+import java.lang.annotation.*;
+
+/**
+ * 强制加密注解
+ *
+ * @author pengles
+ */
+@Documented
+@Target({ElementType.METHOD})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface ApiEncrypt {
+
+    /**
+     * 响应加密忽略，默认不加密，为 true 时加密
+     */
+    boolean response() default false;
+
+}
diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/annotation/EncryptField.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/annotation/EncryptField.java
new file mode 100644
index 0000000..b6943b6
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/annotation/EncryptField.java
@@ -0,0 +1,44 @@
+package org.dromara.common.encrypt.annotation;
+
+import org.dromara.common.encrypt.enumd.AlgorithmType;
+import org.dromara.common.encrypt.enumd.EncodeType;
+
+import java.lang.annotation.*;
+
+/**
+ * 字段加密注解
+ *
+ * @author pengles
+ */
+@Documented
+@Inherited
+@Target({ElementType.FIELD})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface EncryptField {
+
+    /**
+     * 加密算法
+     */
+    AlgorithmType algorithm() default AlgorithmType.DEFAULT;
+
+    /**
+     * 秘钥。AES、SM4需要
+     */
+    String password() default "";
+
+    /**
+     * 公钥。RSA、SM2需要
+     */
+    String publicKey() default "";
+
+    /**
+     * 私钥。RSA、SM2需要
+     */
+    String privateKey() default "";
+
+    /**
+     * 编码方式。对加密算法为BASE64的不起作用
+     */
+    EncodeType encode() default EncodeType.DEFAULT;
+
+}
diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/config/ApiDecryptAutoConfiguration.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/config/ApiDecryptAutoConfiguration.java
new file mode 100644
index 0000000..098f6bc
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/config/ApiDecryptAutoConfiguration.java
@@ -0,0 +1,32 @@
+package org.dromara.common.encrypt.config;
+
+import jakarta.servlet.DispatcherType;
+import org.dromara.common.encrypt.filter.CryptoFilter;
+import org.dromara.common.encrypt.properties.ApiDecryptProperties;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.boot.web.servlet.FilterRegistrationBean;
+import org.springframework.context.annotation.Bean;
+
+/**
+ * api 解密自动配置
+ *
+ * @author wdhcr
+ */
+@AutoConfiguration
+@EnableConfigurationProperties(ApiDecryptProperties.class)
+@ConditionalOnProperty(value = "api-decrypt.enabled", havingValue = "true")
+public class ApiDecryptAutoConfiguration {
+
+    @Bean
+    public FilterRegistrationBean<CryptoFilter> cryptoFilterRegistration(ApiDecryptProperties properties) {
+        FilterRegistrationBean<CryptoFilter> registration = new FilterRegistrationBean<>();
+        registration.setDispatcherTypes(DispatcherType.REQUEST);
+        registration.setFilter(new CryptoFilter(properties));
+        registration.addUrlPatterns("/*");
+        registration.setName("cryptoFilter");
+        registration.setOrder(FilterRegistrationBean.HIGHEST_PRECEDENCE);
+        return registration;
+    }
+}
diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/config/EncryptorAutoConfiguration.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/config/EncryptorAutoConfiguration.java
new file mode 100644
index 0000000..cbb0e4e
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/config/EncryptorAutoConfiguration.java
@@ -0,0 +1,49 @@
+package org.dromara.common.encrypt.config;
+
+import com.baomidou.mybatisplus.autoconfigure.MybatisPlusAutoConfiguration;
+import com.baomidou.mybatisplus.autoconfigure.MybatisPlusProperties;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.encrypt.core.EncryptorManager;
+import org.dromara.common.encrypt.interceptor.MybatisDecryptInterceptor;
+import org.dromara.common.encrypt.interceptor.MybatisEncryptInterceptor;
+import org.dromara.common.encrypt.properties.EncryptorProperties;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+
+/**
+ * 加解密配置
+ *
+ * @author pengles
+ * @version 4.6.0
+ */
+@AutoConfiguration(after = MybatisPlusAutoConfiguration.class)
+@EnableConfigurationProperties(EncryptorProperties.class)
+@ConditionalOnProperty(value = "mybatis-encryptor.enable", havingValue = "true")
+@Slf4j
+public class EncryptorAutoConfiguration {
+
+    @Autowired
+    private EncryptorProperties properties;
+
+    @Bean
+    public EncryptorManager encryptorManager(MybatisPlusProperties mybatisPlusProperties) {
+        return new EncryptorManager(mybatisPlusProperties.getTypeAliasesPackage());
+    }
+
+    @Bean
+    public MybatisEncryptInterceptor mybatisEncryptInterceptor(EncryptorManager encryptorManager) {
+        return new MybatisEncryptInterceptor(encryptorManager, properties);
+    }
+
+    @Bean
+    public MybatisDecryptInterceptor mybatisDecryptInterceptor(EncryptorManager encryptorManager) {
+        return new MybatisDecryptInterceptor(encryptorManager, properties);
+    }
+
+}
+
+
+
diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/EncryptContext.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/EncryptContext.java
new file mode 100644
index 0000000..fd21ed1
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/EncryptContext.java
@@ -0,0 +1,41 @@
+package org.dromara.common.encrypt.core;
+
+import lombok.Data;
+import org.dromara.common.encrypt.enumd.AlgorithmType;
+import org.dromara.common.encrypt.enumd.EncodeType;
+
+/**
+ * 加密上下文 用于encryptor传递必要的参数。
+ *
+ * @author pengles
+ * @version 4.6.0
+ */
+@Data
+public class EncryptContext {
+
+    /**
+     * 默认算法
+     */
+    private AlgorithmType algorithm;
+
+    /**
+     * 安全秘钥
+     */
+    private String password;
+
+    /**
+     * 公钥
+     */
+    private String publicKey;
+
+    /**
+     * 私钥
+     */
+    private String privateKey;
+
+    /**
+     * 编码方式，base64/hex
+     */
+    private EncodeType encode;
+
+}
diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/EncryptorManager.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/EncryptorManager.java
new file mode 100644
index 0000000..f22f1bc
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/EncryptorManager.java
@@ -0,0 +1,159 @@
+package org.dromara.common.encrypt.core;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ReflectUtil;
+import lombok.NoArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.ibatis.io.Resources;
+import org.dromara.common.core.utils.ObjectUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.encrypt.annotation.EncryptField;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.core.io.Resource;
+import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
+import org.springframework.core.io.support.ResourcePatternResolver;
+import org.springframework.core.type.ClassMetadata;
+import org.springframework.core.type.classreading.CachingMetadataReaderFactory;
+import org.springframework.util.ClassUtils;
+
+import java.lang.reflect.Field;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.stream.Collectors;
+
+/**
+ * 加密管理类
+ *
+ * @author pengles
+ * @version 4.6.0
+ */
+@Slf4j
+@NoArgsConstructor
+public class EncryptorManager {
+
+    /**
+     * 缓存加密器
+     */
+    Map<Integer, IEncryptor> encryptorMap = new ConcurrentHashMap<>();
+
+    /**
+     * 类加密字段缓存
+     */
+    Map<Class<?>, Set<Field>> fieldCache = new ConcurrentHashMap<>();
+
+    /**
+     * 构造方法传入类加密字段缓存
+     *
+     * @param typeAliasesPackage 实体类包
+     */
+    public EncryptorManager(String typeAliasesPackage) {
+        scanEncryptClasses(typeAliasesPackage);
+    }
+
+
+    /**
+     * 获取类加密字段缓存
+     */
+    public Set<Field> getFieldCache(Class<?> sourceClazz) {
+        return ObjectUtils.notNullGetter(fieldCache, f -> f.get(sourceClazz));
+    }
+
+    /**
+     * 注册加密执行者到缓存
+     *
+     * @param encryptContext 加密执行者需要的相关配置参数
+     */
+    public IEncryptor registAndGetEncryptor(EncryptContext encryptContext) {
+        int key = encryptContext.hashCode();
+        if (encryptorMap.containsKey(key)) {
+            return encryptorMap.get(key);
+        }
+        IEncryptor encryptor = ReflectUtil.newInstance(encryptContext.getAlgorithm().getClazz(), encryptContext);
+        encryptorMap.put(key, encryptor);
+        return encryptor;
+    }
+
+    /**
+     * 移除缓存中的加密执行者
+     *
+     * @param encryptContext 加密执行者需要的相关配置参数
+     */
+    public void removeEncryptor(EncryptContext encryptContext) {
+        this.encryptorMap.remove(encryptContext.hashCode());
+    }
+
+    /**
+     * 根据配置进行加密。会进行本地缓存对应的算法和对应的秘钥信息。
+     *
+     * @param value          待加密的值
+     * @param encryptContext 加密相关的配置信息
+     */
+    public String encrypt(String value, EncryptContext encryptContext) {
+        IEncryptor encryptor = this.registAndGetEncryptor(encryptContext);
+        return encryptor.encrypt(value, encryptContext.getEncode());
+    }
+
+    /**
+     * 根据配置进行解密
+     *
+     * @param value          待解密的值
+     * @param encryptContext 加密相关的配置信息
+     */
+    public String decrypt(String value, EncryptContext encryptContext) {
+        IEncryptor encryptor = this.registAndGetEncryptor(encryptContext);
+        return encryptor.decrypt(value);
+    }
+
+    /**
+     * 通过 typeAliasesPackage 设置的扫描包 扫描缓存实体
+     */
+    private void scanEncryptClasses(String typeAliasesPackage) {
+        PathMatchingResourcePatternResolver resolver = new PathMatchingResourcePatternResolver();
+        CachingMetadataReaderFactory factory = new CachingMetadataReaderFactory();
+        String[] packagePatternArray = StringUtils.splitPreserveAllTokens(typeAliasesPackage, ConfigurableApplicationContext.CONFIG_LOCATION_DELIMITERS);
+        String classpath = ResourcePatternResolver.CLASSPATH_ALL_URL_PREFIX;
+        try {
+            for (String packagePattern : packagePatternArray) {
+                String path = ClassUtils.convertClassNameToResourcePath(packagePattern);
+                Resource[] resources = resolver.getResources(classpath + path + "/*.class");
+                for (Resource resource : resources) {
+                    ClassMetadata classMetadata = factory.getMetadataReader(resource).getClassMetadata();
+                    Class<?> clazz = Resources.classForName(classMetadata.getClassName());
+                    Set<Field> encryptFieldSet = getEncryptFieldSetFromClazz(clazz);
+                    if (CollUtil.isNotEmpty(encryptFieldSet)) {
+                        fieldCache.put(clazz, encryptFieldSet);
+                    }
+                }
+            }
+        } catch (Exception e) {
+            log.error("初始化数据安全缓存时出错:{}", e.getMessage());
+        }
+    }
+
+    /**
+     * 获得一个类的加密字段集合
+     */
+    private Set<Field> getEncryptFieldSetFromClazz(Class<?> clazz) {
+        Set<Field> fieldSet = new HashSet<>();
+        // 判断clazz如果是接口,内部类,匿名类就直接返回
+        if (clazz.isInterface() || clazz.isMemberClass() || clazz.isAnonymousClass()) {
+            return fieldSet;
+        }
+        while (clazz != null) {
+            Field[] fields = clazz.getDeclaredFields();
+            fieldSet.addAll(Arrays.asList(fields));
+            clazz = clazz.getSuperclass();
+        }
+        fieldSet = fieldSet.stream().filter(field ->
+                field.isAnnotationPresent(EncryptField.class) && field.getType() == String.class)
+            .collect(Collectors.toSet());
+        for (Field field : fieldSet) {
+            field.setAccessible(true);
+        }
+        return fieldSet;
+    }
+
+}
diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/IEncryptor.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/IEncryptor.java
new file mode 100644
index 0000000..a56232b
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/IEncryptor.java
@@ -0,0 +1,35 @@
+package org.dromara.common.encrypt.core;
+
+import org.dromara.common.encrypt.enumd.AlgorithmType;
+import org.dromara.common.encrypt.enumd.EncodeType;
+
+/**
+ * 加解者
+ *
+ * @author pengles
+ * @version 4.6.0
+ */
+public interface IEncryptor {
+
+    /**
+     * 获得当前算法
+     */
+    AlgorithmType algorithm();
+
+    /**
+     * 加密
+     *
+     * @param value      待加密字符串
+     * @param encodeType 加密后的编码格式
+     * @return 加密后的字符串
+     */
+    String encrypt(String value, EncodeType encodeType);
+
+    /**
+     * 解密
+     *
+     * @param value      待加密字符串
+     * @return 解密后的字符串
+     */
+    String decrypt(String value);
+}
diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/AbstractEncryptor.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/AbstractEncryptor.java
new file mode 100644
index 0000000..8c31d86
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/AbstractEncryptor.java
@@ -0,0 +1,18 @@
+package org.dromara.common.encrypt.core.encryptor;
+
+import org.dromara.common.encrypt.core.EncryptContext;
+import org.dromara.common.encrypt.core.IEncryptor;
+
+/**
+ * 所有加密执行者的基类
+ *
+ * @author pengles
+ * @version 4.6.0
+ */
+public abstract class AbstractEncryptor implements IEncryptor {
+
+    public AbstractEncryptor(EncryptContext context) {
+        // 用户配置校验与配置注入
+    }
+
+}
diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/AesEncryptor.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/AesEncryptor.java
new file mode 100644
index 0000000..4347e05
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/AesEncryptor.java
@@ -0,0 +1,55 @@
+package org.dromara.common.encrypt.core.encryptor;
+
+import org.dromara.common.encrypt.core.EncryptContext;
+import org.dromara.common.encrypt.enumd.AlgorithmType;
+import org.dromara.common.encrypt.enumd.EncodeType;
+import org.dromara.common.encrypt.utils.EncryptUtils;
+
+/**
+ * AES算法实现
+ *
+ * @author pengles
+ * @version 4.6.0
+ */
+public class AesEncryptor extends AbstractEncryptor {
+
+    private final EncryptContext context;
+
+    public AesEncryptor(EncryptContext context) {
+        super(context);
+        this.context = context;
+    }
+
+    /**
+     * 获得当前算法
+     */
+    @Override
+    public AlgorithmType algorithm() {
+        return AlgorithmType.AES;
+    }
+
+    /**
+     * 加密
+     *
+     * @param value      待加密字符串
+     * @param encodeType 加密后的编码格式
+     */
+    @Override
+    public String encrypt(String value, EncodeType encodeType) {
+        if (encodeType == EncodeType.HEX) {
+            return EncryptUtils.encryptByAesHex(value, context.getPassword());
+        } else {
+            return EncryptUtils.encryptByAes(value, context.getPassword());
+        }
+    }
+
+    /**
+     * 解密
+     *
+     * @param value      待加密字符串
+     */
+    @Override
+    public String decrypt(String value) {
+        return EncryptUtils.decryptByAes(value, context.getPassword());
+    }
+}
diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/Base64Encryptor.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/Base64Encryptor.java
new file mode 100644
index 0000000..670dd62
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/Base64Encryptor.java
@@ -0,0 +1,48 @@
+package org.dromara.common.encrypt.core.encryptor;
+
+import org.dromara.common.encrypt.core.EncryptContext;
+import org.dromara.common.encrypt.enumd.AlgorithmType;
+import org.dromara.common.encrypt.enumd.EncodeType;
+import org.dromara.common.encrypt.utils.EncryptUtils;
+
+/**
+ * Base64算法实现
+ *
+ * @author pengles
+ * @version 4.6.0
+ */
+public class Base64Encryptor extends AbstractEncryptor {
+
+    public Base64Encryptor(EncryptContext context) {
+        super(context);
+    }
+
+    /**
+     * 获得当前算法
+     */
+    @Override
+    public AlgorithmType algorithm() {
+        return AlgorithmType.BASE64;
+    }
+
+    /**
+     * 加密
+     *
+     * @param value      待加密字符串
+     * @param encodeType 加密后的编码格式
+     */
+    @Override
+    public String encrypt(String value, EncodeType encodeType) {
+        return EncryptUtils.encryptByBase64(value);
+    }
+
+    /**
+     * 解密
+     *
+     * @param value      待加密字符串
+     */
+    @Override
+    public String decrypt(String value) {
+        return EncryptUtils.decryptByBase64(value);
+    }
+}
diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/RsaEncryptor.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/RsaEncryptor.java
new file mode 100644
index 0000000..8a0f3db
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/RsaEncryptor.java
@@ -0,0 +1,62 @@
+package org.dromara.common.encrypt.core.encryptor;
+
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.encrypt.core.EncryptContext;
+import org.dromara.common.encrypt.enumd.AlgorithmType;
+import org.dromara.common.encrypt.enumd.EncodeType;
+import org.dromara.common.encrypt.utils.EncryptUtils;
+
+
+/**
+ * RSA算法实现
+ *
+ * @author pengles
+ * @version 4.6.0
+ */
+public class RsaEncryptor extends AbstractEncryptor {
+
+    private final EncryptContext context;
+
+    public RsaEncryptor(EncryptContext context) {
+        super(context);
+        String privateKey = context.getPrivateKey();
+        String publicKey = context.getPublicKey();
+        if (StringUtils.isAnyEmpty(privateKey, publicKey)) {
+            throw new IllegalArgumentException("RSA公私钥均需要提供，公钥加密，私钥解密。");
+        }
+        this.context = context;
+    }
+
+    /**
+     * 获得当前算法
+     */
+    @Override
+    public AlgorithmType algorithm() {
+        return AlgorithmType.RSA;
+    }
+
+    /**
+     * 加密
+     *
+     * @param value      待加密字符串
+     * @param encodeType 加密后的编码格式
+     */
+    @Override
+    public String encrypt(String value, EncodeType encodeType) {
+        if (encodeType == EncodeType.HEX) {
+            return EncryptUtils.encryptByRsaHex(value, context.getPublicKey());
+        } else {
+            return EncryptUtils.encryptByRsa(value, context.getPublicKey());
+        }
+    }
+
+    /**
+     * 解密
+     *
+     * @param value      待加密字符串
+     */
+    @Override
+    public String decrypt(String value) {
+        return EncryptUtils.decryptByRsa(value, context.getPrivateKey());
+    }
+}
diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/Sm2Encryptor.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/Sm2Encryptor.java
new file mode 100644
index 0000000..e3e86f6
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/Sm2Encryptor.java
@@ -0,0 +1,61 @@
+package org.dromara.common.encrypt.core.encryptor;
+
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.encrypt.core.EncryptContext;
+import org.dromara.common.encrypt.enumd.AlgorithmType;
+import org.dromara.common.encrypt.enumd.EncodeType;
+import org.dromara.common.encrypt.utils.EncryptUtils;
+
+/**
+ * sm2算法实现
+ *
+ * @author pengles
+ * @version 4.6.0
+ */
+public class Sm2Encryptor extends AbstractEncryptor {
+
+    private final EncryptContext context;
+
+    public Sm2Encryptor(EncryptContext context) {
+        super(context);
+        String privateKey = context.getPrivateKey();
+        String publicKey = context.getPublicKey();
+        if (StringUtils.isAnyEmpty(privateKey, publicKey)) {
+            throw new IllegalArgumentException("SM2公私钥均需要提供，公钥加密，私钥解密。");
+        }
+        this.context = context;
+    }
+
+    /**
+     * 获得当前算法
+     */
+    @Override
+    public AlgorithmType algorithm() {
+        return AlgorithmType.SM2;
+    }
+
+    /**
+     * 加密
+     *
+     * @param value      待加密字符串
+     * @param encodeType 加密后的编码格式
+     */
+    @Override
+    public String encrypt(String value, EncodeType encodeType) {
+        if (encodeType == EncodeType.HEX) {
+            return EncryptUtils.encryptBySm2Hex(value, context.getPublicKey());
+        } else {
+            return EncryptUtils.encryptBySm2(value, context.getPublicKey());
+        }
+    }
+
+    /**
+     * 解密
+     *
+     * @param value      待加密字符串
+     */
+    @Override
+    public String decrypt(String value) {
+        return EncryptUtils.decryptBySm2(value, context.getPrivateKey());
+    }
+}
diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/Sm4Encryptor.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/Sm4Encryptor.java
new file mode 100644
index 0000000..28a870d
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/core/encryptor/Sm4Encryptor.java
@@ -0,0 +1,55 @@
+package org.dromara.common.encrypt.core.encryptor;
+
+import org.dromara.common.encrypt.core.EncryptContext;
+import org.dromara.common.encrypt.enumd.AlgorithmType;
+import org.dromara.common.encrypt.enumd.EncodeType;
+import org.dromara.common.encrypt.utils.EncryptUtils;
+
+/**
+ * sm4算法实现
+ *
+ * @author pengles
+ * @version 4.6.0
+ */
+public class Sm4Encryptor extends AbstractEncryptor {
+
+    private final EncryptContext context;
+
+    public Sm4Encryptor(EncryptContext context) {
+        super(context);
+        this.context = context;
+    }
+
+    /**
+     * 获得当前算法
+     */
+    @Override
+    public AlgorithmType algorithm() {
+        return AlgorithmType.SM4;
+    }
+
+    /**
+     * 加密
+     *
+     * @param value      待加密字符串
+     * @param encodeType 加密后的编码格式
+     */
+    @Override
+    public String encrypt(String value, EncodeType encodeType) {
+        if (encodeType == EncodeType.HEX) {
+            return EncryptUtils.encryptBySm4Hex(value, context.getPassword());
+        } else {
+            return EncryptUtils.encryptBySm4(value, context.getPassword());
+        }
+    }
+
+    /**
+     * 解密
+     *
+     * @param value      待加密字符串
+     */
+    @Override
+    public String decrypt(String value) {
+        return EncryptUtils.decryptBySm4(value, context.getPassword());
+    }
+}
diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/enumd/AlgorithmType.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/enumd/AlgorithmType.java
new file mode 100644
index 0000000..1fc221e
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/enumd/AlgorithmType.java
@@ -0,0 +1,48 @@
+package org.dromara.common.encrypt.enumd;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import org.dromara.common.encrypt.core.encryptor.*;
+
+/**
+ * 算法名称
+ *
+ * @author pengles
+ * @version 4.6.0
+ */
+@Getter
+@AllArgsConstructor
+public enum AlgorithmType {
+
+    /**
+     * 默认走yml配置
+     */
+    DEFAULT(null),
+
+    /**
+     * base64
+     */
+    BASE64(Base64Encryptor.class),
+
+    /**
+     * aes
+     */
+    AES(AesEncryptor.class),
+
+    /**
+     * rsa
+     */
+    RSA(RsaEncryptor.class),
+
+    /**
+     * sm2
+     */
+    SM2(Sm2Encryptor.class),
+
+    /**
+     * sm4
+     */
+    SM4(Sm4Encryptor.class);
+
+    private final Class<? extends AbstractEncryptor> clazz;
+}
diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/enumd/EncodeType.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/enumd/EncodeType.java
new file mode 100644
index 0000000..ee1466f
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/enumd/EncodeType.java
@@ -0,0 +1,26 @@
+package org.dromara.common.encrypt.enumd;
+
+/**
+ * 编码类型
+ *
+ * @author pengles
+ * @version 4.6.0
+ */
+public enum EncodeType {
+
+    /**
+     * 默认使用yml配置
+     */
+    DEFAULT,
+
+    /**
+     * base64编码
+     */
+    BASE64,
+
+    /**
+     * 16进制编码
+     */
+    HEX;
+
+}
diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/CryptoFilter.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/CryptoFilter.java
new file mode 100644
index 0000000..79d58da
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/CryptoFilter.java
@@ -0,0 +1,110 @@
+package org.dromara.common.encrypt.filter;
+
+import cn.hutool.core.util.ObjectUtil;
+import jakarta.servlet.*;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import org.dromara.common.core.constant.HttpStatus;
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.utils.SpringUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.encrypt.annotation.ApiEncrypt;
+import org.dromara.common.encrypt.properties.ApiDecryptProperties;
+import org.springframework.http.HttpMethod;
+import org.springframework.web.method.HandlerMethod;
+import org.springframework.web.servlet.HandlerExceptionResolver;
+import org.springframework.web.servlet.HandlerExecutionChain;
+import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping;
+
+import java.io.IOException;
+
+
+/**
+ * Crypto 过滤器
+ *
+ * @author wdhcr
+ */
+public class CryptoFilter implements Filter {
+    private final ApiDecryptProperties properties;
+
+    public CryptoFilter(ApiDecryptProperties properties) {
+        this.properties = properties;
+    }
+
+    @Override
+    public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
+        HttpServletRequest servletRequest = (HttpServletRequest) request;
+        HttpServletResponse servletResponse = (HttpServletResponse) response;
+        // 获取加密注解
+        ApiEncrypt apiEncrypt = this.getApiEncryptAnnotation(servletRequest);
+        boolean responseFlag = apiEncrypt != null && apiEncrypt.response();
+        ServletRequest requestWrapper = null;
+        ServletResponse responseWrapper = null;
+        EncryptResponseBodyWrapper responseBodyWrapper = null;
+
+        // 是否为 put 或者 post 请求
+        if (HttpMethod.PUT.matches(servletRequest.getMethod()) || HttpMethod.POST.matches(servletRequest.getMethod())) {
+            // 是否存在加密标头
+            String headerValue = servletRequest.getHeader(properties.getHeaderFlag());
+            if (StringUtils.isNotBlank(headerValue)) {
+                // 请求解密
+                requestWrapper = new DecryptRequestBodyWrapper(servletRequest, properties.getPrivateKey(), properties.getHeaderFlag());
+            } else {
+                // 是否有注解，有就报错，没有放行
+                if (ObjectUtil.isNotNull(apiEncrypt)) {
+                    HandlerExceptionResolver exceptionResolver = SpringUtils.getBean("handlerExceptionResolver", HandlerExceptionResolver.class);
+                    exceptionResolver.resolveException(
+                        servletRequest, servletResponse, null,
+                        new ServiceException("没有访问权限，请联系管理员授权", HttpStatus.FORBIDDEN));
+                    return;
+                }
+            }
+        }
+
+        // 判断是否响应加密
+        if (responseFlag) {
+            responseBodyWrapper = new EncryptResponseBodyWrapper(servletResponse);
+            responseWrapper = responseBodyWrapper;
+        }
+
+        chain.doFilter(
+            ObjectUtil.defaultIfNull(requestWrapper, request),
+            ObjectUtil.defaultIfNull(responseWrapper, response));
+
+        if (responseFlag) {
+            servletResponse.reset();
+            // 对原始内容加密
+            String encryptContent = responseBodyWrapper.getEncryptContent(
+                servletResponse, properties.getPublicKey(), properties.getHeaderFlag());
+            // 对加密后的内容写出
+            servletResponse.getWriter().write(encryptContent);
+        }
+    }
+
+    /**
+     * 获取 ApiEncrypt 注解
+     */
+    private ApiEncrypt getApiEncryptAnnotation(HttpServletRequest servletRequest) {
+        RequestMappingHandlerMapping handlerMapping = SpringUtils.getBean("requestMappingHandlerMapping", RequestMappingHandlerMapping.class);
+        // 获取注解
+        try {
+            HandlerExecutionChain mappingHandler = handlerMapping.getHandler(servletRequest);
+            if (ObjectUtil.isNotNull(mappingHandler)) {
+                Object handler = mappingHandler.getHandler();
+                if (ObjectUtil.isNotNull(handler)) {
+                    // 从handler获取注解
+                    if (handler instanceof HandlerMethod handlerMethod) {
+                        return handlerMethod.getMethodAnnotation(ApiEncrypt.class);
+                    }
+                }
+            }
+        } catch (Exception e) {
+            return null;
+        }
+        return null;
+    }
+
+    @Override
+    public void destroy() {
+    }
+}
diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/DecryptRequestBodyWrapper.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/DecryptRequestBodyWrapper.java
new file mode 100644
index 0000000..98f4bc7
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/DecryptRequestBodyWrapper.java
@@ -0,0 +1,94 @@
+package org.dromara.common.encrypt.filter;
+
+import cn.hutool.core.io.IoUtil;
+import jakarta.servlet.ReadListener;
+import jakarta.servlet.ServletInputStream;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequestWrapper;
+import org.dromara.common.core.constant.Constants;
+import org.dromara.common.encrypt.utils.EncryptUtils;
+import org.springframework.http.MediaType;
+
+import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
+
+/**
+ * 解密请求参数工具类
+ *
+ * @author wdhcr
+ */
+public class DecryptRequestBodyWrapper extends HttpServletRequestWrapper {
+
+    private final byte[] body;
+
+    public DecryptRequestBodyWrapper(HttpServletRequest request, String privateKey, String headerFlag) throws IOException {
+        super(request);
+        // 获取 AES 密码 采用 RSA 加密
+        String headerRsa = request.getHeader(headerFlag);
+        String decryptAes = EncryptUtils.decryptByRsa(headerRsa, privateKey);
+        // 解密 AES 密码
+        String aesPassword = EncryptUtils.decryptByBase64(decryptAes);
+        request.setCharacterEncoding(Constants.UTF8);
+        byte[] readBytes = IoUtil.readBytes(request.getInputStream(), false);
+        String requestBody = new String(readBytes, StandardCharsets.UTF_8);
+        // 解密 body 采用 AES 加密
+        String decryptBody = EncryptUtils.decryptByAes(requestBody, aesPassword);
+        body = decryptBody.getBytes(StandardCharsets.UTF_8);
+    }
+
+    @Override
+    public BufferedReader getReader() {
+        return new BufferedReader(new InputStreamReader(getInputStream()));
+    }
+
+
+    @Override
+    public int getContentLength() {
+        return body.length;
+    }
+
+    @Override
+    public long getContentLengthLong() {
+        return body.length;
+    }
+
+    @Override
+    public String getContentType() {
+        return MediaType.APPLICATION_JSON_VALUE;
+    }
+
+
+    @Override
+    public ServletInputStream getInputStream() {
+        final ByteArrayInputStream bais = new ByteArrayInputStream(body);
+        return new ServletInputStream() {
+            @Override
+            public int read() {
+                return bais.read();
+            }
+
+            @Override
+            public int available() {
+                return body.length;
+            }
+
+            @Override
+            public boolean isFinished() {
+                return false;
+            }
+
+            @Override
+            public boolean isReady() {
+                return false;
+            }
+
+            @Override
+            public void setReadListener(ReadListener readListener) {
+
+            }
+        };
+    }
+}
diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/EncryptResponseBodyWrapper.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/EncryptResponseBodyWrapper.java
new file mode 100644
index 0000000..41309f2
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/EncryptResponseBodyWrapper.java
@@ -0,0 +1,126 @@
+package org.dromara.common.encrypt.filter;
+
+import cn.hutool.core.util.RandomUtil;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.WriteListener;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponseWrapper;
+import org.dromara.common.encrypt.utils.EncryptUtils;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
+import java.nio.charset.StandardCharsets;
+
+/**
+ * 加密响应参数包装类
+ *
+ * @author pengles
+ */
+public class EncryptResponseBodyWrapper extends HttpServletResponseWrapper {
+
+    private final ByteArrayOutputStream byteArrayOutputStream;
+    private final ServletOutputStream servletOutputStream;
+    private final PrintWriter printWriter;
+
+    public EncryptResponseBodyWrapper(HttpServletResponse response) throws IOException {
+        super(response);
+        this.byteArrayOutputStream = new ByteArrayOutputStream();
+        this.servletOutputStream = this.getOutputStream();
+        this.printWriter = new PrintWriter(new OutputStreamWriter(byteArrayOutputStream));
+    }
+
+    @Override
+    public PrintWriter getWriter() {
+        return printWriter;
+    }
+
+    @Override
+    public void flushBuffer() throws IOException {
+        if (servletOutputStream != null) {
+            servletOutputStream.flush();
+        }
+        if (printWriter != null) {
+            printWriter.flush();
+        }
+    }
+
+    @Override
+    public void reset() {
+        byteArrayOutputStream.reset();
+    }
+
+    public byte[] getResponseData() throws IOException {
+        flushBuffer();
+        return byteArrayOutputStream.toByteArray();
+    }
+
+    public String getContent() throws IOException {
+        flushBuffer();
+        return byteArrayOutputStream.toString();
+    }
+
+    /**
+     * 获取加密内容
+     *
+     * @param servletResponse response
+     * @param publicKey       RSA公钥 (用于加密 AES 秘钥)
+     * @param headerFlag      请求头标志
+     * @return 加密内容
+     * @throws IOException
+     */
+    public String getEncryptContent(HttpServletResponse servletResponse, String publicKey, String headerFlag) throws IOException {
+        // 生成秘钥
+        String aesPassword = RandomUtil.randomString(32);
+        // 秘钥使用 Base64 编码
+        String encryptAes = EncryptUtils.encryptByBase64(aesPassword);
+        // Rsa 公钥加密 Base64 编码
+        String encryptPassword = EncryptUtils.encryptByRsa(encryptAes, publicKey);
+
+        // 设置响应头
+        // vue版本需要设置
+        servletResponse.addHeader("Access-Control-Expose-Headers", headerFlag);
+        servletResponse.setHeader("Access-Control-Allow-Origin", "*");
+        servletResponse.setHeader("Access-Control-Allow-Methods", "*");
+        servletResponse.setHeader(headerFlag, encryptPassword);
+        servletResponse.setCharacterEncoding(StandardCharsets.UTF_8.toString());
+
+
+        // 获取原始内容
+        String originalBody = this.getContent();
+        // 对内容进行加密
+        return EncryptUtils.encryptByAes(originalBody, aesPassword);
+    }
+
+    @Override
+    public ServletOutputStream getOutputStream() throws IOException {
+        return new ServletOutputStream() {
+            @Override
+            public boolean isReady() {
+                return false;
+            }
+
+            @Override
+            public void setWriteListener(WriteListener writeListener) {
+
+            }
+
+            @Override
+            public void write(int b) throws IOException {
+                byteArrayOutputStream.write(b);
+            }
+
+            @Override
+            public void write(byte[] b) throws IOException {
+                byteArrayOutputStream.write(b);
+            }
+
+            @Override
+            public void write(byte[] b, int off, int len) throws IOException {
+                byteArrayOutputStream.write(b, off, len);
+            }
+        };
+    }
+
+}
diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/interceptor/MybatisDecryptInterceptor.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/interceptor/MybatisDecryptInterceptor.java
new file mode 100644
index 0000000..9d3216d
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/interceptor/MybatisDecryptInterceptor.java
@@ -0,0 +1,132 @@
+package org.dromara.common.encrypt.interceptor;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.convert.Convert;
+import cn.hutool.core.util.ObjectUtil;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.ibatis.executor.parameter.ParameterHandler;
+import org.apache.ibatis.executor.resultset.ResultSetHandler;
+import org.apache.ibatis.plugin.*;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.encrypt.annotation.EncryptField;
+import org.dromara.common.encrypt.core.EncryptContext;
+import org.dromara.common.encrypt.core.EncryptorManager;
+import org.dromara.common.encrypt.enumd.AlgorithmType;
+import org.dromara.common.encrypt.enumd.EncodeType;
+import org.dromara.common.encrypt.properties.EncryptorProperties;
+
+import java.lang.reflect.Field;
+import java.sql.Statement;
+import java.util.*;
+
+/**
+ * 出参解密拦截器
+ *
+ * @author pengles
+ * @version 4.6.0
+ */
+@Slf4j
+@Intercepts({@Signature(
+    type = ResultSetHandler.class,
+    method = "handleResultSets",
+    args = {Statement.class})
+})
+@AllArgsConstructor
+public class MybatisDecryptInterceptor implements Interceptor {
+
+    private final EncryptorManager encryptorManager;
+    private final EncryptorProperties defaultProperties;
+
+    @Override
+    public Object intercept(Invocation invocation) throws Throwable {
+        // 开始进行参数解密
+        ResultSetHandler resultSetHandler = (ResultSetHandler) invocation.getTarget();
+        Field parameterHandlerField = resultSetHandler.getClass().getDeclaredField("parameterHandler");
+        parameterHandlerField.setAccessible(true);
+        Object target = parameterHandlerField.get(resultSetHandler);
+        if (target instanceof ParameterHandler parameterHandler) {
+            Object parameterObject = parameterHandler.getParameterObject();
+            if (ObjectUtil.isNotNull(parameterObject) && !(parameterObject instanceof String)) {
+                this.decryptHandler(parameterObject);
+            }
+        }
+        // 获取执行mysql执行结果
+        Object result = invocation.proceed();
+        if (result == null) {
+            return null;
+        }
+        this.decryptHandler(result);
+        return result;
+    }
+
+    /**
+     * 解密对象
+     *
+     * @param sourceObject 待加密对象
+     */
+    private void decryptHandler(Object sourceObject) {
+        if (ObjectUtil.isNull(sourceObject)) {
+            return;
+        }
+        if (sourceObject instanceof Map<?, ?> map) {
+            new HashSet<>(map.values()).forEach(this::decryptHandler);
+            return;
+        }
+        if (sourceObject instanceof List<?> list) {
+            if(CollUtil.isEmpty(list)) {
+                return;
+            }
+            // 判断第一个元素是否含有注解。如果没有直接返回，提高效率
+            Object firstItem = list.get(0);
+            if (ObjectUtil.isNull(firstItem) || CollUtil.isEmpty(encryptorManager.getFieldCache(firstItem.getClass()))) {
+                return;
+            }
+            list.forEach(this::decryptHandler);
+            return;
+        }
+        // 不在缓存中的类,就是没有加密注解的类(当然也有可能是typeAliasesPackage写错)
+        Set<Field> fields = encryptorManager.getFieldCache(sourceObject.getClass());
+        if(ObjectUtil.isNull(fields)){
+            return;
+        }
+        try {
+            for (Field field : fields) {
+                field.set(sourceObject, this.decryptField(Convert.toStr(field.get(sourceObject)), field));
+            }
+        } catch (Exception e) {
+            log.error("处理解密字段时出错", e);
+        }
+    }
+
+    /**
+     * 字段值进行加密。通过字段的批注注册新的加密算法
+     *
+     * @param value 待加密的值
+     * @param field 待加密字段
+     * @return 加密后结果
+     */
+    private String decryptField(String value, Field field) {
+        if (ObjectUtil.isNull(value)) {
+            return null;
+        }
+        EncryptField encryptField = field.getAnnotation(EncryptField.class);
+        EncryptContext encryptContext = new EncryptContext();
+        encryptContext.setAlgorithm(encryptField.algorithm() == AlgorithmType.DEFAULT ? defaultProperties.getAlgorithm() : encryptField.algorithm());
+        encryptContext.setEncode(encryptField.encode() == EncodeType.DEFAULT ? defaultProperties.getEncode() : encryptField.encode());
+        encryptContext.setPassword(StringUtils.isBlank(encryptField.password()) ? defaultProperties.getPassword() : encryptField.password());
+        encryptContext.setPrivateKey(StringUtils.isBlank(encryptField.privateKey()) ? defaultProperties.getPrivateKey() : encryptField.privateKey());
+        encryptContext.setPublicKey(StringUtils.isBlank(encryptField.publicKey()) ? defaultProperties.getPublicKey() : encryptField.publicKey());
+        return this.encryptorManager.decrypt(value, encryptContext);
+    }
+
+    @Override
+    public Object plugin(Object target) {
+        return Plugin.wrap(target, this);
+    }
+
+    @Override
+    public void setProperties(Properties properties) {
+
+    }
+}
diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/interceptor/MybatisEncryptInterceptor.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/interceptor/MybatisEncryptInterceptor.java
new file mode 100644
index 0000000..dece1ca
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/interceptor/MybatisEncryptInterceptor.java
@@ -0,0 +1,124 @@
+package org.dromara.common.encrypt.interceptor;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.convert.Convert;
+import cn.hutool.core.util.ObjectUtil;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.ibatis.executor.parameter.ParameterHandler;
+import org.apache.ibatis.plugin.Interceptor;
+import org.apache.ibatis.plugin.Intercepts;
+import org.apache.ibatis.plugin.Invocation;
+import org.apache.ibatis.plugin.Signature;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.encrypt.annotation.EncryptField;
+import org.dromara.common.encrypt.core.EncryptContext;
+import org.dromara.common.encrypt.core.EncryptorManager;
+import org.dromara.common.encrypt.enumd.AlgorithmType;
+import org.dromara.common.encrypt.enumd.EncodeType;
+import org.dromara.common.encrypt.properties.EncryptorProperties;
+
+import java.lang.reflect.Field;
+import java.sql.PreparedStatement;
+import java.util.*;
+
+/**
+ * 入参加密拦截器
+ *
+ * @author pengles
+ * @version 4.6.0
+ */
+@Slf4j
+@Intercepts({@Signature(
+    type = ParameterHandler.class,
+    method = "setParameters",
+    args = {PreparedStatement.class})
+})
+@AllArgsConstructor
+public class MybatisEncryptInterceptor implements Interceptor {
+
+    private final EncryptorManager encryptorManager;
+    private final EncryptorProperties defaultProperties;
+
+    @Override
+    public Object intercept(Invocation invocation) throws Throwable {
+        return invocation;
+    }
+
+    @Override
+    public Object plugin(Object target) {
+        if (target instanceof ParameterHandler parameterHandler) {
+            // 进行加密操作
+            Object parameterObject = parameterHandler.getParameterObject();
+            if (ObjectUtil.isNotNull(parameterObject) && !(parameterObject instanceof String)) {
+                this.encryptHandler(parameterObject);
+            }
+        }
+        return target;
+    }
+
+    /**
+     * 加密对象
+     *
+     * @param sourceObject 待加密对象
+     */
+    private void encryptHandler(Object sourceObject) {
+        if (ObjectUtil.isNull(sourceObject)) {
+            return;
+        }
+        if (sourceObject instanceof Map<?, ?> map) {
+            new HashSet<>(map.values()).forEach(this::encryptHandler);
+            return;
+        }
+        if (sourceObject instanceof List<?> list) {
+            if(CollUtil.isEmpty(list)) {
+                return;
+            }
+            // 判断第一个元素是否含有注解。如果没有直接返回，提高效率
+            Object firstItem = list.get(0);
+            if (ObjectUtil.isNull(firstItem) || CollUtil.isEmpty(encryptorManager.getFieldCache(firstItem.getClass()))) {
+                return;
+            }
+            list.forEach(this::encryptHandler);
+            return;
+        }
+        // 不在缓存中的类,就是没有加密注解的类(当然也有可能是typeAliasesPackage写错)
+        Set<Field> fields = encryptorManager.getFieldCache(sourceObject.getClass());
+        if(ObjectUtil.isNull(fields)){
+            return;
+        }
+        try {
+            for (Field field : fields) {
+                field.set(sourceObject, this.encryptField(Convert.toStr(field.get(sourceObject)), field));
+            }
+        } catch (Exception e) {
+            log.error("处理加密字段时出错", e);
+        }
+    }
+
+    /**
+     * 字段值进行加密。通过字段的批注注册新的加密算法
+     *
+     * @param value 待加密的值
+     * @param field 待加密字段
+     * @return 加密后结果
+     */
+    private String encryptField(String value, Field field) {
+        if (ObjectUtil.isNull(value)) {
+            return null;
+        }
+        EncryptField encryptField = field.getAnnotation(EncryptField.class);
+        EncryptContext encryptContext = new EncryptContext();
+        encryptContext.setAlgorithm(encryptField.algorithm() == AlgorithmType.DEFAULT ? defaultProperties.getAlgorithm() : encryptField.algorithm());
+        encryptContext.setEncode(encryptField.encode() == EncodeType.DEFAULT ? defaultProperties.getEncode() : encryptField.encode());
+        encryptContext.setPassword(StringUtils.isBlank(encryptField.password()) ? defaultProperties.getPassword() : encryptField.password());
+        encryptContext.setPrivateKey(StringUtils.isBlank(encryptField.privateKey()) ? defaultProperties.getPrivateKey() : encryptField.privateKey());
+        encryptContext.setPublicKey(StringUtils.isBlank(encryptField.publicKey()) ? defaultProperties.getPublicKey() : encryptField.publicKey());
+        return this.encryptorManager.encrypt(value, encryptContext);
+    }
+
+
+    @Override
+    public void setProperties(Properties properties) {
+    }
+}
diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/properties/ApiDecryptProperties.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/properties/ApiDecryptProperties.java
new file mode 100644
index 0000000..6aadb3e
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/properties/ApiDecryptProperties.java
@@ -0,0 +1,34 @@
+package org.dromara.common.encrypt.properties;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+/**
+ * api解密属性配置类
+ * @author wdhcr
+ */
+@Data
+@ConfigurationProperties(prefix = "api-decrypt")
+public class ApiDecryptProperties {
+
+    /**
+     * 加密开关
+     */
+    private Boolean enabled;
+
+    /**
+     * 头部标识
+     */
+    private String headerFlag;
+
+    /**
+     * 响应加密公钥
+     */
+    private String publicKey;
+
+    /**
+     * 请求解密私钥
+     */
+    private String privateKey;
+
+}
diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/properties/EncryptorProperties.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/properties/EncryptorProperties.java
new file mode 100644
index 0000000..2633710
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/properties/EncryptorProperties.java
@@ -0,0 +1,48 @@
+package org.dromara.common.encrypt.properties;
+
+import lombok.Data;
+import org.dromara.common.encrypt.enumd.AlgorithmType;
+import org.dromara.common.encrypt.enumd.EncodeType;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+/**
+ * 加解密属性配置类
+ *
+ * @author pengles
+ * @version 4.6.0
+ */
+@Data
+@ConfigurationProperties(prefix = "mybatis-encryptor")
+public class EncryptorProperties {
+
+    /**
+     * 过滤开关
+     */
+    private Boolean enable;
+
+    /**
+     * 默认算法
+     */
+    private AlgorithmType algorithm;
+
+    /**
+     * 安全秘钥
+     */
+    private String password;
+
+    /**
+     * 公钥
+     */
+    private String publicKey;
+
+    /**
+     * 私钥
+     */
+    private String privateKey;
+
+    /**
+     * 编码方式，base64/hex
+     */
+    private EncodeType encode;
+
+}
diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/utils/EncryptUtils.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/utils/EncryptUtils.java
new file mode 100644
index 0000000..1a11f49
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/utils/EncryptUtils.java
@@ -0,0 +1,313 @@
+package org.dromara.common.encrypt.utils;
+
+import cn.hutool.core.codec.Base64;
+import cn.hutool.core.util.ArrayUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.crypto.SecureUtil;
+import cn.hutool.crypto.SmUtil;
+import cn.hutool.crypto.asymmetric.KeyType;
+import cn.hutool.crypto.asymmetric.RSA;
+import cn.hutool.crypto.asymmetric.SM2;
+
+import java.nio.charset.StandardCharsets;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 安全相关工具类
+ *
+ * @author pengles
+ */
+public class EncryptUtils {
+
+    /**
+     * 公钥
+     */
+    public static final String PUBLIC_KEY = "publicKey";
+
+    /**
+     * 私钥
+     */
+    public static final String PRIVATE_KEY = "privateKey";
+
+    /**
+     * Base64加密
+     *
+     * @param data 待加密数据
+     * @return 加密后字符串
+     */
+    public static String encryptByBase64(String data) {
+        return Base64.encode(data, StandardCharsets.UTF_8);
+    }
+
+    /**
+     * Base64解密
+     *
+     * @param data 待解密数据
+     * @return 解密后字符串
+     */
+    public static String decryptByBase64(String data) {
+        return Base64.decodeStr(data, StandardCharsets.UTF_8);
+    }
+
+    /**
+     * AES加密
+     *
+     * @param data     待加密数据
+     * @param password 秘钥字符串
+     * @return 加密后字符串, 采用Base64编码
+     */
+    public static String encryptByAes(String data, String password) {
+        if (StrUtil.isBlank(password)) {
+            throw new IllegalArgumentException("AES需要传入秘钥信息");
+        }
+        // aes算法的秘钥要求是16位、24位、32位
+        int[] array = {16, 24, 32};
+        if (!ArrayUtil.contains(array, password.length())) {
+            throw new IllegalArgumentException("AES秘钥长度要求为16位、24位、32位");
+        }
+        return SecureUtil.aes(password.getBytes(StandardCharsets.UTF_8)).encryptBase64(data, StandardCharsets.UTF_8);
+    }
+
+    /**
+     * AES加密
+     *
+     * @param data     待加密数据
+     * @param password 秘钥字符串
+     * @return 加密后字符串, 采用Hex编码
+     */
+    public static String encryptByAesHex(String data, String password) {
+        if (StrUtil.isBlank(password)) {
+            throw new IllegalArgumentException("AES需要传入秘钥信息");
+        }
+        // aes算法的秘钥要求是16位、24位、32位
+        int[] array = {16, 24, 32};
+        if (!ArrayUtil.contains(array, password.length())) {
+            throw new IllegalArgumentException("AES秘钥长度要求为16位、24位、32位");
+        }
+        return SecureUtil.aes(password.getBytes(StandardCharsets.UTF_8)).encryptHex(data, StandardCharsets.UTF_8);
+    }
+
+    /**
+     * AES解密
+     *
+     * @param data     待解密数据
+     * @param password 秘钥字符串
+     * @return 解密后字符串
+     */
+    public static String decryptByAes(String data, String password) {
+        if (StrUtil.isBlank(password)) {
+            throw new IllegalArgumentException("AES需要传入秘钥信息");
+        }
+        // aes算法的秘钥要求是16位、24位、32位
+        int[] array = {16, 24, 32};
+        if (!ArrayUtil.contains(array, password.length())) {
+            throw new IllegalArgumentException("AES秘钥长度要求为16位、24位、32位");
+        }
+        return SecureUtil.aes(password.getBytes(StandardCharsets.UTF_8)).decryptStr(data, StandardCharsets.UTF_8);
+    }
+
+    /**
+     * SM4加密（Base64编码）
+     *
+     * @param data     待加密数据
+     * @param password 秘钥字符串
+     * @return 加密后字符串, 采用Base64编码
+     */
+    public static String encryptBySm4(String data, String password) {
+        if (StrUtil.isBlank(password)) {
+            throw new IllegalArgumentException("SM4需要传入秘钥信息");
+        }
+        // sm4算法的秘钥要求是16位长度
+        int sm4PasswordLength = 16;
+        if (sm4PasswordLength != password.length()) {
+            throw new IllegalArgumentException("SM4秘钥长度要求为16位");
+        }
+        return SmUtil.sm4(password.getBytes(StandardCharsets.UTF_8)).encryptBase64(data, StandardCharsets.UTF_8);
+    }
+
+    /**
+     * SM4加密（Hex编码）
+     *
+     * @param data     待加密数据
+     * @param password 秘钥字符串
+     * @return 加密后字符串, 采用Hex编码
+     */
+    public static String encryptBySm4Hex(String data, String password) {
+        if (StrUtil.isBlank(password)) {
+            throw new IllegalArgumentException("SM4需要传入秘钥信息");
+        }
+        // sm4算法的秘钥要求是16位长度
+        int sm4PasswordLength = 16;
+        if (sm4PasswordLength != password.length()) {
+            throw new IllegalArgumentException("SM4秘钥长度要求为16位");
+        }
+        return SmUtil.sm4(password.getBytes(StandardCharsets.UTF_8)).encryptHex(data, StandardCharsets.UTF_8);
+    }
+
+    /**
+     * sm4解密
+     *
+     * @param data     待解密数据（可以是Base64或Hex编码）
+     * @param password 秘钥字符串
+     * @return 解密后字符串
+     */
+    public static String decryptBySm4(String data, String password) {
+        if (StrUtil.isBlank(password)) {
+            throw new IllegalArgumentException("SM4需要传入秘钥信息");
+        }
+        // sm4算法的秘钥要求是16位长度
+        int sm4PasswordLength = 16;
+        if (sm4PasswordLength != password.length()) {
+            throw new IllegalArgumentException("SM4秘钥长度要求为16位");
+        }
+        return SmUtil.sm4(password.getBytes(StandardCharsets.UTF_8)).decryptStr(data, StandardCharsets.UTF_8);
+    }
+
+    /**
+     * 产生sm2加解密需要的公钥和私钥
+     *
+     * @return 公私钥Map
+     */
+    public static Map<String, String> generateSm2Key() {
+        Map<String, String> keyMap = new HashMap<>(2);
+        SM2 sm2 = SmUtil.sm2();
+        keyMap.put(PRIVATE_KEY, sm2.getPrivateKeyBase64());
+        keyMap.put(PUBLIC_KEY, sm2.getPublicKeyBase64());
+        return keyMap;
+    }
+
+    /**
+     * sm2公钥加密
+     *
+     * @param data      待加密数据
+     * @param publicKey 公钥
+     * @return 加密后字符串, 采用Base64编码
+     */
+    public static String encryptBySm2(String data, String publicKey) {
+        if (StrUtil.isBlank(publicKey)) {
+            throw new IllegalArgumentException("SM2需要传入公钥进行加密");
+        }
+        SM2 sm2 = SmUtil.sm2(null, publicKey);
+        return sm2.encryptBase64(data, StandardCharsets.UTF_8, KeyType.PublicKey);
+    }
+
+    /**
+     * sm2公钥加密
+     *
+     * @param data      待加密数据
+     * @param publicKey 公钥
+     * @return 加密后字符串, 采用Hex编码
+     */
+    public static String encryptBySm2Hex(String data, String publicKey) {
+        if (StrUtil.isBlank(publicKey)) {
+            throw new IllegalArgumentException("SM2需要传入公钥进行加密");
+        }
+        SM2 sm2 = SmUtil.sm2(null, publicKey);
+        return sm2.encryptHex(data, StandardCharsets.UTF_8, KeyType.PublicKey);
+    }
+
+    /**
+     * sm2私钥解密
+     *
+     * @param data       待解密数据
+     * @param privateKey 私钥
+     * @return 解密后字符串
+     */
+    public static String decryptBySm2(String data, String privateKey) {
+        if (StrUtil.isBlank(privateKey)) {
+            throw new IllegalArgumentException("SM2需要传入私钥进行解密");
+        }
+        SM2 sm2 = SmUtil.sm2(privateKey, null);
+        return sm2.decryptStr(data, KeyType.PrivateKey, StandardCharsets.UTF_8);
+    }
+
+    /**
+     * 产生RSA加解密需要的公钥和私钥
+     *
+     * @return 公私钥Map
+     */
+    public static Map<String, String> generateRsaKey() {
+        Map<String, String> keyMap = new HashMap<>(2);
+        RSA rsa = SecureUtil.rsa();
+        keyMap.put(PRIVATE_KEY, rsa.getPrivateKeyBase64());
+        keyMap.put(PUBLIC_KEY, rsa.getPublicKeyBase64());
+        return keyMap;
+    }
+
+    /**
+     * rsa公钥加密
+     *
+     * @param data      待加密数据
+     * @param publicKey 公钥
+     * @return 加密后字符串, 采用Base64编码
+     */
+    public static String encryptByRsa(String data, String publicKey) {
+        if (StrUtil.isBlank(publicKey)) {
+            throw new IllegalArgumentException("RSA需要传入公钥进行加密");
+        }
+        RSA rsa = SecureUtil.rsa(null, publicKey);
+        return rsa.encryptBase64(data, StandardCharsets.UTF_8, KeyType.PublicKey);
+    }
+
+    /**
+     * rsa公钥加密
+     *
+     * @param data      待加密数据
+     * @param publicKey 公钥
+     * @return 加密后字符串, 采用Hex编码
+     */
+    public static String encryptByRsaHex(String data, String publicKey) {
+        if (StrUtil.isBlank(publicKey)) {
+            throw new IllegalArgumentException("RSA需要传入公钥进行加密");
+        }
+        RSA rsa = SecureUtil.rsa(null, publicKey);
+        return rsa.encryptHex(data, StandardCharsets.UTF_8, KeyType.PublicKey);
+    }
+
+    /**
+     * rsa私钥解密
+     *
+     * @param data       待解密数据
+     * @param privateKey 私钥
+     * @return 解密后字符串
+     */
+    public static String decryptByRsa(String data, String privateKey) {
+        if (StrUtil.isBlank(privateKey)) {
+            throw new IllegalArgumentException("RSA需要传入私钥进行解密");
+        }
+        RSA rsa = SecureUtil.rsa(privateKey, null);
+        return rsa.decryptStr(data, KeyType.PrivateKey, StandardCharsets.UTF_8);
+    }
+
+    /**
+     * md5加密
+     *
+     * @param data 待加密数据
+     * @return 加密后字符串, 采用Hex编码
+     */
+    public static String encryptByMd5(String data) {
+        return SecureUtil.md5(data);
+    }
+
+    /**
+     * sha256加密
+     *
+     * @param data 待加密数据
+     * @return 加密后字符串, 采用Hex编码
+     */
+    public static String encryptBySha256(String data) {
+        return SecureUtil.sha256(data);
+    }
+
+    /**
+     * sm3加密
+     *
+     * @param data 待加密数据
+     * @return 加密后字符串, 采用Hex编码
+     */
+    public static String encryptBySm3(String data) {
+        return SmUtil.sm3(data);
+    }
+
+}
diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-encrypt/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
new file mode 100644
index 0000000..132cf29
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-encrypt/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1,3 @@
+org.dromara.common.encrypt.config.EncryptorAutoConfiguration
+org.dromara.common.encrypt.config.ApiDecryptAutoConfiguration
+
diff --git a/ruoyi-common/ruoyi-common-excel/pom.xml b/ruoyi-common/ruoyi-common-excel/pom.xml
new file mode 100644
index 0000000..47ba528
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-excel/pom.xml
@@ -0,0 +1,30 @@
+<?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>
+        <groupId>org.dromara</groupId>
+        <artifactId>ruoyi-common</artifactId>
+        <version>${revision}</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>ruoyi-common-excel</artifactId>
+
+    <description>
+        ruoyi-common-excel
+    </description>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-json</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>cn.idev.excel</groupId>
+            <artifactId>fastexcel</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>
diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/CellMerge.java b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/CellMerge.java
new file mode 100644
index 0000000..9509c59
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/CellMerge.java
@@ -0,0 +1,29 @@
+package org.dromara.common.excel.annotation;
+
+import org.dromara.common.excel.core.CellMergeStrategy;
+
+import java.lang.annotation.*;
+
+/**
+ * excel 列单元格合并(合并列相同项)
+ *
+ * 需搭配 {@link CellMergeStrategy} 策略使用
+ *
+ * @author pengles
+ */
+@Target(ElementType.FIELD)
+@Retention(RetentionPolicy.RUNTIME)
+@Inherited
+public @interface CellMerge {
+
+	/**
+	 * col index
+	 */
+	int index() default -1;
+
+    /**
+     * 合并需要依赖的其他字段名称
+     */
+    String[] mergeBy() default {};
+
+}
diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/ExcelDictFormat.java b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/ExcelDictFormat.java
new file mode 100644
index 0000000..7b2bb04
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/ExcelDictFormat.java
@@ -0,0 +1,32 @@
+package org.dromara.common.excel.annotation;
+
+import org.dromara.common.core.utils.StringUtils;
+
+import java.lang.annotation.*;
+
+/**
+ * 字典格式化
+ *
+ * @author pengles
+ */
+@Target({ElementType.FIELD})
+@Retention(RetentionPolicy.RUNTIME)
+@Inherited
+public @interface ExcelDictFormat {
+
+    /**
+     * 如果是字典类型，请设置字典的type值 (如: sys_user_sex)
+     */
+    String dictType() default "";
+
+    /**
+     * 读取内容转表达式 (如: 0=男,1=女,2=未知)
+     */
+    String readConverterExp() default "";
+
+    /**
+     * 分隔符，读取字符串组内容
+     */
+    String separator() default StringUtils.SEPARATOR;
+
+}
diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/ExcelEnumFormat.java b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/ExcelEnumFormat.java
new file mode 100644
index 0000000..290379d
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/ExcelEnumFormat.java
@@ -0,0 +1,30 @@
+package org.dromara.common.excel.annotation;
+
+import java.lang.annotation.*;
+
+/**
+ * 枚举格式化
+ *
+ * @author Liang
+ */
+@Target({ElementType.FIELD})
+@Retention(RetentionPolicy.RUNTIME)
+@Inherited
+public @interface ExcelEnumFormat {
+
+    /**
+     * 字典枚举类型
+     */
+    Class<? extends Enum<?>> enumClass();
+
+    /**
+     * 字典枚举类中对应的code属性名称，默认为code
+     */
+    String codeField() default "code";
+
+    /**
+     * 字典枚举类中对应的text属性名称，默认为text
+     */
+    String textField() default "text";
+
+}
diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/ExcelNotation.java b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/ExcelNotation.java
new file mode 100644
index 0000000..ed42371
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/ExcelNotation.java
@@ -0,0 +1,20 @@
+package org.dromara.common.excel.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * 批注 此注解仅用于单表头 不支持多层级表头
+ * @author guzhouyanyu
+ */
+@Target({ElementType.FIELD})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface ExcelNotation {
+
+    /**
+     * 批注内容
+     */
+    String value() default "";
+}
diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/ExcelRequired.java b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/ExcelRequired.java
new file mode 100644
index 0000000..ca8083b
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/annotation/ExcelRequired.java
@@ -0,0 +1,22 @@
+package org.dromara.common.excel.annotation;
+
+import org.apache.poi.ss.usermodel.IndexedColors;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * 是否必填 此注解仅用于单表头 不支持多层级表头
+ * @author guzhouyanyu
+ */
+@Target({ElementType.FIELD})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface ExcelRequired {
+
+    /**
+     * 字体颜色
+     */
+    IndexedColors fontColor() default IndexedColors.RED;
+}
diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/convert/ExcelBigNumberConvert.java b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/convert/ExcelBigNumberConvert.java
new file mode 100644
index 0000000..9332d4e
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/convert/ExcelBigNumberConvert.java
@@ -0,0 +1,52 @@
+package org.dromara.common.excel.convert;
+
+import cn.hutool.core.convert.Convert;
+import cn.hutool.core.util.ObjectUtil;
+import cn.idev.excel.converters.Converter;
+import cn.idev.excel.enums.CellDataTypeEnum;
+import cn.idev.excel.metadata.GlobalConfiguration;
+import cn.idev.excel.metadata.data.ReadCellData;
+import cn.idev.excel.metadata.data.WriteCellData;
+import cn.idev.excel.metadata.property.ExcelContentProperty;
+import lombok.extern.slf4j.Slf4j;
+
+import java.math.BigDecimal;
+
+/**
+ * 大数值转换
+ * Excel 数值长度位15位 大于15位的数值转换位字符串
+ *
+ * @author pengles
+ */
+@Slf4j
+public class ExcelBigNumberConvert implements Converter<Long> {
+
+    @Override
+    public Class<Long> supportJavaTypeKey() {
+        return Long.class;
+    }
+
+    @Override
+    public CellDataTypeEnum supportExcelTypeKey() {
+        return CellDataTypeEnum.STRING;
+    }
+
+    @Override
+    public Long convertToJavaData(ReadCellData<?> cellData, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) {
+        return Convert.toLong(cellData.getData());
+    }
+
+    @Override
+    public WriteCellData<Object> convertToExcelData(Long object, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) {
+        if (ObjectUtil.isNotNull(object)) {
+            String str = Convert.toStr(object);
+            if (str.length() > 15) {
+                return new WriteCellData<>(str);
+            }
+        }
+        WriteCellData<Object> cellData = new WriteCellData<>(new BigDecimal(object));
+        cellData.setType(CellDataTypeEnum.NUMBER);
+        return cellData;
+    }
+
+}
diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/convert/ExcelDictConvert.java b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/convert/ExcelDictConvert.java
new file mode 100644
index 0000000..d6788cd
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/convert/ExcelDictConvert.java
@@ -0,0 +1,73 @@
+package org.dromara.common.excel.convert;
+
+import cn.hutool.core.annotation.AnnotationUtil;
+import cn.hutool.core.convert.Convert;
+import cn.hutool.core.util.ObjectUtil;
+import cn.idev.excel.converters.Converter;
+import cn.idev.excel.enums.CellDataTypeEnum;
+import cn.idev.excel.metadata.GlobalConfiguration;
+import cn.idev.excel.metadata.data.ReadCellData;
+import cn.idev.excel.metadata.data.WriteCellData;
+import cn.idev.excel.metadata.property.ExcelContentProperty;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.core.service.DictService;
+import org.dromara.common.core.utils.SpringUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.excel.utils.ExcelUtil;
+import lombok.extern.slf4j.Slf4j;
+
+import java.lang.reflect.Field;
+
+/**
+ * 字典格式化转换处理
+ *
+ * @author pengles
+ */
+@Slf4j
+public class ExcelDictConvert implements Converter<Object> {
+
+    @Override
+    public Class<Object> supportJavaTypeKey() {
+        return Object.class;
+    }
+
+    @Override
+    public CellDataTypeEnum supportExcelTypeKey() {
+        return null;
+    }
+
+    @Override
+    public Object convertToJavaData(ReadCellData<?> cellData, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) {
+        ExcelDictFormat anno = getAnnotation(contentProperty.getField());
+        String type = anno.dictType();
+        String label = cellData.getStringValue();
+        String value;
+        if (StringUtils.isBlank(type)) {
+            value = ExcelUtil.reverseByExp(label, anno.readConverterExp(), anno.separator());
+        } else {
+            value = SpringUtils.getBean(DictService.class).getDictValue(type, label, anno.separator());
+        }
+        return Convert.convert(contentProperty.getField().getType(), value);
+    }
+
+    @Override
+    public WriteCellData<String> convertToExcelData(Object object, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) {
+        if (ObjectUtil.isNull(object)) {
+            return new WriteCellData<>("");
+        }
+        ExcelDictFormat anno = getAnnotation(contentProperty.getField());
+        String type = anno.dictType();
+        String value = Convert.toStr(object);
+        String label;
+        if (StringUtils.isBlank(type)) {
+            label = ExcelUtil.convertByExp(value, anno.readConverterExp(), anno.separator());
+        } else {
+            label = SpringUtils.getBean(DictService.class).getDictLabel(type, value, anno.separator());
+        }
+        return new WriteCellData<>(label);
+    }
+
+    private ExcelDictFormat getAnnotation(Field field) {
+        return AnnotationUtil.getAnnotation(field, ExcelDictFormat.class);
+    }
+}
diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/convert/ExcelEnumConvert.java b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/convert/ExcelEnumConvert.java
new file mode 100644
index 0000000..5723e61
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/convert/ExcelEnumConvert.java
@@ -0,0 +1,87 @@
+package org.dromara.common.excel.convert;
+
+import cn.hutool.core.annotation.AnnotationUtil;
+import cn.hutool.core.convert.Convert;
+import cn.hutool.core.util.ObjectUtil;
+import cn.idev.excel.converters.Converter;
+import cn.idev.excel.enums.CellDataTypeEnum;
+import cn.idev.excel.metadata.GlobalConfiguration;
+import cn.idev.excel.metadata.data.ReadCellData;
+import cn.idev.excel.metadata.data.WriteCellData;
+import cn.idev.excel.metadata.property.ExcelContentProperty;
+import org.dromara.common.core.utils.reflect.ReflectUtils;
+import org.dromara.common.excel.annotation.ExcelEnumFormat;
+import lombok.extern.slf4j.Slf4j;
+
+import java.lang.reflect.Field;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 枚举格式化转换处理
+ *
+ * @author Liang
+ */
+@Slf4j
+public class ExcelEnumConvert implements Converter<Object> {
+
+    @Override
+    public Class<Object> supportJavaTypeKey() {
+        return Object.class;
+    }
+
+    @Override
+    public CellDataTypeEnum supportExcelTypeKey() {
+        return null;
+    }
+
+    @Override
+    public Object convertToJavaData(ReadCellData<?> cellData, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) {
+        cellData.checkEmpty();
+        // Excel中填入的是枚举中指定的描述
+        Object textValue = switch (cellData.getType()) {
+            case STRING, DIRECT_STRING, RICH_TEXT_STRING -> cellData.getStringValue();
+            case NUMBER -> cellData.getNumberValue();
+            case BOOLEAN -> cellData.getBooleanValue();
+            default -> throw new IllegalArgumentException("单元格类型异常!");
+        };
+        // 如果是空值
+        if (ObjectUtil.isNull(textValue)) {
+            return null;
+        }
+        Map<Object, String> enumCodeToTextMap = beforeConvert(contentProperty);
+        // 从Java输出至Excel是code转text
+        // 因此从Excel转Java应该将text与code对调
+        Map<Object, Object> enumTextToCodeMap = new HashMap<>();
+        enumCodeToTextMap.forEach((key, value) -> enumTextToCodeMap.put(value, key));
+        // 应该从text -> code中查找
+        Object codeValue = enumTextToCodeMap.get(textValue);
+        return Convert.convert(contentProperty.getField().getType(), codeValue);
+    }
+
+    @Override
+    public WriteCellData<String> convertToExcelData(Object object, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) {
+        if (ObjectUtil.isNull(object)) {
+            return new WriteCellData<>("");
+        }
+        Map<Object, String> enumValueMap = beforeConvert(contentProperty);
+        String value = Convert.toStr(enumValueMap.get(object), "");
+        return new WriteCellData<>(value);
+    }
+
+    private Map<Object, String> beforeConvert(ExcelContentProperty contentProperty) {
+        ExcelEnumFormat anno = getAnnotation(contentProperty.getField());
+        Map<Object, String> enumValueMap = new HashMap<>();
+        Enum<?>[] enumConstants = anno.enumClass().getEnumConstants();
+        for (Enum<?> enumConstant : enumConstants) {
+            Object codeValue = ReflectUtils.invokeGetter(enumConstant, anno.codeField());
+            String textValue = ReflectUtils.invokeGetter(enumConstant, anno.textField());
+            enumValueMap.put(codeValue, textValue);
+        }
+        return enumValueMap;
+    }
+
+    private ExcelEnumFormat getAnnotation(Field field) {
+        return AnnotationUtil.getAnnotation(field, ExcelEnumFormat.class);
+    }
+}
diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/CellMergeStrategy.java b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/CellMergeStrategy.java
new file mode 100644
index 0000000..e8fef12
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/CellMergeStrategy.java
@@ -0,0 +1,163 @@
+package org.dromara.common.excel.core;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ReflectUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.idev.excel.annotation.ExcelProperty;
+import cn.idev.excel.metadata.Head;
+import cn.idev.excel.write.handler.WorkbookWriteHandler;
+import cn.idev.excel.write.handler.context.WorkbookWriteHandlerContext;
+import cn.idev.excel.write.merge.AbstractMergeStrategy;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.util.CellRangeAddress;
+import org.dromara.common.core.utils.reflect.ReflectUtils;
+import org.dromara.common.excel.annotation.CellMerge;
+
+import java.lang.reflect.Field;
+import java.util.*;
+
+/**
+ * 列值重复合并策略
+ *
+ * @author pengles
+ */
+@Slf4j
+public class CellMergeStrategy extends AbstractMergeStrategy implements WorkbookWriteHandler {
+
+    private final List<CellRangeAddress> cellList;
+    private final boolean hasTitle;
+    private int rowIndex;
+
+    public CellMergeStrategy(List<?> list, boolean hasTitle) {
+        this.hasTitle = hasTitle;
+        // 行合并开始下标
+        this.rowIndex = hasTitle ? 1 : 0;
+        this.cellList = handle(list, hasTitle);
+    }
+
+    @Override
+    protected void merge(Sheet sheet, Cell cell, Head head, Integer relativeRowIndex) {
+        //单元格写入了,遍历合并区域,如果该Cell在区域内,但非首行,则清空
+        final int rowIndex = cell.getRowIndex();
+        if (CollUtil.isNotEmpty(cellList)){
+            for (CellRangeAddress cellAddresses : cellList) {
+                final int firstRow = cellAddresses.getFirstRow();
+                if (cellAddresses.isInRange(cell) && rowIndex != firstRow){
+                    cell.setBlank();
+                }
+            }
+        }
+    }
+
+    @Override
+    public void afterWorkbookDispose(final WorkbookWriteHandlerContext context) {
+        //当前表格写完后，统一写入
+        if (CollUtil.isNotEmpty(cellList)){
+            for (CellRangeAddress item : cellList) {
+                context.getWriteContext().writeSheetHolder().getSheet().addMergedRegion(item);
+            }
+        }
+    }
+
+    @SneakyThrows
+    private List<CellRangeAddress> handle(List<?> list, boolean hasTitle) {
+        List<CellRangeAddress> cellList = new ArrayList<>();
+        if (CollUtil.isEmpty(list)) {
+            return cellList;
+        }
+        Field[] fields = ReflectUtils.getFields(list.get(0).getClass(), field -> !"serialVersionUID".equals(field.getName()));
+
+        // 有注解的字段
+        List<Field> mergeFields = new ArrayList<>();
+        List<Integer> mergeFieldsIndex = new ArrayList<>();
+        for (int i = 0; i < fields.length; i++) {
+            Field field = fields[i];
+            if (field.isAnnotationPresent(CellMerge.class)) {
+                CellMerge cm = field.getAnnotation(CellMerge.class);
+                mergeFields.add(field);
+                mergeFieldsIndex.add(cm.index() == -1 ? i : cm.index());
+                if (hasTitle) {
+                    ExcelProperty property = field.getAnnotation(ExcelProperty.class);
+                    rowIndex = Math.max(rowIndex, property.value().length);
+                }
+            }
+        }
+
+        Map<Field, RepeatCell> map = new HashMap<>();
+        // 生成两两合并单元格
+        for (int i = 0; i < list.size(); i++) {
+            for (int j = 0; j < mergeFields.size(); j++) {
+                Field field = mergeFields.get(j);
+                Object val = ReflectUtils.invokeGetter(list.get(i), field.getName());
+
+                int colNum = mergeFieldsIndex.get(j);
+                if (!map.containsKey(field)) {
+                    map.put(field, new RepeatCell(val, i));
+                } else {
+                    RepeatCell repeatCell = map.get(field);
+                    Object cellValue = repeatCell.getValue();
+                    if (cellValue == null || "".equals(cellValue)) {
+                        // 空值跳过不合并
+                        continue;
+                    }
+
+                    if (!cellValue.equals(val)) {
+                        if ((i - repeatCell.getCurrent() > 1)) {
+                            cellList.add(new CellRangeAddress(repeatCell.getCurrent() + rowIndex, i + rowIndex - 1, colNum, colNum));
+                        }
+                        map.put(field, new RepeatCell(val, i));
+                    } else if (i == list.size() - 1) {
+                        if (!isMerge(list, i, field)) {
+                            // 如果最后一行不能合并，检查之前的数据是否需要合并
+                            if (i - repeatCell.getCurrent() > 1) {
+                                cellList.add(new CellRangeAddress(repeatCell.getCurrent() + rowIndex, i + rowIndex - 1, colNum, colNum));
+                            }
+                        } else if (i > repeatCell.getCurrent()) {
+                            // 如果最后一行可以合并，则直接合并到最后
+                            cellList.add(new CellRangeAddress(repeatCell.getCurrent() + rowIndex, i + rowIndex, colNum, colNum));
+                        }
+                    } else if (!isMerge(list, i, field)) {
+                        if ((i - repeatCell.getCurrent() > 1)) {
+                            cellList.add(new CellRangeAddress(repeatCell.getCurrent() + rowIndex, i + rowIndex - 1, colNum, colNum));
+                        }
+                        map.put(field, new RepeatCell(val, i));
+                    }
+                }
+            }
+        }
+        return cellList;
+    }
+
+    private boolean isMerge(List<?> list, int i, Field field) {
+        boolean isMerge = true;
+        CellMerge cm = field.getAnnotation(CellMerge.class);
+        final String[] mergeBy = cm.mergeBy();
+        if (StrUtil.isAllNotBlank(mergeBy)) {
+            //比对当前list(i)和list(i - 1)的各个属性值一一比对 如果全为真 则为真
+            for (String fieldName : mergeBy) {
+                final Object valCurrent = ReflectUtil.getFieldValue(list.get(i), fieldName);
+                final Object valPre = ReflectUtil.getFieldValue(list.get(i - 1), fieldName);
+                if (!Objects.equals(valPre, valCurrent)) {
+                    //依赖字段如有任一不等值,则标记为不可合并
+                    isMerge = false;
+                }
+            }
+        }
+        return isMerge;
+    }
+
+    @Data
+    @AllArgsConstructor
+    static class RepeatCell {
+
+        private Object value;
+
+        private int current;
+
+    }
+}
diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/DefaultExcelListener.java b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/DefaultExcelListener.java
new file mode 100644
index 0000000..fb46e6d
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/DefaultExcelListener.java
@@ -0,0 +1,104 @@
+package org.dromara.common.excel.core;
+
+import cn.hutool.core.util.StrUtil;
+import cn.idev.excel.context.AnalysisContext;
+import cn.idev.excel.event.AnalysisEventListener;
+import cn.idev.excel.exception.ExcelAnalysisException;
+import cn.idev.excel.exception.ExcelDataConvertException;
+import org.dromara.common.core.utils.StreamUtils;
+import org.dromara.common.core.utils.ValidatorUtils;
+import org.dromara.common.json.utils.JsonUtils;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.ConstraintViolationException;
+import lombok.NoArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * Excel 导入监听
+ *
+ * @author Yjoioooo
+ * @author pengles
+ */
+@Slf4j
+@NoArgsConstructor
+public class DefaultExcelListener<T> extends AnalysisEventListener<T> implements ExcelListener<T> {
+
+    /**
+     * 是否Validator检验，默认为是
+     */
+    private Boolean isValidate = Boolean.TRUE;
+
+    /**
+     * excel 表头数据
+     */
+    private Map<Integer, String> headMap;
+
+    /**
+     * 导入回执
+     */
+    private ExcelResult<T> excelResult;
+
+    public DefaultExcelListener(boolean isValidate) {
+        this.excelResult = new DefaultExcelResult<>();
+        this.isValidate = isValidate;
+    }
+
+    /**
+     * 处理异常
+     *
+     * @param exception ExcelDataConvertException
+     * @param context   Excel 上下文
+     */
+    @Override
+    public void onException(Exception exception, AnalysisContext context) throws Exception {
+        String errMsg = null;
+        if (exception instanceof ExcelDataConvertException excelDataConvertException) {
+            // 如果是某一个单元格的转换异常 能获取到具体行号
+            Integer rowIndex = excelDataConvertException.getRowIndex();
+            Integer columnIndex = excelDataConvertException.getColumnIndex();
+            errMsg = StrUtil.format("第{}行-第{}列-表头{}: 解析异常<br/>",
+                rowIndex + 1, columnIndex + 1, headMap.get(columnIndex));
+            if (log.isDebugEnabled()) {
+                log.error(errMsg);
+            }
+        }
+        if (exception instanceof ConstraintViolationException constraintViolationException) {
+            Set<ConstraintViolation<?>> constraintViolations = constraintViolationException.getConstraintViolations();
+            String constraintViolationsMsg = StreamUtils.join(constraintViolations, ConstraintViolation::getMessage, ", ");
+            errMsg = StrUtil.format("第{}行数据校验异常: {}", context.readRowHolder().getRowIndex() + 1, constraintViolationsMsg);
+            if (log.isDebugEnabled()) {
+                log.error(errMsg);
+            }
+        }
+        excelResult.getErrorList().add(errMsg);
+        throw new ExcelAnalysisException(errMsg);
+    }
+
+    @Override
+    public void invokeHeadMap(Map<Integer, String> headMap, AnalysisContext context) {
+        this.headMap = headMap;
+        log.debug("解析到一条表头数据: {}", JsonUtils.toJsonString(headMap));
+    }
+
+    @Override
+    public void invoke(T data, AnalysisContext context) {
+        if (isValidate) {
+            ValidatorUtils.validate(data);
+        }
+        excelResult.getList().add(data);
+    }
+
+    @Override
+    public void doAfterAllAnalysed(AnalysisContext context) {
+        log.debug("所有数据解析完成！");
+    }
+
+    @Override
+    public ExcelResult<T> getExcelResult() {
+        return excelResult;
+    }
+
+}
diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/DefaultExcelResult.java b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/DefaultExcelResult.java
new file mode 100644
index 0000000..19bfac6
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/DefaultExcelResult.java
@@ -0,0 +1,73 @@
+package org.dromara.common.excel.core;
+
+import cn.hutool.core.util.StrUtil;
+import lombok.Setter;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 默认excel返回对象
+ *
+ * @author Yjoioooo
+ * @author pengles
+ */
+public class DefaultExcelResult<T> implements ExcelResult<T> {
+
+    /**
+     * 数据对象list
+     */
+    @Setter
+    private List<T> list;
+
+    /**
+     * 错误信息列表
+     */
+    @Setter
+    private List<String> errorList;
+
+    public DefaultExcelResult() {
+        this.list = new ArrayList<>();
+        this.errorList = new ArrayList<>();
+    }
+
+    public DefaultExcelResult(List<T> list, List<String> errorList) {
+        this.list = list;
+        this.errorList = errorList;
+    }
+
+    public DefaultExcelResult(ExcelResult<T> excelResult) {
+        this.list = excelResult.getList();
+        this.errorList = excelResult.getErrorList();
+    }
+
+    @Override
+    public List<T> getList() {
+        return list;
+    }
+
+    @Override
+    public List<String> getErrorList() {
+        return errorList;
+    }
+
+    /**
+     * 获取导入回执
+     *
+     * @return 导入回执
+     */
+    @Override
+    public String getAnalysis() {
+        int successCount = list.size();
+        int errorCount = errorList.size();
+        if (successCount == 0) {
+            return "读取失败，未解析到数据";
+        } else {
+            if (errorCount == 0) {
+                return StrUtil.format("恭喜您，全部读取成功！共{}条", successCount);
+            } else {
+                return "";
+            }
+        }
+    }
+}
diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/DropDownOptions.java b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/DropDownOptions.java
new file mode 100644
index 0000000..8b53a0c
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/DropDownOptions.java
@@ -0,0 +1,149 @@
+package org.dromara.common.excel.core;
+
+import cn.hutool.core.util.StrUtil;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.dromara.common.core.exception.ServiceException;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+/**
+ * <h1>Excel下拉可选项</h1>
+ * 注意：为确保下拉框解析正确，传值务必使用createOptionValue()做为值的拼接
+ *
+ * @author Emil.Zhang
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@SuppressWarnings("unused")
+public class DropDownOptions {
+    /**
+     * 一级下拉所在列index，从0开始算
+     */
+    private int index = 0;
+    /**
+     * 二级下拉所在的index，从0开始算，不能与一级相同
+     */
+    private int nextIndex = 0;
+    /**
+     * 一级下拉所包含的数据
+     */
+    private List<String> options = new ArrayList<>();
+    /**
+     * 二级下拉所包含的数据Map
+     * <p>以每一个一级选项值为Key，每个一级选项对应的二级数据为Value</p>
+     */
+    private Map<String, List<String>> nextOptions = new HashMap<>();
+    /**
+     * 分隔符
+     */
+    private static final String DELIMITER = "_";
+
+    /**
+     * 创建只有一级的下拉选
+     */
+    public DropDownOptions(int index, List<String> options) {
+        this.index = index;
+        this.options = options;
+    }
+
+    /**
+     * <h2>创建每个选项可选值</h2>
+     * <p>注意：不能以数字，特殊符号开头，选项中不可以包含任何运算符号</p>
+     *
+     * @param vars 可选值内包含的参数
+     * @return 合规的可选值
+     */
+    public static String createOptionValue(Object... vars) {
+        StringBuilder stringBuffer = new StringBuilder();
+        String regex = "^[\\S\\d\\u4e00-\\u9fa5]+$";
+        for (int i = 0; i < vars.length; i++) {
+            String var = StrUtil.trimToEmpty(String.valueOf(vars[i]));
+            if (!var.matches(regex)) {
+                throw new ServiceException("选项数据不符合规则，仅允许使用中英文字符以及数字");
+            }
+            stringBuffer.append(var);
+            if (i < vars.length - 1) {
+                // 直至最后一个前，都以_作为切割线
+                stringBuffer.append(DELIMITER);
+            }
+        }
+        if (stringBuffer.toString().matches("^\\d_*$")) {
+            throw new ServiceException("禁止以数字开头");
+        }
+        return stringBuffer.toString();
+    }
+
+    /**
+     * 将处理后合理的可选值解析为原始的参数
+     *
+     * @param option 经过处理后的合理的可选项
+     * @return 原始的参数
+     */
+    public static List<String> analyzeOptionValue(String option) {
+        return StrUtil.split(option, DELIMITER, true, true);
+    }
+
+    /**
+     * 创建级联下拉选项
+     *
+     * @param parentList                  父实体可选项原始数据
+     * @param parentIndex                 父下拉选位置
+     * @param sonList                     子实体可选项原始数据
+     * @param sonIndex                    子下拉选位置
+     * @param parentHowToGetIdFunction    父类如何获取唯一标识
+     * @param sonHowToGetParentIdFunction 子类如何获取父类的唯一标识
+     * @param howToBuildEveryOption       如何生成下拉选内容
+     * @return 级联下拉选项
+     */
+    public static <T> DropDownOptions buildLinkedOptions(List<T> parentList,
+                                                         int parentIndex,
+                                                         List<T> sonList,
+                                                         int sonIndex,
+                                                         Function<T, Number> parentHowToGetIdFunction,
+                                                         Function<T, Number> sonHowToGetParentIdFunction,
+                                                         Function<T, String> howToBuildEveryOption) {
+        DropDownOptions parentLinkSonOptions = new DropDownOptions();
+        // 先创建父类的下拉
+        parentLinkSonOptions.setIndex(parentIndex);
+        parentLinkSonOptions.setOptions(
+            parentList.stream()
+                .map(howToBuildEveryOption)
+                .collect(Collectors.toList())
+        );
+        // 提取父-子级联下拉
+        Map<String, List<String>> sonOptions = new HashMap<>();
+        // 父级依据自己的ID分组
+        Map<Number, List<T>> parentGroupByIdMap =
+            parentList.stream().collect(Collectors.groupingBy(parentHowToGetIdFunction));
+        // 遍历每个子集，提取到Map中
+        sonList.forEach(everySon -> {
+            if (parentGroupByIdMap.containsKey(sonHowToGetParentIdFunction.apply(everySon))) {
+                // 找到对应的上级
+                T parentObj = parentGroupByIdMap.get(sonHowToGetParentIdFunction.apply(everySon)).get(0);
+                // 提取名称和ID作为Key
+                String key = howToBuildEveryOption.apply(parentObj);
+                // Key对应的Value
+                List<String> thisParentSonOptionList;
+                if (sonOptions.containsKey(key)) {
+                    thisParentSonOptionList = sonOptions.get(key);
+                } else {
+                    thisParentSonOptionList = new ArrayList<>();
+                    sonOptions.put(key, thisParentSonOptionList);
+                }
+                // 往Value中添加当前子集选项
+                thisParentSonOptionList.add(howToBuildEveryOption.apply(everySon));
+            }
+        });
+        parentLinkSonOptions.setNextIndex(sonIndex);
+        parentLinkSonOptions.setNextOptions(sonOptions);
+        return parentLinkSonOptions;
+    }
+}
diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/ExcelDownHandler.java b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/ExcelDownHandler.java
new file mode 100644
index 0000000..f3b6415
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/ExcelDownHandler.java
@@ -0,0 +1,401 @@
+package org.dromara.common.excel.core;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ArrayUtil;
+import cn.hutool.core.util.EnumUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.idev.excel.metadata.FieldCache;
+import cn.idev.excel.metadata.FieldWrapper;
+import cn.idev.excel.util.ClassUtils;
+import cn.idev.excel.write.handler.SheetWriteHandler;
+import cn.idev.excel.write.metadata.holder.WriteSheetHolder;
+import cn.idev.excel.write.metadata.holder.WriteWorkbookHolder;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.ss.util.CellRangeAddressList;
+import org.apache.poi.ss.util.WorkbookUtil;
+import org.apache.poi.xssf.usermodel.XSSFDataValidation;
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.service.DictService;
+import org.dromara.common.core.utils.SpringUtils;
+import org.dromara.common.core.utils.StreamUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.annotation.ExcelEnumFormat;
+
+import java.lang.reflect.Field;
+import java.util.*;
+
+/**
+ * <h1>Excel表格下拉选操作</h1>
+ * 考虑到下拉选过多可能导致Excel打开缓慢的问题，只校验前1000行
+ * <p>
+ * 即只有前1000行的数据可以用下拉框，超出的自行通过限制数据量的形式，第二次输出
+ *
+ * @author Emil.Zhang
+ */
+@Slf4j
+public class ExcelDownHandler implements SheetWriteHandler {
+
+    /**
+     * Excel表格中的列名英文
+     * 仅为了解析列英文，禁止修改
+     */
+    private static final String EXCEL_COLUMN_NAME = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+    /**
+     * 单选数据Sheet名
+     */
+    private static final String OPTIONS_SHEET_NAME = "options";
+    /**
+     * 联动选择数据Sheet名的头
+     */
+    private static final String LINKED_OPTIONS_SHEET_NAME = "linkedOptions";
+    /**
+     * 下拉可选项
+     */
+    private final List<DropDownOptions> dropDownOptions;
+    private final DictService dictService;
+    /**
+     * 当前单选进度
+     */
+    private int currentOptionsColumnIndex;
+    /**
+     * 当前联动选择进度
+     */
+    private int currentLinkedOptionsSheetIndex;
+
+    public ExcelDownHandler(List<DropDownOptions> options) {
+        this.dropDownOptions = options;
+        this.currentOptionsColumnIndex = 0;
+        this.currentLinkedOptionsSheetIndex = 0;
+        this.dictService = SpringUtils.getBean(DictService.class);
+    }
+
+    /**
+     * <h2>开始创建下拉数据</h2>
+     * 1.通过解析传入的@ExcelProperty同级是否标注有@DropDown选项
+     * 如果有且设置了value值，则将其直接置为下拉可选项
+     * <p>
+     * 2.或者在调用ExcelUtil时指定了可选项，将依据传入的可选项做下拉
+     * <p>
+     * 3.二者并存，注意调用方式
+     */
+    @Override
+    public void afterSheetCreate(WriteWorkbookHolder writeWorkbookHolder, WriteSheetHolder writeSheetHolder) {
+        Sheet sheet = writeSheetHolder.getSheet();
+        // 开始设置下拉框 HSSFWorkbook
+        DataValidationHelper helper = sheet.getDataValidationHelper();
+        Workbook workbook = writeWorkbookHolder.getWorkbook();
+        FieldCache fieldCache = ClassUtils.declaredFields(writeWorkbookHolder.getClazz(), writeWorkbookHolder);
+        for (Map.Entry<Integer, FieldWrapper> entry : fieldCache.getSortedFieldMap().entrySet()) {
+            Integer index = entry.getKey();
+            FieldWrapper wrapper = entry.getValue();
+            Field field = wrapper.getField();
+            // 循环实体中的每个属性
+            // 可选的下拉值
+            List<String> options = new ArrayList<>();
+            if (field.isAnnotationPresent(ExcelDictFormat.class)) {
+                // 如果指定了@ExcelDictFormat，则使用字典的逻辑
+                ExcelDictFormat format = field.getDeclaredAnnotation(ExcelDictFormat.class);
+                String dictType = format.dictType();
+                String converterExp = format.readConverterExp();
+                if (StringUtils.isNotBlank(dictType)) {
+                    // 如果传递了字典名，则依据字典建立下拉
+                    Collection<String> values = Optional.ofNullable(dictService.getAllDictByDictType(dictType))
+                        .orElseThrow(() -> new ServiceException(String.format("字典 %s 不存在", dictType)))
+                        .values();
+                    options = new ArrayList<>(values);
+                } else if (StringUtils.isNotBlank(converterExp)) {
+                    // 如果指定了确切的值，则直接解析确切的值
+                    List<String> strList = StringUtils.splitList(converterExp, format.separator());
+                    options = StreamUtils.toList(strList, s -> StringUtils.split(s, "=")[1]);
+                }
+            } else if (field.isAnnotationPresent(ExcelEnumFormat.class)) {
+                // 否则如果指定了@ExcelEnumFormat，则使用枚举的逻辑
+                ExcelEnumFormat format = field.getDeclaredAnnotation(ExcelEnumFormat.class);
+                List<Object> values = EnumUtil.getFieldValues(format.enumClass(), format.textField());
+                options = StreamUtils.toList(values, String::valueOf);
+            }
+            if (ObjectUtil.isNotEmpty(options)) {
+                // 仅当下拉可选项不为空时执行
+                if (options.size() > 20) {
+                    // 这里限制如果可选项大于20，则使用额外表形式
+                    dropDownWithSheet(helper, workbook, sheet, index, options);
+                } else {
+                    // 否则使用固定值形式
+                    dropDownWithSimple(helper, sheet, index, options);
+                }
+            }
+        }
+        if (CollUtil.isEmpty(dropDownOptions)) {
+            return;
+        }
+        dropDownOptions.forEach(everyOptions -> {
+            // 如果传递了下拉框选择器参数
+            if (!everyOptions.getNextOptions().isEmpty()) {
+                // 当二级选项不为空时，使用额外关联表的形式
+                dropDownLinkedOptions(helper, workbook, sheet, everyOptions);
+            } else if (everyOptions.getOptions().size() > 10) {
+                // 当一级选项参数个数大于10，使用额外表的形式
+                dropDownWithSheet(helper, workbook, sheet, everyOptions.getIndex(), everyOptions.getOptions());
+            } else {
+                // 否则使用默认形式
+                dropDownWithSimple(helper, sheet, everyOptions.getIndex(), everyOptions.getOptions());
+            }
+        });
+    }
+
+    /**
+     * <h2>简单下拉框</h2>
+     * 直接将可选项拼接为指定列的数据校验值
+     *
+     * @param celIndex 列index
+     * @param value    下拉选可选值
+     */
+    private void dropDownWithSimple(DataValidationHelper helper, Sheet sheet, Integer celIndex, List<String> value) {
+        if (ObjectUtil.isEmpty(value)) {
+            return;
+        }
+        this.markOptionsToSheet(helper, sheet, celIndex, helper.createExplicitListConstraint(ArrayUtil.toArray(value, String.class)));
+    }
+
+    /**
+     * <h2>额外表格形式的级联下拉框</h2>
+     *
+     * @param options 额外表格形式存储的下拉可选项
+     */
+    private void dropDownLinkedOptions(DataValidationHelper helper, Workbook workbook, Sheet sheet, DropDownOptions options) {
+        String linkedOptionsSheetName = String.format("%s_%d", LINKED_OPTIONS_SHEET_NAME, currentLinkedOptionsSheetIndex);
+        // 创建联动下拉数据表
+        Sheet linkedOptionsDataSheet = workbook.createSheet(WorkbookUtil.createSafeSheetName(linkedOptionsSheetName));
+        // 将下拉表隐藏
+        workbook.setSheetHidden(workbook.getSheetIndex(linkedOptionsDataSheet), true);
+        // 选项数据
+        List<String> firstOptions = options.getOptions();
+        Map<String, List<String>> secoundOptionsMap = options.getNextOptions();
+
+        // 采用按行填充数据的方式，避免出现数据无法写入的问题
+        // Attempting to write a row in the range that is already written to disk
+
+        // 使用ArrayList记载数据，防止乱序
+        List<String> columnNames = new ArrayList<>();
+        // 写入第一行，即第一级的数据
+        Row firstRow = linkedOptionsDataSheet.createRow(0);
+        for (int columnIndex = 0; columnIndex < firstOptions.size(); columnIndex++) {
+            String columnName = firstOptions.get(columnIndex);
+            firstRow.createCell(columnIndex)
+                .setCellValue(columnName);
+            columnNames.add(columnName);
+        }
+
+        // 创建名称管理器
+        Name name = workbook.createName();
+        // 设置名称管理器的别名
+        name.setNameName(linkedOptionsSheetName);
+        // 以横向第一行创建一级下拉拼接引用位置
+        String firstOptionsFunction = String.format("%s!$%s$1:$%s$1",
+            linkedOptionsSheetName,
+            getExcelColumnName(0),
+            getExcelColumnName(firstOptions.size())
+        );
+        // 设置名称管理器的引用位置
+        name.setRefersToFormula(firstOptionsFunction);
+        // 设置数据校验为序列模式，引用的是名称管理器中的别名
+        this.markOptionsToSheet(helper, sheet, options.getIndex(), helper.createFormulaListConstraint(linkedOptionsSheetName));
+
+        // 创建二级选项的名称管理器
+        for (int columIndex = 0; columIndex < columnNames.size(); columIndex++) {
+            // 列名
+            String firstOptionsColumnName = getExcelColumnName(columIndex);
+            // 对应的一级值
+            String thisFirstOptionsValue = columnNames.get(columIndex);
+
+            // 以该一级选项值创建子名称管理器
+            Name sonName = workbook.createName();
+            // 设置名称管理器的别名
+            sonName.setNameName(thisFirstOptionsValue);
+            // 以第二行该列数据拼接引用位置
+            String sonFunction = String.format("%s!$%s$2:$%s$%d",
+                linkedOptionsSheetName,
+                firstOptionsColumnName,
+                firstOptionsColumnName,
+                // 二级选项存在则设置为(选项个数+1)行，否则设置为2行
+                Math.max(Optional.ofNullable(secoundOptionsMap.get(thisFirstOptionsValue))
+                    .orElseGet(ArrayList::new).size(), 1) + 1
+            );
+            // 设置名称管理器的引用位置
+            sonName.setRefersToFormula(sonFunction);
+            // 数据验证为序列模式，引用到每一个主表中的二级选项位置
+            // 创建子项的名称管理器，只是为了使得Excel可以识别到数据
+            String mainSheetFirstOptionsColumnName = getExcelColumnName(options.getIndex());
+            for (int i = 0; i < 100; i++) {
+                // 以一级选项对应的主体所在位置创建二级下拉
+                String secondOptionsFunction = String.format("=INDIRECT(%s%d)", mainSheetFirstOptionsColumnName, i + 1);
+                // 二级只能主表每一行的每一列添加二级校验
+                markLinkedOptionsToSheet(helper, sheet, i, options.getNextIndex(), helper.createFormulaListConstraint(secondOptionsFunction));
+            }
+        }
+
+        // 将二级数据处理为按行区分
+        Map<Integer, List<String>> columnValueMap = new HashMap<>();
+        int currentRow = 1;
+        while (currentRow >= 0) {
+            boolean flag = false;
+            List<String> rowData = new ArrayList<>();
+            for (String columnName : columnNames) {
+                List<String> data = secoundOptionsMap.get(columnName);
+                if (CollUtil.isEmpty(data)) {
+                    // 添加空字符串填充位置
+                    rowData.add(" ");
+                    continue;
+                }
+                // 取第一个
+                String str = data.get(0);
+                rowData.add(str);
+                // 通过移除的方式避免重复
+                data.remove(0);
+                // 设置可以继续
+                flag = true;
+            }
+            columnValueMap.put(currentRow, rowData);
+            // 可以继续，则增加行数，否则置为负数跳出循环
+            if (flag) {
+                currentRow++;
+            } else {
+                currentRow = -1;
+            }
+        }
+
+        // 填充第二级选项数据
+        columnValueMap.forEach((rowIndex, rowValues) -> {
+            Row row = linkedOptionsDataSheet.createRow(rowIndex);
+            for (int columnIndex = 0; columnIndex < rowValues.size(); columnIndex++) {
+                String rowValue = rowValues.get(columnIndex);
+                // 填充位置的部分不渲染
+                if (StrUtil.isNotBlank(rowValue)) {
+                    row.createCell(columnIndex)
+                        .setCellValue(rowValue);
+                }
+            }
+        });
+
+        currentLinkedOptionsSheetIndex++;
+    }
+
+    /**
+     * <h2>额外表格形式的普通下拉框</h2>
+     * 由于下拉框可选值数量过多，为提升Excel打开效率，使用额外表格形式做下拉
+     *
+     * @param celIndex 下拉选
+     * @param value    下拉选可选值
+     */
+    private void dropDownWithSheet(DataValidationHelper helper, Workbook workbook, Sheet sheet, Integer celIndex, List<String> value) {
+        //由于poi的写出相关问题，超过100个会被临时写进硬盘，导致后续内存合并会出Attempting to write a row[] in the range [] that is already written to disk
+        String tmpOptionsSheetName = OPTIONS_SHEET_NAME + "_" + currentOptionsColumnIndex;
+        // 创建下拉数据表
+        Sheet simpleDataSheet = Optional.ofNullable(workbook.getSheet(WorkbookUtil.createSafeSheetName(tmpOptionsSheetName)))
+            .orElseGet(() -> workbook.createSheet(WorkbookUtil.createSafeSheetName(tmpOptionsSheetName)));
+        // 将下拉表隐藏
+        workbook.setSheetHidden(workbook.getSheetIndex(simpleDataSheet), true);
+        // 完善纵向的一级选项数据表
+        for (int i = 0; i < value.size(); i++) {
+            int finalI = i;
+            // 获取每一选项行，如果没有则创建
+            Row row = Optional.ofNullable(simpleDataSheet.getRow(i))
+                .orElseGet(() -> simpleDataSheet.createRow(finalI));
+            // 获取本级选项对应的选项列，如果没有则创建。上述采用多个sheet,默认索引为1列
+            Cell cell = Optional.ofNullable(row.getCell(0))
+                .orElseGet(() -> row.createCell(0));
+            // 设置值
+            cell.setCellValue(value.get(i));
+        }
+
+        // 创建名称管理器
+        Name name = workbook.createName();
+        // 设置名称管理器的别名
+        String nameName = String.format("%s_%d", tmpOptionsSheetName, celIndex);
+        name.setNameName(nameName);
+        // 以纵向第一列创建一级下拉拼接引用位置
+        String function = String.format("%s!$%s$1:$%s$%d",
+            tmpOptionsSheetName,
+            getExcelColumnName(0),
+            getExcelColumnName(0),
+            value.size());
+        // 设置名称管理器的引用位置
+        name.setRefersToFormula(function);
+        // 设置数据校验为序列模式，引用的是名称管理器中的别名
+        this.markOptionsToSheet(helper, sheet, celIndex, helper.createFormulaListConstraint(nameName));
+        currentOptionsColumnIndex++;
+    }
+
+    /**
+     * 挂载下拉的列，仅限一级选项
+     */
+    private void markOptionsToSheet(DataValidationHelper helper, Sheet sheet, Integer celIndex,
+                                    DataValidationConstraint constraint) {
+        // 设置数据有效性加载在哪个单元格上,四个参数分别是：起始行、终止行、起始列、终止列
+        CellRangeAddressList addressList = new CellRangeAddressList(1, 1000, celIndex, celIndex);
+        markDataValidationToSheet(helper, sheet, constraint, addressList);
+    }
+
+    /**
+     * 挂载下拉的列，仅限二级选项
+     */
+    private void markLinkedOptionsToSheet(DataValidationHelper helper, Sheet sheet, Integer rowIndex,
+                                          Integer celIndex, DataValidationConstraint constraint) {
+        // 设置数据有效性加载在哪个单元格上,四个参数分别是：起始行、终止行、起始列、终止列
+        CellRangeAddressList addressList = new CellRangeAddressList(rowIndex, rowIndex, celIndex, celIndex);
+        markDataValidationToSheet(helper, sheet, constraint, addressList);
+    }
+
+    /**
+     * 应用数据校验
+     */
+    private void markDataValidationToSheet(DataValidationHelper helper, Sheet sheet,
+                                           DataValidationConstraint constraint, CellRangeAddressList addressList) {
+        // 数据有效性对象
+        DataValidation dataValidation = helper.createValidation(constraint, addressList);
+        // 处理Excel兼容性问题
+        if (dataValidation instanceof XSSFDataValidation) {
+            //数据校验
+            dataValidation.setSuppressDropDownArrow(true);
+            //错误提示
+            dataValidation.setErrorStyle(DataValidation.ErrorStyle.STOP);
+            dataValidation.createErrorBox("提示", "此值与单元格定义数据不一致");
+            dataValidation.setShowErrorBox(true);
+            //选定提示
+            dataValidation.createPromptBox("填写说明：", "填写内容只能为下拉中数据，其他数据将导致导入失败");
+            dataValidation.setShowPromptBox(true);
+            sheet.addValidationData(dataValidation);
+        } else {
+            dataValidation.setSuppressDropDownArrow(false);
+        }
+        sheet.addValidationData(dataValidation);
+    }
+
+    /**
+     * <h2>依据列index获取列名英文</h2>
+     * 依据列index转换为Excel中的列名英文
+     * <p>例如第1列，index为0，解析出来为A列</p>
+     * 第27列，index为26，解析为AA列
+     * <p>第28列，index为27，解析为AB列</p>
+     *
+     * @param columnIndex 列index
+     * @return 列index所在得英文名
+     */
+    private String getExcelColumnName(int columnIndex) {
+        // 26一循环的次数
+        int columnCircleCount = columnIndex / 26;
+        // 26一循环内的位置
+        int thisCircleColumnIndex = columnIndex % 26;
+        // 26一循环的次数大于0，则视为栏名至少两位
+        String columnPrefix = columnCircleCount == 0
+            ? StrUtil.EMPTY
+            : StrUtil.subWithLength(EXCEL_COLUMN_NAME, columnCircleCount - 1, 1);
+        // 从26一循环内取对应的栏位名
+        String columnNext = StrUtil.subWithLength(EXCEL_COLUMN_NAME, thisCircleColumnIndex, 1);
+        // 将二者拼接即为最终的栏位名
+        return columnPrefix + columnNext;
+    }
+}
diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/ExcelListener.java b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/ExcelListener.java
new file mode 100644
index 0000000..af3315b
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/ExcelListener.java
@@ -0,0 +1,14 @@
+package org.dromara.common.excel.core;
+
+import cn.idev.excel.read.listener.ReadListener;
+
+/**
+ * Excel 导入监听
+ *
+ * @author pengles
+ */
+public interface ExcelListener<T> extends ReadListener<T> {
+
+    ExcelResult<T> getExcelResult();
+
+}
diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/ExcelResult.java b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/ExcelResult.java
new file mode 100644
index 0000000..67bfe4f
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/core/ExcelResult.java
@@ -0,0 +1,26 @@
+package org.dromara.common.excel.core;
+
+import java.util.List;
+
+/**
+ * excel返回对象
+ *
+ * @author pengles
+ */
+public interface ExcelResult<T> {
+
+    /**
+     * 对象列表
+     */
+    List<T> getList();
+
+    /**
+     * 错误列表
+     */
+    List<String> getErrorList();
+
+    /**
+     * 导入回执
+     */
+    String getAnalysis();
+}
diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/handler/DataWriteHandler.java b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/handler/DataWriteHandler.java
new file mode 100644
index 0000000..3770f80
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/handler/DataWriteHandler.java
@@ -0,0 +1,123 @@
+package org.dromara.common.excel.handler;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.idev.excel.annotation.ExcelProperty;
+import cn.idev.excel.metadata.data.DataFormatData;
+import cn.idev.excel.metadata.data.WriteCellData;
+import cn.idev.excel.util.StyleUtil;
+import cn.idev.excel.write.handler.CellWriteHandler;
+import cn.idev.excel.write.handler.SheetWriteHandler;
+import cn.idev.excel.write.handler.context.CellWriteHandlerContext;
+import cn.idev.excel.write.metadata.holder.WriteSheetHolder;
+import cn.idev.excel.write.metadata.style.WriteCellStyle;
+import cn.idev.excel.write.metadata.style.WriteFont;
+import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.xssf.usermodel.XSSFClientAnchor;
+import org.apache.poi.xssf.usermodel.XSSFRichTextString;
+import org.dromara.common.excel.annotation.ExcelNotation;
+import org.dromara.common.excel.annotation.ExcelRequired;
+
+import java.lang.reflect.Field;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 批注、必填
+ *
+ * @author guzhouyanyu
+ */
+public class DataWriteHandler implements SheetWriteHandler, CellWriteHandler {
+
+    /**
+     * 批注
+     */
+    private final Map<String, String> notationMap;
+
+    /**
+     * 头列字体颜色
+     */
+    private final Map<String, Short> headColumnMap;
+
+
+    public DataWriteHandler(Class<?> clazz) {
+        notationMap = getNotationMap(clazz);
+        headColumnMap = getRequiredMap(clazz);
+    }
+
+    @Override
+    public void afterCellDispose(CellWriteHandlerContext context) {
+        if (CollUtil.isEmpty(notationMap) && CollUtil.isEmpty(headColumnMap)) {
+            return;
+        }
+        // 第一行
+        WriteCellData<?> cellData = context.getFirstCellData();
+        // 第一个格子
+        WriteCellStyle writeCellStyle = cellData.getOrCreateStyle();
+
+        if (context.getHead()) {
+            DataFormatData dataFormatData = new DataFormatData();
+            // 单元格设置为文本格式
+            dataFormatData.setIndex((short) 49);
+            writeCellStyle.setDataFormatData(dataFormatData);
+            Cell cell = context.getCell();
+            WriteSheetHolder writeSheetHolder = context.getWriteSheetHolder();
+            Sheet sheet = writeSheetHolder.getSheet();
+            Workbook workbook = writeSheetHolder.getSheet().getWorkbook();
+            Drawing<?> drawing = sheet.createDrawingPatriarch();
+            // 设置标题字体样式
+            WriteFont headWriteFont = new WriteFont();
+            // 加粗
+            headWriteFont.setBold(true);
+            if (CollUtil.isNotEmpty(headColumnMap) && headColumnMap.containsKey(cell.getStringCellValue())) {
+                // 设置字体颜色
+                headWriteFont.setColor(headColumnMap.get(cell.getStringCellValue()));
+            }
+            writeCellStyle.setWriteFont(headWriteFont);
+            CellStyle cellStyle = StyleUtil.buildCellStyle(workbook, null, writeCellStyle);
+            cell.setCellStyle(cellStyle);
+
+            if (CollUtil.isNotEmpty(notationMap) && notationMap.containsKey(cell.getStringCellValue())) {
+                // 批注内容
+                String notationContext = notationMap.get(cell.getStringCellValue());
+                // 创建绘图对象
+                Comment comment = drawing.createCellComment(new XSSFClientAnchor(0, 0, 0, 0, (short) cell.getColumnIndex(), 0, (short) 5, 5));
+                comment.setString(new XSSFRichTextString(notationContext));
+                cell.setCellComment(comment);
+            }
+        }
+    }
+
+    /**
+     * 获取必填列
+     */
+    private static Map<String, Short> getRequiredMap(Class<?> clazz) {
+        Map<String, Short> requiredMap = new HashMap<>();
+        Field[] fields = clazz.getDeclaredFields();
+        for (Field field : fields) {
+            if (!field.isAnnotationPresent(ExcelRequired.class)) {
+                continue;
+            }
+            ExcelRequired excelRequired = field.getAnnotation(ExcelRequired.class);
+            ExcelProperty excelProperty = field.getAnnotation(ExcelProperty.class);
+            requiredMap.put(excelProperty.value()[0], excelRequired.fontColor().getIndex());
+        }
+        return requiredMap;
+    }
+
+    /**
+     * 获取批注
+     */
+    private static Map<String, String> getNotationMap(Class<?> clazz) {
+        Map<String, String> notationMap = new HashMap<>();
+        Field[] fields = clazz.getDeclaredFields();
+        for (Field field : fields) {
+            if (!field.isAnnotationPresent(ExcelNotation.class)) {
+                continue;
+            }
+            ExcelNotation excelNotation = field.getAnnotation(ExcelNotation.class);
+            ExcelProperty excelProperty = field.getAnnotation(ExcelProperty.class);
+            notationMap.put(excelProperty.value()[0], excelNotation.value());
+        }
+        return notationMap;
+    }
+}
diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/utils/ExcelUtil.java b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/utils/ExcelUtil.java
new file mode 100644
index 0000000..57d5f13
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/utils/ExcelUtil.java
@@ -0,0 +1,440 @@
+package org.dromara.common.excel.utils;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.io.resource.ClassPathResource;
+import cn.hutool.core.util.IdUtil;
+import cn.idev.excel.FastExcel;
+import cn.idev.excel.ExcelWriter;
+import cn.idev.excel.write.builder.ExcelWriterSheetBuilder;
+import cn.idev.excel.write.metadata.WriteSheet;
+import cn.idev.excel.write.metadata.fill.FillConfig;
+import cn.idev.excel.write.metadata.fill.FillWrapper;
+import cn.idev.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.core.utils.file.FileUtils;
+import org.dromara.common.excel.convert.ExcelBigNumberConvert;
+import org.dromara.common.excel.core.*;
+import org.dromara.common.excel.handler.DataWriteHandler;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.UnsupportedEncodingException;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Excel相关处理
+ *
+ * @author pengles
+ */
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public class ExcelUtil {
+
+    /**
+     * 同步导入(适用于小数据量)
+     *
+     * @param is 输入流
+     * @return 转换后集合
+     */
+    public static <T> List<T> importExcel(InputStream is, Class<T> clazz) {
+        return FastExcel.read(is).head(clazz).autoCloseStream(false).sheet().doReadSync();
+    }
+
+
+    /**
+     * 使用校验监听器 异步导入 同步返回
+     *
+     * @param is         输入流
+     * @param clazz      对象类型
+     * @param isValidate 是否 Validator 检验 默认为是
+     * @return 转换后集合
+     */
+    public static <T> ExcelResult<T> importExcel(InputStream is, Class<T> clazz, boolean isValidate) {
+        DefaultExcelListener<T> listener = new DefaultExcelListener<>(isValidate);
+        FastExcel.read(is, clazz, listener).sheet().doRead();
+        return listener.getExcelResult();
+    }
+
+    /**
+     * 使用自定义监听器 异步导入 自定义返回
+     *
+     * @param is       输入流
+     * @param clazz    对象类型
+     * @param listener 自定义监听器
+     * @return 转换后集合
+     */
+    public static <T> ExcelResult<T> importExcel(InputStream is, Class<T> clazz, ExcelListener<T> listener) {
+        FastExcel.read(is, clazz, listener).sheet().doRead();
+        return listener.getExcelResult();
+    }
+
+    /**
+     * 导出excel
+     *
+     * @param list      导出数据集合
+     * @param sheetName 工作表的名称
+     * @param clazz     实体类
+     * @param response  响应体
+     */
+    public static <T> void exportExcel(List<T> list, String sheetName, Class<T> clazz, HttpServletResponse response) {
+        try {
+            resetResponse(sheetName, response);
+            ServletOutputStream os = response.getOutputStream();
+            exportExcel(list, sheetName, clazz, false, os, null);
+        } catch (IOException e) {
+            throw new RuntimeException("导出Excel异常");
+        }
+    }
+
+    /**
+     * 导出excel
+     *
+     * @param list      导出数据集合
+     * @param sheetName 工作表的名称
+     * @param clazz     实体类
+     * @param response  响应体
+     * @param options   级联下拉选
+     */
+    public static <T> void exportExcel(List<T> list, String sheetName, Class<T> clazz, HttpServletResponse response, List<DropDownOptions> options) {
+        try {
+            resetResponse(sheetName, response);
+            ServletOutputStream os = response.getOutputStream();
+            exportExcel(list, sheetName, clazz, false, os, options);
+        } catch (IOException e) {
+            throw new RuntimeException("导出Excel异常");
+        }
+    }
+
+    /**
+     * 导出excel
+     *
+     * @param list      导出数据集合
+     * @param sheetName 工作表的名称
+     * @param clazz     实体类
+     * @param merge     是否合并单元格
+     * @param response  响应体
+     */
+    public static <T> void exportExcel(List<T> list, String sheetName, Class<T> clazz, boolean merge, HttpServletResponse response) {
+        try {
+            resetResponse(sheetName, response);
+            ServletOutputStream os = response.getOutputStream();
+            exportExcel(list, sheetName, clazz, merge, os, null);
+        } catch (IOException e) {
+            throw new RuntimeException("导出Excel异常");
+        }
+    }
+
+    /**
+     * 导出excel
+     *
+     * @param list      导出数据集合
+     * @param sheetName 工作表的名称
+     * @param clazz     实体类
+     * @param merge     是否合并单元格
+     * @param response  响应体
+     * @param options   级联下拉选
+     */
+    public static <T> void exportExcel(List<T> list, String sheetName, Class<T> clazz, boolean merge, HttpServletResponse response, List<DropDownOptions> options) {
+        try {
+            resetResponse(sheetName, response);
+            ServletOutputStream os = response.getOutputStream();
+            exportExcel(list, sheetName, clazz, merge, os, options);
+        } catch (IOException e) {
+            throw new RuntimeException("导出Excel异常");
+        }
+    }
+
+    /**
+     * 导出excel
+     *
+     * @param list      导出数据集合
+     * @param sheetName 工作表的名称
+     * @param clazz     实体类
+     * @param os        输出流
+     */
+    public static <T> void exportExcel(List<T> list, String sheetName, Class<T> clazz, OutputStream os) {
+        exportExcel(list, sheetName, clazz, false, os, null);
+    }
+
+    /**
+     * 导出excel
+     *
+     * @param list      导出数据集合
+     * @param sheetName 工作表的名称
+     * @param clazz     实体类
+     * @param os        输出流
+     * @param options   级联下拉选内容
+     */
+    public static <T> void exportExcel(List<T> list, String sheetName, Class<T> clazz, OutputStream os, List<DropDownOptions> options) {
+        exportExcel(list, sheetName, clazz, false, os, options);
+    }
+
+    /**
+     * 导出excel
+     *
+     * @param list      导出数据集合
+     * @param sheetName 工作表的名称
+     * @param clazz     实体类
+     * @param merge     是否合并单元格
+     * @param os        输出流
+     */
+    public static <T> void exportExcel(List<T> list, String sheetName, Class<T> clazz, boolean merge,
+                                       OutputStream os, List<DropDownOptions> options) {
+        ExcelWriterSheetBuilder builder = FastExcel.write(os, clazz)
+            .autoCloseStream(false)
+            // 自动适配
+            .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
+            // 大数值自动转换 防止失真
+            .registerConverter(new ExcelBigNumberConvert())
+            .registerWriteHandler(new DataWriteHandler(clazz))
+            .sheet(sheetName);
+        if (merge) {
+            // 合并处理器
+            builder.registerWriteHandler(new CellMergeStrategy(list, true));
+        }
+        // 添加下拉框操作
+        builder.registerWriteHandler(new ExcelDownHandler(options));
+        builder.doWrite(list);
+    }
+
+    /**
+     * 单表多数据模板导出 模板格式为 {.属性}
+     *
+     * @param filename     文件名
+     * @param templatePath 模板路径 resource 目录下的路径包括模板文件名
+     *                     例如: excel/temp.xlsx
+     *                     重点: 模板文件必须放置到启动类对应的 resource 目录下
+     * @param data         模板需要的数据
+     * @param response     响应体
+     */
+    public static <T> void exportTemplate(List<T> data, String filename, String templatePath, HttpServletResponse response) {
+        try {
+            if (CollUtil.isEmpty(data)) {
+                throw new IllegalArgumentException("数据为空");
+            }
+            resetResponse(filename, response);
+            ServletOutputStream os = response.getOutputStream();
+            exportTemplate(data, templatePath, os);
+        } catch (IOException e) {
+            throw new RuntimeException("导出Excel异常");
+        }
+    }
+
+    /**
+     * 单表多数据模板导出 模板格式为 {.属性}
+     *
+     * @param templatePath 模板路径 resource 目录下的路径包括模板文件名
+     *                     例如: excel/temp.xlsx
+     *                     重点: 模板文件必须放置到启动类对应的 resource 目录下
+     * @param data         模板需要的数据
+     * @param os           输出流
+     */
+    public static <T> void exportTemplate(List<T> data, String templatePath, OutputStream os) {
+        ClassPathResource templateResource = new ClassPathResource(templatePath);
+        ExcelWriter excelWriter = FastExcel.write(os)
+            .withTemplate(templateResource.getStream())
+            .autoCloseStream(false)
+            // 大数值自动转换 防止失真
+            .registerConverter(new ExcelBigNumberConvert())
+            .registerWriteHandler(new DataWriteHandler(data.get(0).getClass()))
+            .build();
+        WriteSheet writeSheet = FastExcel.writerSheet().build();
+        FillConfig fillConfig = FillConfig.builder().forceNewRow(Boolean.TRUE).build();
+        // 单表多数据导出 模板格式为 {.属性}
+        for (T d : data) {
+            excelWriter.fill(d, fillConfig, writeSheet);
+        }
+        excelWriter.finish();
+    }
+
+    /**
+     * 多表多数据模板导出 模板格式为 {key.属性}
+     *
+     * @param filename     文件名
+     * @param templatePath 模板路径 resource 目录下的路径包括模板文件名
+     *                     例如: excel/temp.xlsx
+     *                     重点: 模板文件必须放置到启动类对应的 resource 目录下
+     * @param data         模板需要的数据
+     * @param response     响应体
+     */
+    public static void exportTemplateMultiList(Map<String, Object> data, String filename, String templatePath, HttpServletResponse response) {
+        try {
+            if (CollUtil.isEmpty(data)) {
+                throw new IllegalArgumentException("数据为空");
+            }
+            resetResponse(filename, response);
+            ServletOutputStream os = response.getOutputStream();
+            exportTemplateMultiList(data, templatePath, os);
+        } catch (IOException e) {
+            throw new RuntimeException("导出Excel异常");
+        }
+    }
+
+    /**
+     * 多sheet模板导出 模板格式为 {key.属性}
+     *
+     * @param filename     文件名
+     * @param templatePath 模板路径 resource 目录下的路径包括模板文件名
+     *                     例如: excel/temp.xlsx
+     *                     重点: 模板文件必须放置到启动类对应的 resource 目录下
+     * @param data         模板需要的数据
+     * @param response     响应体
+     */
+    public static void exportTemplateMultiSheet(List<Map<String, Object>> data, String filename, String templatePath, HttpServletResponse response) {
+        try {
+            if (CollUtil.isEmpty(data)) {
+                throw new IllegalArgumentException("数据为空");
+            }
+            resetResponse(filename, response);
+            ServletOutputStream os = response.getOutputStream();
+            exportTemplateMultiSheet(data, templatePath, os);
+        } catch (IOException e) {
+            throw new RuntimeException("导出Excel异常");
+        }
+    }
+
+    /**
+     * 多表多数据模板导出 模板格式为 {key.属性}
+     *
+     * @param templatePath 模板路径 resource 目录下的路径包括模板文件名
+     *                     例如: excel/temp.xlsx
+     *                     重点: 模板文件必须放置到启动类对应的 resource 目录下
+     * @param data         模板需要的数据
+     * @param os           输出流
+     */
+    public static void exportTemplateMultiList(Map<String, Object> data, String templatePath, OutputStream os) {
+        ClassPathResource templateResource = new ClassPathResource(templatePath);
+        ExcelWriter excelWriter = FastExcel.write(os)
+            .withTemplate(templateResource.getStream())
+            .autoCloseStream(false)
+            // 大数值自动转换 防止失真
+            .registerConverter(new ExcelBigNumberConvert())
+            .build();
+        WriteSheet writeSheet = FastExcel.writerSheet().build();
+        for (Map.Entry<String, Object> map : data.entrySet()) {
+            // 设置列表后续还有数据
+            FillConfig fillConfig = FillConfig.builder().forceNewRow(Boolean.TRUE).build();
+            if (map.getValue() instanceof Collection) {
+                // 多表导出必须使用 FillWrapper
+                excelWriter.fill(new FillWrapper(map.getKey(), (Collection<?>) map.getValue()), fillConfig, writeSheet);
+            } else {
+                excelWriter.fill(map.getValue(), fillConfig, writeSheet);
+            }
+        }
+        excelWriter.finish();
+    }
+
+    /**
+     * 多sheet模板导出 模板格式为 {key.属性}
+     *
+     * @param templatePath 模板路径 resource 目录下的路径包括模板文件名
+     *                     例如: excel/temp.xlsx
+     *                     重点: 模板文件必须放置到启动类对应的 resource 目录下
+     * @param data         模板需要的数据
+     * @param os           输出流
+     */
+    public static void exportTemplateMultiSheet(List<Map<String, Object>> data, String templatePath, OutputStream os) {
+        ClassPathResource templateResource = new ClassPathResource(templatePath);
+        ExcelWriter excelWriter = FastExcel.write(os)
+            .withTemplate(templateResource.getStream())
+            .autoCloseStream(false)
+            // 大数值自动转换 防止失真
+            .registerConverter(new ExcelBigNumberConvert())
+            .build();
+        for (int i = 0; i < data.size(); i++) {
+            WriteSheet writeSheet = FastExcel.writerSheet(i).build();
+            for (Map.Entry<String, Object> map : data.get(i).entrySet()) {
+                // 设置列表后续还有数据
+                FillConfig fillConfig = FillConfig.builder().forceNewRow(Boolean.TRUE).build();
+                if (map.getValue() instanceof Collection) {
+                    // 多表导出必须使用 FillWrapper
+                    excelWriter.fill(new FillWrapper(map.getKey(), (Collection<?>) map.getValue()), fillConfig, writeSheet);
+                } else {
+                    excelWriter.fill(map.getValue(), writeSheet);
+                }
+            }
+        }
+        excelWriter.finish();
+    }
+
+    /**
+     * 重置响应体
+     */
+    private static void resetResponse(String sheetName, HttpServletResponse response) throws UnsupportedEncodingException {
+        String filename = encodingFilename(sheetName);
+        FileUtils.setAttachmentResponseHeader(response, filename);
+        response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=UTF-8");
+    }
+
+    /**
+     * 解析导出值 0=男,1=女,2=未知
+     *
+     * @param propertyValue 参数值
+     * @param converterExp  翻译注解
+     * @param separator     分隔符
+     * @return 解析后值
+     */
+    public static String convertByExp(String propertyValue, String converterExp, String separator) {
+        StringBuilder propertyString = new StringBuilder();
+        String[] convertSource = converterExp.split(StringUtils.SEPARATOR);
+        for (String item : convertSource) {
+            String[] itemArray = item.split("=");
+            if (StringUtils.containsAny(propertyValue, separator)) {
+                for (String value : propertyValue.split(separator)) {
+                    if (itemArray[0].equals(value)) {
+                        propertyString.append(itemArray[1] + separator);
+                        break;
+                    }
+                }
+            } else {
+                if (itemArray[0].equals(propertyValue)) {
+                    return itemArray[1];
+                }
+            }
+        }
+        return StringUtils.stripEnd(propertyString.toString(), separator);
+    }
+
+    /**
+     * 反向解析值 男=0,女=1,未知=2
+     *
+     * @param propertyValue 参数值
+     * @param converterExp  翻译注解
+     * @param separator     分隔符
+     * @return 解析后值
+     */
+    public static String reverseByExp(String propertyValue, String converterExp, String separator) {
+        StringBuilder propertyString = new StringBuilder();
+        String[] convertSource = converterExp.split(StringUtils.SEPARATOR);
+        for (String item : convertSource) {
+            String[] itemArray = item.split("=");
+            if (StringUtils.containsAny(propertyValue, separator)) {
+                for (String value : propertyValue.split(separator)) {
+                    if (itemArray[1].equals(value)) {
+                        propertyString.append(itemArray[0] + separator);
+                        break;
+                    }
+                }
+            } else {
+                if (itemArray[1].equals(propertyValue)) {
+                    return itemArray[0];
+                }
+            }
+        }
+        return StringUtils.stripEnd(propertyString.toString(), separator);
+    }
+
+    /**
+     * 编码文件名
+     */
+    public static String encodingFilename(String filename) {
+        return IdUtil.fastSimpleUUID() + "_" + filename + ".xlsx";
+    }
+
+}
diff --git a/ruoyi-common/ruoyi-common-idempotent/pom.xml b/ruoyi-common/ruoyi-common-idempotent/pom.xml
new file mode 100644
index 0000000..64418b4
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-idempotent/pom.xml
@@ -0,0 +1,41 @@
+<?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>
+        <groupId>org.dromara</groupId>
+        <artifactId>ruoyi-common</artifactId>
+        <version>${revision}</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>ruoyi-common-idempotent</artifactId>
+
+    <description>
+        ruoyi-common-idempotent 幂等功能
+    </description>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-json</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-redis</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-crypto</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>cn.dev33</groupId>
+            <artifactId>sa-token-core</artifactId>
+        </dependency>
+
+    </dependencies>
+
+</project>
diff --git a/ruoyi-common/ruoyi-common-idempotent/src/main/java/org/dromara/common/idempotent/annotation/RepeatSubmit.java b/ruoyi-common/ruoyi-common-idempotent/src/main/java/org/dromara/common/idempotent/annotation/RepeatSubmit.java
new file mode 100644
index 0000000..fba2286
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-idempotent/src/main/java/org/dromara/common/idempotent/annotation/RepeatSubmit.java
@@ -0,0 +1,29 @@
+package org.dromara.common.idempotent.annotation;
+
+import java.lang.annotation.*;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * 自定义注解防止表单重复提交
+ *
+ * @author pengles
+ */
+@Inherited
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface RepeatSubmit {
+
+    /**
+     * 间隔时间(ms)，小于此时间视为重复提交
+     */
+    int interval() default 5000;
+
+    TimeUnit timeUnit() default TimeUnit.MILLISECONDS;
+
+    /**
+     * 提示消息 支持国际化 格式为 {code}
+     */
+    String message() default "{repeat.submit.message}";
+
+}
diff --git a/ruoyi-common/ruoyi-common-idempotent/src/main/java/org/dromara/common/idempotent/aspectj/RepeatSubmitAspect.java b/ruoyi-common/ruoyi-common-idempotent/src/main/java/org/dromara/common/idempotent/aspectj/RepeatSubmitAspect.java
new file mode 100644
index 0000000..5a8e192
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-idempotent/src/main/java/org/dromara/common/idempotent/aspectj/RepeatSubmitAspect.java
@@ -0,0 +1,146 @@
+package org.dromara.common.idempotent.aspectj;
+
+import cn.dev33.satoken.SaManager;
+import cn.hutool.core.util.ArrayUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.crypto.SecureUtil;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.annotation.AfterReturning;
+import org.aspectj.lang.annotation.AfterThrowing;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Before;
+import org.dromara.common.core.constant.GlobalConstants;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.utils.MessageUtils;
+import org.dromara.common.core.utils.ServletUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.json.utils.JsonUtils;
+import org.dromara.common.redis.utils.RedisUtils;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.time.Duration;
+import java.util.Collection;
+import java.util.Map;
+import java.util.StringJoiner;
+
+/**
+ * 防止重复提交(参考美团GTIS防重系统)
+ *
+ * @author pengles
+ */
+@Aspect
+public class RepeatSubmitAspect {
+
+    private static final ThreadLocal<String> KEY_CACHE = new ThreadLocal<>();
+
+    @Before("@annotation(repeatSubmit)")
+    public void doBefore(JoinPoint point, RepeatSubmit repeatSubmit) throws Throwable {
+        // 如果注解不为0 则使用注解数值
+        long interval = repeatSubmit.timeUnit().toMillis(repeatSubmit.interval());
+
+        if (interval < 1000) {
+            throw new ServiceException("重复提交间隔时间不能小于'1'秒");
+        }
+        HttpServletRequest request = ServletUtils.getRequest();
+        String nowParams = argsArrayToString(point.getArgs());
+
+        // 请求地址（作为存放cache的key值）
+        String url = request.getRequestURI();
+
+        // 唯一值（没有消息头则使用请求地址）
+        String submitKey = StringUtils.trimToEmpty(request.getHeader(SaManager.getConfig().getTokenName()));
+
+        submitKey = SecureUtil.md5(submitKey + ":" + nowParams);
+        // 唯一标识（指定key + url + 消息头）
+        String cacheRepeatKey = GlobalConstants.REPEAT_SUBMIT_KEY + url + submitKey;
+        if (RedisUtils.setObjectIfAbsent(cacheRepeatKey, "", Duration.ofMillis(interval))) {
+            KEY_CACHE.set(cacheRepeatKey);
+        } else {
+            String message = repeatSubmit.message();
+            if (StringUtils.startsWith(message, "{") && StringUtils.endsWith(message, "}")) {
+                message = MessageUtils.message(StringUtils.substring(message, 1, message.length() - 1));
+            }
+            throw new ServiceException(message);
+        }
+    }
+
+    /**
+     * 处理完请求后执行
+     *
+     * @param joinPoint 切点
+     */
+    @AfterReturning(pointcut = "@annotation(repeatSubmit)", returning = "jsonResult")
+    public void doAfterReturning(JoinPoint joinPoint, RepeatSubmit repeatSubmit, Object jsonResult) {
+        if (jsonResult instanceof R<?> r) {
+            try {
+                // 成功则不删除redis数据 保证在有效时间内无法重复提交
+                if (r.getCode() == R.SUCCESS) {
+                    return;
+                }
+                RedisUtils.deleteObject(KEY_CACHE.get());
+            } finally {
+                KEY_CACHE.remove();
+            }
+        }
+    }
+
+    /**
+     * 拦截异常操作
+     *
+     * @param joinPoint 切点
+     * @param e         异常
+     */
+    @AfterThrowing(value = "@annotation(repeatSubmit)", throwing = "e")
+    public void doAfterThrowing(JoinPoint joinPoint, RepeatSubmit repeatSubmit, Exception e) {
+        RedisUtils.deleteObject(KEY_CACHE.get());
+        KEY_CACHE.remove();
+    }
+
+    /**
+     * 参数拼装
+     */
+    private String argsArrayToString(Object[] paramsArray) {
+        StringJoiner params = new StringJoiner(" ");
+        if (ArrayUtil.isEmpty(paramsArray)) {
+            return params.toString();
+        }
+        for (Object o : paramsArray) {
+            if (ObjectUtil.isNotNull(o) && !isFilterObject(o)) {
+                params.add(JsonUtils.toJsonString(o));
+            }
+        }
+        return params.toString();
+    }
+
+    /**
+     * 判断是否需要过滤的对象。
+     *
+     * @param o 对象信息。
+     * @return 如果是需要过滤的对象，则返回true；否则返回false。
+     */
+    @SuppressWarnings("rawtypes")
+    public boolean isFilterObject(final Object o) {
+        Class<?> clazz = o.getClass();
+        if (clazz.isArray()) {
+            return MultipartFile.class.isAssignableFrom(clazz.getComponentType());
+        } else if (Collection.class.isAssignableFrom(clazz)) {
+            Collection collection = (Collection) o;
+            for (Object value : collection) {
+                return value instanceof MultipartFile;
+            }
+        } else if (Map.class.isAssignableFrom(clazz)) {
+            Map map = (Map) o;
+            for (Object value : map.values()) {
+                return value instanceof MultipartFile;
+            }
+        }
+        return o instanceof MultipartFile || o instanceof HttpServletRequest || o instanceof HttpServletResponse
+               || o instanceof BindingResult;
+    }
+
+}
diff --git a/ruoyi-common/ruoyi-common-idempotent/src/main/java/org/dromara/common/idempotent/config/IdempotentConfig.java b/ruoyi-common/ruoyi-common-idempotent/src/main/java/org/dromara/common/idempotent/config/IdempotentConfig.java
new file mode 100644
index 0000000..2c74a0e
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-idempotent/src/main/java/org/dromara/common/idempotent/config/IdempotentConfig.java
@@ -0,0 +1,21 @@
+package org.dromara.common.idempotent.config;
+
+import org.dromara.common.idempotent.aspectj.RepeatSubmitAspect;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
+import org.springframework.context.annotation.Bean;
+import org.springframework.data.redis.connection.RedisConfiguration;
+
+/**
+ * 幂等功能配置
+ *
+ * @author pengles
+ */
+@AutoConfiguration(after = RedisConfiguration.class)
+public class IdempotentConfig {
+
+    @Bean
+    public RepeatSubmitAspect repeatSubmitAspect() {
+        return new RepeatSubmitAspect();
+    }
+
+}
diff --git a/ruoyi-common/ruoyi-common-idempotent/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-idempotent/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
new file mode 100644
index 0000000..f2fa958
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-idempotent/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1 @@
+org.dromara.common.idempotent.config.IdempotentConfig
diff --git a/ruoyi-common/ruoyi-common-job/pom.xml b/ruoyi-common/ruoyi-common-job/pom.xml
new file mode 100644
index 0000000..3a4a0cb
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-job/pom.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>org.dromara</groupId>
+        <artifactId>ruoyi-common</artifactId>
+        <version>${revision}</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>ruoyi-common-job</artifactId>
+
+    <description>
+        ruoyi-common-job 定时任务
+    </description>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-autoconfigure</artifactId>
+        </dependency>
+
+        <!-- SnailJob client -->
+        <dependency>
+            <groupId>com.aizuda</groupId>
+            <artifactId>snail-job-client-starter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.aizuda</groupId>
+            <artifactId>snail-job-client-job-core</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-core</artifactId>
+        </dependency>
+
+    </dependencies>
+</project>
diff --git a/ruoyi-common/ruoyi-common-job/src/main/java/org/dromara/common/job/config/SnailJobConfig.java b/ruoyi-common/ruoyi-common-job/src/main/java/org/dromara/common/job/config/SnailJobConfig.java
new file mode 100644
index 0000000..0f8a0b6
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-job/src/main/java/org/dromara/common/job/config/SnailJobConfig.java
@@ -0,0 +1,36 @@
+package org.dromara.common.job.config;
+
+import ch.qos.logback.classic.Logger;
+import ch.qos.logback.classic.LoggerContext;
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import com.aizuda.snailjob.client.common.appender.SnailLogbackAppender;
+import com.aizuda.snailjob.client.common.event.SnailClientStartingEvent;
+import com.aizuda.snailjob.client.starter.EnableSnailJob;
+import org.slf4j.LoggerFactory;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.event.EventListener;
+import org.springframework.scheduling.annotation.EnableScheduling;
+
+/**
+ * 启动定时任务
+ *
+ * @author pengles
+ */
+@AutoConfiguration
+@ConditionalOnProperty(prefix = "snail-job", name = "enabled", havingValue = "true")
+@EnableScheduling
+@EnableSnailJob
+public class SnailJobConfig {
+
+    @EventListener(SnailClientStartingEvent.class)
+    public void onStarting(SnailClientStartingEvent event) {
+        LoggerContext lc = (LoggerContext) LoggerFactory.getILoggerFactory();
+        SnailLogbackAppender<ILoggingEvent> ca = new SnailLogbackAppender<>();
+        ca.setName("snail_log_appender");
+        ca.start();
+        Logger rootLogger = lc.getLogger(Logger.ROOT_LOGGER_NAME);
+        rootLogger.addAppender(ca);
+    }
+
+}
diff --git a/ruoyi-common/ruoyi-common-job/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-job/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
new file mode 100644
index 0000000..3aa1881
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-job/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1 @@
+org.dromara.common.job.config.SnailJobConfig
diff --git a/ruoyi-common/ruoyi-common-json/pom.xml b/ruoyi-common/ruoyi-common-json/pom.xml
new file mode 100644
index 0000000..870df5c
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-json/pom.xml
@@ -0,0 +1,37 @@
+<?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>
+        <groupId>org.dromara</groupId>
+        <artifactId>ruoyi-common</artifactId>
+        <version>${revision}</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>ruoyi-common-json</artifactId>
+
+    <description>
+        ruoyi-common-json 序列化模块
+    </description>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-core</artifactId>
+        </dependency>
+
+        <!-- JSON工具类 -->
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-jsr310</artifactId>
+        </dependency>
+
+    </dependencies>
+
+</project>
diff --git a/ruoyi-common/ruoyi-common-json/src/main/java/org/dromara/common/json/config/JacksonConfig.java b/ruoyi-common/ruoyi-common-json/src/main/java/org/dromara/common/json/config/JacksonConfig.java
new file mode 100644
index 0000000..b4dade2
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-json/src/main/java/org/dromara/common/json/config/JacksonConfig.java
@@ -0,0 +1,51 @@
+package org.dromara.common.json.config;
+
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
+import org.dromara.common.json.handler.BigNumberSerializer;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.json.handler.BigNumberSerializer;
+import org.dromara.common.json.handler.CustomDateDeserializer;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
+import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer;
+import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration;
+import org.springframework.context.annotation.Bean;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.Date;
+import java.util.TimeZone;
+
+/**
+ * jackson 配置
+ *
+ * @author pengles
+ */
+@Slf4j
+@AutoConfiguration(before = JacksonAutoConfiguration.class)
+public class JacksonConfig {
+
+    @Bean
+    public Jackson2ObjectMapperBuilderCustomizer customizer() {
+        return builder -> {
+            // 全局配置序列化返回 JSON 处理
+            JavaTimeModule javaTimeModule = new JavaTimeModule();
+            javaTimeModule.addSerializer(Long.class, BigNumberSerializer.INSTANCE);
+            javaTimeModule.addSerializer(Long.TYPE, BigNumberSerializer.INSTANCE);
+            javaTimeModule.addSerializer(BigInteger.class, BigNumberSerializer.INSTANCE);
+            javaTimeModule.addSerializer(BigDecimal.class, ToStringSerializer.instance);
+            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+            javaTimeModule.addSerializer(LocalDateTime.class, new LocalDateTimeSerializer(formatter));
+            javaTimeModule.addDeserializer(LocalDateTime.class, new LocalDateTimeDeserializer(formatter));
+            javaTimeModule.addDeserializer(Date.class, new CustomDateDeserializer());
+            builder.modules(javaTimeModule);
+            builder.timeZone(TimeZone.getDefault());
+            log.info("初始化 jackson 配置");
+        };
+    }
+
+}
diff --git a/ruoyi-common/ruoyi-common-json/src/main/java/org/dromara/common/json/handler/BigNumberSerializer.java b/ruoyi-common/ruoyi-common-json/src/main/java/org/dromara/common/json/handler/BigNumberSerializer.java
new file mode 100644
index 0000000..f6fe164
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-json/src/main/java/org/dromara/common/json/handler/BigNumberSerializer.java
@@ -0,0 +1,42 @@
+package org.dromara.common.json.handler;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.annotation.JacksonStdImpl;
+import com.fasterxml.jackson.databind.ser.std.NumberSerializer;
+
+import java.io.IOException;
+
+/**
+ * 超出 JS 最大最小值 处理
+ *
+ * @author pengles
+ */
+@JacksonStdImpl
+public class BigNumberSerializer extends NumberSerializer {
+
+    /**
+     * 根据 JS Number.MAX_SAFE_INTEGER 与 Number.MIN_SAFE_INTEGER 得来
+     */
+    private static final long MAX_SAFE_INTEGER = 9007199254740991L;
+    private static final long MIN_SAFE_INTEGER = -9007199254740991L;
+
+    /**
+     * 提供实例
+     */
+    public static final BigNumberSerializer INSTANCE = new BigNumberSerializer(Number.class);
+
+    public BigNumberSerializer(Class<? extends Number> rawType) {
+        super(rawType);
+    }
+
+    @Override
+    public void serialize(Number value, JsonGenerator gen, SerializerProvider provider) throws IOException {
+        // 超出范围 序列化为字符串
+        if (value.longValue() > MIN_SAFE_INTEGER && value.longValue() < MAX_SAFE_INTEGER) {
+            super.serialize(value, gen, provider);
+        } else {
+            gen.writeString(value.toString());
+        }
+    }
+}
diff --git a/ruoyi-common/ruoyi-common-json/src/main/java/org/dromara/common/json/handler/CustomDateDeserializer.java b/ruoyi-common/ruoyi-common-json/src/main/java/org/dromara/common/json/handler/CustomDateDeserializer.java
new file mode 100644
index 0000000..069b924
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-json/src/main/java/org/dromara/common/json/handler/CustomDateDeserializer.java
@@ -0,0 +1,31 @@
+package org.dromara.common.json.handler;
+
+import cn.hutool.core.date.DateUtil;
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JsonDeserializer;
+
+import java.io.IOException;
+import java.util.Date;
+
+/**
+ * 自定义 Date 类型反序列化处理器（支持多种格式）
+ *
+ * @author AprilWind
+ */
+public class CustomDateDeserializer extends JsonDeserializer<Date> {
+
+    /**
+     * 反序列化逻辑：将字符串转换为 Date 对象
+     *
+     * @param p    JSON 解析器，用于获取字符串值
+     * @param ctxt 上下文环境（可用于获取更多配置）
+     * @return 转换后的 Date 对象，若为空字符串返回 null
+     * @throws IOException 当字符串格式非法或转换失败时抛出
+     */
+    @Override
+    public Date deserialize(JsonParser p, DeserializationContext ctxt) throws IOException {
+        return DateUtil.parse(p.getText());
+    }
+
+}
diff --git a/ruoyi-common/ruoyi-common-json/src/main/java/org/dromara/common/json/utils/JsonUtils.java b/ruoyi-common/ruoyi-common-json/src/main/java/org/dromara/common/json/utils/JsonUtils.java
new file mode 100644
index 0000000..65c2faa
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-json/src/main/java/org/dromara/common/json/utils/JsonUtils.java
@@ -0,0 +1,170 @@
+package org.dromara.common.json.utils;
+
+import cn.hutool.core.lang.Dict;
+import cn.hutool.core.util.ArrayUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.exc.MismatchedInputException;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+import org.dromara.common.core.utils.SpringUtils;
+import org.dromara.common.core.utils.StringUtils;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * JSON 工具类
+ *
+ * @author 芋道源码
+ */
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public class JsonUtils {
+
+    private static final ObjectMapper OBJECT_MAPPER = SpringUtils.getBean(ObjectMapper.class);
+
+    public static ObjectMapper getObjectMapper() {
+        return OBJECT_MAPPER;
+    }
+
+    /**
+     * 将对象转换为JSON格式的字符串
+     *
+     * @param object 要转换的对象
+     * @return JSON格式的字符串，如果对象为null，则返回null
+     * @throws RuntimeException 如果转换过程中发生JSON处理异常，则抛出运行时异常
+     */
+    public static String toJsonString(Object object) {
+        if (ObjectUtil.isNull(object)) {
+            return null;
+        }
+        try {
+            return OBJECT_MAPPER.writeValueAsString(object);
+        } catch (JsonProcessingException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    /**
+     * 将JSON格式的字符串转换为指定类型的对象
+     *
+     * @param text  JSON格式的字符串
+     * @param clazz 要转换的目标对象类型
+     * @param <T>   目标对象的泛型类型
+     * @return 转换后的对象，如果字符串为空则返回null
+     * @throws RuntimeException 如果转换过程中发生IO异常，则抛出运行时异常
+     */
+    public static <T> T parseObject(String text, Class<T> clazz) {
+        if (StringUtils.isEmpty(text)) {
+            return null;
+        }
+        try {
+            return OBJECT_MAPPER.readValue(text, clazz);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    /**
+     * 将字节数组转换为指定类型的对象
+     *
+     * @param bytes 字节数组
+     * @param clazz 要转换的目标对象类型
+     * @param <T>   目标对象的泛型类型
+     * @return 转换后的对象，如果字节数组为空则返回null
+     * @throws RuntimeException 如果转换过程中发生IO异常，则抛出运行时异常
+     */
+    public static <T> T parseObject(byte[] bytes, Class<T> clazz) {
+        if (ArrayUtil.isEmpty(bytes)) {
+            return null;
+        }
+        try {
+            return OBJECT_MAPPER.readValue(bytes, clazz);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    /**
+     * 将JSON格式的字符串转换为指定类型的对象，支持复杂类型
+     *
+     * @param text          JSON格式的字符串
+     * @param typeReference 指定类型的TypeReference对象
+     * @param <T>           目标对象的泛型类型
+     * @return 转换后的对象，如果字符串为空则返回null
+     * @throws RuntimeException 如果转换过程中发生IO异常，则抛出运行时异常
+     */
+    public static <T> T parseObject(String text, TypeReference<T> typeReference) {
+        if (StringUtils.isBlank(text)) {
+            return null;
+        }
+        try {
+            return OBJECT_MAPPER.readValue(text, typeReference);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    /**
+     * 将JSON格式的字符串转换为Dict对象
+     *
+     * @param text JSON格式的字符串
+     * @return 转换后的Dict对象，如果字符串为空或者不是JSON格式则返回null
+     * @throws RuntimeException 如果转换过程中发生IO异常，则抛出运行时异常
+     */
+    public static Dict parseMap(String text) {
+        if (StringUtils.isBlank(text)) {
+            return null;
+        }
+        try {
+            return OBJECT_MAPPER.readValue(text, OBJECT_MAPPER.getTypeFactory().constructType(Dict.class));
+        } catch (MismatchedInputException e) {
+            // 类型不匹配说明不是json
+            return null;
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    /**
+     * 将JSON格式的字符串转换为Dict对象的列表
+     *
+     * @param text JSON格式的字符串
+     * @return 转换后的Dict对象的列表，如果字符串为空则返回null
+     * @throws RuntimeException 如果转换过程中发生IO异常，则抛出运行时异常
+     */
+    public static List<Dict> parseArrayMap(String text) {
+        if (StringUtils.isBlank(text)) {
+            return null;
+        }
+        try {
+            return OBJECT_MAPPER.readValue(text, OBJECT_MAPPER.getTypeFactory().constructCollectionType(List.class, Dict.class));
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    /**
+     * 将JSON格式的字符串转换为指定类型对象的列表
+     *
+     * @param text  JSON格式的字符串
+     * @param clazz 要转换的目标对象类型
+     * @param <T>   目标对象的泛型类型
+     * @return 转换后的对象的列表，如果字符串为空则返回空列表
+     * @throws RuntimeException 如果转换过程中发生IO异常，则抛出运行时异常
+     */
+    public static <T> List<T> parseArray(String text, Class<T> clazz) {
+        if (StringUtils.isEmpty(text)) {
+            return new ArrayList<>();
+        }
+        try {
+            return OBJECT_MAPPER.readValue(text, OBJECT_MAPPER.getTypeFactory().constructCollectionType(List.class, clazz));
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+}
diff --git a/ruoyi-common/ruoyi-common-json/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-json/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
new file mode 100644
index 0000000..1625397
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-json/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1 @@
+org.dromara.common.json.config.JacksonConfig
diff --git a/ruoyi-common/ruoyi-common-log/pom.xml b/ruoyi-common/ruoyi-common-log/pom.xml
new file mode 100644
index 0000000..1e2b33b
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-log/pom.xml
@@ -0,0 +1,32 @@
+<?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>
+        <groupId>org.dromara</groupId>
+        <artifactId>ruoyi-common</artifactId>
+        <version>${revision}</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>ruoyi-common-log</artifactId>
+
+    <description>
+        ruoyi-common-log 日志记录
+    </description>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-satoken</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-json</artifactId>
+        </dependency>
+
+    </dependencies>
+
+</project>
diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/annotation/Log.java b/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/annotation/Log.java
new file mode 100644
index 0000000..f2b0004
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/annotation/Log.java
@@ -0,0 +1,48 @@
+package org.dromara.common.log.annotation;
+
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.log.enums.OperatorType;
+
+import java.lang.annotation.*;
+
+/**
+ * 自定义操作日志记录注解
+ *
+ * @author pengles
+ */
+@Target({ElementType.PARAMETER, ElementType.METHOD})
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface Log {
+    /**
+     * 模块
+     */
+    String title() default "";
+
+    /**
+     * 功能
+     */
+    BusinessType businessType() default BusinessType.OTHER;
+
+    /**
+     * 操作人类别
+     */
+    OperatorType operatorType() default OperatorType.MANAGE;
+
+    /**
+     * 是否保存请求的参数
+     */
+    boolean isSaveRequestData() default true;
+
+    /**
+     * 是否保存响应的参数
+     */
+    boolean isSaveResponseData() default true;
+
+
+    /**
+     * 排除指定的请求参数
+     */
+    String[] excludeParamNames() default {};
+
+}
diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/aspect/LogAspect.java b/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/aspect/LogAspect.java
new file mode 100644
index 0000000..30a8572
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/aspect/LogAspect.java
@@ -0,0 +1,218 @@
+package org.dromara.common.log.aspect;
+
+import cn.hutool.core.lang.Dict;
+import cn.hutool.core.map.MapUtil;
+import cn.hutool.core.util.ArrayUtil;
+import cn.hutool.core.util.ObjectUtil;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.time.StopWatch;
+import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.annotation.AfterReturning;
+import org.aspectj.lang.annotation.AfterThrowing;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Before;
+import org.dromara.common.core.domain.model.LoginUser;
+import org.dromara.common.core.utils.ServletUtils;
+import org.dromara.common.core.utils.SpringUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.json.utils.JsonUtils;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessStatus;
+import org.dromara.common.log.event.OperLogEvent;
+import org.dromara.common.satoken.utils.LoginHelper;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
+import org.springframework.http.HttpMethod;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.Collection;
+import java.util.Map;
+import java.util.StringJoiner;
+
+/**
+ * 操作日志记录处理
+ *
+ * @author pengles
+ */
+@Slf4j
+@Aspect
+@AutoConfiguration
+public class LogAspect {
+
+    /**
+     * 排除敏感属性字段
+     */
+    public static final String[] EXCLUDE_PROPERTIES = { "password", "oldPassword", "newPassword", "confirmPassword" };
+
+
+    /**
+     * 计时 key
+     */
+    private static final ThreadLocal<StopWatch> KEY_CACHE = new ThreadLocal<>();
+
+    /**
+     * 处理请求前执行
+     */
+    @Before(value = "@annotation(controllerLog)")
+    public void doBefore(JoinPoint joinPoint, Log controllerLog) {
+        StopWatch stopWatch = new StopWatch();
+        KEY_CACHE.set(stopWatch);
+        stopWatch.start();
+    }
+
+    /**
+     * 处理完请求后执行
+     *
+     * @param joinPoint 切点
+     */
+    @AfterReturning(pointcut = "@annotation(controllerLog)", returning = "jsonResult")
+    public void doAfterReturning(JoinPoint joinPoint, Log controllerLog, Object jsonResult) {
+        handleLog(joinPoint, controllerLog, null, jsonResult);
+    }
+
+    /**
+     * 拦截异常操作
+     *
+     * @param joinPoint 切点
+     * @param e         异常
+     */
+    @AfterThrowing(value = "@annotation(controllerLog)", throwing = "e")
+    public void doAfterThrowing(JoinPoint joinPoint, Log controllerLog, Exception e) {
+        handleLog(joinPoint, controllerLog, e, null);
+    }
+
+    protected void handleLog(final JoinPoint joinPoint, Log controllerLog, final Exception e, Object jsonResult) {
+        try {
+
+            // *========数据库日志=========*//
+            OperLogEvent operLog = new OperLogEvent();
+            operLog.setStatus(BusinessStatus.SUCCESS.ordinal());
+            // 请求的地址
+            String ip = ServletUtils.getClientIP();
+            operLog.setOperIp(ip);
+            operLog.setOperUrl(StringUtils.substring(ServletUtils.getRequest().getRequestURI(), 0, 255));
+            LoginUser loginUser = LoginHelper.getLoginUser();
+            operLog.setOperName(loginUser.getUsername());
+            operLog.setDeptName(loginUser.getDeptName());
+
+            if (e != null) {
+                operLog.setStatus(BusinessStatus.FAIL.ordinal());
+                operLog.setErrorMsg(StringUtils.substring(e.getMessage(), 0, 3800));
+            }
+            // 设置方法名称
+            String className = joinPoint.getTarget().getClass().getName();
+            String methodName = joinPoint.getSignature().getName();
+            operLog.setMethod(className + "." + methodName + "()");
+            // 设置请求方式
+            operLog.setRequestMethod(ServletUtils.getRequest().getMethod());
+            // 处理设置注解上的参数
+            getControllerMethodDescription(joinPoint, controllerLog, operLog, jsonResult);
+            // 设置消耗时间
+            StopWatch stopWatch = KEY_CACHE.get();
+            stopWatch.stop();
+            operLog.setCostTime(stopWatch.getDuration().toMillis());
+            // 发布事件保存数据库
+            SpringUtils.context().publishEvent(operLog);
+        } catch (Exception exp) {
+            // 记录本地异常日志
+            log.error("异常信息:{}", exp.getMessage());
+        } finally {
+            KEY_CACHE.remove();
+        }
+    }
+
+    /**
+     * 获取注解中对方法的描述信息 用于Controller层注解
+     *
+     * @param log     日志
+     * @param operLog 操作日志
+     * @throws Exception
+     */
+    public void getControllerMethodDescription(JoinPoint joinPoint, Log log, OperLogEvent operLog, Object jsonResult) throws Exception {
+        // 设置action动作
+        operLog.setBusinessType(log.businessType().ordinal());
+        // 设置标题
+        operLog.setTitle(log.title());
+        // 设置操作人类别
+        operLog.setOperatorType(log.operatorType().ordinal());
+        // 是否需要保存request，参数和值
+        if (log.isSaveRequestData()) {
+            // 获取参数的信息，传入到数据库中。
+            setRequestValue(joinPoint, operLog, log.excludeParamNames());
+        }
+        // 是否需要保存response，参数和值
+        if (log.isSaveResponseData() && ObjectUtil.isNotNull(jsonResult)) {
+            operLog.setJsonResult(StringUtils.substring(JsonUtils.toJsonString(jsonResult), 0, 3800));
+        }
+    }
+
+    /**
+     * 获取请求的参数，放到log中
+     *
+     * @param operLog 操作日志
+     * @throws Exception 异常
+     */
+    private void setRequestValue(JoinPoint joinPoint, OperLogEvent operLog, String[] excludeParamNames) throws Exception {
+        Map<String, String> paramsMap = ServletUtils.getParamMap(ServletUtils.getRequest());
+        String requestMethod = operLog.getRequestMethod();
+        if (MapUtil.isEmpty(paramsMap) && StringUtils.equalsAny(requestMethod, HttpMethod.PUT.name(), HttpMethod.POST.name(), HttpMethod.DELETE.name())) {
+            String params = argsArrayToString(joinPoint.getArgs(), excludeParamNames);
+            operLog.setOperParam(StringUtils.substring(params, 0, 3800));
+        } else {
+            MapUtil.removeAny(paramsMap, EXCLUDE_PROPERTIES);
+            MapUtil.removeAny(paramsMap, excludeParamNames);
+            operLog.setOperParam(StringUtils.substring(JsonUtils.toJsonString(paramsMap), 0, 3800));
+        }
+    }
+
+    /**
+     * 参数拼装
+     */
+    private String argsArrayToString(Object[] paramsArray, String[] excludeParamNames) {
+        StringJoiner params = new StringJoiner(" ");
+        if (ArrayUtil.isEmpty(paramsArray)) {
+            return params.toString();
+        }
+        for (Object o : paramsArray) {
+            if (ObjectUtil.isNotNull(o) && !isFilterObject(o)) {
+                String str = JsonUtils.toJsonString(o);
+                Dict dict = JsonUtils.parseMap(str);
+                if (MapUtil.isNotEmpty(dict)) {
+                    MapUtil.removeAny(dict, EXCLUDE_PROPERTIES);
+                    MapUtil.removeAny(dict, excludeParamNames);
+                    str = JsonUtils.toJsonString(dict);
+                }
+                params.add(str);
+            }
+        }
+        return params.toString();
+    }
+
+    /**
+     * 判断是否需要过滤的对象。
+     *
+     * @param o 对象信息。
+     * @return 如果是需要过滤的对象，则返回true；否则返回false。
+     */
+    @SuppressWarnings("rawtypes")
+    public boolean isFilterObject(final Object o) {
+        Class<?> clazz = o.getClass();
+        if (clazz.isArray()) {
+            return MultipartFile.class.isAssignableFrom(clazz.getComponentType());
+        } else if (Collection.class.isAssignableFrom(clazz)) {
+            Collection collection = (Collection) o;
+            for (Object value : collection) {
+                return value instanceof MultipartFile;
+            }
+        } else if (Map.class.isAssignableFrom(clazz)) {
+            Map map = (Map) o;
+            for (Object value : map.values()) {
+                return value instanceof MultipartFile;
+            }
+        }
+        return o instanceof MultipartFile || o instanceof HttpServletRequest || o instanceof HttpServletResponse
+               || o instanceof BindingResult;
+    }
+}
diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/enums/BusinessStatus.java b/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/enums/BusinessStatus.java
new file mode 100644
index 0000000..6feeea7
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/enums/BusinessStatus.java
@@ -0,0 +1,18 @@
+package org.dromara.common.log.enums;
+
+/**
+ * 操作状态
+ *
+ * @author pengles
+ */
+public enum BusinessStatus {
+    /**
+     * 成功
+     */
+    SUCCESS,
+
+    /**
+     * 失败
+     */
+    FAIL,
+}
diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/enums/BusinessType.java b/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/enums/BusinessType.java
new file mode 100644
index 0000000..07c04c7
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/enums/BusinessType.java
@@ -0,0 +1,58 @@
+package org.dromara.common.log.enums;
+
+/**
+ * 业务操作类型
+ *
+ * @author pengles
+ */
+public enum BusinessType {
+    /**
+     * 其它
+     */
+    OTHER,
+
+    /**
+     * 新增
+     */
+    INSERT,
+
+    /**
+     * 修改
+     */
+    UPDATE,
+
+    /**
+     * 删除
+     */
+    DELETE,
+
+    /**
+     * 授权
+     */
+    GRANT,
+
+    /**
+     * 导出
+     */
+    EXPORT,
+
+    /**
+     * 导入
+     */
+    IMPORT,
+
+    /**
+     * 强退
+     */
+    FORCE,
+
+    /**
+     * 生成代码
+     */
+    GENCODE,
+
+    /**
+     * 清空数据
+     */
+    CLEAN,
+}
diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/enums/OperatorType.java b/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/enums/OperatorType.java
new file mode 100644
index 0000000..0069c82
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/enums/OperatorType.java
@@ -0,0 +1,23 @@
+package org.dromara.common.log.enums;
+
+/**
+ * 操作人类别
+ *
+ * @author pengles
+ */
+public enum OperatorType {
+    /**
+     * 其它
+     */
+    OTHER,
+
+    /**
+     * 后台用户
+     */
+    MANAGE,
+
+    /**
+     * 手机端用户
+     */
+    MOBILE
+}
diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/event/LogininforEvent.java b/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/event/LogininforEvent.java
new file mode 100644
index 0000000..dd0f59e
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/event/LogininforEvent.java
@@ -0,0 +1,46 @@
+package org.dromara.common.log.event;
+
+import jakarta.servlet.http.HttpServletRequest;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 登录事件
+ *
+ * @author pengles
+ */
+
+@Data
+public class LogininforEvent implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 用户账号
+     */
+    private String username;
+
+    /**
+     * 登录状态 0成功 1失败
+     */
+    private String status;
+
+    /**
+     * 提示消息
+     */
+    private String message;
+
+    /**
+     * 请求体
+     */
+    private HttpServletRequest request;
+
+    /**
+     * 其他参数
+     */
+    private Object[] args;
+
+}
diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/event/OperLogEvent.java b/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/event/OperLogEvent.java
new file mode 100644
index 0000000..4f01dc2
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-log/src/main/java/org/dromara/common/log/event/OperLogEvent.java
@@ -0,0 +1,110 @@
+package org.dromara.common.log.event;
+
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 操作日志事件
+ *
+ * @author pengles
+ */
+
+@Data
+public class OperLogEvent implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 日志主键
+     */
+    private Long operId;
+
+    /**
+     * 操作模块
+     */
+    private String title;
+
+    /**
+     * 业务类型（0其它 1新增 2修改 3删除）
+     */
+    private Integer businessType;
+
+    /**
+     * 业务类型数组
+     */
+    private Integer[] businessTypes;
+
+    /**
+     * 请求方法
+     */
+    private String method;
+
+    /**
+     * 请求方式
+     */
+    private String requestMethod;
+
+    /**
+     * 操作类别（0其它 1后台用户 2手机端用户）
+     */
+    private Integer operatorType;
+
+    /**
+     * 操作人员
+     */
+    private String operName;
+
+    /**
+     * 部门名称
+     */
+    private String deptName;
+
+    /**
+     * 请求url
+     */
+    private String operUrl;
+
+    /**
+     * 操作地址
+     */
+    private String operIp;
+
+    /**
+     * 操作地点
+     */
+    private String operLocation;
+
+    /**
+     * 请求参数
+     */
+    private String operParam;
+
+    /**
+     * 返回参数
+     */
+    private String jsonResult;
+
+    /**
+     * 操作状态（0正常 1异常）
+     */
+    private Integer status;
+
+    /**
+     * 错误消息
+     */
+    private String errorMsg;
+
+    /**
+     * 操作时间
+     */
+    private Date operTime;
+
+    /**
+     * 消耗时间
+     */
+    private Long costTime;
+}
diff --git a/ruoyi-common/ruoyi-common-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
new file mode 100644
index 0000000..6893020
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1 @@
+org.dromara.common.log.aspect.LogAspect
diff --git a/ruoyi-common/ruoyi-common-mail/pom.xml b/ruoyi-common/ruoyi-common-mail/pom.xml
new file mode 100644
index 0000000..c0e1b2e
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-mail/pom.xml
@@ -0,0 +1,34 @@
+<?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>
+        <groupId>org.dromara</groupId>
+        <artifactId>ruoyi-common</artifactId>
+        <version>${revision}</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>ruoyi-common-mail</artifactId>
+
+    <description>
+        ruoyi-common-mail 邮件模块
+    </description>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-core</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>jakarta.mail</groupId>
+            <artifactId>jakarta.mail-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.angus</groupId>
+            <artifactId>jakarta.mail</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>
diff --git a/ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/config/MailConfig.java b/ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/config/MailConfig.java
new file mode 100644
index 0000000..dd235eb
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/config/MailConfig.java
@@ -0,0 +1,37 @@
+package org.dromara.common.mail.config;
+
+import cn.hutool.extra.mail.MailAccount;
+import org.dromara.common.mail.config.properties.MailProperties;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+
+/**
+ * JavaMail 配置
+ *
+ * @author pengles
+ */
+@AutoConfiguration
+@EnableConfigurationProperties(MailProperties.class)
+public class MailConfig {
+
+    @Bean
+    @ConditionalOnProperty(value = "mail.enabled", havingValue = "true")
+    public MailAccount mailAccount(MailProperties mailProperties) {
+        MailAccount account = new MailAccount();
+        account.setHost(mailProperties.getHost());
+        account.setPort(mailProperties.getPort());
+        account.setAuth(mailProperties.getAuth());
+        account.setFrom(mailProperties.getFrom());
+        account.setUser(mailProperties.getUser());
+        account.setPass(mailProperties.getPass());
+        account.setSocketFactoryPort(mailProperties.getPort());
+        account.setStarttlsEnable(mailProperties.getStarttlsEnable());
+        account.setSslEnable(mailProperties.getSslEnable());
+        account.setTimeout(mailProperties.getTimeout());
+        account.setConnectionTimeout(mailProperties.getConnectionTimeout());
+        return account;
+    }
+
+}
diff --git a/ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/config/properties/MailProperties.java b/ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/config/properties/MailProperties.java
new file mode 100644
index 0000000..07cc637
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/config/properties/MailProperties.java
@@ -0,0 +1,75 @@
+package org.dromara.common.mail.config.properties;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+/**
+ * JavaMail 配置属性
+ *
+ * @author pengles
+ */
+@Data
+@ConfigurationProperties(prefix = "mail")
+public class MailProperties {
+
+    /**
+     * 过滤开关
+     */
+    private Boolean enabled;
+
+    /**
+     * SMTP服务器域名
+     */
+    private String host;
+
+    /**
+     * SMTP服务端口
+     */
+    private Integer port;
+
+    /**
+     * 是否需要用户名密码验证
+     */
+    private Boolean auth;
+
+    /**
+     * 用户名
+     */
+    private String user;
+
+    /**
+     * 密码
+     */
+    private String pass;
+
+    /**
+     * 发送方，遵循RFC-822标准<br>
+     * 发件人可以是以下形式：
+     *
+     * <pre>
+     * 1. user@xxx.xx
+     * 2.  name &lt;user@xxx.xx&gt;
+     * </pre>
+     */
+    private String from;
+
+    /**
+     * 使用 STARTTLS安全连接，STARTTLS是对纯文本通信协议的扩展。它将纯文本连接升级为加密连接（TLS或SSL）， 而不是使用一个单独的加密通信端口。
+     */
+    private Boolean starttlsEnable;
+
+    /**
+     * 使用 SSL安全连接
+     */
+    private Boolean sslEnable;
+
+    /**
+     * SMTP超时时长，单位毫秒，缺省值不超时
+     */
+    private Long timeout;
+
+    /**
+     * Socket连接超时值，单位毫秒，缺省值不超时
+     */
+    private Long connectionTimeout;
+}
diff --git a/ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/utils/MailUtils.java b/ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/utils/MailUtils.java
new file mode 100644
index 0000000..a28701f
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-mail/src/main/java/org/dromara/common/mail/utils/MailUtils.java
@@ -0,0 +1,469 @@
+package org.dromara.common.mail.utils;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.io.IoUtil;
+import cn.hutool.core.map.MapUtil;
+import cn.hutool.core.util.CharUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.extra.mail.JakartaMail;
+import cn.hutool.extra.mail.JakartaUserPassAuthenticator;
+import cn.hutool.extra.mail.MailAccount;
+import jakarta.mail.Authenticator;
+import jakarta.mail.Session;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+import org.dromara.common.core.utils.SpringUtils;
+import org.dromara.common.core.utils.StringUtils;
+
+import java.io.File;
+import java.io.InputStream;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
+/**
+ * 邮件工具类
+ */
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public class MailUtils {
+
+    private static final MailAccount ACCOUNT = SpringUtils.getBean(MailAccount.class);
+
+    /**
+     * 获取邮件发送实例
+     */
+    public static MailAccount getMailAccount() {
+        return ACCOUNT;
+    }
+
+    /**
+     * 获取邮件发送实例 (自定义发送人以及授权码)
+     *
+     * @param user 发送人
+     * @param pass 授权码
+     */
+    public static MailAccount getMailAccount(String from, String user, String pass) {
+        ACCOUNT.setFrom(StringUtils.blankToDefault(from, ACCOUNT.getFrom()));
+        ACCOUNT.setUser(StringUtils.blankToDefault(user, ACCOUNT.getUser()));
+        ACCOUNT.setPass(StringUtils.blankToDefault(pass, ACCOUNT.getPass()));
+        return ACCOUNT;
+    }
+
+    /**
+     * 使用配置文件中设置的账户发送文本邮件，发送给单个或多个收件人<br>
+     * 多个收件人可以使用逗号“,”分隔，也可以通过分号“;”分隔
+     *
+     * @param to      收件人
+     * @param subject 标题
+     * @param content 正文
+     * @param files   附件列表
+     * @return message-id
+     * @since 3.2.0
+     */
+    public static String sendText(String to, String subject, String content, File... files) {
+        return send(to, subject, content, false, files);
+    }
+
+    /**
+     * 使用配置文件中设置的账户发送HTML邮件，发送给单个或多个收件人<br>
+     * 多个收件人可以使用逗号“,”分隔，也可以通过分号“;”分隔
+     *
+     * @param to      收件人
+     * @param subject 标题
+     * @param content 正文
+     * @param files   附件列表
+     * @return message-id
+     * @since 3.2.0
+     */
+    public static String sendHtml(String to, String subject, String content, File... files) {
+        return send(to, subject, content, true, files);
+    }
+
+    /**
+     * 使用配置文件中设置的账户发送邮件，发送单个或多个收件人<br>
+     * 多个收件人可以使用逗号“,”分隔，也可以通过分号“;”分隔
+     *
+     * @param to      收件人
+     * @param subject 标题
+     * @param content 正文
+     * @param isHtml  是否为HTML
+     * @param files   附件列表
+     * @return message-id
+     */
+    public static String send(String to, String subject, String content, boolean isHtml, File... files) {
+        return send(splitAddress(to), subject, content, isHtml, files);
+    }
+
+    /**
+     * 使用配置文件中设置的账户发送邮件，发送单个或多个收件人<br>
+     * 多个收件人、抄送人、密送人可以使用逗号“,”分隔，也可以通过分号“;”分隔
+     *
+     * @param to      收件人，可以使用逗号“,”分隔，也可以通过分号“;”分隔
+     * @param cc      抄送人，可以使用逗号“,”分隔，也可以通过分号“;”分隔
+     * @param bcc     密送人，可以使用逗号“,”分隔，也可以通过分号“;”分隔
+     * @param subject 标题
+     * @param content 正文
+     * @param isHtml  是否为HTML
+     * @param files   附件列表
+     * @return message-id
+     * @since 4.0.3
+     */
+    public static String send(String to, String cc, String bcc, String subject, String content, boolean isHtml, File... files) {
+        return send(splitAddress(to), splitAddress(cc), splitAddress(bcc), subject, content, isHtml, files);
+    }
+
+    /**
+     * 使用配置文件中设置的账户发送文本邮件，发送给多人
+     *
+     * @param tos     收件人列表
+     * @param subject 标题
+     * @param content 正文
+     * @param files   附件列表
+     * @return message-id
+     */
+    public static String sendText(Collection<String> tos, String subject, String content, File... files) {
+        return send(tos, subject, content, false, files);
+    }
+
+    /**
+     * 使用配置文件中设置的账户发送HTML邮件，发送给多人
+     *
+     * @param tos     收件人列表
+     * @param subject 标题
+     * @param content 正文
+     * @param files   附件列表
+     * @return message-id
+     * @since 3.2.0
+     */
+    public static String sendHtml(Collection<String> tos, String subject, String content, File... files) {
+        return send(tos, subject, content, true, files);
+    }
+
+    /**
+     * 使用配置文件中设置的账户发送邮件，发送给多人
+     *
+     * @param tos     收件人列表
+     * @param subject 标题
+     * @param content 正文
+     * @param isHtml  是否为HTML
+     * @param files   附件列表
+     * @return message-id
+     */
+    public static String send(Collection<String> tos, String subject, String content, boolean isHtml, File... files) {
+        return send(tos, null, null, subject, content, isHtml, files);
+    }
+
+    /**
+     * 使用配置文件中设置的账户发送邮件，发送给多人
+     *
+     * @param tos     收件人列表
+     * @param ccs     抄送人列表，可以为null或空
+     * @param bccs    密送人列表，可以为null或空
+     * @param subject 标题
+     * @param content 正文
+     * @param isHtml  是否为HTML
+     * @param files   附件列表
+     * @return message-id
+     * @since 4.0.3
+     */
+    public static String send(Collection<String> tos, Collection<String> ccs, Collection<String> bccs, String subject, String content, boolean isHtml, File... files) {
+        return send(getMailAccount(), true, tos, ccs, bccs, subject, content, null, isHtml, files);
+    }
+
+    // ------------------------------------------------------------------------------------------------------------------------------- Custom MailAccount
+
+    /**
+     * 发送邮件给多人
+     *
+     * @param mailAccount 邮件认证对象
+     * @param to          收件人，多个收件人逗号或者分号隔开
+     * @param subject     标题
+     * @param content     正文
+     * @param isHtml      是否为HTML格式
+     * @param files       附件列表
+     * @return message-id
+     * @since 3.2.0
+     */
+    public static String send(MailAccount mailAccount, String to, String subject, String content, boolean isHtml, File... files) {
+        return send(mailAccount, splitAddress(to), subject, content, isHtml, files);
+    }
+
+    /**
+     * 发送邮件给多人
+     *
+     * @param mailAccount 邮件帐户信息
+     * @param tos         收件人列表
+     * @param subject     标题
+     * @param content     正文
+     * @param isHtml      是否为HTML格式
+     * @param files       附件列表
+     * @return message-id
+     */
+    public static String send(MailAccount mailAccount, Collection<String> tos, String subject, String content, boolean isHtml, File... files) {
+        return send(mailAccount, tos, null, null, subject, content, isHtml, files);
+    }
+
+    /**
+     * 发送邮件给多人
+     *
+     * @param mailAccount 邮件帐户信息
+     * @param tos         收件人列表
+     * @param ccs         抄送人列表，可以为null或空
+     * @param bccs        密送人列表，可以为null或空
+     * @param subject     标题
+     * @param content     正文
+     * @param isHtml      是否为HTML格式
+     * @param files       附件列表
+     * @return message-id
+     * @since 4.0.3
+     */
+    public static String send(MailAccount mailAccount, Collection<String> tos, Collection<String> ccs, Collection<String> bccs, String subject, String content, boolean isHtml, File... files) {
+        return send(mailAccount, false, tos, ccs, bccs, subject, content, null, isHtml, files);
+    }
+
+    /**
+     * 使用配置文件中设置的账户发送HTML邮件，发送给单个或多个收件人<br>
+     * 多个收件人可以使用逗号“,”分隔，也可以通过分号“;”分隔
+     *
+     * @param to       收件人
+     * @param subject  标题
+     * @param content  正文
+     * @param imageMap 图片与占位符，占位符格式为cid:$IMAGE_PLACEHOLDER
+     * @param files    附件列表
+     * @return message-id
+     * @since 3.2.0
+     */
+    public static String sendHtml(String to, String subject, String content, Map<String, InputStream> imageMap, File... files) {
+        return send(to, subject, content, imageMap, true, files);
+    }
+
+    /**
+     * 使用配置文件中设置的账户发送邮件，发送单个或多个收件人<br>
+     * 多个收件人可以使用逗号“,”分隔，也可以通过分号“;”分隔
+     *
+     * @param to       收件人
+     * @param subject  标题
+     * @param content  正文
+     * @param imageMap 图片与占位符，占位符格式为cid:$IMAGE_PLACEHOLDER
+     * @param isHtml   是否为HTML
+     * @param files    附件列表
+     * @return message-id
+     */
+    public static String send(String to, String subject, String content, Map<String, InputStream> imageMap, boolean isHtml, File... files) {
+        return send(splitAddress(to), subject, content, imageMap, isHtml, files);
+    }
+
+    /**
+     * 使用配置文件中设置的账户发送邮件，发送单个或多个收件人<br>
+     * 多个收件人、抄送人、密送人可以使用逗号“,”分隔，也可以通过分号“;”分隔
+     *
+     * @param to       收件人，可以使用逗号“,”分隔，也可以通过分号“;”分隔
+     * @param cc       抄送人，可以使用逗号“,”分隔，也可以通过分号“;”分隔
+     * @param bcc      密送人，可以使用逗号“,”分隔，也可以通过分号“;”分隔
+     * @param subject  标题
+     * @param content  正文
+     * @param imageMap 图片与占位符，占位符格式为cid:$IMAGE_PLACEHOLDER
+     * @param isHtml   是否为HTML
+     * @param files    附件列表
+     * @return message-id
+     * @since 4.0.3
+     */
+    public static String send(String to, String cc, String bcc, String subject, String content, Map<String, InputStream> imageMap, boolean isHtml, File... files) {
+        return send(splitAddress(to), splitAddress(cc), splitAddress(bcc), subject, content, imageMap, isHtml, files);
+    }
+
+    /**
+     * 使用配置文件中设置的账户发送HTML邮件，发送给多人
+     *
+     * @param tos      收件人列表
+     * @param subject  标题
+     * @param content  正文
+     * @param imageMap 图片与占位符，占位符格式为cid:$IMAGE_PLACEHOLDER
+     * @param files    附件列表
+     * @return message-id
+     * @since 3.2.0
+     */
+    public static String sendHtml(Collection<String> tos, String subject, String content, Map<String, InputStream> imageMap, File... files) {
+        return send(tos, subject, content, imageMap, true, files);
+    }
+
+    /**
+     * 使用配置文件中设置的账户发送邮件，发送给多人
+     *
+     * @param tos      收件人列表
+     * @param subject  标题
+     * @param content  正文
+     * @param imageMap 图片与占位符，占位符格式为cid:$IMAGE_PLACEHOLDER
+     * @param isHtml   是否为HTML
+     * @param files    附件列表
+     * @return message-id
+     */
+    public static String send(Collection<String> tos, String subject, String content, Map<String, InputStream> imageMap, boolean isHtml, File... files) {
+        return send(tos, null, null, subject, content, imageMap, isHtml, files);
+    }
+
+    /**
+     * 使用配置文件中设置的账户发送邮件，发送给多人
+     *
+     * @param tos      收件人列表
+     * @param ccs      抄送人列表，可以为null或空
+     * @param bccs     密送人列表，可以为null或空
+     * @param subject  标题
+     * @param content  正文
+     * @param imageMap 图片与占位符，占位符格式为cid:$IMAGE_PLACEHOLDER
+     * @param isHtml   是否为HTML
+     * @param files    附件列表
+     * @return message-id
+     * @since 4.0.3
+     */
+    public static String send(Collection<String> tos, Collection<String> ccs, Collection<String> bccs, String subject, String content, Map<String, InputStream> imageMap, boolean isHtml, File... files) {
+        return send(getMailAccount(), true, tos, ccs, bccs, subject, content, imageMap, isHtml, files);
+    }
+
+    // ------------------------------------------------------------------------------------------------------------------------------- Custom MailAccount
+
+    /**
+     * 发送邮件给多人
+     *
+     * @param mailAccount 邮件认证对象
+     * @param to          收件人，多个收件人逗号或者分号隔开
+     * @param subject     标题
+     * @param content     正文
+     * @param imageMap    图片与占位符，占位符格式为cid:$IMAGE_PLACEHOLDER
+     * @param isHtml      是否为HTML格式
+     * @param files       附件列表
+     * @return message-id
+     * @since 3.2.0
+     */
+    public static String send(MailAccount mailAccount, String to, String subject, String content, Map<String, InputStream> imageMap, boolean isHtml, File... files) {
+        return send(mailAccount, splitAddress(to), subject, content, imageMap, isHtml, files);
+    }
+
+    /**
+     * 发送邮件给多人
+     *
+     * @param mailAccount 邮件帐户信息
+     * @param tos         收件人列表
+     * @param subject     标题
+     * @param content     正文
+     * @param imageMap    图片与占位符，占位符格式为cid:$IMAGE_PLACEHOLDER
+     * @param isHtml      是否为HTML格式
+     * @param files       附件列表
+     * @return message-id
+     * @since 4.6.3
+     */
+    public static String send(MailAccount mailAccount, Collection<String> tos, String subject, String content, Map<String, InputStream> imageMap, boolean isHtml, File... files) {
+        return send(mailAccount, tos, null, null, subject, content, imageMap, isHtml, files);
+    }
+
+    /**
+     * 发送邮件给多人
+     *
+     * @param mailAccount 邮件帐户信息
+     * @param tos         收件人列表
+     * @param ccs         抄送人列表，可以为null或空
+     * @param bccs        密送人列表，可以为null或空
+     * @param subject     标题
+     * @param content     正文
+     * @param imageMap    图片与占位符，占位符格式为cid:$IMAGE_PLACEHOLDER
+     * @param isHtml      是否为HTML格式
+     * @param files       附件列表
+     * @return message-id
+     * @since 4.6.3
+     */
+    public static String send(MailAccount mailAccount, Collection<String> tos, Collection<String> ccs, Collection<String> bccs, String subject, String content, Map<String, InputStream> imageMap,
+                              boolean isHtml, File... files) {
+        return send(mailAccount, false, tos, ccs, bccs, subject, content, imageMap, isHtml, files);
+    }
+
+    /**
+     * 根据配置文件，获取邮件客户端会话
+     *
+     * @param mailAccount 邮件账户配置
+     * @param isSingleton 是否单例（全局共享会话）
+     * @return {@link Session}
+     * @since 5.5.7
+     */
+    public static Session getSession(MailAccount mailAccount, boolean isSingleton) {
+        Authenticator authenticator = null;
+        if (mailAccount.isAuth()) {
+            authenticator = new JakartaUserPassAuthenticator(mailAccount.getUser(), mailAccount.getPass());
+        }
+
+        return isSingleton ? Session.getDefaultInstance(mailAccount.getSmtpProps(), authenticator) //
+            : Session.getInstance(mailAccount.getSmtpProps(), authenticator);
+    }
+
+    // ------------------------------------------------------------------------------------------------------------------------ Private method start
+
+    /**
+     * 发送邮件给多人
+     *
+     * @param mailAccount      邮件帐户信息
+     * @param useGlobalSession 是否全局共享Session
+     * @param tos              收件人列表
+     * @param ccs              抄送人列表，可以为null或空
+     * @param bccs             密送人列表，可以为null或空
+     * @param subject          标题
+     * @param content          正文
+     * @param imageMap         图片与占位符，占位符格式为cid:${cid}
+     * @param isHtml           是否为HTML格式
+     * @param files            附件列表
+     * @return message-id
+     * @since 4.6.3
+     */
+    private static String send(MailAccount mailAccount, boolean useGlobalSession, Collection<String> tos, Collection<String> ccs, Collection<String> bccs, String subject, String content,
+                               Map<String, InputStream> imageMap, boolean isHtml, File... files) {
+        final JakartaMail mail = JakartaMail.create(mailAccount).setUseGlobalSession(useGlobalSession);
+
+        // 可选抄送人
+        if (CollUtil.isNotEmpty(ccs)) {
+            mail.setCcs(ccs.toArray(new String[0]));
+        }
+        // 可选密送人
+        if (CollUtil.isNotEmpty(bccs)) {
+            mail.setBccs(bccs.toArray(new String[0]));
+        }
+
+        mail.setTos(tos.toArray(new String[0]));
+        mail.setTitle(subject);
+        mail.setContent(content);
+        mail.setHtml(isHtml);
+        mail.setFiles(files);
+
+        // 图片
+        if (MapUtil.isNotEmpty(imageMap)) {
+            for (Entry<String, InputStream> entry : imageMap.entrySet()) {
+                mail.addImage(entry.getKey(), entry.getValue());
+                // 关闭流
+                IoUtil.close(entry.getValue());
+            }
+        }
+
+        return mail.send();
+    }
+
+    /**
+     * 将多个联系人转为列表，分隔符为逗号或者分号
+     *
+     * @param addresses 多个联系人，如果为空返回null
+     * @return 联系人列表
+     */
+    private static List<String> splitAddress(String addresses) {
+        if (StrUtil.isBlank(addresses)) {
+            return null;
+        }
+
+        List<String> result;
+        if (StrUtil.contains(addresses, CharUtil.COMMA)) {
+            result = StrUtil.splitTrim(addresses, CharUtil.COMMA);
+        } else if (StrUtil.contains(addresses, ';')) {
+            result = StrUtil.splitTrim(addresses, ';');
+        } else {
+            result = CollUtil.newArrayList(addresses);
+        }
+        return result;
+    }
+    // ------------------------------------------------------------------------------------------------------------------------ Private method end
+}
diff --git a/ruoyi-common/ruoyi-common-mail/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-mail/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
new file mode 100644
index 0000000..ef0cf11
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-mail/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1 @@
+org.dromara.common.mail.config.MailConfig
diff --git a/ruoyi-common/ruoyi-common-mybatis/pom.xml b/ruoyi-common/ruoyi-common-mybatis/pom.xml
new file mode 100644
index 0000000..d79ba28
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-mybatis/pom.xml
@@ -0,0 +1,52 @@
+<?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>
+        <groupId>org.dromara</groupId>
+        <artifactId>ruoyi-common</artifactId>
+        <version>${revision}</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>ruoyi-common-mybatis</artifactId>
+
+    <description>
+        ruoyi-common-mybatis 数据库服务
+    </description>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-core</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-satoken</artifactId>
+        </dependency>
+
+        <!-- dynamic-datasource 多数据源-->
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>dynamic-datasource-spring-boot3-starter</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-jsqlparser</artifactId>
+        </dependency>
+
+        <!-- sql性能分析插件 -->
+        <dependency>
+            <groupId>p6spy</groupId>
+            <artifactId>p6spy</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>
diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/annotation/DataColumn.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/annotation/DataColumn.java
new file mode 100644
index 0000000..ed7d4d2
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/annotation/DataColumn.java
@@ -0,0 +1,40 @@
+package org.dromara.common.mybatis.annotation;
+
+import java.lang.annotation.*;
+
+/**
+ * 数据权限注解，用于标记数据权限的占位符关键字和替换值
+ * <p>
+ * 一个注解只能对应一个模板
+ * </p>
+ *
+ * @author pengles
+ * @version 3.5.0
+ */
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface DataColumn {
+
+    /**
+     * 数据权限模板的占位符关键字，默认为 "deptName"
+     *
+     * @return 占位符关键字数组
+     */
+    String[] key() default "deptName";
+
+    /**
+     * 数据权限模板的占位符替换值，默认为 "dept_id"
+     *
+     * @return 占位符替换值数组
+     */
+    String[] value() default "dept_id";
+
+    /**
+     * 权限标识符 用于通过菜单权限标识符来获取数据权限
+     * 拥有此标识符的角色 将不会拼接此角色的数据过滤sql
+     *
+     * @return 权限标识符
+     */
+    String permission() default "";
+}
diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/annotation/DataPermission.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/annotation/DataPermission.java
new file mode 100644
index 0000000..12e780a
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/annotation/DataPermission.java
@@ -0,0 +1,30 @@
+package org.dromara.common.mybatis.annotation;
+
+import java.lang.annotation.*;
+
+/**
+ * 数据权限组注解，用于标记数据权限配置数组
+ *
+ * @author pengles
+ * @version 3.5.0
+ */
+@Target({ElementType.METHOD, ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface DataPermission {
+
+    /**
+     * 数据权限配置数组，用于指定数据权限的占位符关键字和替换值
+     *
+     * @return 数据权限配置数组
+     */
+    DataColumn[] value();
+
+    /**
+     * 权限拼接标识符(用于指定连接语句的sql符号)
+     * 如不填 默认 select 用 OR 其他语句用 AND
+     * 内容 OR 或者 AND
+     */
+    String joinStr() default "";
+
+}
diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/aspect/DataPermissionAspect.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/aspect/DataPermissionAspect.java
new file mode 100644
index 0000000..6f34d6d
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/aspect/DataPermissionAspect.java
@@ -0,0 +1,50 @@
+package org.dromara.common.mybatis.aspect;
+
+import lombok.extern.slf4j.Slf4j;
+import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.annotation.AfterReturning;
+import org.aspectj.lang.annotation.AfterThrowing;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Before;
+import org.dromara.common.mybatis.annotation.DataPermission;
+import org.dromara.common.mybatis.helper.DataPermissionHelper;
+
+/**
+ * 数据权限处理
+ *
+ * @author pengles
+ */
+@Slf4j
+@Aspect
+public class DataPermissionAspect {
+
+    /**
+     * 处理请求前执行
+     */
+    @Before(value = "@annotation(dataPermission)")
+    public void doBefore(JoinPoint joinPoint, DataPermission dataPermission) {
+        DataPermissionHelper.setPermission(dataPermission);
+    }
+
+    /**
+     * 处理完请求后执行
+     *
+     * @param joinPoint 切点
+     */
+    @AfterReturning(pointcut = "@annotation(dataPermission)")
+    public void doAfterReturning(JoinPoint joinPoint, DataPermission dataPermission) {
+        DataPermissionHelper.removePermission();
+    }
+
+    /**
+     * 拦截异常操作
+     *
+     * @param joinPoint 切点
+     * @param e         异常
+     */
+    @AfterThrowing(value = "@annotation(dataPermission)", throwing = "e")
+    public void doAfterThrowing(JoinPoint joinPoint, DataPermission dataPermission, Exception e) {
+        DataPermissionHelper.removePermission();
+    }
+
+}
diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/config/MybatisPlusConfig.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/config/MybatisPlusConfig.java
new file mode 100644
index 0000000..a164c58
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/config/MybatisPlusConfig.java
@@ -0,0 +1,130 @@
+package org.dromara.common.mybatis.config;
+
+import cn.hutool.core.net.NetUtil;
+import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
+import com.baomidou.mybatisplus.core.handlers.PostInitTableInfoHandler;
+import com.baomidou.mybatisplus.core.incrementer.DefaultIdentifierGenerator;
+import com.baomidou.mybatisplus.core.incrementer.IdentifierGenerator;
+import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.OptimisticLockerInnerInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
+import org.dromara.common.core.factory.YmlPropertySourceFactory;
+import org.dromara.common.core.utils.SpringUtils;
+import org.dromara.common.mybatis.aspect.DataPermissionAspect;
+import org.dromara.common.mybatis.handler.InjectionMetaObjectHandler;
+import org.dromara.common.mybatis.handler.MybatisExceptionHandler;
+import org.dromara.common.mybatis.handler.PlusPostInitTableInfoHandler;
+import org.dromara.common.mybatis.interceptor.PlusDataPermissionInterceptor;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.PropertySource;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+
+/**
+ * mybatis-plus配置类(下方注释有插件介绍)
+ *
+ * @author pengles
+ */
+@EnableTransactionManagement(proxyTargetClass = true)
+@MapperScan("${mybatis-plus.mapperPackage}")
+@PropertySource(value = "classpath:common-mybatis.yml", factory = YmlPropertySourceFactory.class)
+public class MybatisPlusConfig {
+
+    @Bean
+    public MybatisPlusInterceptor mybatisPlusInterceptor() {
+        MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
+        // 数据权限处理
+        interceptor.addInnerInterceptor(dataPermissionInterceptor());
+        // 分页插件
+        interceptor.addInnerInterceptor(paginationInnerInterceptor());
+        // 乐观锁插件
+        interceptor.addInnerInterceptor(optimisticLockerInnerInterceptor());
+        return interceptor;
+    }
+
+    /**
+     * 数据权限拦截器
+     */
+    public PlusDataPermissionInterceptor dataPermissionInterceptor() {
+        return new PlusDataPermissionInterceptor(SpringUtils.getProperty("mybatis-plus.mapperPackage"));
+    }
+
+    /**
+     * 数据权限切面处理器
+     */
+    @Bean
+    public DataPermissionAspect dataPermissionAspect() {
+        return new DataPermissionAspect();
+    }
+
+    /**
+     * 分页插件，自动识别数据库类型
+     */
+    public PaginationInnerInterceptor paginationInnerInterceptor() {
+        PaginationInnerInterceptor paginationInnerInterceptor = new PaginationInnerInterceptor();
+        // 分页合理化
+        paginationInnerInterceptor.setOverflow(true);
+        return paginationInnerInterceptor;
+    }
+
+    /**
+     * 乐观锁插件
+     */
+    public OptimisticLockerInnerInterceptor optimisticLockerInnerInterceptor() {
+        return new OptimisticLockerInnerInterceptor();
+    }
+
+    /**
+     * 元对象字段填充控制器
+     */
+    @Bean
+    public MetaObjectHandler metaObjectHandler() {
+        return new InjectionMetaObjectHandler();
+    }
+
+    /**
+     * 使用网卡信息绑定雪花生成器
+     * 防止集群雪花ID重复
+     */
+    @Bean
+    public IdentifierGenerator idGenerator() {
+        return new DefaultIdentifierGenerator(NetUtil.getLocalhost());
+    }
+
+    /**
+     * 异常处理器
+     */
+    @Bean
+    public MybatisExceptionHandler mybatisExceptionHandler() {
+        return new MybatisExceptionHandler();
+    }
+
+    /**
+     * 初始化表对象处理器
+     */
+    @Bean
+    public PostInitTableInfoHandler postInitTableInfoHandler() {
+        return new PlusPostInitTableInfoHandler();
+    }
+
+    /**
+     * PaginationInnerInterceptor 分页插件，自动识别数据库类型
+     * https://baomidou.com/pages/97710a/
+     * OptimisticLockerInnerInterceptor 乐观锁插件
+     * https://baomidou.com/pages/0d93c0/
+     * MetaObjectHandler 元对象字段填充控制器
+     * https://baomidou.com/pages/4c6bcf/
+     * ISqlInjector sql注入器
+     * https://baomidou.com/pages/42ea4a/
+     * BlockAttackInnerInterceptor 如果是对全表的删除或更新操作，就会终止该操作
+     * https://baomidou.com/pages/f9a237/
+     * IllegalSQLInnerInterceptor sql性能规范插件(垃圾SQL拦截)
+     * IdentifierGenerator 自定义主键策略
+     * https://baomidou.com/pages/568eb2/
+     * TenantLineInnerInterceptor 多租户插件
+     * https://baomidou.com/pages/aef2f2/
+     * DynamicTableNameInnerInterceptor 动态表名插件
+     * https://baomidou.com/pages/2a45ff/
+     */
+
+}
diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/domain/BaseEntity.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/domain/BaseEntity.java
new file mode 100644
index 0000000..8f9a8c3
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/domain/BaseEntity.java
@@ -0,0 +1,70 @@
+package org.dromara.common.mybatis.core.domain;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Entity基类
+ *
+ * @author pengles
+ */
+@Data
+public class BaseEntity implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 搜索值
+     */
+    @JsonIgnore
+    @TableField(exist = false)
+    private String searchValue;
+
+    /**
+     * 创建部门
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createDept;
+
+    /**
+     * 创建者
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createBy;
+
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 更新者
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateBy;
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+    /**
+     * 请求参数
+     */
+    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    @TableField(exist = false)
+    private Map<String, Object> params = new HashMap<>();
+
+}
diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/mapper/BaseMapperPlus.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/mapper/BaseMapperPlus.java
new file mode 100644
index 0000000..aa443c3
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/mapper/BaseMapperPlus.java
@@ -0,0 +1,334 @@
+package org.dromara.common.mybatis.core.mapper;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.reflect.GenericTypeUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.toolkit.Db;
+import org.apache.ibatis.logging.Log;
+import org.apache.ibatis.logging.LogFactory;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StreamUtils;
+
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+
+/**
+ * 自定义 Mapper 接口, 实现 自定义扩展
+ *
+ * @param <T> table 泛型
+ * @param <V> vo 泛型
+ * @author pengles
+ * @since 2021-05-13
+ */
+@SuppressWarnings("unchecked")
+public interface BaseMapperPlus<T, V> extends BaseMapper<T> {
+
+    Log log = LogFactory.getLog(BaseMapperPlus.class);
+
+    /**
+     * 获取当前实例对象关联的泛型类型 V 的 Class 对象
+     *
+     * @return 返回当前实例对象关联的泛型类型 V 的 Class 对象
+     */
+    default Class<V> currentVoClass() {
+        return (Class<V>) GenericTypeUtils.resolveTypeArguments(this.getClass(), BaseMapperPlus.class)[1];
+    }
+
+    /**
+     * 获取当前实例对象关联的泛型类型 T 的 Class 对象
+     *
+     * @return 返回当前实例对象关联的泛型类型 T 的 Class 对象
+     */
+    default Class<T> currentModelClass() {
+        return (Class<T>) GenericTypeUtils.resolveTypeArguments(this.getClass(), BaseMapperPlus.class)[0];
+    }
+
+    /**
+     * 使用默认的查询条件查询并返回结果列表
+     *
+     * @return 返回查询结果的列表
+     */
+    default List<T> selectList() {
+        return this.selectList(new QueryWrapper<>());
+    }
+
+    /**
+     * 批量插入实体对象集合
+     *
+     * @param entityList 实体对象集合
+     * @return 插入操作是否成功的布尔值
+     */
+    default boolean insertBatch(Collection<T> entityList) {
+        return Db.saveBatch(entityList);
+    }
+
+    /**
+     * 批量根据ID更新实体对象集合
+     *
+     * @param entityList 实体对象集合
+     * @return 更新操作是否成功的布尔值
+     */
+    default boolean updateBatchById(Collection<T> entityList) {
+        return Db.updateBatchById(entityList);
+    }
+
+    /**
+     * 批量插入或更新实体对象集合
+     *
+     * @param entityList 实体对象集合
+     * @return 插入或更新操作是否成功的布尔值
+     */
+    default boolean insertOrUpdateBatch(Collection<T> entityList) {
+        return Db.saveOrUpdateBatch(entityList);
+    }
+
+    /**
+     * 批量插入实体对象集合并指定批处理大小
+     *
+     * @param entityList 实体对象集合
+     * @param batchSize  批处理大小
+     * @return 插入操作是否成功的布尔值
+     */
+    default boolean insertBatch(Collection<T> entityList, int batchSize) {
+        return Db.saveBatch(entityList, batchSize);
+    }
+
+    /**
+     * 批量根据ID更新实体对象集合并指定批处理大小
+     *
+     * @param entityList 实体对象集合
+     * @param batchSize  批处理大小
+     * @return 更新操作是否成功的布尔值
+     */
+    default boolean updateBatchById(Collection<T> entityList, int batchSize) {
+        return Db.updateBatchById(entityList, batchSize);
+    }
+
+    /**
+     * 批量插入或更新实体对象集合并指定批处理大小
+     *
+     * @param entityList 实体对象集合
+     * @param batchSize  批处理大小
+     * @return 插入或更新操作是否成功的布尔值
+     */
+    default boolean insertOrUpdateBatch(Collection<T> entityList, int batchSize) {
+        return Db.saveOrUpdateBatch(entityList, batchSize);
+    }
+
+    /**
+     * 根据ID查询单个VO对象
+     *
+     * @param id 主键ID
+     * @return 查询到的单个VO对象
+     */
+    default V selectVoById(Serializable id) {
+        return selectVoById(id, this.currentVoClass());
+    }
+
+    /**
+     * 根据ID查询单个VO对象并将其转换为指定的VO类
+     *
+     * @param id      主键ID
+     * @param voClass 要转换的VO类的Class对象
+     * @param <C>     VO类的类型
+     * @return 查询到的单个VO对象，经过转换为指定的VO类后返回
+     */
+    default <C> C selectVoById(Serializable id, Class<C> voClass) {
+        T obj = this.selectById(id);
+        if (ObjectUtil.isNull(obj)) {
+            return null;
+        }
+        return MapstructUtils.convert(obj, voClass);
+    }
+
+    /**
+     * 根据ID集合批量查询VO对象列表
+     *
+     * @param idList 主键ID集合
+     * @return 查询到的VO对象列表
+     */
+    default List<V> selectVoByIds(Collection<? extends Serializable> idList) {
+        return selectVoByIds(idList, this.currentVoClass());
+    }
+
+    /**
+     * 根据ID集合批量查询实体对象列表，并将其转换为指定的VO对象列表
+     *
+     * @param idList  主键ID集合
+     * @param voClass 要转换的VO类的Class对象
+     * @param <C>     VO类的类型
+     * @return 查询到的VO对象列表，经过转换为指定的VO类后返回
+     */
+    default <C> List<C> selectVoByIds(Collection<? extends Serializable> idList, Class<C> voClass) {
+        List<T> list = this.selectByIds(idList);
+        if (CollUtil.isEmpty(list)) {
+            return CollUtil.newArrayList();
+        }
+        return MapstructUtils.convert(list, voClass);
+    }
+
+    /**
+     * 根据查询条件Map查询VO对象列表
+     *
+     * @param map 查询条件Map
+     * @return 查询到的VO对象列表
+     */
+    default List<V> selectVoByMap(Map<String, Object> map) {
+        return selectVoByMap(map, this.currentVoClass());
+    }
+
+    /**
+     * 根据查询条件Map查询实体对象列表，并将其转换为指定的VO对象列表
+     *
+     * @param map     查询条件Map
+     * @param voClass 要转换的VO类的Class对象
+     * @param <C>     VO类的类型
+     * @return 查询到的VO对象列表，经过转换为指定的VO类后返回
+     */
+    default <C> List<C> selectVoByMap(Map<String, Object> map, Class<C> voClass) {
+        List<T> list = this.selectByMap(map);
+        if (CollUtil.isEmpty(list)) {
+            return CollUtil.newArrayList();
+        }
+        return MapstructUtils.convert(list, voClass);
+    }
+
+    /**
+     * 根据条件查询单个VO对象
+     *
+     * @param wrapper 查询条件Wrapper
+     * @return 查询到的单个VO对象
+     */
+    default V selectVoOne(Wrapper<T> wrapper) {
+        return selectVoOne(wrapper, this.currentVoClass());
+    }
+
+    /**
+     * 根据条件查询单个VO对象，并根据需要决定是否抛出异常
+     *
+     * @param wrapper 查询条件Wrapper
+     * @param throwEx 是否抛出异常的标志
+     * @return 查询到的单个VO对象
+     */
+    default V selectVoOne(Wrapper<T> wrapper, boolean throwEx) {
+        return selectVoOne(wrapper, this.currentVoClass(), throwEx);
+    }
+
+    /**
+     * 根据条件查询单个VO对象，并指定返回的VO对象的类型
+     *
+     * @param wrapper 查询条件Wrapper
+     * @param voClass 返回的VO对象的Class对象
+     * @param <C>     返回的VO对象的类型
+     * @return 查询到的单个VO对象，经过类型转换为指定的VO类后返回
+     */
+    default <C> C selectVoOne(Wrapper<T> wrapper, Class<C> voClass) {
+        return selectVoOne(wrapper, voClass, true);
+    }
+
+    /**
+     * 根据条件查询单个实体对象，并将其转换为指定的VO对象
+     *
+     * @param wrapper 查询条件Wrapper
+     * @param voClass 要转换的VO类的Class对象
+     * @param throwEx 是否抛出异常的标志
+     * @param <C>     VO类的类型
+     * @return 查询到的单个VO对象，经过转换为指定的VO类后返回
+     */
+    default <C> C selectVoOne(Wrapper<T> wrapper, Class<C> voClass, boolean throwEx) {
+        T obj = this.selectOne(wrapper, throwEx);
+        if (ObjectUtil.isNull(obj)) {
+            return null;
+        }
+        return MapstructUtils.convert(obj, voClass);
+    }
+
+    /**
+     * 查询所有VO对象列表
+     *
+     * @return 查询到的VO对象列表
+     */
+    default List<V> selectVoList() {
+        return selectVoList(new QueryWrapper<>(), this.currentVoClass());
+    }
+
+    /**
+     * 根据条件查询VO对象列表
+     *
+     * @param wrapper 查询条件Wrapper
+     * @return 查询到的VO对象列表
+     */
+    default List<V> selectVoList(Wrapper<T> wrapper) {
+        return selectVoList(wrapper, this.currentVoClass());
+    }
+
+    /**
+     * 根据条件查询实体对象列表，并将其转换为指定的VO对象列表
+     *
+     * @param wrapper 查询条件Wrapper
+     * @param voClass 要转换的VO类的Class对象
+     * @param <C>     VO类的类型
+     * @return 查询到的VO对象列表，经过转换为指定的VO类后返回
+     */
+    default <C> List<C> selectVoList(Wrapper<T> wrapper, Class<C> voClass) {
+        List<T> list = this.selectList(wrapper);
+        if (CollUtil.isEmpty(list)) {
+            return CollUtil.newArrayList();
+        }
+        return MapstructUtils.convert(list, voClass);
+    }
+
+    /**
+     * 根据条件分页查询VO对象列表
+     *
+     * @param page    分页信息
+     * @param wrapper 查询条件Wrapper
+     * @return 查询到的VO对象分页列表
+     */
+    default <P extends IPage<V>> P selectVoPage(IPage<T> page, Wrapper<T> wrapper) {
+        return selectVoPage(page, wrapper, this.currentVoClass());
+    }
+
+    /**
+     * 根据条件分页查询实体对象列表，并将其转换为指定的VO对象分页列表
+     *
+     * @param page    分页信息
+     * @param wrapper 查询条件Wrapper
+     * @param voClass 要转换的VO类的Class对象
+     * @param <C>     VO类的类型
+     * @param <P>     VO对象分页列表的类型
+     * @return 查询到的VO对象分页列表，经过转换为指定的VO类后返回
+     */
+    default <C, P extends IPage<C>> P selectVoPage(IPage<T> page, Wrapper<T> wrapper, Class<C> voClass) {
+        // 根据条件分页查询实体对象列表
+        List<T> list = this.selectList(page, wrapper);
+        // 创建一个新的VO对象分页列表，并设置分页信息
+        IPage<C> voPage = new Page<>(page.getCurrent(), page.getSize(), page.getTotal());
+        if (CollUtil.isEmpty(list)) {
+            return (P) voPage;
+        }
+        voPage.setRecords(MapstructUtils.convert(list, voClass));
+        return (P) voPage;
+    }
+
+    /**
+     * 根据条件查询符合条件的对象，并将其转换为指定类型的对象列表
+     *
+     * @param wrapper 查询条件Wrapper
+     * @param mapper  转换函数，用于将查询到的对象转换为指定类型的对象
+     * @param <C>     要转换的对象的类型
+     * @return 查询到的符合条件的对象列表，经过转换为指定类型的对象后返回
+     */
+    default <C> List<C> selectObjs(Wrapper<T> wrapper, Function<? super Object, C> mapper) {
+        return StreamUtils.toList(this.selectObjs(wrapper), mapper);
+    }
+
+}
diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/page/PageQuery.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/page/PageQuery.java
new file mode 100644
index 0000000..d350f5c
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/page/PageQuery.java
@@ -0,0 +1,129 @@
+package org.dromara.common.mybatis.core.page;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.core.utils.sql.SqlUtil;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 分页查询实体类
+ *
+ * @author pengles
+ */
+@Data
+@NoArgsConstructor
+public class PageQuery implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 分页大小
+     */
+    private Integer pageSize;
+
+    /**
+     * 当前页数
+     */
+    private Integer pageNum;
+
+    /**
+     * 排序列
+     */
+    private String orderByColumn;
+
+    /**
+     * 排序的方向desc或者asc
+     */
+    private String isAsc;
+
+    /**
+     * 当前记录起始索引 默认值
+     */
+    public static final int DEFAULT_PAGE_NUM = 1;
+
+    /**
+     * 每页显示记录数 默认值 默认查全部
+     */
+    public static final int DEFAULT_PAGE_SIZE = Integer.MAX_VALUE;
+
+    /**
+     * 构建分页对象
+     */
+    public <T> Page<T> build() {
+        Integer pageNum = ObjectUtil.defaultIfNull(getPageNum(), DEFAULT_PAGE_NUM);
+        Integer pageSize = ObjectUtil.defaultIfNull(getPageSize(), DEFAULT_PAGE_SIZE);
+        if (pageNum <= 0) {
+            pageNum = DEFAULT_PAGE_NUM;
+        }
+        Page<T> page = new Page<>(pageNum, pageSize);
+        List<OrderItem> orderItems = buildOrderItem();
+        if (CollUtil.isNotEmpty(orderItems)) {
+            page.addOrder(orderItems);
+        }
+        return page;
+    }
+
+    /**
+     * 构建排序
+     *
+     * 支持的用法如下:
+     * {isAsc:"asc",orderByColumn:"id"} order by id asc
+     * {isAsc:"asc",orderByColumn:"id,createTime"} order by id asc,create_time asc
+     * {isAsc:"desc",orderByColumn:"id,createTime"} order by id desc,create_time desc
+     * {isAsc:"asc,desc",orderByColumn:"id,createTime"} order by id asc,create_time desc
+     */
+    private List<OrderItem> buildOrderItem() {
+        if (StringUtils.isBlank(orderByColumn) || StringUtils.isBlank(isAsc)) {
+            return null;
+        }
+        String orderBy = SqlUtil.escapeOrderBySql(orderByColumn);
+        orderBy = StringUtils.toUnderScoreCase(orderBy);
+
+        // 兼容前端排序类型
+        isAsc = StringUtils.replaceEach(isAsc, new String[]{"ascending", "descending"}, new String[]{"asc", "desc"});
+
+        String[] orderByArr = orderBy.split(StringUtils.SEPARATOR);
+        String[] isAscArr = isAsc.split(StringUtils.SEPARATOR);
+        if (isAscArr.length != 1 && isAscArr.length != orderByArr.length) {
+            throw new ServiceException("排序参数有误");
+        }
+
+        List<OrderItem> list = new ArrayList<>();
+        // 每个字段各自排序
+        for (int i = 0; i < orderByArr.length; i++) {
+            String orderByStr = orderByArr[i];
+            String isAscStr = isAscArr.length == 1 ? isAscArr[0] : isAscArr[i];
+            if ("asc".equals(isAscStr)) {
+                list.add(OrderItem.asc(orderByStr));
+            } else if ("desc".equals(isAscStr)) {
+                list.add(OrderItem.desc(orderByStr));
+            } else {
+                throw new ServiceException("排序参数有误");
+            }
+        }
+        return list;
+    }
+
+    @JsonIgnore
+    public Integer getFirstNum() {
+        return (pageNum - 1) * pageSize;
+    }
+
+    public PageQuery(Integer pageSize, Integer pageNum) {
+        this.pageSize = pageSize;
+        this.pageNum = pageNum;
+    }
+
+}
diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/page/TableDataInfo.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/page/TableDataInfo.java
new file mode 100644
index 0000000..1e91ca1
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/page/TableDataInfo.java
@@ -0,0 +1,107 @@
+package org.dromara.common.mybatis.core.page;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.http.HttpStatus;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 表格分页数据对象
+ *
+ * @author pengles
+ */
+@Data
+@NoArgsConstructor
+public class TableDataInfo<T> implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 总记录数
+     */
+    private long total;
+
+    /**
+     * 列表数据
+     */
+    private List<T> rows;
+
+    /**
+     * 消息状态码
+     */
+    private int code;
+
+    /**
+     * 消息内容
+     */
+    private String msg;
+
+    /**
+     * 分页
+     *
+     * @param list  列表数据
+     * @param total 总记录数
+     */
+    public TableDataInfo(List<T> list, long total) {
+        this.rows = list;
+        this.total = total;
+        this.code = HttpStatus.HTTP_OK;
+        this.msg = "查询成功";
+    }
+
+    /**
+     * 根据分页对象构建表格分页数据对象
+     */
+    public static <T> TableDataInfo<T> build(IPage<T> page) {
+        TableDataInfo<T> rspData = new TableDataInfo<>();
+        rspData.setCode(HttpStatus.HTTP_OK);
+        rspData.setMsg("查询成功");
+        rspData.setRows(page.getRecords());
+        rspData.setTotal(page.getTotal());
+        return rspData;
+    }
+
+    /**
+     * 根据数据列表构建表格分页数据对象
+     */
+    public static <T> TableDataInfo<T> build(List<T> list) {
+        TableDataInfo<T> rspData = new TableDataInfo<>();
+        rspData.setCode(HttpStatus.HTTP_OK);
+        rspData.setMsg("查询成功");
+        rspData.setRows(list);
+        rspData.setTotal(list.size());
+        return rspData;
+    }
+
+    /**
+     * 构建表格分页数据对象
+     */
+    public static <T> TableDataInfo<T> build() {
+        TableDataInfo<T> rspData = new TableDataInfo<>();
+        rspData.setCode(HttpStatus.HTTP_OK);
+        rspData.setMsg("查询成功");
+        return rspData;
+    }
+
+    /**
+     * 根据原始数据列表和分页参数，构建表格分页数据对象（用于假分页）
+     *
+     * @param list 原始数据列表（全部数据）
+     * @param page 分页参数对象（包含当前页码、每页大小等）
+     * @return 构造好的分页结果 TableDataInfo<T>
+     */
+    public static <T> TableDataInfo<T> build(List<T> list, IPage<T> page) {
+        if (CollUtil.isEmpty(list)) {
+            return TableDataInfo.build();
+        }
+        List<T> pageList = CollUtil.page((int) page.getCurrent() - 1, (int) page.getSize(), list);
+        return new TableDataInfo<>(pageList, list.size());
+    }
+
+}
diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/enums/DataBaseType.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/enums/DataBaseType.java
new file mode 100644
index 0000000..911e7dd
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/enums/DataBaseType.java
@@ -0,0 +1,58 @@
+package org.dromara.common.mybatis.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import org.dromara.common.core.utils.StringUtils;
+
+/**
+ * 数据库类型
+ *
+ * @author pengles
+ */
+@Getter
+@AllArgsConstructor
+public enum DataBaseType {
+
+    /**
+     * MySQL
+     */
+    MY_SQL("MySQL"),
+
+    /**
+     * Oracle
+     */
+    ORACLE("Oracle"),
+
+    /**
+     * PostgreSQL
+     */
+    POSTGRE_SQL("PostgreSQL"),
+
+    /**
+     * SQL Server
+     */
+    SQL_SERVER("Microsoft SQL Server");
+
+    /**
+     * 数据库类型
+     */
+    private final String type;
+
+    /**
+     * 根据数据库产品名称查找对应的数据库类型
+     *
+     * @param databaseProductName 数据库产品名称
+     * @return 对应的数据库类型枚举值，如果未找到则返回 null
+     */
+    public static DataBaseType find(String databaseProductName) {
+        if (StringUtils.isBlank(databaseProductName)) {
+            return null;
+        }
+        for (DataBaseType type : values()) {
+            if (type.getType().equals(databaseProductName)) {
+                return type;
+            }
+        }
+        return null;
+    }
+}
diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/enums/DataScopeType.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/enums/DataScopeType.java
new file mode 100644
index 0000000..684f964
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/enums/DataScopeType.java
@@ -0,0 +1,87 @@
+package org.dromara.common.mybatis.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import org.dromara.common.core.domain.model.LoginUser;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.helper.DataPermissionHelper;
+
+/**
+ * 数据权限类型枚举
+ * <p>
+ * 支持使用 SpEL 模板表达式定义 SQL 查询条件
+ * 内置数据：
+ * - {@code user}: 当前登录用户信息，参考 {@link LoginUser}
+ * 内置服务：
+ * - {@code sdss}: 系统数据权限服务，参考 ISysDataScopeService
+ * 如需扩展数据，可以通过 {@link DataPermissionHelper} 进行操作
+ * 如需扩展服务，可以通过 ISysDataScopeService 自行编写
+ * </p>
+ *
+ * @author pengles
+ * @version 3.5.0
+ */
+@Getter
+@AllArgsConstructor
+public enum DataScopeType {
+
+    /**
+     * 全部数据权限
+     */
+    ALL("1", "", ""),
+
+    /**
+     * 自定数据权限
+     */
+    CUSTOM("2", " #{#deptName} IN ( #{@sdss.getRoleCustom( #user.roleId )} ) ", " 1 = 0 "),
+
+    /**
+     * 部门数据权限
+     */
+    DEPT("3", " #{#deptName} = #{#user.deptId} ", " 1 = 0 "),
+
+    /**
+     * 部门及以下数据权限
+     */
+    DEPT_AND_CHILD("4", " #{#deptName} IN ( #{@sdss.getDeptAndChild( #user.deptId )} )", " 1 = 0 "),
+
+    /**
+     * 仅本人数据权限
+     */
+    SELF("5", " #{#userName} = #{#user.userId} ", " 1 = 0 "),
+
+    /**
+     * 部门及以下或本人数据权限
+     */
+    DEPT_AND_CHILD_OR_SELF("6", " #{#deptName} IN ( #{@sdss.getDeptAndChild( #user.deptId )} ) OR #{#userName} = #{#user.userId} ", " 1 = 0 ");
+
+    private final String code;
+
+    /**
+     * SpEL 模板表达式，用于构建 SQL 查询条件
+     */
+    private final String sqlTemplate;
+
+    /**
+     * 如果不满足 {@code sqlTemplate} 的条件，则使用此默认 SQL 表达式
+     */
+    private final String elseSql;
+
+    /**
+     * 根据枚举代码查找对应的枚举值
+     *
+     * @param code 枚举代码
+     * @return 对应的枚举值，如果未找到则返回 null
+     */
+    public static DataScopeType findCode(String code) {
+        if (StringUtils.isBlank(code)) {
+            return null;
+        }
+        for (DataScopeType type : values()) {
+            if (type.getCode().equals(code)) {
+                return type;
+            }
+        }
+        return null;
+    }
+}
diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/InjectionMetaObjectHandler.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/InjectionMetaObjectHandler.java
new file mode 100644
index 0000000..33fd098
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/InjectionMetaObjectHandler.java
@@ -0,0 +1,113 @@
+package org.dromara.common.mybatis.handler;
+
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.http.HttpStatus;
+import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.ibatis.reflection.MetaObject;
+import org.dromara.common.core.domain.model.LoginUser;
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.utils.ObjectUtils;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.satoken.utils.LoginHelper;
+
+import java.util.Date;
+
+/**
+ * MP注入处理器
+ *
+ * @author pengles
+ * @date 2021/4/25
+ */
+@Slf4j
+public class InjectionMetaObjectHandler implements MetaObjectHandler {
+
+    /**
+     * 如果用户不存在默认注入-1代表无用户
+     */
+    private static final Long DEFAULT_USER_ID = -1L;
+
+    /**
+     * 插入填充方法，用于在插入数据时自动填充实体对象中的创建时间、更新时间、创建人、更新人等信息
+     *
+     * @param metaObject 元对象，用于获取原始对象并进行填充
+     */
+    @Override
+    public void insertFill(MetaObject metaObject) {
+        try {
+            if (ObjectUtil.isNotNull(metaObject) && metaObject.getOriginalObject() instanceof BaseEntity baseEntity) {
+                // 获取当前时间作为创建时间和更新时间，如果创建时间不为空，则使用创建时间，否则使用当前时间
+                Date current = ObjectUtils.notNull(baseEntity.getCreateTime(), new Date());
+                baseEntity.setCreateTime(current);
+                baseEntity.setUpdateTime(current);
+
+                // 如果创建人为空，则填充当前登录用户的信息
+                if (ObjectUtil.isNull(baseEntity.getCreateBy())) {
+                    LoginUser loginUser = getLoginUser();
+                    if (ObjectUtil.isNotNull(loginUser)) {
+                        Long userId = loginUser.getUserId();
+                        // 填充创建人、更新人和创建部门信息
+                        baseEntity.setCreateBy(userId);
+                        baseEntity.setUpdateBy(userId);
+                        baseEntity.setCreateDept(ObjectUtils.notNull(baseEntity.getCreateDept(), loginUser.getDeptId()));
+                    } else {
+                        // 填充创建人、更新人和创建部门信息
+                        baseEntity.setCreateBy(DEFAULT_USER_ID);
+                        baseEntity.setUpdateBy(DEFAULT_USER_ID);
+                        baseEntity.setCreateDept(ObjectUtils.notNull(baseEntity.getCreateDept(), DEFAULT_USER_ID));
+                    }
+                }
+            } else {
+                Date date = new Date();
+                this.strictInsertFill(metaObject, "createTime", Date.class, date);
+                this.strictInsertFill(metaObject, "updateTime", Date.class, date);
+            }
+        } catch (Exception e) {
+            throw new ServiceException("自动注入异常 => " + e.getMessage(), HttpStatus.HTTP_UNAUTHORIZED);
+        }
+    }
+
+    /**
+     * 更新填充方法，用于在更新数据时自动填充实体对象中的更新时间和更新人信息
+     *
+     * @param metaObject 元对象，用于获取原始对象并进行填充
+     */
+    @Override
+    public void updateFill(MetaObject metaObject) {
+        try {
+            if (ObjectUtil.isNotNull(metaObject) && metaObject.getOriginalObject() instanceof BaseEntity baseEntity) {
+                // 获取当前时间作为更新时间，无论原始对象中的更新时间是否为空都填充
+                Date current = new Date();
+                baseEntity.setUpdateTime(current);
+
+                // 获取当前登录用户的ID，并填充更新人信息
+                Long userId = LoginHelper.getUserId();
+                if (ObjectUtil.isNotNull(userId)) {
+                    baseEntity.setUpdateBy(userId);
+                } else {
+                    baseEntity.setUpdateBy(DEFAULT_USER_ID);
+                }
+            } else {
+                this.strictUpdateFill(metaObject, "updateTime", Date.class, new Date());
+            }
+        } catch (Exception e) {
+            throw new ServiceException("自动注入异常 => " + e.getMessage(), HttpStatus.HTTP_UNAUTHORIZED);
+        }
+    }
+
+    /**
+     * 获取当前登录用户信息
+     *
+     * @return 当前登录用户的信息，如果用户未登录则返回 null
+     */
+    private LoginUser getLoginUser() {
+        LoginUser loginUser;
+        try {
+            loginUser = LoginHelper.getLoginUser();
+        } catch (Exception e) {
+            return null;
+        }
+        return loginUser;
+    }
+
+}
diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/MybatisExceptionHandler.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/MybatisExceptionHandler.java
new file mode 100644
index 0000000..795132e
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/MybatisExceptionHandler.java
@@ -0,0 +1,47 @@
+package org.dromara.common.mybatis.handler;
+
+import cn.hutool.http.HttpStatus;
+import jakarta.servlet.http.HttpServletRequest;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.utils.StringUtils;
+import org.mybatis.spring.MyBatisSystemException;
+import org.springframework.dao.DuplicateKeyException;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
+
+/**
+ * Mybatis异常处理器
+ *
+ * @author pengles
+ */
+@Slf4j
+@RestControllerAdvice
+public class MybatisExceptionHandler {
+
+    /**
+     * 主键或UNIQUE索引，数据重复异常
+     */
+    @ExceptionHandler(DuplicateKeyException.class)
+    public R<Void> handleDuplicateKeyException(DuplicateKeyException e, HttpServletRequest request) {
+        String requestURI = request.getRequestURI();
+        log.error("请求地址'{}',数据库中已存在记录'{}'", requestURI, e.getMessage());
+        return R.fail(HttpStatus.HTTP_CONFLICT, "数据库中已存在该记录，请联系管理员确认");
+    }
+
+    /**
+     * Mybatis系统异常 通用处理
+     */
+    @ExceptionHandler(MyBatisSystemException.class)
+    public R<Void> handleCannotFindDataSourceException(MyBatisSystemException e, HttpServletRequest request) {
+        String requestURI = request.getRequestURI();
+        String message = e.getMessage();
+        if (StringUtils.contains(message, "CannotFindDataSourceException")) {
+            log.error("请求地址'{}', 未找到数据源", requestURI);
+            return R.fail(HttpStatus.HTTP_INTERNAL_ERROR, "未找到数据源，请联系管理员确认");
+        }
+        log.error("请求地址'{}', Mybatis系统异常", requestURI, e);
+        return R.fail(HttpStatus.HTTP_INTERNAL_ERROR, message);
+    }
+
+}
diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/PlusDataPermissionHandler.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/PlusDataPermissionHandler.java
new file mode 100644
index 0000000..a977c8a
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/PlusDataPermissionHandler.java
@@ -0,0 +1,357 @@
+package org.dromara.common.mybatis.handler;
+
+import cn.hutool.core.annotation.AnnotationUtil;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import net.sf.jsqlparser.JSQLParserException;
+import net.sf.jsqlparser.expression.Expression;
+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.dromara.common.core.domain.dto.RoleDTO;
+import org.dromara.common.core.domain.model.LoginUser;
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.utils.SpringUtils;
+import org.dromara.common.core.utils.StreamUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.annotation.DataColumn;
+import org.dromara.common.mybatis.annotation.DataPermission;
+import org.dromara.common.mybatis.enums.DataScopeType;
+import org.dromara.common.mybatis.helper.DataPermissionHelper;
+import org.dromara.common.satoken.utils.LoginHelper;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.context.expression.BeanFactoryResolver;
+import org.springframework.core.io.Resource;
+import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
+import org.springframework.core.io.support.ResourcePatternResolver;
+import org.springframework.core.type.ClassMetadata;
+import org.springframework.core.type.classreading.CachingMetadataReaderFactory;
+import org.springframework.expression.*;
+import org.springframework.expression.common.TemplateParserContext;
+import org.springframework.expression.spel.standard.SpelExpressionParser;
+import org.springframework.expression.spel.support.StandardEvaluationContext;
+import org.springframework.util.ClassUtils;
+
+import java.lang.reflect.Method;
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Function;
+
+/**
+ * 数据权限过滤
+ *
+ * @author pengles
+ * @version 3.5.0
+ */
+@Slf4j
+public class PlusDataPermissionHandler {
+
+    /**
+     * 类名称与注解的映射关系缓存(由于aop无法拦截mybatis接口类上的注解 只能通过启动预扫描的方式进行)
+     */
+    private final Map<String, DataPermission> dataPermissionCacheMap = new ConcurrentHashMap<>();
+
+    /**
+     * spel 解析器
+     */
+    private final ExpressionParser parser = new SpelExpressionParser();
+    private final ParserContext parserContext = new TemplateParserContext();
+    /**
+     * bean解析器 用于处理 spel 表达式中对 bean 的调用
+     */
+    private final BeanResolver beanResolver = new BeanFactoryResolver(SpringUtils.getBeanFactory());
+
+    /**
+     * 构造方法，扫描指定包下的 Mapper 类并初始化缓存
+     *
+     * @param mapperPackage Mapper 类所在的包路径
+     */
+    public PlusDataPermissionHandler(String mapperPackage) {
+        scanMapperClasses(mapperPackage);
+    }
+
+    /**
+     * 获取数据过滤条件的 SQL 片段
+     *
+     * @param where             原始的查询条件表达式
+     * @param mappedStatementId Mapper 方法的 ID
+     * @param isSelect          是否为查询语句
+     * @return 数据过滤条件的 SQL 片段
+     */
+    public Expression getSqlSegment(Expression where, String mappedStatementId, boolean isSelect) {
+        try {
+            // 获取数据权限配置
+            DataPermission dataPermission = getDataPermission(mappedStatementId);
+            // 获取当前登录用户信息
+            LoginUser currentUser = DataPermissionHelper.getVariable("user");
+            if (ObjectUtil.isNull(currentUser)) {
+                currentUser = LoginHelper.getLoginUser();
+                DataPermissionHelper.setVariable("user", currentUser);
+            }
+            // 如果是超级管理员，则不过滤数据
+            if (LoginHelper.isSuperAdmin()) {
+                return where;
+            }
+            // 构造数据过滤条件的 SQL 片段
+            String dataFilterSql = buildDataFilter(dataPermission, isSelect);
+            if (StringUtils.isBlank(dataFilterSql)) {
+                return where;
+            }
+            Expression expression = CCJSqlParserUtil.parseExpression(dataFilterSql);
+            // 数据权限使用单独的括号 防止与其他条件冲突
+            ParenthesedExpressionList<Expression> parenthesis = new ParenthesedExpressionList<>(expression);
+            if (ObjectUtil.isNotNull(where)) {
+                return new AndExpression(where, parenthesis);
+            } else {
+                return parenthesis;
+            }
+        } catch (JSQLParserException e) {
+            throw new ServiceException("数据权限解析异常 => " + e.getMessage());
+        } finally {
+            DataPermissionHelper.removePermission();
+        }
+    }
+
+    /**
+     * 构建数据过滤条件的 SQL 语句
+     *
+     * @param dataPermission 数据权限注解
+     * @param isSelect       标志当前操作是否为查询操作，查询操作和更新或删除操作在处理过滤条件时会有不同的处理方式
+     * @return 构建的数据过滤条件的 SQL 语句
+     * @throws ServiceException 如果角色的数据范围异常或者 key 与 value 的长度不匹配，则抛出 ServiceException 异常
+     */
+    private String buildDataFilter(DataPermission dataPermission, boolean isSelect) {
+        // 更新或删除需满足所有条件
+        String joinStr = isSelect ? " OR " : " AND ";
+        if (StringUtils.isNotBlank(dataPermission.joinStr())) {
+            joinStr = " " + dataPermission.joinStr() + " ";
+        }
+        LoginUser user = DataPermissionHelper.getVariable("user");
+        Object defaultValue = "-1";
+        NullSafeStandardEvaluationContext context = new NullSafeStandardEvaluationContext(defaultValue);
+        context.addPropertyAccessor(new NullSafePropertyAccessor(context.getPropertyAccessors().get(0), defaultValue));
+        context.setBeanResolver(beanResolver);
+        DataPermissionHelper.getContext().forEach(context::setVariable);
+        Set<String> conditions = new HashSet<>();
+        // 优先设置变量
+        List<String> keys = new ArrayList<>();
+        Map<DataColumn, Boolean> ignoreMap = new HashMap<>();
+        for (DataColumn dataColumn : dataPermission.value()) {
+            if (dataColumn.key().length != dataColumn.value().length) {
+                throw new ServiceException("角色数据范围异常 => key与value长度不匹配");
+            }
+            // 包含权限标识符 这直接跳过
+            if (StringUtils.isNotBlank(dataColumn.permission()) &&
+                CollUtil.contains(user.getMenuPermission(), dataColumn.permission())
+            ) {
+                ignoreMap.put(dataColumn, Boolean.TRUE);
+                continue;
+            }
+            // 设置注解变量 key 为表达式变量 value 为变量值
+            for (int i = 0; i < dataColumn.key().length; i++) {
+                context.setVariable(dataColumn.key()[i], dataColumn.value()[i]);
+            }
+            keys.addAll(Arrays.stream(dataColumn.key()).map(key -> "#" + key).toList());
+        }
+
+        for (RoleDTO role : user.getRoles()) {
+            user.setRoleId(role.getRoleId());
+            // 获取角色权限泛型
+            DataScopeType type = DataScopeType.findCode(role.getDataScope());
+            if (ObjectUtil.isNull(type)) {
+                throw new ServiceException("角色数据范围异常 => " + role.getDataScope());
+            }
+            // 全部数据权限直接返回
+            if (type == DataScopeType.ALL) {
+                return StringUtils.EMPTY;
+            }
+            boolean isSuccess = false;
+            for (DataColumn dataColumn : dataPermission.value()) {
+                // 包含权限标识符 这直接跳过
+                if (ignoreMap.containsKey(dataColumn)) {
+                    // 修复多角色与权限标识符共用问题 https://gitee.com/dromara/RuoYi-Vue-Plus/issues/IB4CS4
+                    conditions.add(joinStr + " 1 = 1 ");
+                    isSuccess = true;
+                    continue;
+                }
+                // 不包含 key 变量 则不处理
+                if (!StringUtils.containsAny(type.getSqlTemplate(), keys.toArray(String[]::new))) {
+                    continue;
+                }
+                // 当前注解不满足模板 不处理
+                if (!StringUtils.containsAny(type.getSqlTemplate(), dataColumn.key())) {
+                    continue;
+                }
+                // 忽略数据权限 防止spel表达式内有其他sql查询导致死循环调用
+                String sql = DataPermissionHelper.ignore(() ->
+                    parser.parseExpression(type.getSqlTemplate(), parserContext).getValue(context, String.class)
+                );
+                // 解析sql模板并填充
+                conditions.add(joinStr + sql);
+                isSuccess = true;
+            }
+            // 未处理成功则填充兜底方案
+            if (!isSuccess && StringUtils.isNotBlank(type.getElseSql())) {
+                conditions.add(joinStr + type.getElseSql());
+            }
+        }
+
+        if (CollUtil.isNotEmpty(conditions)) {
+            String sql = StreamUtils.join(conditions, Function.identity(), "");
+            return sql.substring(joinStr.length());
+        }
+        return StringUtils.EMPTY;
+    }
+
+    /**
+     * 扫描指定包下的 Mapper 类，并查找其中带有特定注解的方法或类
+     *
+     * @param mapperPackage Mapper 类所在的包路径
+     */
+    private void scanMapperClasses(String mapperPackage) {
+        // 创建资源解析器和元数据读取工厂
+        PathMatchingResourcePatternResolver resolver = new PathMatchingResourcePatternResolver();
+        CachingMetadataReaderFactory factory = new CachingMetadataReaderFactory();
+        // 将 Mapper 包路径按分隔符拆分为数组
+        String[] packagePatternArray = StringUtils.splitPreserveAllTokens(mapperPackage, ConfigurableApplicationContext.CONFIG_LOCATION_DELIMITERS);
+        String classpath = ResourcePatternResolver.CLASSPATH_ALL_URL_PREFIX;
+        try {
+            for (String packagePattern : packagePatternArray) {
+                // 将包路径转换为资源路径
+                String path = ClassUtils.convertClassNameToResourcePath(packagePattern);
+                // 获取指定路径下的所有 .class 文件资源
+                Resource[] resources = resolver.getResources(classpath + path + "/*.class");
+                for (Resource resource : resources) {
+                    // 获取资源的类元数据
+                    ClassMetadata classMetadata = factory.getMetadataReader(resource).getClassMetadata();
+                    // 获取资源对应的类对象
+                    Class<?> clazz = Resources.classForName(classMetadata.getClassName());
+                    // 查找类中的特定注解
+                    findAnnotation(clazz);
+                }
+            }
+        } catch (Exception e) {
+            log.error("初始化数据安全缓存时出错:{}", e.getMessage());
+        }
+    }
+
+    /**
+     * 在指定的类中查找特定的注解 DataPermission，并将带有这个注解的方法或类存储到 dataPermissionCacheMap 中
+     *
+     * @param clazz 要查找的类
+     */
+    private void findAnnotation(Class<?> clazz) {
+        DataPermission dataPermission;
+        for (Method method : clazz.getMethods()) {
+            if (method.isDefault() || method.isVarArgs()) {
+                continue;
+            }
+            String mappedStatementId = clazz.getName() + "." + method.getName();
+            if (AnnotationUtil.hasAnnotation(method, DataPermission.class)) {
+                dataPermission = AnnotationUtil.getAnnotation(method, DataPermission.class);
+                dataPermissionCacheMap.put(mappedStatementId, dataPermission);
+            }
+        }
+        if (AnnotationUtil.hasAnnotation(clazz, DataPermission.class)) {
+            dataPermission = AnnotationUtil.getAnnotation(clazz, DataPermission.class);
+            dataPermissionCacheMap.put(clazz.getName(), dataPermission);
+        }
+    }
+
+    /**
+     * 根据映射语句 ID 或类名获取对应的 DataPermission 注解对象
+     *
+     * @param mapperId 映射语句 ID
+     * @return DataPermission 注解对象，如果不存在则返回 null
+     */
+    public DataPermission getDataPermission(String mapperId) {
+        // 检查上下文中是否包含映射语句 ID 对应的 DataPermission 注解对象
+        if (DataPermissionHelper.getPermission() != null) {
+            return DataPermissionHelper.getPermission();
+        }
+        // 检查缓存中是否包含映射语句 ID 对应的 DataPermission 注解对象
+        if (dataPermissionCacheMap.containsKey(mapperId)) {
+            return dataPermissionCacheMap.get(mapperId);
+        }
+        // 如果缓存中不包含映射语句 ID 对应的 DataPermission 注解对象，则尝试使用类名作为键查找
+        String clazzName = mapperId.substring(0, mapperId.lastIndexOf("."));
+        if (dataPermissionCacheMap.containsKey(clazzName)) {
+            return dataPermissionCacheMap.get(clazzName);
+        }
+        return null;
+    }
+
+    /**
+     * 检查给定的映射语句 ID 是否有效，即是否能够找到对应的 DataPermission 注解对象
+     *
+     * @param mapperId 映射语句 ID
+     * @return 如果找到对应的 DataPermission 注解对象，则返回 false；否则返回 true
+     */
+    public boolean invalid(String mapperId) {
+        return getDataPermission(mapperId) == null;
+    }
+
+    /**
+     * 对所有null变量找不到的变量返回默认值
+     */
+    @AllArgsConstructor
+    private static class NullSafeStandardEvaluationContext extends StandardEvaluationContext {
+
+        private final Object defaultValue;
+
+        @Override
+        public Object lookupVariable(String name) {
+            Object obj = super.lookupVariable(name);
+            // 如果读取到的值是 null，则返回默认值
+            if (obj == null) {
+                return defaultValue;
+            }
+            return obj;
+        }
+
+    }
+
+    /**
+     * 对所有null变量找不到的变量返回默认值 委托模式 将不需要处理的方法委托给原处理器
+     */
+    @AllArgsConstructor
+    private static class NullSafePropertyAccessor implements PropertyAccessor {
+
+        private final PropertyAccessor delegate;
+        private final Object defaultValue;
+
+        @Override
+        public Class<?>[] getSpecificTargetClasses() {
+            return delegate.getSpecificTargetClasses();
+        }
+
+        @Override
+        public boolean canRead(EvaluationContext context, Object target, String name) throws AccessException {
+            return delegate.canRead(context, target, name);
+        }
+
+        @Override
+        public TypedValue read(EvaluationContext context, Object target, String name) throws AccessException {
+            TypedValue value = delegate.read(context, target, name);
+            // 如果读取到的值是 null，则返回默认值
+            if (value.getValue() == null) {
+                return new TypedValue(defaultValue);
+            }
+            return value;
+        }
+
+        @Override
+        public boolean canWrite(EvaluationContext context, Object target, String name) throws AccessException {
+            return delegate.canWrite(context, target, name);
+        }
+
+        @Override
+        public void write(EvaluationContext context, Object target, String name, Object newValue) throws AccessException {
+            delegate.write(context, target, name, newValue);
+        }
+    }
+
+}
diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/PlusPostInitTableInfoHandler.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/PlusPostInitTableInfoHandler.java
new file mode 100644
index 0000000..729e6e0
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/PlusPostInitTableInfoHandler.java
@@ -0,0 +1,27 @@
+package org.dromara.common.mybatis.handler;
+
+import cn.hutool.core.convert.Convert;
+import com.baomidou.mybatisplus.core.handlers.PostInitTableInfoHandler;
+import com.baomidou.mybatisplus.core.metadata.TableInfo;
+import org.apache.ibatis.session.Configuration;
+import org.dromara.common.core.utils.SpringUtils;
+import org.dromara.common.core.utils.reflect.ReflectUtils;
+
+/**
+ * 修改表信息初始化方式
+ * 目前用于全局修改是否使用逻辑删除
+ *
+ * @author pengles
+ */
+public class PlusPostInitTableInfoHandler implements PostInitTableInfoHandler {
+
+    @Override
+    public void postTableInfo(TableInfo tableInfo, Configuration configuration) {
+        String flag = SpringUtils.getProperty("mybatis-plus.enableLogicDelete", "true");
+        // 只有关闭时 统一设置false 为true时mp自动判断不处理
+        if (!Convert.toBool(flag)) {
+            ReflectUtils.setFieldValue(tableInfo, "withLogicDelete", false);
+        }
+    }
+
+}
diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/helper/DataBaseHelper.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/helper/DataBaseHelper.java
new file mode 100644
index 0000000..025f5e4
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/helper/DataBaseHelper.java
@@ -0,0 +1,81 @@
+package org.dromara.common.mybatis.helper;
+
+import cn.hutool.core.convert.Convert;
+import com.baomidou.dynamic.datasource.DynamicRoutingDataSource;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.utils.SpringUtils;
+import org.dromara.common.mybatis.enums.DataBaseType;
+
+import javax.sql.DataSource;
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 数据库助手
+ *
+ * @author pengles
+ */
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public class DataBaseHelper {
+
+    private static final DynamicRoutingDataSource DS = SpringUtils.getBean(DynamicRoutingDataSource.class);
+
+    /**
+     * 获取当前数据库类型
+     */
+    public static DataBaseType getDataBaseType() {
+        DataSource dataSource = DS.determineDataSource();
+        try (Connection conn = dataSource.getConnection()) {
+            DatabaseMetaData metaData = conn.getMetaData();
+            String databaseProductName = metaData.getDatabaseProductName();
+            return DataBaseType.find(databaseProductName);
+        } catch (SQLException e) {
+            throw new ServiceException(e.getMessage());
+        }
+    }
+
+    public static boolean isMySql() {
+        return DataBaseType.MY_SQL == getDataBaseType();
+    }
+
+    public static boolean isOracle() {
+        return DataBaseType.ORACLE == getDataBaseType();
+    }
+
+    public static boolean isPostgerSql() {
+        return DataBaseType.POSTGRE_SQL == getDataBaseType();
+    }
+
+    public static boolean isSqlServer() {
+        return DataBaseType.SQL_SERVER == getDataBaseType();
+    }
+
+    public static String findInSet(Object var1, String var2) {
+        DataBaseType dataBasyType = getDataBaseType();
+        String var = Convert.toStr(var1);
+        if (dataBasyType == DataBaseType.SQL_SERVER) {
+            // charindex(',100,' , ',0,100,101,') <> 0
+            return "charindex(',%s,' , ','+%s+',') <> 0".formatted(var, var2);
+        } else if (dataBasyType == DataBaseType.POSTGRE_SQL) {
+            // (select strpos(',0,100,101,' , ',100,')) <> 0
+            return "(select strpos(','||%s||',' , ',%s,')) <> 0".formatted(var2, var);
+        } else if (dataBasyType == DataBaseType.ORACLE) {
+            // instr(',0,100,101,' , ',100,') <> 0
+            return "instr(','||%s||',' , ',%s,') <> 0".formatted(var2, var);
+        }
+        // find_in_set(100 , '0,100,101')
+        return "find_in_set('%s' , %s) <> 0".formatted(var, var2);
+    }
+
+    /**
+     * 获取当前加载的数据库名
+     */
+    public static List<String> getDataSourceNameList() {
+        return new ArrayList<>(DS.getDataSources().keySet());
+    }
+}
diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/helper/DataPermissionHelper.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/helper/DataPermissionHelper.java
new file mode 100644
index 0000000..9c3e7df
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/helper/DataPermissionHelper.java
@@ -0,0 +1,175 @@
+package org.dromara.common.mybatis.helper;
+
+import cn.dev33.satoken.context.SaHolder;
+import cn.dev33.satoken.context.model.SaStorage;
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.plugins.IgnoreStrategy;
+import com.baomidou.mybatisplus.core.plugins.InterceptorIgnoreHelper;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+import org.dromara.common.core.utils.reflect.ReflectUtils;
+import org.dromara.common.mybatis.annotation.DataPermission;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Stack;
+import java.util.function.Supplier;
+
+/**
+ * 数据权限助手
+ *
+ * @author pengles
+ * @version 3.5.0
+ */
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+@SuppressWarnings("unchecked cast")
+public class DataPermissionHelper {
+
+    private static final String DATA_PERMISSION_KEY = "data:permission";
+
+    private static final ThreadLocal<Stack<Integer>> REENTRANT_IGNORE = ThreadLocal.withInitial(Stack::new);
+
+    private static final ThreadLocal<DataPermission> PERMISSION_CACHE = new ThreadLocal<>();
+
+    /**
+     * 获取当前执行mapper权限注解
+     *
+     * @return 返回当前执行mapper权限注解
+     */
+    public static DataPermission getPermission() {
+        return PERMISSION_CACHE.get();
+    }
+
+    /**
+     * 设置当前执行mapper权限注解
+     *
+     * @param dataPermission   数据权限注解
+     */
+    public static void setPermission(DataPermission dataPermission) {
+        PERMISSION_CACHE.set(dataPermission);
+    }
+
+    /**
+     * 删除当前执行mapper权限注解
+     */
+    public static void removePermission() {
+        PERMISSION_CACHE.remove();
+    }
+
+    /**
+     * 从上下文中获取指定键的变量值，并将其转换为指定的类型
+     *
+     * @param key 变量的键
+     * @param <T> 变量值的类型
+     * @return 指定键的变量值，如果不存在则返回 null
+     */
+    public static <T> T getVariable(String key) {
+        Map<String, Object> context = getContext();
+        return (T) context.get(key);
+    }
+
+    /**
+     * 向上下文中设置指定键的变量值
+     *
+     * @param key   要设置的变量的键
+     * @param value 要设置的变量值
+     */
+    public static void setVariable(String key, Object value) {
+        Map<String, Object> context = getContext();
+        context.put(key, value);
+    }
+
+    /**
+     * 获取数据权限上下文
+     *
+     * @return 存储在SaStorage中的Map对象，用于存储数据权限相关的上下文信息
+     * @throws NullPointerException 如果数据权限上下文类型异常，则抛出NullPointerException
+     */
+    public static Map<String, Object> getContext() {
+        SaStorage saStorage = SaHolder.getStorage();
+        Object attribute = saStorage.get(DATA_PERMISSION_KEY);
+        if (ObjectUtil.isNull(attribute)) {
+            saStorage.set(DATA_PERMISSION_KEY, new HashMap<>());
+            attribute = saStorage.get(DATA_PERMISSION_KEY);
+        }
+        if (attribute instanceof Map map) {
+            return map;
+        }
+        throw new NullPointerException("data permission context type exception");
+    }
+
+    private static IgnoreStrategy getIgnoreStrategy() {
+        Object ignoreStrategyLocal = ReflectUtils.getStaticFieldValue(ReflectUtils.getField(InterceptorIgnoreHelper.class, "IGNORE_STRATEGY_LOCAL"));
+        if (ignoreStrategyLocal instanceof ThreadLocal<?> IGNORE_STRATEGY_LOCAL) {
+            if (IGNORE_STRATEGY_LOCAL.get() instanceof IgnoreStrategy ignoreStrategy) {
+                return ignoreStrategy;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * 开启忽略数据权限(开启后需手动调用 {@link #disableIgnore()} 关闭)
+     */
+    public static void enableIgnore() {
+        IgnoreStrategy ignoreStrategy = getIgnoreStrategy();
+        if (ObjectUtil.isNull(ignoreStrategy)) {
+            InterceptorIgnoreHelper.handle(IgnoreStrategy.builder().dataPermission(true).build());
+        } else {
+            ignoreStrategy.setDataPermission(true);
+        }
+        Stack<Integer> reentrantStack = REENTRANT_IGNORE.get();
+        reentrantStack.push(reentrantStack.size() + 1);
+    }
+
+    /**
+     * 关闭忽略数据权限
+     */
+    public static void disableIgnore() {
+        IgnoreStrategy ignoreStrategy = getIgnoreStrategy();
+        if (ObjectUtil.isNotNull(ignoreStrategy)) {
+            boolean noOtherIgnoreStrategy = !Boolean.TRUE.equals(ignoreStrategy.getDynamicTableName())
+                && !Boolean.TRUE.equals(ignoreStrategy.getBlockAttack())
+                && !Boolean.TRUE.equals(ignoreStrategy.getIllegalSql())
+                && CollectionUtil.isEmpty(ignoreStrategy.getOthers());
+            Stack<Integer> reentrantStack = REENTRANT_IGNORE.get();
+            boolean empty = reentrantStack.isEmpty() || reentrantStack.pop() == 1;
+            if (noOtherIgnoreStrategy && empty) {
+                InterceptorIgnoreHelper.clearIgnoreStrategy();
+            } else if (empty) {
+                ignoreStrategy.setDataPermission(false);
+            }
+
+        }
+    }
+
+    /**
+     * 在忽略数据权限中执行
+     *
+     * @param handle 处理执行方法
+     */
+    public static void ignore(Runnable handle) {
+        enableIgnore();
+        try {
+            handle.run();
+        } finally {
+            disableIgnore();
+        }
+    }
+
+    /**
+     * 在忽略数据权限中执行
+     *
+     * @param handle 处理执行方法
+     */
+    public static <T> T ignore(Supplier<T> handle) {
+        enableIgnore();
+        try {
+            return handle.get();
+        } finally {
+            disableIgnore();
+        }
+    }
+
+}
diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/interceptor/PlusDataPermissionInterceptor.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/interceptor/PlusDataPermissionInterceptor.java
new file mode 100644
index 0000000..74494f2
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/interceptor/PlusDataPermissionInterceptor.java
@@ -0,0 +1,181 @@
+package org.dromara.common.mybatis.interceptor;
+
+import com.baomidou.mybatisplus.core.plugins.InterceptorIgnoreHelper;
+import com.baomidou.mybatisplus.core.toolkit.PluginUtils;
+import com.baomidou.mybatisplus.extension.plugins.handler.MultiDataPermissionHandler;
+import com.baomidou.mybatisplus.extension.plugins.inner.BaseMultiTableInnerInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.InnerInterceptor;
+import lombok.extern.slf4j.Slf4j;
+import net.sf.jsqlparser.expression.Expression;
+import net.sf.jsqlparser.schema.Table;
+import net.sf.jsqlparser.statement.delete.Delete;
+import net.sf.jsqlparser.statement.select.PlainSelect;
+import net.sf.jsqlparser.statement.select.Select;
+import net.sf.jsqlparser.statement.select.SetOperationList;
+import net.sf.jsqlparser.statement.update.Update;
+import org.apache.ibatis.executor.Executor;
+import org.apache.ibatis.executor.statement.StatementHandler;
+import org.apache.ibatis.mapping.BoundSql;
+import org.apache.ibatis.mapping.MappedStatement;
+import org.apache.ibatis.mapping.SqlCommandType;
+import org.apache.ibatis.session.ResultHandler;
+import org.apache.ibatis.session.RowBounds;
+import org.dromara.common.mybatis.handler.PlusDataPermissionHandler;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.util.List;
+
+/**
+ * 数据权限拦截器
+ *
+ * @author pengles
+ * @version 3.5.0
+ */
+@Slf4j
+public class PlusDataPermissionInterceptor extends BaseMultiTableInnerInterceptor implements InnerInterceptor {
+
+    private final PlusDataPermissionHandler dataPermissionHandler;
+
+    /**
+     * 构造函数，初始化 PlusDataPermissionHandler 实例
+     *
+     * @param mapperPackage 扫描的映射器包
+     */
+    public PlusDataPermissionInterceptor(String mapperPackage) {
+        this.dataPermissionHandler = new PlusDataPermissionHandler(mapperPackage);
+    }
+
+    /**
+     * 在执行查询之前，检查并处理数据权限相关逻辑
+     *
+     * @param executor      MyBatis 执行器对象
+     * @param ms            映射语句对象
+     * @param parameter     方法参数
+     * @param rowBounds     分页对象
+     * @param resultHandler 结果处理器
+     * @param boundSql      绑定的 SQL 对象
+     * @throws SQLException 如果发生 SQL 异常
+     */
+    @Override
+    public void beforeQuery(Executor executor, MappedStatement ms, Object parameter, RowBounds rowBounds, ResultHandler resultHandler, BoundSql boundSql) throws SQLException {
+        // 检查是否需要忽略数据权限处理
+        if (InterceptorIgnoreHelper.willIgnoreDataPermission(ms.getId())) {
+            return;
+        }
+        // 检查是否缺少有效的数据权限注解
+        if (dataPermissionHandler.invalid(ms.getId())) {
+            return;
+        }
+        // 解析 sql 分配对应方法
+        PluginUtils.MPBoundSql mpBs = PluginUtils.mpBoundSql(boundSql);
+        mpBs.sql(parserSingle(mpBs.sql(), ms.getId()));
+    }
+
+    /**
+     * 在准备 SQL 语句之前，检查并处理更新和删除操作的数据权限相关逻辑
+     *
+     * @param sh                 MyBatis StatementHandler 对象
+     * @param connection         数据库连接对象
+     * @param transactionTimeout 事务超时时间
+     */
+    @Override
+    public void beforePrepare(StatementHandler sh, Connection connection, Integer transactionTimeout) {
+        PluginUtils.MPStatementHandler mpSh = PluginUtils.mpStatementHandler(sh);
+        MappedStatement ms = mpSh.mappedStatement();
+        // 获取 SQL 命令类型（增、删、改、查）
+        SqlCommandType sct = ms.getSqlCommandType();
+
+        // 只处理更新和删除操作的 SQL 语句
+        if (sct == SqlCommandType.UPDATE || sct == SqlCommandType.DELETE) {
+            if (InterceptorIgnoreHelper.willIgnoreDataPermission(ms.getId())) {
+                return;
+            }
+            // 检查是否缺少有效的数据权限注解
+            if (dataPermissionHandler.invalid(ms.getId())) {
+                return;
+            }
+            PluginUtils.MPBoundSql mpBs = mpSh.mPBoundSql();
+            mpBs.sql(parserMulti(mpBs.sql(), ms.getId()));
+        }
+    }
+
+    /**
+     * 处理 SELECT 查询语句中的 WHERE 条件
+     *
+     * @param select SELECT 查询对象
+     * @param index  查询语句的索引
+     * @param sql    查询语句
+     * @param obj    WHERE 条件参数
+     */
+    @Override
+    protected void processSelect(Select select, int index, String sql, Object obj) {
+        if (select instanceof PlainSelect) {
+            this.setWhere((PlainSelect) select, (String) obj);
+        } else if (select instanceof SetOperationList setOperationList) {
+            List<Select> selectBodyList = setOperationList.getSelects();
+            selectBodyList.forEach(s -> this.setWhere((PlainSelect) s, (String) obj));
+        }
+    }
+
+    /**
+     * 处理 UPDATE 语句中的 WHERE 条件
+     *
+     * @param update UPDATE 查询对象
+     * @param index  查询语句的索引
+     * @param sql    查询语句
+     * @param obj    WHERE 条件参数
+     */
+    @Override
+    protected void processUpdate(Update update, int index, String sql, Object obj) {
+        Expression sqlSegment = dataPermissionHandler.getSqlSegment(update.getWhere(), (String) obj, false);
+        if (null != sqlSegment) {
+            update.setWhere(sqlSegment);
+        }
+    }
+
+    /**
+     * 处理 DELETE 语句中的 WHERE 条件
+     *
+     * @param delete DELETE 查询对象
+     * @param index  查询语句的索引
+     * @param sql    查询语句
+     * @param obj    WHERE 条件参数
+     */
+    @Override
+    protected void processDelete(Delete delete, int index, String sql, Object obj) {
+        Expression sqlSegment = dataPermissionHandler.getSqlSegment(delete.getWhere(), (String) obj, false);
+        if (null != sqlSegment) {
+            delete.setWhere(sqlSegment);
+        }
+    }
+
+    /**
+     * 设置 SELECT 语句的 WHERE 条件
+     *
+     * @param plainSelect       SELECT 查询对象
+     * @param mappedStatementId 映射语句的 ID
+     */
+    protected void setWhere(PlainSelect plainSelect, String mappedStatementId) {
+        Expression sqlSegment = dataPermissionHandler.getSqlSegment(plainSelect.getWhere(), mappedStatementId, true);
+        if (null != sqlSegment) {
+            plainSelect.setWhere(sqlSegment);
+        }
+    }
+
+    /**
+     * 构建表达式，用于处理表的数据权限
+     *
+     * @param table        表对象
+     * @param where        WHERE 条件表达式
+     * @param whereSegment WHERE 条件片段
+     * @return 构建的表达式
+     */
+    @Override
+    public Expression buildTableExpression(Table table, Expression where, String whereSegment) {
+        // 只有新版数据权限处理器才会执行到这里
+        final MultiDataPermissionHandler handler = (MultiDataPermissionHandler) dataPermissionHandler;
+        return handler.getSqlSegment(table, where, whereSegment);
+    }
+}
+
diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-mybatis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
new file mode 100644
index 0000000..cc625da
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-mybatis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1 @@
+org.dromara.common.mybatis.config.MybatisPlusConfig
diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/resources/common-mybatis.yml b/ruoyi-common/ruoyi-common-mybatis/src/main/resources/common-mybatis.yml
new file mode 100644
index 0000000..14662e1
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-mybatis/src/main/resources/common-mybatis.yml
@@ -0,0 +1,33 @@
+# 内置配置 不允许修改 如需修改请在 nacos 上写相同配置覆盖
+# MyBatisPlus配置
+# https://baomidou.com/config/
+mybatis-plus:
+  # 启动时是否检查 MyBatis XML 文件的存在，默认不检查
+  checkConfigLocation: false
+  configuration:
+    # 自动驼峰命名规则（camel case）映射
+    mapUnderscoreToCamelCase: true
+    # MyBatis 自动映射策略
+    # NONE：不启用 PARTIAL：只对非嵌套 resultMap 自动映射 FULL：对所有 resultMap 自动映射
+    autoMappingBehavior: FULL
+    # MyBatis 自动映射时未知列或未知属性处理策
+    # NONE：不做处理 WARNING：打印相关警告 FAILING：抛出异常和详细信息
+    autoMappingUnknownColumnBehavior: NONE
+    # 更详细的日志输出 会有性能损耗 org.apache.ibatis.logging.stdout.StdOutImpl
+    # 关闭日志记录 (可单纯使用 p6spy 分析) org.apache.ibatis.logging.nologging.NoLoggingImpl
+    # 默认日志输出 org.apache.ibatis.logging.slf4j.Slf4jImpl
+    logImpl: org.apache.ibatis.logging.nologging.NoLoggingImpl
+  global-config:
+    # 是否打印 Logo banner
+    banner: true
+    dbConfig:
+      # 主键类型
+      # AUTO 自增 NONE 空 INPUT 用户输入 ASSIGN_ID 雪花 ASSIGN_UUID 唯一 UUID
+      idType: ASSIGN_ID
+      # 逻辑已删除值(可按需求随意修改)
+      logicDeleteValue: 1
+      # 逻辑未删除值
+      logicNotDeleteValue: 0
+      insertStrategy: NOT_NULL
+      updateStrategy: NOT_NULL
+      whereStrategy: NOT_NULL
diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/resources/spy.properties b/ruoyi-common/ruoyi-common-mybatis/src/main/resources/spy.properties
new file mode 100644
index 0000000..f3ed7d8
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-mybatis/src/main/resources/spy.properties
@@ -0,0 +1,20 @@
+# p6spy 性能分析插件配置文件
+modulelist=com.baomidou.mybatisplus.extension.p6spy.MybatisPlusLogFactory,com.p6spy.engine.outage.P6OutageFactory
+# 自定义日志打印
+logMessageFormat=com.baomidou.mybatisplus.extension.p6spy.P6SpyLogger
+#日志输出到控制台
+appender=com.baomidou.mybatisplus.extension.p6spy.StdoutLogger
+# 使用日志系统记录 sql
+#appender=com.p6spy.engine.spy.appender.Slf4JLogger
+# 取消JDBC URL前缀
+useprefix=true
+# 配置记录 Log 例外,可去掉的结果集有error,info,batch,debug,statement,commit,rollback,result,resultset.
+excludecategories=info,debug,result,commit,resultset
+# 日期格式
+dateformat=yyyy-MM-dd HH:mm:ss
+# SQL语句打印时间格式
+databaseDialectTimestampFormat=yyyy-MM-dd HH:mm:ss
+# 是否过滤 Log
+filter=true
+# 过滤 Log 时所排除的 sql 关键字，以逗号分隔
+exclude=
diff --git a/ruoyi-common/ruoyi-common-oss/pom.xml b/ruoyi-common/ruoyi-common-oss/pom.xml
new file mode 100644
index 0000000..190dc5d
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-oss/pom.xml
@@ -0,0 +1,66 @@
+<?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>
+        <groupId>org.dromara</groupId>
+        <artifactId>ruoyi-common</artifactId>
+        <version>${revision}</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>ruoyi-common-oss</artifactId>
+
+    <description>
+        ruoyi-common-oss oss服务
+    </description>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-json</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-redis</artifactId>
+        </dependency>
+
+        <!--  AWS SDK for Java 2.x  -->
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>s3</artifactId>
+            <exclusions>
+                <!-- 将基于 CRT 的 HTTP 客户端从类路径中移除 -->
+                <exclusion>
+                    <groupId>software.amazon.awssdk</groupId>
+                    <artifactId>aws-crt-client</artifactId>
+                </exclusion>
+                <!-- 将基于 Apache 的 HTTP 客户端从类路径中移除 -->
+                <exclusion>
+                    <groupId>software.amazon.awssdk</groupId>
+                    <artifactId>apache-client</artifactId>
+                </exclusion>
+                <!-- 将配置基于 URL 连接的 HTTP 客户端从类路径中移除 -->
+                <exclusion>
+                    <groupId>software.amazon.awssdk</groupId>
+                    <artifactId>url-connection-client</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <!-- 将基于 Netty 的 HTTP 客户端从类路径中移除 -->
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>netty-nio-client</artifactId>
+        </dependency>
+
+        <!-- 基于 AWS CRT 的 S3 客户端的性能增强的 S3 传输管理器 -->
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>s3-transfer-manager</artifactId>
+        </dependency>
+
+    </dependencies>
+
+</project>
diff --git a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/constant/OssConstant.java b/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/constant/OssConstant.java
new file mode 100644
index 0000000..21c3216
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/constant/OssConstant.java
@@ -0,0 +1,40 @@
+package org.dromara.common.oss.constant;
+
+import org.dromara.common.core.constant.GlobalConstants;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 对象存储常量
+ *
+ * @author pengles
+ */
+public interface OssConstant {
+
+    /**
+     * 默认配置KEY
+     */
+    String DEFAULT_CONFIG_KEY = GlobalConstants.GLOBAL_REDIS_KEY + "sys_oss:default_config";
+
+    /**
+     * 预览列表资源开关Key
+     */
+    String PEREVIEW_LIST_RESOURCE_KEY = "sys.oss.previewListResource";
+
+    /**
+     * 系统数据ids
+     */
+    List<Long> SYSTEM_DATA_IDS = Arrays.asList(1L, 2L, 3L, 4L);
+
+    /**
+     * 云服务商
+     */
+    String[] CLOUD_SERVICE = new String[] {"aliyun", "qcloud", "qiniu", "obs"};
+
+    /**
+     * https 状态
+     */
+    String IS_HTTPS = "Y";
+
+}
diff --git a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/core/OssClient.java b/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/core/OssClient.java
new file mode 100644
index 0000000..de5119e
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/core/OssClient.java
@@ -0,0 +1,491 @@
+package org.dromara.common.oss.core;
+
+import cn.hutool.core.io.IoUtil;
+import cn.hutool.core.util.IdUtil;
+import org.dromara.common.core.constant.Constants;
+import org.dromara.common.core.utils.DateUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.core.utils.file.FileUtils;
+import org.dromara.common.oss.constant.OssConstant;
+import org.dromara.common.oss.entity.UploadResult;
+import org.dromara.common.oss.enums.AccessPolicyType;
+import org.dromara.common.oss.exception.OssException;
+import org.dromara.common.oss.properties.OssProperties;
+import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
+import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
+import software.amazon.awssdk.core.ResponseInputStream;
+import software.amazon.awssdk.core.async.AsyncResponseTransformer;
+import software.amazon.awssdk.core.async.BlockingInputStreamAsyncRequestBody;
+import software.amazon.awssdk.http.nio.netty.NettyNioAsyncHttpClient;
+import software.amazon.awssdk.regions.Region;
+import software.amazon.awssdk.services.s3.S3AsyncClient;
+import software.amazon.awssdk.services.s3.S3Configuration;
+import software.amazon.awssdk.services.s3.model.GetObjectResponse;
+import software.amazon.awssdk.services.s3.presigner.S3Presigner;
+import software.amazon.awssdk.transfer.s3.S3TransferManager;
+import software.amazon.awssdk.transfer.s3.model.*;
+import software.amazon.awssdk.transfer.s3.progress.LoggingTransferListener;
+
+import java.io.*;
+import java.net.URI;
+import java.net.URL;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.time.Duration;
+import java.util.function.Consumer;
+
+/**
+ * S3 存储协议 所有兼容S3协议的云厂商均支持
+ * 阿里云 腾讯云 七牛云 minio
+ *
+ * @author AprilWind
+ */
+public class OssClient {
+
+    /**
+     * 服务商
+     */
+    private final String configKey;
+
+    /**
+     * 配置属性
+     */
+    private final OssProperties properties;
+
+    /**
+     * Amazon S3 异步客户端
+     */
+    private final S3AsyncClient client;
+
+    /**
+     * 用于管理 S3 数据传输的高级工具
+     */
+    private final S3TransferManager transferManager;
+
+    /**
+     * AWS S3 预签名 URL 的生成器
+     */
+    private final S3Presigner presigner;
+
+    /**
+     * 构造方法
+     *
+     * @param configKey     配置键
+     * @param ossProperties Oss配置属性
+     */
+    public OssClient(String configKey, OssProperties ossProperties) {
+        this.configKey = configKey;
+        this.properties = ossProperties;
+        try {
+            // 创建 AWS 认证信息
+            StaticCredentialsProvider credentialsProvider = StaticCredentialsProvider.create(
+                AwsBasicCredentials.create(properties.getAccessKey(), properties.getSecretKey()));
+
+            // MinIO 使用 HTTPS 限制使用域名访问，站点填域名。需要启用路径样式访问
+            boolean isStyle = !StringUtils.containsAny(properties.getEndpoint(), OssConstant.CLOUD_SERVICE);
+
+            // 创建AWS基于 Netty 的 S3 客户端
+            this.client = S3AsyncClient.builder()
+                .credentialsProvider(credentialsProvider)
+                .endpointOverride(URI.create(getEndpoint()))
+                .region(of())
+                .forcePathStyle(isStyle)
+                .httpClient(NettyNioAsyncHttpClient.builder()
+                    .connectionTimeout(Duration.ofSeconds(60)).build())
+                .build();
+
+            //AWS基于 CRT 的 S3 AsyncClient 实例用作 S3 传输管理器的底层客户端
+            this.transferManager = S3TransferManager.builder().s3Client(this.client).build();
+
+            // 创建 S3 配置对象
+            S3Configuration config = S3Configuration.builder().chunkedEncodingEnabled(false)
+                .pathStyleAccessEnabled(isStyle).build();
+
+            // 创建 预签名 URL 的生成器 实例，用于生成 S3 预签名 URL
+            this.presigner = S3Presigner.builder()
+                .region(of())
+                .credentialsProvider(credentialsProvider)
+                .endpointOverride(URI.create(getDomain()))
+                .serviceConfiguration(config)
+                .build();
+
+        } catch (Exception e) {
+            if (e instanceof OssException) {
+                throw e;
+            }
+            throw new OssException("配置错误! 请检查系统配置:[" + e.getMessage() + "]");
+        }
+    }
+
+    /**
+     * 上传文件到 Amazon S3，并返回上传结果
+     *
+     * @param filePath    本地文件路径
+     * @param key         在 Amazon S3 中的对象键
+     * @param md5Digest   本地文件的 MD5 哈希值（可选）
+     * @param contentType 文件内容类型
+     * @return UploadResult 包含上传后的文件信息
+     * @throws OssException 如果上传失败，抛出自定义异常
+     */
+    public UploadResult upload(Path filePath, String key, String md5Digest, String contentType) {
+        try {
+            // 构建上传请求对象
+            FileUpload fileUpload = transferManager.uploadFile(
+                x -> x.putObjectRequest(
+                        y -> y.bucket(properties.getBucketName())
+                            .key(key)
+                            .contentMD5(StringUtils.isNotEmpty(md5Digest) ? md5Digest : null)
+                            .contentType(contentType)
+                            // 用于设置对象的访问控制列表（ACL）。不同云厂商对ACL的支持和实现方式有所不同，
+                            // 因此根据具体的云服务提供商，你可能需要进行不同的配置（自行开启，阿里云有acl权限配置，腾讯云没有acl权限配置）
+                            //.acl(getAccessPolicy().getObjectCannedACL())
+                            .build())
+                    .addTransferListener(LoggingTransferListener.create())
+                    .source(filePath).build());
+
+            // 等待上传完成并获取上传结果
+            CompletedFileUpload uploadResult = fileUpload.completionFuture().join();
+            String eTag = uploadResult.response().eTag();
+
+            // 提取上传结果中的 ETag，并构建一个自定义的 UploadResult 对象
+            return UploadResult.builder().url(getUrl() + StringUtils.SLASH + key).filename(key).eTag(eTag).build();
+        } catch (Exception e) {
+            // 捕获异常并抛出自定义异常
+            throw new OssException("上传文件失败，请检查配置信息:[" + e.getMessage() + "]");
+        } finally {
+            // 无论上传是否成功，最终都会删除临时文件
+            FileUtils.del(filePath);
+        }
+    }
+
+    /**
+     * 上传 InputStream 到 Amazon S3
+     *
+     * @param inputStream 要上传的输入流
+     * @param key         在 Amazon S3 中的对象键
+     * @param length      输入流的长度
+     * @param contentType 文件内容类型
+     * @return UploadResult 包含上传后的文件信息
+     * @throws OssException 如果上传失败，抛出自定义异常
+     */
+    public UploadResult upload(InputStream inputStream, String key, Long length, String contentType) {
+        // 如果输入流不是 ByteArrayInputStream，则将其读取为字节数组再创建 ByteArrayInputStream
+        if (!(inputStream instanceof ByteArrayInputStream)) {
+            inputStream = new ByteArrayInputStream(IoUtil.readBytes(inputStream));
+        }
+        try {
+            // 创建异步请求体（length如果为空会报错）
+            BlockingInputStreamAsyncRequestBody body = BlockingInputStreamAsyncRequestBody.builder()
+                .contentLength(length)
+                .subscribeTimeout(Duration.ofSeconds(30))
+                .build();
+
+            // 使用 transferManager 进行上传
+            Upload upload = transferManager.upload(
+                x -> x.requestBody(body)
+                    .putObjectRequest(
+                        y -> y.bucket(properties.getBucketName())
+                            .key(key)
+                            .contentType(contentType)
+                            // 用于设置对象的访问控制列表（ACL）。不同云厂商对ACL的支持和实现方式有所不同，
+                            // 因此根据具体的云服务提供商，你可能需要进行不同的配置（自行开启，阿里云有acl权限配置，腾讯云没有acl权限配置）
+                            //.acl(getAccessPolicy().getObjectCannedACL())
+                            .build())
+                    .build());
+
+            // 将输入流写入请求体
+            body.writeInputStream(inputStream);
+
+            // 等待文件上传操作完成
+            CompletedUpload uploadResult = upload.completionFuture().join();
+            String eTag = uploadResult.response().eTag();
+
+            // 提取上传结果中的 ETag，并构建一个自定义的 UploadResult 对象
+            return UploadResult.builder().url(getUrl() + StringUtils.SLASH + key).filename(key).eTag(eTag).build();
+        } catch (Exception e) {
+            throw new OssException("上传文件失败，请检查配置信息:[" + e.getMessage() + "]");
+        }
+    }
+
+    /**
+     * 下载文件从 Amazon S3 到临时目录
+     *
+     * @param path 文件在 Amazon S3 中的对象键
+     * @return 下载后的文件在本地的临时路径
+     * @throws OssException 如果下载失败，抛出自定义异常
+     */
+    public Path fileDownload(String path) {
+        // 构建临时文件
+        Path tempFilePath = FileUtils.createTempFile().toPath();
+        // 使用 S3TransferManager 下载文件
+        FileDownload downloadFile = transferManager.downloadFile(
+            x -> x.getObjectRequest(
+                    y -> y.bucket(properties.getBucketName())
+                        .key(removeBaseUrl(path))
+                        .build())
+                .addTransferListener(LoggingTransferListener.create())
+                .destination(tempFilePath)
+                .build());
+        // 等待文件下载操作完成
+        downloadFile.completionFuture().join();
+        return tempFilePath;
+    }
+
+    /**
+     * 下载文件从 Amazon S3 到 输出流
+     *
+     * @param key 文件在 Amazon S3 中的对象键
+     * @param out 输出流
+     * @param consumer 自定义处理逻辑
+     * @return 输出流中写入的字节数（长度）
+     * @throws OssException 如果下载失败，抛出自定义异常
+     */
+    public void download(String key, OutputStream out, Consumer<Long> consumer) {
+        try {
+            // 构建下载请求
+            DownloadRequest<ResponseInputStream<GetObjectResponse>> downloadRequest = DownloadRequest.builder()
+                // 文件对象
+                .getObjectRequest(y -> y.bucket(properties.getBucketName())
+                    .key(key)
+                    .build())
+                .addTransferListener(LoggingTransferListener.create())
+                // 使用订阅转换器
+                .responseTransformer(AsyncResponseTransformer.toBlockingInputStream())
+                .build();
+            // 使用 S3TransferManager 下载文件
+            Download<ResponseInputStream<GetObjectResponse>> responseFuture = transferManager.download(downloadRequest);
+            // 输出到流中
+            try (ResponseInputStream<GetObjectResponse> responseStream = responseFuture.completionFuture().join().result()) { // auto-closeable stream
+                if (consumer != null) {
+                    consumer.accept(responseStream.response().contentLength());
+                }
+                responseStream.transferTo(out); // 阻塞调用线程 blocks the calling thread
+            }
+        } catch (Exception e) {
+            throw new OssException("文件下载失败，错误信息:[" + e.getMessage() + "]");
+        }
+    }
+
+    /**
+     * 删除云存储服务中指定路径下文件
+     *
+     * @param path 指定路径
+     */
+    public void delete(String path) {
+        try {
+            client.deleteObject(
+                x -> x.bucket(properties.getBucketName())
+                    .key(removeBaseUrl(path))
+                    .build());
+        } catch (Exception e) {
+            throw new OssException("删除文件失败，请检查配置信息:[" + e.getMessage() + "]");
+        }
+    }
+
+    /**
+     * 获取私有URL链接
+     *
+     * @param objectKey   对象KEY
+     * @param expiredTime 链接授权到期时间
+     */
+    public String getPrivateUrl(String objectKey, Duration expiredTime) {
+        // 使用 AWS S3 预签名 URL 的生成器 获取对象的预签名 URL
+        URL url = presigner.presignGetObject(
+                x -> x.signatureDuration(expiredTime)
+                    .getObjectRequest(
+                        y -> y.bucket(properties.getBucketName())
+                            .key(objectKey)
+                            .build())
+                    .build())
+            .url();
+        return url.toString();
+    }
+
+    /**
+     * 上传 byte[] 数据到 Amazon S3，使用指定的后缀构造对象键。
+     *
+     * @param data   要上传的 byte[] 数据
+     * @param suffix 对象键的后缀
+     * @return UploadResult 包含上传后的文件信息
+     * @throws OssException 如果上传失败，抛出自定义异常
+     */
+    public UploadResult uploadSuffix(byte[] data, String suffix, String contentType) {
+        return upload(new ByteArrayInputStream(data), getPath(properties.getPrefix(), suffix), Long.valueOf(data.length), contentType);
+    }
+
+    /**
+     * 上传 InputStream 到 Amazon S3，使用指定的后缀构造对象键。
+     *
+     * @param inputStream 要上传的输入流
+     * @param suffix      对象键的后缀
+     * @param length      输入流的长度
+     * @return UploadResult 包含上传后的文件信息
+     * @throws OssException 如果上传失败，抛出自定义异常
+     */
+    public UploadResult uploadSuffix(InputStream inputStream, String suffix, Long length, String contentType) {
+        return upload(inputStream, getPath(properties.getPrefix(), suffix), length, contentType);
+    }
+
+    /**
+     * 上传文件到 Amazon S3，使用指定的后缀构造对象键
+     *
+     * @param file   要上传的文件
+     * @param suffix 对象键的后缀
+     * @return UploadResult 包含上传后的文件信息
+     * @throws OssException 如果上传失败，抛出自定义异常
+     */
+    public UploadResult uploadSuffix(File file, String suffix) {
+        return upload(file.toPath(), getPath(properties.getPrefix(), suffix), null, FileUtils.getMimeType(suffix));
+    }
+
+    /**
+     * 获取文件输入流
+     *
+     * @param path 完整文件路径
+     * @return 输入流
+     */
+    public InputStream getObjectContent(String path) throws IOException {
+        // 下载文件到临时目录
+        Path tempFilePath = fileDownload(path);
+        // 创建输入流
+        InputStream inputStream = Files.newInputStream(tempFilePath);
+        // 删除临时文件
+        FileUtils.del(tempFilePath);
+        // 返回对象内容的输入流
+        return inputStream;
+    }
+
+    /**
+     * 获取 S3 客户端的终端点 URL
+     *
+     * @return 终端点 URL
+     */
+    public String getEndpoint() {
+        // 根据配置文件中的是否使用 HTTPS，设置协议头部
+        String header = getIsHttps();
+        // 拼接协议头部和终端点，得到完整的终端点 URL
+        return header + properties.getEndpoint();
+    }
+
+    /**
+     * 获取 S3 客户端的终端点 URL（自定义域名）
+     *
+     * @return 终端点 URL
+     */
+    public String getDomain() {
+        // 从配置中获取域名、终端点、是否使用 HTTPS 等信息
+        String domain = properties.getDomain();
+        String endpoint = properties.getEndpoint();
+        String header = getIsHttps();
+
+        // 如果是云服务商，直接返回域名或终端点
+        if (StringUtils.containsAny(endpoint, OssConstant.CLOUD_SERVICE)) {
+            return StringUtils.isNotEmpty(domain) ? header + domain : header + endpoint;
+        }
+
+        // 如果是 MinIO，处理域名并返回
+        if (StringUtils.isNotEmpty(domain)) {
+            return domain.startsWith(Constants.HTTPS) || domain.startsWith(Constants.HTTP) ? domain : header + domain;
+        }
+
+        // 返回终端点
+        return header + endpoint;
+    }
+
+    /**
+     * 根据传入的 region 参数返回相应的 AWS 区域
+     * 如果 region 参数非空，使用 Region.of 方法创建并返回对应的 AWS 区域对象
+     * 如果 region 参数为空，返回一个默认的 AWS 区域（例如，us-east-1），作为广泛支持的区域
+     *
+     * @return 对应的 AWS 区域对象，或者默认的广泛支持的区域（us-east-1）
+     */
+    public Region of() {
+        //AWS 区域字符串
+        String region = properties.getRegion();
+        // 如果 region 参数非空，使用 Region.of 方法创建对应的 AWS 区域对象，否则返回默认区域
+        return StringUtils.isNotEmpty(region) ? Region.of(region) : Region.US_EAST_1;
+    }
+
+    /**
+     * 获取云存储服务的URL
+     *
+     * @return 文件路径
+     */
+    public String getUrl() {
+        String domain = properties.getDomain();
+        String endpoint = properties.getEndpoint();
+        String header = getIsHttps();
+        // 云服务商直接返回
+        if (StringUtils.containsAny(endpoint, OssConstant.CLOUD_SERVICE)) {
+            return header + (StringUtils.isNotEmpty(domain) ? domain : properties.getBucketName() + "." + endpoint);
+        }
+        // MinIO 单独处理
+        if (StringUtils.isNotEmpty(domain)) {
+            // 如果 domain 以 "https://" 或 "http://" 开头
+            return (domain.startsWith(Constants.HTTPS) || domain.startsWith(Constants.HTTP)) ?
+                domain + StringUtils.SLASH + properties.getBucketName() : header + domain + StringUtils.SLASH + properties.getBucketName();
+        }
+        return header + endpoint + StringUtils.SLASH + properties.getBucketName();
+    }
+
+    /**
+     * 生成一个符合特定规则的、唯一的文件路径。通过使用日期、UUID、前缀和后缀等元素的组合，确保了文件路径的独一无二性
+     *
+     * @param prefix 前缀
+     * @param suffix 后缀
+     * @return 文件路径
+     */
+    public String getPath(String prefix, String suffix) {
+        // 生成uuid
+        String uuid = IdUtil.fastSimpleUUID();
+        // 生成日期路径
+        String datePath = DateUtils.datePath();
+        // 拼接路径
+        String path = StringUtils.isNotEmpty(prefix) ?
+            prefix + StringUtils.SLASH + datePath + StringUtils.SLASH + uuid : datePath + StringUtils.SLASH + uuid;
+        return path + suffix;
+    }
+
+    /**
+     * 移除路径中的基础URL部分，得到相对路径
+     *
+     * @param path 完整的路径，包括基础URL和相对路径
+     * @return 去除基础URL后的相对路径
+     */
+    public String removeBaseUrl(String path) {
+        return path.replace(getUrl() + StringUtils.SLASH, "");
+    }
+
+    /**
+     * 服务商
+     */
+    public String getConfigKey() {
+        return configKey;
+    }
+
+    /**
+     * 获取是否使用 HTTPS 的配置，并返回相应的协议头部。
+     *
+     * @return 协议头部，根据是否使用 HTTPS 返回 "https://" 或 "http://"
+     */
+    public String getIsHttps() {
+        return OssConstant.IS_HTTPS.equals(properties.getIsHttps()) ? Constants.HTTPS : Constants.HTTP;
+    }
+
+    /**
+     * 检查配置是否相同
+     */
+    public boolean checkPropertiesSame(OssProperties properties) {
+        return this.properties.equals(properties);
+    }
+
+    /**
+     * 获取当前桶权限类型
+     *
+     * @return 当前桶权限类型code
+     */
+    public AccessPolicyType getAccessPolicy() {
+        return AccessPolicyType.getByType(properties.getAccessPolicy());
+    }
+
+}
diff --git a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/entity/UploadResult.java b/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/entity/UploadResult.java
new file mode 100644
index 0000000..f3d5937
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/entity/UploadResult.java
@@ -0,0 +1,30 @@
+package org.dromara.common.oss.entity;
+
+import lombok.Builder;
+import lombok.Data;
+
+/**
+ * 上传返回体
+ *
+ * @author pengles
+ */
+@Data
+@Builder
+public class UploadResult {
+
+    /**
+     * 文件路径
+     */
+    private String url;
+
+    /**
+     * 文件名
+     */
+    private String filename;
+
+    /**
+     * 已上传对象的实体标记（用来校验文件）
+     */
+    private String eTag;
+
+}
diff --git a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/enums/AccessPolicyType.java b/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/enums/AccessPolicyType.java
new file mode 100644
index 0000000..45b13be
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/enums/AccessPolicyType.java
@@ -0,0 +1,56 @@
+package org.dromara.common.oss.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import software.amazon.awssdk.services.s3.model.BucketCannedACL;
+import software.amazon.awssdk.services.s3.model.ObjectCannedACL;
+
+/**
+ * 桶访问策略配置
+ *
+ * @author 陈賝
+ */
+@Getter
+@AllArgsConstructor
+public enum AccessPolicyType {
+
+    /**
+     * private
+     */
+    PRIVATE("0", BucketCannedACL.PRIVATE, ObjectCannedACL.PRIVATE),
+
+    /**
+     * public
+     */
+    PUBLIC("1", BucketCannedACL.PUBLIC_READ_WRITE, ObjectCannedACL.PUBLIC_READ_WRITE),
+
+    /**
+     * custom
+     */
+    CUSTOM("2", BucketCannedACL.PUBLIC_READ, ObjectCannedACL.PUBLIC_READ);
+
+    /**
+     * 桶 权限类型（数据库值）
+     */
+    private final String type;
+
+    /**
+     * 桶 权限类型
+     */
+    private final BucketCannedACL bucketCannedACL;
+
+    /**
+     * 文件对象 权限类型
+     */
+    private final ObjectCannedACL objectCannedACL;
+
+    public static AccessPolicyType getByType(String type) {
+        for (AccessPolicyType value : values()) {
+            if (value.getType().equals(type)) {
+                return value;
+            }
+        }
+        throw new RuntimeException("'type' not found By " + type);
+    }
+
+}
diff --git a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/exception/OssException.java b/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/exception/OssException.java
new file mode 100644
index 0000000..0c8e6ea
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/exception/OssException.java
@@ -0,0 +1,19 @@
+package org.dromara.common.oss.exception;
+
+import java.io.Serial;
+
+/**
+ * OSS异常类
+ *
+ * @author pengles
+ */
+public class OssException extends RuntimeException {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    public OssException(String msg) {
+        super(msg);
+    }
+
+}
diff --git a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/factory/OssFactory.java b/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/factory/OssFactory.java
new file mode 100644
index 0000000..97539ee
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/factory/OssFactory.java
@@ -0,0 +1,68 @@
+package org.dromara.common.oss.factory;
+
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.constant.CacheNames;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.json.utils.JsonUtils;
+import org.dromara.common.oss.constant.OssConstant;
+import org.dromara.common.oss.core.OssClient;
+import org.dromara.common.oss.exception.OssException;
+import org.dromara.common.oss.properties.OssProperties;
+import org.dromara.common.redis.utils.CacheUtils;
+import org.dromara.common.redis.utils.RedisUtils;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.locks.ReentrantLock;
+
+/**
+ * 文件上传Factory
+ *
+ * @author pengles
+ */
+@Slf4j
+public class OssFactory {
+
+    private static final Map<String, OssClient> CLIENT_CACHE = new ConcurrentHashMap<>();
+    private static final ReentrantLock LOCK = new ReentrantLock();
+
+    /**
+     * 获取默认实例
+     */
+    public static OssClient instance() {
+        // 获取redis 默认类型
+        String configKey = RedisUtils.getCacheObject(OssConstant.DEFAULT_CONFIG_KEY);
+        if (StringUtils.isEmpty(configKey)) {
+            throw new OssException("文件存储服务类型无法找到!");
+        }
+        return instance(configKey);
+    }
+
+    /**
+     * 根据类型获取实例
+     */
+    public static OssClient instance(String configKey) {
+        String json = CacheUtils.get(CacheNames.SYS_OSS_CONFIG, configKey);
+        if (json == null) {
+            throw new OssException("系统异常, '" + configKey + "'配置信息不存在!");
+        }
+        OssProperties properties = JsonUtils.parseObject(json, OssProperties.class);
+        OssClient client = CLIENT_CACHE.get(configKey);
+        // 客户端不存在或配置不相同则重新构建
+        if (client == null || !client.checkPropertiesSame(properties)) {
+            LOCK.lock();
+            try {
+                client = CLIENT_CACHE.get(configKey);
+                if (client == null || !client.checkPropertiesSame(properties)) {
+                    CLIENT_CACHE.put(configKey, new OssClient(configKey, properties));
+                    log.info("创建OSS实例 key => {}", configKey);
+                    return CLIENT_CACHE.get(configKey);
+                }
+            } finally {
+                LOCK.unlock();
+            }
+        }
+        return client;
+    }
+
+}
diff --git a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/properties/OssProperties.java b/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/properties/OssProperties.java
new file mode 100644
index 0000000..1f2b794
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/properties/OssProperties.java
@@ -0,0 +1,58 @@
+package org.dromara.common.oss.properties;
+
+import lombok.Data;
+
+/**
+ * OSS对象存储 配置属性
+ *
+ * @author pengles
+ */
+@Data
+public class OssProperties {
+
+    /**
+     * 访问站点
+     */
+    private String endpoint;
+
+    /**
+     * 自定义域名
+     */
+    private String domain;
+
+    /**
+     * 前缀
+     */
+    private String prefix;
+
+    /**
+     * ACCESS_KEY
+     */
+    private String accessKey;
+
+    /**
+     * SECRET_KEY
+     */
+    private String secretKey;
+
+    /**
+     * 存储空间名
+     */
+    private String bucketName;
+
+    /**
+     * 存储区域
+     */
+    private String region;
+
+    /**
+     * 是否https（Y=是,N=否）
+     */
+    private String isHttps;
+
+    /**
+     * 桶权限类型(0private 1public 2custom)
+     */
+    private String accessPolicy;
+
+}
diff --git a/ruoyi-common/ruoyi-common-ratelimiter/pom.xml b/ruoyi-common/ruoyi-common-ratelimiter/pom.xml
new file mode 100644
index 0000000..bbde940
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-ratelimiter/pom.xml
@@ -0,0 +1,30 @@
+<?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>
+        <groupId>org.dromara</groupId>
+        <artifactId>ruoyi-common</artifactId>
+        <version>${revision}</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>ruoyi-common-ratelimiter</artifactId>
+
+    <description>
+        ruoyi-common-ratelimiter 限流功能
+    </description>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-core</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-redis</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>
diff --git a/ruoyi-common/ruoyi-common-ratelimiter/src/main/java/org/dromara/common/ratelimiter/annotation/RateLimiter.java b/ruoyi-common/ruoyi-common-ratelimiter/src/main/java/org/dromara/common/ratelimiter/annotation/RateLimiter.java
new file mode 100644
index 0000000..8a4341f
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-ratelimiter/src/main/java/org/dromara/common/ratelimiter/annotation/RateLimiter.java
@@ -0,0 +1,47 @@
+package org.dromara.common.ratelimiter.annotation;
+
+import org.dromara.common.ratelimiter.enums.LimitType;
+
+import java.lang.annotation.*;
+
+/**
+ * 限流注解
+ *
+ * @author pengles
+ */
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface RateLimiter {
+    /**
+     * 限流key,支持使用Spring el表达式来动态获取方法上的参数值
+     * 格式类似于  #code.id #{#code}
+     */
+    String key() default "";
+
+    /**
+     * 限流时间,单位秒
+     */
+    int time() default 60;
+
+    /**
+     * 限流次数
+     */
+    int count() default 100;
+
+    /**
+     * 限流类型
+     */
+    LimitType limitType() default LimitType.DEFAULT;
+
+    /**
+     * 提示消息 支持国际化 格式为 {code}
+     */
+    String message() default "{rate.limiter.message}";
+
+    /**
+     * 限流策略超时时间 默认一天(策略存活时间 会清除已存在的策略数据)
+     */
+    int timeout() default 86400;
+
+}
diff --git a/ruoyi-common/ruoyi-common-ratelimiter/src/main/java/org/dromara/common/ratelimiter/aspectj/RateLimiterAspect.java b/ruoyi-common/ruoyi-common-ratelimiter/src/main/java/org/dromara/common/ratelimiter/aspectj/RateLimiterAspect.java
new file mode 100644
index 0000000..dd4da58
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-ratelimiter/src/main/java/org/dromara/common/ratelimiter/aspectj/RateLimiterAspect.java
@@ -0,0 +1,112 @@
+package org.dromara.common.ratelimiter.aspectj;
+
+import lombok.extern.slf4j.Slf4j;
+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.dromara.common.core.constant.GlobalConstants;
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.utils.MessageUtils;
+import org.dromara.common.core.utils.ServletUtils;
+import org.dromara.common.core.utils.SpringUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.ratelimiter.annotation.RateLimiter;
+import org.dromara.common.ratelimiter.enums.LimitType;
+import org.dromara.common.redis.utils.RedisUtils;
+import org.redisson.api.RateType;
+import org.springframework.context.expression.BeanFactoryResolver;
+import org.springframework.context.expression.MethodBasedEvaluationContext;
+import org.springframework.core.DefaultParameterNameDiscoverer;
+import org.springframework.core.ParameterNameDiscoverer;
+import org.springframework.expression.Expression;
+import org.springframework.expression.ExpressionParser;
+import org.springframework.expression.ParserContext;
+import org.springframework.expression.common.TemplateParserContext;
+import org.springframework.expression.spel.standard.SpelExpressionParser;
+
+import java.lang.reflect.Method;
+
+/**
+ * 限流处理
+ *
+ * @author pengles
+ */
+@Slf4j
+@Aspect
+public class RateLimiterAspect {
+
+    /**
+     * 定义spel表达式解析器
+     */
+    private final ExpressionParser parser = new SpelExpressionParser();
+    /**
+     * 定义spel解析模版
+     */
+    private final ParserContext parserContext = new TemplateParserContext();
+    /**
+     * 方法参数解析器
+     */
+    private final ParameterNameDiscoverer pnd = new DefaultParameterNameDiscoverer();
+
+
+    @Before("@annotation(rateLimiter)")
+    public void doBefore(JoinPoint point, RateLimiter rateLimiter) {
+        int time = rateLimiter.time();
+        int count = rateLimiter.count();
+        int timeout = rateLimiter.timeout();
+        try {
+            String combineKey = getCombineKey(rateLimiter, point);
+            RateType rateType = RateType.OVERALL;
+            if (rateLimiter.limitType() == LimitType.CLUSTER) {
+                rateType = RateType.PER_CLIENT;
+            }
+            long number = RedisUtils.rateLimiter(combineKey, rateType, count, time, timeout);
+            if (number == -1) {
+                String message = rateLimiter.message();
+                if (StringUtils.startsWith(message, "{") && StringUtils.endsWith(message, "}")) {
+                    message = MessageUtils.message(StringUtils.substring(message, 1, message.length() - 1));
+                }
+                throw new ServiceException(message);
+            }
+            log.info("限制令牌 => {}, 剩余令牌 => {}, 缓存key => '{}'", count, number, combineKey);
+        } catch (Exception e) {
+            if (e instanceof ServiceException) {
+                throw e;
+            } else {
+                throw new RuntimeException("服务器限流异常，请稍候再试", e);
+            }
+        }
+    }
+
+    private String getCombineKey(RateLimiter rateLimiter, JoinPoint point) {
+        String key = rateLimiter.key();
+        // 判断 key 不为空 和 不是表达式
+        if (StringUtils.isNotBlank(key) && StringUtils.containsAny(key, "#")) {
+            MethodSignature signature = (MethodSignature) point.getSignature();
+            Method targetMethod = signature.getMethod();
+            Object[] args = point.getArgs();
+            MethodBasedEvaluationContext context =
+                new MethodBasedEvaluationContext(null, targetMethod, args, pnd);
+            context.setBeanResolver(new BeanFactoryResolver(SpringUtils.getBeanFactory()));
+            Expression expression;
+            if (StringUtils.startsWith(key, parserContext.getExpressionPrefix())
+                && StringUtils.endsWith(key, parserContext.getExpressionSuffix())) {
+                expression = parser.parseExpression(key, parserContext);
+            } else {
+                expression = parser.parseExpression(key);
+            }
+            key = expression.getValue(context, String.class);
+        }
+        StringBuilder stringBuffer = new StringBuilder(GlobalConstants.RATE_LIMIT_KEY);
+        stringBuffer.append(ServletUtils.getRequest().getRequestURI()).append(":");
+        if (rateLimiter.limitType() == LimitType.IP) {
+            // 获取请求ip
+            stringBuffer.append(ServletUtils.getClientIP()).append(":");
+        } else if (rateLimiter.limitType() == LimitType.CLUSTER) {
+            // 获取客户端实例id
+            stringBuffer.append(RedisUtils.getClient().getId()).append(":");
+        }
+        return stringBuffer.append(key).toString();
+    }
+}
diff --git a/ruoyi-common/ruoyi-common-ratelimiter/src/main/java/org/dromara/common/ratelimiter/config/RateLimiterConfig.java b/ruoyi-common/ruoyi-common-ratelimiter/src/main/java/org/dromara/common/ratelimiter/config/RateLimiterConfig.java
new file mode 100644
index 0000000..4b7e5b7
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-ratelimiter/src/main/java/org/dromara/common/ratelimiter/config/RateLimiterConfig.java
@@ -0,0 +1,20 @@
+package org.dromara.common.ratelimiter.config;
+
+import org.dromara.common.ratelimiter.aspectj.RateLimiterAspect;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
+import org.springframework.context.annotation.Bean;
+import org.springframework.data.redis.connection.RedisConfiguration;
+
+/**
+ * @author guangxin
+ * @date 2023/1/18
+ */
+@AutoConfiguration(after = RedisConfiguration.class)
+public class RateLimiterConfig {
+
+    @Bean
+    public RateLimiterAspect rateLimiterAspect() {
+        return new RateLimiterAspect();
+    }
+
+}
diff --git a/ruoyi-common/ruoyi-common-ratelimiter/src/main/java/org/dromara/common/ratelimiter/enums/LimitType.java b/ruoyi-common/ruoyi-common-ratelimiter/src/main/java/org/dromara/common/ratelimiter/enums/LimitType.java
new file mode 100644
index 0000000..2d37ef1
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-ratelimiter/src/main/java/org/dromara/common/ratelimiter/enums/LimitType.java
@@ -0,0 +1,24 @@
+package org.dromara.common.ratelimiter.enums;
+
+/**
+ * 限流类型
+ *
+ * @author pengles
+ */
+
+public enum LimitType {
+    /**
+     * 默认策略全局限流
+     */
+    DEFAULT,
+
+    /**
+     * 根据请求者IP进行限流
+     */
+    IP,
+
+    /**
+     * 实例限流(集群多后端实例)
+     */
+    CLUSTER
+}
diff --git a/ruoyi-common/ruoyi-common-ratelimiter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-ratelimiter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
new file mode 100644
index 0000000..3b95432
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-ratelimiter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1 @@
+org.dromara.common.ratelimiter.config.RateLimiterConfig
diff --git a/ruoyi-common/ruoyi-common-ratelimiter/src/main/resources/spel-extension.json b/ruoyi-common/ruoyi-common-ratelimiter/src/main/resources/spel-extension.json
new file mode 100644
index 0000000..64a0e1b
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-ratelimiter/src/main/resources/spel-extension.json
@@ -0,0 +1,7 @@
+{
+  "org.dromara.common.ratelimiter.annotation.RateLimiter@key": {
+    "method": {
+      "parameters": true
+    }
+  }
+}
diff --git a/ruoyi-common/ruoyi-common-redis/pom.xml b/ruoyi-common/ruoyi-common-redis/pom.xml
new file mode 100644
index 0000000..d7d99ca
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-redis/pom.xml
@@ -0,0 +1,59 @@
+<?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>
+        <groupId>org.dromara</groupId>
+        <artifactId>ruoyi-common</artifactId>
+        <version>${revision}</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>ruoyi-common-redis</artifactId>
+
+    <description>
+        ruoyi-common-redis 缓存服务
+    </description>
+
+    <dependencies>
+        <!-- RuoYi Common Core-->
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-core</artifactId>
+        </dependency>
+
+        <!--redisson-->
+        <dependency>
+            <groupId>org.redisson</groupId>
+            <artifactId>redisson-spring-boot-starter</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>lock4j-redisson-spring-boot-starter</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.github.ben-manes.caffeine</groupId>
+            <artifactId>caffeine</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-jsr310</artifactId>
+        </dependency>
+
+<!--        &lt;!&ndash; redis序列化替代方案 比json快无数的跨语言二进制序列化 &ndash;&gt;-->
+<!--        <dependency>-->
+<!--            <groupId>org.apache.fury</groupId>-->
+<!--            <artifactId>fury-core</artifactId>-->
+<!--            <version>0.9.0</version>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>org.slf4j</groupId>-->
+<!--            <artifactId>slf4j-api</artifactId>-->
+<!--        </dependency>-->
+
+    </dependencies>
+
+</project>
diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/config/CacheConfig.java b/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/config/CacheConfig.java
new file mode 100644
index 0000000..7dda246
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/config/CacheConfig.java
@@ -0,0 +1,45 @@
+package org.dromara.common.redis.config;
+
+import com.github.benmanes.caffeine.cache.Cache;
+import com.github.benmanes.caffeine.cache.Caffeine;
+import org.dromara.common.redis.manager.PlusSpringCacheManager;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
+import org.springframework.cache.CacheManager;
+import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.context.annotation.Bean;
+
+import java.util.concurrent.TimeUnit;
+
+/**
+ * 缓存配置
+ *
+ * @author pengles
+ */
+@AutoConfiguration
+@EnableCaching
+public class CacheConfig {
+
+    /**
+     * caffeine 本地缓存处理器
+     */
+    @Bean
+    public Cache<Object, Object> caffeine() {
+        return Caffeine.newBuilder()
+            // 设置最后一次写入或访问后经过固定时间过期
+            .expireAfterWrite(30, TimeUnit.SECONDS)
+            // 初始的缓存空间大小
+            .initialCapacity(100)
+            // 缓存的最大条数
+            .maximumSize(1000)
+            .build();
+    }
+
+    /**
+     * 自定义缓存管理器 整合spring-cache
+     */
+    @Bean
+    public CacheManager cacheManager() {
+        return new PlusSpringCacheManager();
+    }
+
+}
diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/config/RedisConfig.java b/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/config/RedisConfig.java
new file mode 100644
index 0000000..51a8d81
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/config/RedisConfig.java
@@ -0,0 +1,159 @@
+package org.dromara.common.redis.config;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.PropertyAccessor;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.jsontype.impl.LaissezFaireSubTypeValidator;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.utils.SpringUtils;
+import org.dromara.common.redis.config.properties.RedissonProperties;
+import org.dromara.common.redis.handler.KeyPrefixHandler;
+import org.dromara.common.redis.handler.RedisExceptionHandler;
+import org.redisson.client.codec.StringCodec;
+import org.redisson.codec.CompositeCodec;
+import org.redisson.codec.TypedJsonJacksonCodec;
+import org.redisson.spring.starter.RedissonAutoConfigurationCustomizer;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.core.task.VirtualThreadTaskExecutor;
+
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.TimeZone;
+
+/**
+ * redis配置
+ *
+ * @author pengles
+ */
+@Slf4j
+@AutoConfiguration
+@EnableConfigurationProperties(RedissonProperties.class)
+public class RedisConfig {
+
+    @Autowired
+    private RedissonProperties redissonProperties;
+
+    @Bean
+    public RedissonAutoConfigurationCustomizer redissonCustomizer() {
+        return config -> {
+            JavaTimeModule javaTimeModule = new JavaTimeModule();
+            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+            javaTimeModule.addSerializer(LocalDateTime.class, new LocalDateTimeSerializer(formatter));
+            javaTimeModule.addDeserializer(LocalDateTime.class, new LocalDateTimeDeserializer(formatter));
+            ObjectMapper om = new ObjectMapper();
+            om.registerModule(javaTimeModule);
+            om.setTimeZone(TimeZone.getDefault());
+            om.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY);
+            // 指定序列化输入的类型，类必须是非final修饰的。序列化时将对象全类名一起保存下来
+            om.activateDefaultTyping(LaissezFaireSubTypeValidator.instance, ObjectMapper.DefaultTyping.NON_FINAL);
+//            LoggerFactory.useSlf4jLogging(true);
+//            FuryCodec furyCodec = new FuryCodec();
+//            CompositeCodec codec = new CompositeCodec(StringCodec.INSTANCE, furyCodec, furyCodec);
+            TypedJsonJacksonCodec jsonCodec = new TypedJsonJacksonCodec(Object.class, om);
+            // 组合序列化 key 使用 String 内容使用通用 json 格式
+            CompositeCodec codec = new CompositeCodec(StringCodec.INSTANCE, jsonCodec, jsonCodec);
+            config.setThreads(redissonProperties.getThreads())
+                .setNettyThreads(redissonProperties.getNettyThreads())
+                // 缓存 Lua 脚本 减少网络传输(redisson 大部分的功能都是基于 Lua 脚本实现)
+                .setUseScriptCache(true)
+                .setCodec(codec);
+            if (SpringUtils.isVirtual()) {
+                config.setNettyExecutor(new VirtualThreadTaskExecutor("redisson-"));
+            }
+            RedissonProperties.SingleServerConfig singleServerConfig = redissonProperties.getSingleServerConfig();
+            if (ObjectUtil.isNotNull(singleServerConfig)) {
+                // 使用单机模式
+                config.useSingleServer()
+                    //设置redis key前缀
+                    .setNameMapper(new KeyPrefixHandler(redissonProperties.getKeyPrefix()))
+                    .setTimeout(singleServerConfig.getTimeout())
+                    .setClientName(singleServerConfig.getClientName())
+                    .setIdleConnectionTimeout(singleServerConfig.getIdleConnectionTimeout())
+                    .setSubscriptionConnectionPoolSize(singleServerConfig.getSubscriptionConnectionPoolSize())
+                    .setConnectionMinimumIdleSize(singleServerConfig.getConnectionMinimumIdleSize())
+                    .setConnectionPoolSize(singleServerConfig.getConnectionPoolSize());
+            }
+            // 集群配置方式 参考下方注释
+            RedissonProperties.ClusterServersConfig clusterServersConfig = redissonProperties.getClusterServersConfig();
+            if (ObjectUtil.isNotNull(clusterServersConfig)) {
+                config.useClusterServers()
+                    //设置redis key前缀
+                    .setNameMapper(new KeyPrefixHandler(redissonProperties.getKeyPrefix()))
+                    .setTimeout(clusterServersConfig.getTimeout())
+                    .setClientName(clusterServersConfig.getClientName())
+                    .setIdleConnectionTimeout(clusterServersConfig.getIdleConnectionTimeout())
+                    .setSubscriptionConnectionPoolSize(clusterServersConfig.getSubscriptionConnectionPoolSize())
+                    .setMasterConnectionMinimumIdleSize(clusterServersConfig.getMasterConnectionMinimumIdleSize())
+                    .setMasterConnectionPoolSize(clusterServersConfig.getMasterConnectionPoolSize())
+                    .setSlaveConnectionMinimumIdleSize(clusterServersConfig.getSlaveConnectionMinimumIdleSize())
+                    .setSlaveConnectionPoolSize(clusterServersConfig.getSlaveConnectionPoolSize())
+                    .setReadMode(clusterServersConfig.getReadMode())
+                    .setSubscriptionMode(clusterServersConfig.getSubscriptionMode());
+            }
+            log.info("初始化 redis 配置");
+        };
+    }
+
+    /**
+     * 异常处理器
+     */
+    @Bean
+    public RedisExceptionHandler redisExceptionHandler() {
+        return new RedisExceptionHandler();
+    }
+
+    /**
+     * redis集群配置 yml
+     *
+     * --- # redis 集群配置(单机与集群只能开启一个另一个需要注释掉)
+     * spring.data:
+     *   redis:
+     *     cluster:
+     *       nodes:
+     *         - 192.168.0.100:6379
+     *         - 192.168.0.101:6379
+     *         - 192.168.0.102:6379
+     *     # 密码
+     *     password:
+     *     # 连接超时时间
+     *     timeout: 10s
+     *     # 是否开启ssl
+     *     ssl.enabled: false
+     *
+     * redisson:
+     *   # 线程池数量
+     *   threads: 16
+     *   # Netty线程池数量
+     *   nettyThreads: 32
+     *   # 集群配置
+     *   clusterServersConfig:
+     *     # 客户端名称
+     *     clientName: ${ruoyi.name}
+     *     # master最小空闲连接数
+     *     masterConnectionMinimumIdleSize: 32
+     *     # master连接池大小
+     *     masterConnectionPoolSize: 64
+     *     # slave最小空闲连接数
+     *     slaveConnectionMinimumIdleSize: 32
+     *     # slave连接池大小
+     *     slaveConnectionPoolSize: 64
+     *     # 连接空闲超时，单位：毫秒
+     *     idleConnectionTimeout: 10000
+     *     # 命令等待超时，单位：毫秒
+     *     timeout: 3000
+     *     # 发布和订阅连接池大小
+     *     subscriptionConnectionPoolSize: 50
+     *     # 读取模式
+     *     readMode: "SLAVE"
+     *     # 订阅模式
+     *     subscriptionMode: "MASTER"
+     */
+
+}
diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/config/properties/RedissonProperties.java b/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/config/properties/RedissonProperties.java
new file mode 100644
index 0000000..bbdf1c9
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/config/properties/RedissonProperties.java
@@ -0,0 +1,135 @@
+package org.dromara.common.redis.config.properties;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.redisson.config.ReadMode;
+import org.redisson.config.SubscriptionMode;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+/**
+ * Redisson 配置属性
+ *
+ * @author pengles
+ */
+@Data
+@ConfigurationProperties(prefix = "redisson")
+public class RedissonProperties {
+
+    /**
+     * redis缓存key前缀
+     */
+    private String keyPrefix;
+
+    /**
+     * 线程池数量,默认值 = 当前处理核数量 * 2
+     */
+    private int threads;
+
+    /**
+     * Netty线程池数量,默认值 = 当前处理核数量 * 2
+     */
+    private int nettyThreads;
+
+    /**
+     * 单机服务配置
+     */
+    private SingleServerConfig singleServerConfig;
+
+    /**
+     * 集群服务配置
+     */
+    private ClusterServersConfig clusterServersConfig;
+
+    @Data
+    @NoArgsConstructor
+    public static class SingleServerConfig {
+
+        /**
+         * 客户端名称
+         */
+        private String clientName;
+
+        /**
+         * 最小空闲连接数
+         */
+        private int connectionMinimumIdleSize;
+
+        /**
+         * 连接池大小
+         */
+        private int connectionPoolSize;
+
+        /**
+         * 连接空闲超时，单位：毫秒
+         */
+        private int idleConnectionTimeout;
+
+        /**
+         * 命令等待超时，单位：毫秒
+         */
+        private int timeout;
+
+        /**
+         * 发布和订阅连接池大小
+         */
+        private int subscriptionConnectionPoolSize;
+
+    }
+
+    @Data
+    @NoArgsConstructor
+    public static class ClusterServersConfig {
+
+        /**
+         * 客户端名称
+         */
+        private String clientName;
+
+        /**
+         * master最小空闲连接数
+         */
+        private int masterConnectionMinimumIdleSize;
+
+        /**
+         * master连接池大小
+         */
+        private int masterConnectionPoolSize;
+
+        /**
+         * slave最小空闲连接数
+         */
+        private int slaveConnectionMinimumIdleSize;
+
+        /**
+         * slave连接池大小
+         */
+        private int slaveConnectionPoolSize;
+
+        /**
+         * 连接空闲超时，单位：毫秒
+         */
+        private int idleConnectionTimeout;
+
+        /**
+         * 命令等待超时，单位：毫秒
+         */
+        private int timeout;
+
+        /**
+         * 发布和订阅连接池大小
+         */
+        private int subscriptionConnectionPoolSize;
+
+        /**
+         * 读取模式
+         */
+        private ReadMode readMode;
+
+        /**
+         * 订阅模式
+         */
+        private SubscriptionMode subscriptionMode;
+
+    }
+
+}
diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/handler/KeyPrefixHandler.java b/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/handler/KeyPrefixHandler.java
new file mode 100644
index 0000000..3bf3e34
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/handler/KeyPrefixHandler.java
@@ -0,0 +1,50 @@
+package org.dromara.common.redis.handler;
+
+import org.dromara.common.core.utils.StringUtils;
+import org.redisson.api.NameMapper;
+
+/**
+ * redis缓存key前缀处理
+ *
+ * @author ye
+ * @date 2022/7/14 17:44
+ * @since 4.3.0
+ */
+public class KeyPrefixHandler implements NameMapper {
+
+    private final String keyPrefix;
+
+    public KeyPrefixHandler(String keyPrefix) {
+        //前缀为空 则返回空前缀
+        this.keyPrefix = StringUtils.isBlank(keyPrefix) ? "" : keyPrefix + ":";
+    }
+
+    /**
+     * 增加前缀
+     */
+    @Override
+    public String map(String name) {
+        if (StringUtils.isBlank(name)) {
+            return null;
+        }
+        if (StringUtils.isNotBlank(keyPrefix) && !name.startsWith(keyPrefix)) {
+            return keyPrefix + name;
+        }
+        return name;
+    }
+
+    /**
+     * 去除前缀
+     */
+    @Override
+    public String unmap(String name) {
+        if (StringUtils.isBlank(name)) {
+            return null;
+        }
+        if (StringUtils.isNotBlank(keyPrefix) && name.startsWith(keyPrefix)) {
+            return name.substring(keyPrefix.length());
+        }
+        return name;
+    }
+
+}
diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/handler/RedisExceptionHandler.java b/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/handler/RedisExceptionHandler.java
new file mode 100644
index 0000000..5e904f3
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/handler/RedisExceptionHandler.java
@@ -0,0 +1,30 @@
+package org.dromara.common.redis.handler;
+
+import cn.hutool.http.HttpStatus;
+import com.baomidou.lock.exception.LockFailureException;
+import jakarta.servlet.http.HttpServletRequest;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.domain.R;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
+
+/**
+ * Redis异常处理器
+ *
+ * @author AprilWind
+ */
+@Slf4j
+@RestControllerAdvice
+public class RedisExceptionHandler {
+
+    /**
+     * 分布式锁Lock4j异常
+     */
+    @ExceptionHandler(LockFailureException.class)
+    public R<Void> handleLockFailureException(LockFailureException e, HttpServletRequest request) {
+        String requestURI = request.getRequestURI();
+        log.error("获取锁失败了'{}',发生Lock4j异常.", requestURI, e);
+        return R.fail(HttpStatus.HTTP_UNAVAILABLE, "业务处理中，请稍后再试...");
+    }
+
+}
diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/manager/CaffeineCacheDecorator.java b/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/manager/CaffeineCacheDecorator.java
new file mode 100644
index 0000000..8662c53
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/manager/CaffeineCacheDecorator.java
@@ -0,0 +1,97 @@
+package org.dromara.common.redis.manager;
+
+import org.dromara.common.core.utils.SpringUtils;
+import org.springframework.cache.Cache;
+
+import java.util.concurrent.Callable;
+
+/**
+ * Cache 装饰器模式(用于扩展 Caffeine 一级缓存)
+ *
+ * @author LionLi
+ */
+public class CaffeineCacheDecorator implements Cache {
+
+    private static final com.github.benmanes.caffeine.cache.Cache<Object, Object>
+        CAFFEINE = SpringUtils.getBean("caffeine");
+
+    private final String name;
+    private final Cache cache;
+
+    public CaffeineCacheDecorator(String name, Cache cache) {
+        this.name = name;
+        this.cache = cache;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public Object getNativeCache() {
+        return cache.getNativeCache();
+    }
+
+    public String getUniqueKey(Object key) {
+        return name + ":" + key;
+    }
+
+    @Override
+    public ValueWrapper get(Object key) {
+        Object o = CAFFEINE.get(getUniqueKey(key), k -> cache.get(key));
+        return (ValueWrapper) o;
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public <T> T get(Object key, Class<T> type) {
+        Object o = CAFFEINE.get(getUniqueKey(key), k -> cache.get(key, type));
+        return (T) o;
+    }
+
+    @Override
+    public void put(Object key, Object value) {
+        CAFFEINE.invalidate(getUniqueKey(key));
+        cache.put(key, value);
+    }
+
+    @Override
+    public ValueWrapper putIfAbsent(Object key, Object value) {
+        CAFFEINE.invalidate(getUniqueKey(key));
+        return cache.putIfAbsent(key, value);
+    }
+
+    @Override
+    public void evict(Object key) {
+        evictIfPresent(key);
+    }
+
+    @Override
+    public boolean evictIfPresent(Object key) {
+        boolean b = cache.evictIfPresent(key);
+        if (b) {
+            CAFFEINE.invalidate(getUniqueKey(key));
+        }
+        return b;
+    }
+
+    @Override
+    public void clear() {
+        CAFFEINE.invalidateAll();
+        cache.clear();
+    }
+
+    @Override
+    public boolean invalidate() {
+        return cache.invalidate();
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public <T> T get(Object key, Callable<T> valueLoader) {
+        Object o = CAFFEINE.get(getUniqueKey(key), k -> cache.get(key, valueLoader));
+        return (T) o;
+    }
+
+}
diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/manager/PlusSpringCacheManager.java b/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/manager/PlusSpringCacheManager.java
new file mode 100644
index 0000000..740e2a1
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/manager/PlusSpringCacheManager.java
@@ -0,0 +1,192 @@
+/**
+ * Copyright (c) 2013-2021 Nikita Koksharov
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.dromara.common.redis.manager;
+
+import org.dromara.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.springframework.boot.convert.DurationStyle;
+import org.springframework.cache.Cache;
+import org.springframework.cache.CacheManager;
+import org.springframework.cache.transaction.TransactionAwareCacheDecorator;
+import org.springframework.util.StringUtils;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+
+/**
+ * A {@link org.springframework.cache.CacheManager} implementation
+ * backed by Redisson instance.
+ * <p>
+ * 修改 RedissonSpringCacheManager 源码
+ * 重写 cacheName 处理方法 支持多参数
+ *
+ * @author Nikita Koksharov
+ *
+ */
+@SuppressWarnings("unchecked")
+public class PlusSpringCacheManager implements CacheManager {
+
+    private boolean dynamic = true;
+
+    private boolean allowNullValues = true;
+
+    private boolean transactionAware = true;
+
+    Map<String, CacheConfig> configMap = new ConcurrentHashMap<>();
+    ConcurrentMap<String, Cache> instanceMap = new ConcurrentHashMap<>();
+
+    /**
+     * Creates CacheManager supplied by Redisson instance
+     */
+    public PlusSpringCacheManager() {
+    }
+
+
+    /**
+     * Defines possibility of storing {@code null} values.
+     * <p>
+     * Default is <code>true</code>
+     *
+     * @param allowNullValues stores if <code>true</code>
+     */
+    public void setAllowNullValues(boolean allowNullValues) {
+        this.allowNullValues = allowNullValues;
+    }
+
+    /**
+     * Defines if cache aware of Spring-managed transactions.
+     * If {@code true} put/evict operations are executed only for successful transaction in after-commit phase.
+     * <p>
+     * Default is <code>false</code>
+     *
+     * @param transactionAware cache is transaction aware if <code>true</code>
+     */
+    public void setTransactionAware(boolean transactionAware) {
+        this.transactionAware = transactionAware;
+    }
+
+    /**
+     * Defines 'fixed' cache names.
+     * A new cache instance will not be created in dynamic for non-defined names.
+     * <p>
+     * `null` parameter setups dynamic mode
+     *
+     * @param names of caches
+     */
+    public void setCacheNames(Collection<String> names) {
+        if (names != null) {
+            for (String name : names) {
+                getCache(name);
+            }
+            dynamic = false;
+        } else {
+            dynamic = true;
+        }
+    }
+
+    /**
+     * Set cache config mapped by cache name
+     *
+     * @param config object
+     */
+    public void setConfig(Map<String, ? extends CacheConfig> config) {
+        this.configMap = (Map<String, CacheConfig>) config;
+    }
+
+    protected CacheConfig createDefaultConfig() {
+        return new CacheConfig();
+    }
+
+    @Override
+    public Cache getCache(String name) {
+        // 重写 cacheName 支持多参数
+        String[] array = StringUtils.delimitedListToStringArray(name, "#");
+        name = array[0];
+
+        Cache cache = instanceMap.get(name);
+        if (cache != null) {
+            return cache;
+        }
+        if (!dynamic) {
+            return cache;
+        }
+
+        CacheConfig config = configMap.get(name);
+        if (config == null) {
+            config = createDefaultConfig();
+            configMap.put(name, config);
+        }
+
+        if (array.length > 1) {
+            config.setTTL(DurationStyle.detectAndParse(array[1]).toMillis());
+        }
+        if (array.length > 2) {
+            config.setMaxIdleTime(DurationStyle.detectAndParse(array[2]).toMillis());
+        }
+        if (array.length > 3) {
+            config.setMaxSize(Integer.parseInt(array[3]));
+        }
+
+        if (config.getMaxIdleTime() == 0 && config.getTTL() == 0 && config.getMaxSize() == 0) {
+            return createMap(name, config);
+        }
+
+        return createMapCache(name, config);
+    }
+
+    private Cache createMap(String name, CacheConfig config) {
+        RMap<Object, Object> map = RedisUtils.getClient().getMap(name);
+
+        Cache cache = new CaffeineCacheDecorator(name, new RedissonCache(map, allowNullValues));
+        if (transactionAware) {
+            cache = new TransactionAwareCacheDecorator(cache);
+        }
+        Cache oldCache = instanceMap.putIfAbsent(name, cache);
+        if (oldCache != null) {
+            cache = oldCache;
+        }
+        return cache;
+    }
+
+    private Cache createMapCache(String name, CacheConfig config) {
+        RMapCache<Object, Object> map = RedisUtils.getClient().getMapCache(name);
+
+        Cache cache = new CaffeineCacheDecorator(name, new RedissonCache(map, config, allowNullValues));
+        if (transactionAware) {
+            cache = new TransactionAwareCacheDecorator(cache);
+        }
+        Cache oldCache = instanceMap.putIfAbsent(name, cache);
+        if (oldCache != null) {
+            cache = oldCache;
+        } else {
+            map.setMaxSize(config.getMaxSize());
+        }
+        return cache;
+    }
+
+    @Override
+    public Collection<String> getCacheNames() {
+        return Collections.unmodifiableSet(configMap.keySet());
+    }
+
+
+}
diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/utils/CacheUtils.java b/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/utils/CacheUtils.java
new file mode 100644
index 0000000..12a2e99
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/utils/CacheUtils.java
@@ -0,0 +1,61 @@
+package org.dromara.common.redis.utils;
+
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+import org.dromara.common.core.utils.SpringUtils;
+import org.springframework.cache.Cache;
+import org.springframework.cache.CacheManager;
+
+/**
+ * 缓存操作工具类
+ *
+ * @author pengles
+ */
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+@SuppressWarnings(value = {"unchecked"})
+public class CacheUtils {
+
+    private static final CacheManager CACHE_MANAGER = SpringUtils.getBean(CacheManager.class);
+
+    /**
+     * 获取缓存值
+     *
+     * @param cacheNames 缓存组名称
+     * @param key        缓存key
+     */
+    public static <T> T get(String cacheNames, Object key) {
+        Cache.ValueWrapper wrapper = CACHE_MANAGER.getCache(cacheNames).get(key);
+        return wrapper != null ? (T) wrapper.get() : null;
+    }
+
+    /**
+     * 保存缓存值
+     *
+     * @param cacheNames 缓存组名称
+     * @param key        缓存key
+     * @param value      缓存值
+     */
+    public static void put(String cacheNames, Object key, Object value) {
+        CACHE_MANAGER.getCache(cacheNames).put(key, value);
+    }
+
+    /**
+     * 删除缓存值
+     *
+     * @param cacheNames 缓存组名称
+     * @param key        缓存key
+     */
+    public static void evict(String cacheNames, Object key) {
+        CACHE_MANAGER.getCache(cacheNames).evict(key);
+    }
+
+    /**
+     * 清空缓存值
+     *
+     * @param cacheNames 缓存组名称
+     */
+    public static void clear(String cacheNames) {
+        CACHE_MANAGER.getCache(cacheNames).clear();
+    }
+
+}
diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/utils/QueueUtils.java b/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/utils/QueueUtils.java
new file mode 100644
index 0000000..749f106
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/utils/QueueUtils.java
@@ -0,0 +1,239 @@
+package org.dromara.common.redis.utils;
+
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+import org.dromara.common.core.utils.SpringUtils;
+import org.redisson.api.*;
+
+import java.util.concurrent.CompletionStage;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Function;
+
+/**
+ * 分布式队列工具
+ * 轻量级队列 重量级数据量 请使用 MQ
+ * 要求 redis 5.X 以上
+ *
+ * @author pengles
+ * @version 3.6.0 新增
+ * @deprecated redisson 新版本已经将队列功能标记删除 一些技术问题无法解决 建议搭建MQ使用
+ */
+@Deprecated
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public class QueueUtils {
+
+    private static final RedissonClient CLIENT = SpringUtils.getBean(RedissonClient.class);
+
+
+    /**
+     * 获取客户端实例
+     */
+    public static RedissonClient getClient() {
+        return CLIENT;
+    }
+
+    /**
+     * 添加普通队列数据
+     *
+     * @param queueName 队列名
+     * @param data      数据
+     */
+    public static <T> boolean addQueueObject(String queueName, T data) {
+        RBlockingQueue<T> queue = CLIENT.getBlockingQueue(queueName);
+        return queue.offer(data);
+    }
+
+    /**
+     * 通用获取一个队列数据 没有数据返回 null(不支持延迟队列)
+     *
+     * @param queueName 队列名
+     */
+    public static <T> T getQueueObject(String queueName) {
+        RBlockingQueue<T> queue = CLIENT.getBlockingQueue(queueName);
+        return queue.poll();
+    }
+
+    /**
+     * 通用删除队列数据(不支持延迟队列)
+     */
+    public static <T> boolean removeQueueObject(String queueName, T data) {
+        RBlockingQueue<T> queue = CLIENT.getBlockingQueue(queueName);
+        return queue.remove(data);
+    }
+
+    /**
+     * 通用销毁队列 所有阻塞监听 报错(不支持延迟队列)
+     */
+    public static <T> boolean destroyQueue(String queueName) {
+        RBlockingQueue<T> queue = CLIENT.getBlockingQueue(queueName);
+        return queue.delete();
+    }
+
+    /**
+     * 添加延迟队列数据 默认毫秒
+     *
+     * @param queueName 队列名
+     * @param data      数据
+     * @param time      延迟时间
+     */
+    public static <T> void addDelayedQueueObject(String queueName, T data, long time) {
+        addDelayedQueueObject(queueName, data, time, TimeUnit.MILLISECONDS);
+    }
+
+    /**
+     * 添加延迟队列数据
+     *
+     * @param queueName 队列名
+     * @param data      数据
+     * @param time      延迟时间
+     * @param timeUnit  单位
+     */
+    public static <T> void addDelayedQueueObject(String queueName, T data, long time, TimeUnit timeUnit) {
+        RBlockingQueue<T> queue = CLIENT.getBlockingQueue(queueName);
+        RDelayedQueue<T> delayedQueue = CLIENT.getDelayedQueue(queue);
+        delayedQueue.offer(data, time, timeUnit);
+    }
+
+    /**
+     * 获取一个延迟队列数据 没有数据返回 null
+     *
+     * @param queueName 队列名
+     */
+    public static <T> T getDelayedQueueObject(String queueName) {
+        RBlockingQueue<T> queue = CLIENT.getBlockingQueue(queueName);
+        RDelayedQueue<T> delayedQueue = CLIENT.getDelayedQueue(queue);
+        return delayedQueue.poll();
+    }
+
+    /**
+     * 删除延迟队列数据
+     */
+    public static <T> boolean removeDelayedQueueObject(String queueName, T data) {
+        RBlockingQueue<T> queue = CLIENT.getBlockingQueue(queueName);
+        RDelayedQueue<T> delayedQueue = CLIENT.getDelayedQueue(queue);
+        return delayedQueue.remove(data);
+    }
+
+    /**
+     * 销毁延迟队列 所有阻塞监听 报错
+     */
+    public static <T> void destroyDelayedQueue(String queueName) {
+        RBlockingQueue<T> queue = CLIENT.getBlockingQueue(queueName);
+        RDelayedQueue<T> delayedQueue = CLIENT.getDelayedQueue(queue);
+        delayedQueue.destroy();
+    }
+
+    /**
+     * 添加优先队列数据
+     *
+     * @param queueName 队列名
+     * @param data      数据
+     */
+    public static <T> boolean addPriorityQueueObject(String queueName, T data) {
+        RPriorityBlockingQueue<T> priorityBlockingQueue = CLIENT.getPriorityBlockingQueue(queueName);
+        return priorityBlockingQueue.offer(data);
+    }
+
+    /**
+     * 优先队列获取一个队列数据 没有数据返回 null(不支持延迟队列)
+     *
+     * @param queueName 队列名
+     */
+    public static <T> T getPriorityQueueObject(String queueName) {
+        RPriorityBlockingQueue<T> queue = CLIENT.getPriorityBlockingQueue(queueName);
+        return queue.poll();
+    }
+
+    /**
+     * 优先队列删除队列数据(不支持延迟队列)
+     */
+    public static <T> boolean removePriorityQueueObject(String queueName, T data) {
+        RPriorityBlockingQueue<T> queue = CLIENT.getPriorityBlockingQueue(queueName);
+        return queue.remove(data);
+    }
+
+    /**
+     * 优先队列销毁队列 所有阻塞监听 报错(不支持延迟队列)
+     */
+    public static <T> boolean destroyPriorityQueue(String queueName) {
+        RPriorityBlockingQueue<T> queue = CLIENT.getPriorityBlockingQueue(queueName);
+        return queue.delete();
+    }
+
+    /**
+     * 尝试设置 有界队列 容量 用于限制数量
+     *
+     * @param queueName 队列名
+     * @param capacity  容量
+     */
+    public static <T> boolean trySetBoundedQueueCapacity(String queueName, int capacity) {
+        RBoundedBlockingQueue<T> boundedBlockingQueue = CLIENT.getBoundedBlockingQueue(queueName);
+        return boundedBlockingQueue.trySetCapacity(capacity);
+    }
+
+    /**
+     * 尝试设置 有界队列 容量 用于限制数量
+     *
+     * @param queueName 队列名
+     * @param capacity  容量
+     * @param destroy   是否销毁
+     */
+    public static <T> boolean trySetBoundedQueueCapacity(String queueName, int capacity, boolean destroy) {
+        RBoundedBlockingQueue<T> boundedBlockingQueue = CLIENT.getBoundedBlockingQueue(queueName);
+        if (destroy) {
+            boundedBlockingQueue.delete();
+        }
+        return boundedBlockingQueue.trySetCapacity(capacity);
+    }
+
+    /**
+     * 添加有界队列数据
+     *
+     * @param queueName 队列名
+     * @param data      数据
+     * @return 添加成功 true 已达到界限 false
+     */
+    public static <T> boolean addBoundedQueueObject(String queueName, T data) {
+        RBoundedBlockingQueue<T> boundedBlockingQueue = CLIENT.getBoundedBlockingQueue(queueName);
+        return boundedBlockingQueue.offer(data);
+    }
+
+    /**
+     * 有界队列获取一个队列数据 没有数据返回 null(不支持延迟队列)
+     *
+     * @param queueName 队列名
+     */
+    public static <T> T getBoundedQueueObject(String queueName) {
+        RBoundedBlockingQueue<T> queue = CLIENT.getBoundedBlockingQueue(queueName);
+        return queue.poll();
+    }
+
+    /**
+     * 有界队列删除队列数据(不支持延迟队列)
+     */
+    public static <T> boolean removeBoundedQueueObject(String queueName, T data) {
+        RBoundedBlockingQueue<T> queue = CLIENT.getBoundedBlockingQueue(queueName);
+        return queue.remove(data);
+    }
+
+    /**
+     * 有界队列销毁队列 所有阻塞监听 报错(不支持延迟队列)
+     */
+    public static <T> boolean destroyBoundedQueue(String queueName) {
+        RBoundedBlockingQueue<T> queue = CLIENT.getBoundedBlockingQueue(queueName);
+        return queue.delete();
+    }
+
+    /**
+     * 订阅阻塞队列(可订阅所有实现类 例如: 延迟 优先 有界 等)
+     */
+    public static <T> void subscribeBlockingQueue(String queueName, Function<T, CompletionStage<Void>> consumer, boolean isDelayed) {
+        RBlockingQueue<T> queue = CLIENT.getBlockingQueue(queueName);
+        if (isDelayed) {
+            // 订阅延迟队列
+            CLIENT.getDelayedQueue(queue);
+        }
+        queue.subscribeOnElements(consumer);
+    }
+
+}
diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/utils/RedisUtils.java b/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/utils/RedisUtils.java
new file mode 100644
index 0000000..b95b4f8
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/utils/RedisUtils.java
@@ -0,0 +1,586 @@
+package org.dromara.common.redis.utils;
+
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.utils.SpringUtils;
+import org.redisson.api.*;
+import org.redisson.api.options.KeysScanOptions;
+
+import java.time.Duration;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+/**
+ * redis 工具类
+ *
+ * @author pengles
+ * @version 3.1.0 新增
+ */
+@Slf4j
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public class RedisUtils {
+
+    private static final RedissonClient CLIENT = SpringUtils.getBean(RedissonClient.class);
+
+    /**
+     * 限流
+     *
+     * @param key          限流key
+     * @param rateType     限流类型
+     * @param rate         速率
+     * @param rateInterval 速率间隔
+     * @return -1 表示失败
+     */
+    public static long rateLimiter(String key, RateType rateType, int rate, int rateInterval) {
+        return rateLimiter(key, rateType, rate, rateInterval, 0);
+    }
+
+    /**
+     * 限流
+     *
+     * @param key          限流key
+     * @param rateType     限流类型
+     * @param rate         速率
+     * @param rateInterval 速率间隔
+     * @param timeout      超时时间
+     * @return -1 表示失败
+     */
+    public static long rateLimiter(String key, RateType rateType, int rate, int rateInterval, int timeout) {
+        RRateLimiter rateLimiter = CLIENT.getRateLimiter(key);
+        rateLimiter.trySetRate(rateType, rate, Duration.ofSeconds(rateInterval), Duration.ofSeconds(timeout));
+        if (rateLimiter.tryAcquire()) {
+            return rateLimiter.availablePermits();
+        } else {
+            return -1L;
+        }
+    }
+
+    /**
+     * 获取客户端实例
+     */
+    public static RedissonClient getClient() {
+        return CLIENT;
+    }
+
+    /**
+     * 发布通道消息
+     *
+     * @param channelKey 通道key
+     * @param msg        发送数据
+     * @param consumer   自定义处理
+     */
+    public static <T> void publish(String channelKey, T msg, Consumer<T> consumer) {
+        RTopic topic = CLIENT.getTopic(channelKey);
+        topic.publish(msg);
+        consumer.accept(msg);
+    }
+
+    /**
+     * 发布消息到指定的频道
+     *
+     * @param channelKey 通道key
+     * @param msg        发送数据
+     */
+    public static <T> void publish(String channelKey, T msg) {
+        RTopic topic = CLIENT.getTopic(channelKey);
+        topic.publish(msg);
+    }
+
+    /**
+     * 订阅通道接收消息
+     *
+     * @param channelKey 通道key
+     * @param clazz      消息类型
+     * @param consumer   自定义处理
+     */
+    public static <T> void subscribe(String channelKey, Class<T> clazz, Consumer<T> consumer) {
+        RTopic topic = CLIENT.getTopic(channelKey);
+        topic.addListener(clazz, (channel, msg) -> consumer.accept(msg));
+    }
+
+    /**
+     * 缓存基本的对象，Integer、String、实体类等
+     *
+     * @param key   缓存的键值
+     * @param value 缓存的值
+     */
+    public static <T> void setCacheObject(final String key, final T value) {
+        setCacheObject(key, value, false);
+    }
+
+    /**
+     * 缓存基本的对象，保留当前对象 TTL 有效期
+     *
+     * @param key       缓存的键值
+     * @param value     缓存的值
+     * @param isSaveTtl 是否保留TTL有效期(例如: set之前ttl剩余90 set之后还是为90)
+     * @since Redis 6.X 以上使用 setAndKeepTTL 兼容 5.X 方案
+     */
+    public static <T> void setCacheObject(final String key, final T value, final boolean isSaveTtl) {
+        RBucket<T> bucket = CLIENT.getBucket(key);
+        if (isSaveTtl) {
+            try {
+                bucket.setAndKeepTTL(value);
+            } catch (Exception e) {
+                log.error("Redis setCacheObject error: {}", e.getMessage());
+                long timeToLive = bucket.remainTimeToLive();
+                if (timeToLive == -1) {
+                    setCacheObject(key, value);
+                } else {
+                    setCacheObject(key, value, Duration.ofMillis(timeToLive));
+                }
+            }
+        } else {
+            bucket.set(value);
+        }
+    }
+
+    /**
+     * 缓存基本的对象，Integer、String、实体类等
+     *
+     * @param key      缓存的键值
+     * @param value    缓存的值
+     * @param duration 时间
+     */
+    public static <T> void setCacheObject(final String key, final T value, final Duration duration) {
+        RBatch batch = CLIENT.createBatch();
+        RBucketAsync<T> bucket = batch.getBucket(key);
+        bucket.setAsync(value);
+        bucket.expireAsync(duration);
+        batch.execute();
+    }
+
+    /**
+     * 如果不存在则设置 并返回 true 如果存在则返回 false
+     *
+     * @param key   缓存的键值
+     * @param value 缓存的值
+     * @return set成功或失败
+     */
+    public static <T> boolean setObjectIfAbsent(final String key, final T value, final Duration duration) {
+        RBucket<T> bucket = CLIENT.getBucket(key);
+        return bucket.setIfAbsent(value, duration);
+    }
+
+    /**
+     * 如果存在则设置 并返回 true 如果存在则返回 false
+     *
+     * @param key   缓存的键值
+     * @param value 缓存的值
+     * @return set成功或失败
+     */
+    public static <T> boolean setObjectIfExists(final String key, final T value, final Duration duration) {
+        RBucket<T> bucket = CLIENT.getBucket(key);
+        return bucket.setIfExists(value, duration);
+    }
+
+    /**
+     * 注册对象监听器
+     * <p>
+     * key 监听器需开启 `notify-keyspace-events` 等 redis 相关配置
+     *
+     * @param key      缓存的键值
+     * @param listener 监听器配置
+     */
+    public static <T> void addObjectListener(final String key, final ObjectListener listener) {
+        RBucket<T> result = CLIENT.getBucket(key);
+        result.addListener(listener);
+    }
+
+    /**
+     * 设置有效时间
+     *
+     * @param key     Redis键
+     * @param timeout 超时时间
+     * @return true=设置成功；false=设置失败
+     */
+    public static boolean expire(final String key, final long timeout) {
+        return expire(key, Duration.ofSeconds(timeout));
+    }
+
+    /**
+     * 设置有效时间
+     *
+     * @param key      Redis键
+     * @param duration 超时时间
+     * @return true=设置成功；false=设置失败
+     */
+    public static boolean expire(final String key, final Duration duration) {
+        RBucket<Object> rBucket = CLIENT.getBucket(key);
+        return rBucket.expire(duration);
+    }
+
+    /**
+     * 获得缓存的基本对象。
+     *
+     * @param key 缓存键值
+     * @return 缓存键值对应的数据
+     */
+    public static <T> T getCacheObject(final String key) {
+        RBucket<T> rBucket = CLIENT.getBucket(key);
+        return rBucket.get();
+    }
+
+    /**
+     * 获得key剩余存活时间
+     *
+     * @param key 缓存键值
+     * @return 剩余存活时间
+     */
+    public static <T> long getTimeToLive(final String key) {
+        RBucket<T> rBucket = CLIENT.getBucket(key);
+        return rBucket.remainTimeToLive();
+    }
+
+    /**
+     * 删除单个对象
+     *
+     * @param key 缓存的键值
+     */
+    public static boolean deleteObject(final String key) {
+        return CLIENT.getBucket(key).delete();
+    }
+
+    /**
+     * 删除集合对象
+     *
+     * @param collection 多个对象
+     */
+    public static void deleteObject(final Collection<?> collection) {
+        RBatch batch = CLIENT.createBatch();
+        collection.forEach(t -> {
+            batch.getBucket(t.toString()).deleteAsync();
+        });
+        batch.execute();
+    }
+
+    /**
+     * 检查缓存对象是否存在
+     *
+     * @param key 缓存的键值
+     */
+    public static boolean isExistsObject(final String key) {
+        return CLIENT.getBucket(key).isExists();
+    }
+
+    /**
+     * 缓存List数据
+     *
+     * @param key      缓存的键值
+     * @param dataList 待缓存的List数据
+     * @return 缓存的对象
+     */
+    public static <T> boolean setCacheList(final String key, final List<T> dataList) {
+        RList<T> rList = CLIENT.getList(key);
+        return rList.addAll(dataList);
+    }
+
+    /**
+     * 追加缓存List数据
+     *
+     * @param key  缓存的键值
+     * @param data 待缓存的数据
+     * @return 缓存的对象
+     */
+    public static <T> boolean addCacheList(final String key, final T data) {
+        RList<T> rList = CLIENT.getList(key);
+        return rList.add(data);
+    }
+
+    /**
+     * 注册List监听器
+     * <p>
+     * key 监听器需开启 `notify-keyspace-events` 等 redis 相关配置
+     *
+     * @param key      缓存的键值
+     * @param listener 监听器配置
+     */
+    public static <T> void addListListener(final String key, final ObjectListener listener) {
+        RList<T> rList = CLIENT.getList(key);
+        rList.addListener(listener);
+    }
+
+    /**
+     * 获得缓存的list对象
+     *
+     * @param key 缓存的键值
+     * @return 缓存键值对应的数据
+     */
+    public static <T> List<T> getCacheList(final String key) {
+        RList<T> rList = CLIENT.getList(key);
+        return rList.readAll();
+    }
+
+    /**
+     * 获得缓存的list对象(范围)
+     *
+     * @param key  缓存的键值
+     * @param form 起始下标
+     * @param to   截止下标
+     * @return 缓存键值对应的数据
+     */
+    public static <T> List<T> getCacheListRange(final String key, int form, int to) {
+        RList<T> rList = CLIENT.getList(key);
+        return rList.range(form, to);
+    }
+
+    /**
+     * 缓存Set
+     *
+     * @param key     缓存键值
+     * @param dataSet 缓存的数据
+     * @return 缓存数据的对象
+     */
+    public static <T> boolean setCacheSet(final String key, final Set<T> dataSet) {
+        RSet<T> rSet = CLIENT.getSet(key);
+        return rSet.addAll(dataSet);
+    }
+
+    /**
+     * 追加缓存Set数据
+     *
+     * @param key  缓存的键值
+     * @param data 待缓存的数据
+     * @return 缓存的对象
+     */
+    public static <T> boolean addCacheSet(final String key, final T data) {
+        RSet<T> rSet = CLIENT.getSet(key);
+        return rSet.add(data);
+    }
+
+    /**
+     * 注册Set监听器
+     * <p>
+     * key 监听器需开启 `notify-keyspace-events` 等 redis 相关配置
+     *
+     * @param key      缓存的键值
+     * @param listener 监听器配置
+     */
+    public static <T> void addSetListener(final String key, final ObjectListener listener) {
+        RSet<T> rSet = CLIENT.getSet(key);
+        rSet.addListener(listener);
+    }
+
+    /**
+     * 获得缓存的set
+     *
+     * @param key 缓存的key
+     * @return set对象
+     */
+    public static <T> Set<T> getCacheSet(final String key) {
+        RSet<T> rSet = CLIENT.getSet(key);
+        return rSet.readAll();
+    }
+
+    /**
+     * 缓存Map
+     *
+     * @param key     缓存的键值
+     * @param dataMap 缓存的数据
+     */
+    public static <T> void setCacheMap(final String key, final Map<String, T> dataMap) {
+        if (dataMap != null) {
+            RMap<String, T> rMap = CLIENT.getMap(key);
+            rMap.putAll(dataMap);
+        }
+    }
+
+    /**
+     * 注册Map监听器
+     * <p>
+     * key 监听器需开启 `notify-keyspace-events` 等 redis 相关配置
+     *
+     * @param key      缓存的键值
+     * @param listener 监听器配置
+     */
+    public static <T> void addMapListener(final String key, final ObjectListener listener) {
+        RMap<String, T> rMap = CLIENT.getMap(key);
+        rMap.addListener(listener);
+    }
+
+    /**
+     * 获得缓存的Map
+     *
+     * @param key 缓存的键值
+     * @return map对象
+     */
+    public static <T> Map<String, T> getCacheMap(final String key) {
+        RMap<String, T> rMap = CLIENT.getMap(key);
+        return rMap.getAll(rMap.keySet());
+    }
+
+    /**
+     * 获得缓存Map的key列表
+     *
+     * @param key 缓存的键值
+     * @return key列表
+     */
+    public static <T> Set<String> getCacheMapKeySet(final String key) {
+        RMap<String, T> rMap = CLIENT.getMap(key);
+        return rMap.keySet();
+    }
+
+    /**
+     * 往Hash中存入数据
+     *
+     * @param key   Redis键
+     * @param hKey  Hash键
+     * @param value 值
+     */
+    public static <T> void setCacheMapValue(final String key, final String hKey, final T value) {
+        RMap<String, T> rMap = CLIENT.getMap(key);
+        rMap.put(hKey, value);
+    }
+
+    /**
+     * 获取Hash中的数据
+     *
+     * @param key  Redis键
+     * @param hKey Hash键
+     * @return Hash中的对象
+     */
+    public static <T> T getCacheMapValue(final String key, final String hKey) {
+        RMap<String, T> rMap = CLIENT.getMap(key);
+        return rMap.get(hKey);
+    }
+
+    /**
+     * 删除Hash中的数据
+     *
+     * @param key  Redis键
+     * @param hKey Hash键
+     * @return Hash中的对象
+     */
+    public static <T> T delCacheMapValue(final String key, final String hKey) {
+        RMap<String, T> rMap = CLIENT.getMap(key);
+        return rMap.remove(hKey);
+    }
+
+    /**
+     * 删除Hash中的数据
+     *
+     * @param key   Redis键
+     * @param hKeys Hash键
+     */
+    public static <T> void delMultiCacheMapValue(final String key, final Set<String> hKeys) {
+        RBatch batch = CLIENT.createBatch();
+        RMapAsync<String, T> rMap = batch.getMap(key);
+        for (String hKey : hKeys) {
+            rMap.removeAsync(hKey);
+        }
+        batch.execute();
+    }
+
+    /**
+     * 获取多个Hash中的数据
+     *
+     * @param key   Redis键
+     * @param hKeys Hash键集合
+     * @return Hash对象集合
+     */
+    public static <K, V> Map<K, V> getMultiCacheMapValue(final String key, final Set<K> hKeys) {
+        RMap<K, V> rMap = CLIENT.getMap(key);
+        return rMap.getAll(hKeys);
+    }
+
+    /**
+     * 设置原子值
+     *
+     * @param key   Redis键
+     * @param value 值
+     */
+    public static void setAtomicValue(String key, long value) {
+        RAtomicLong atomic = CLIENT.getAtomicLong(key);
+        atomic.set(value);
+    }
+
+    /**
+     * 获取原子值
+     *
+     * @param key Redis键
+     * @return 当前值
+     */
+    public static long getAtomicValue(String key) {
+        RAtomicLong atomic = CLIENT.getAtomicLong(key);
+        return atomic.get();
+    }
+
+    /**
+     * 递增原子值
+     *
+     * @param key Redis键
+     * @return 当前值
+     */
+    public static long incrAtomicValue(String key) {
+        RAtomicLong atomic = CLIENT.getAtomicLong(key);
+        return atomic.incrementAndGet();
+    }
+
+    /**
+     * 递减原子值
+     *
+     * @param key Redis键
+     * @return 当前值
+     */
+    public static long decrAtomicValue(String key) {
+        RAtomicLong atomic = CLIENT.getAtomicLong(key);
+        return atomic.decrementAndGet();
+    }
+
+    /**
+     * 获得缓存的基本对象列表
+     * <P>
+     * limit-设置扫描的限制数量(默认为0,查询全部)
+     * pattern-设置键的匹配模式(默认为null)
+     * chunkSize-设置每次扫描的块大小(默认为0,本方法设置为1000)
+     * type-设置键的类型(默认为null,查询全部类型)
+     * </P>
+     * @see KeysScanOptions
+     * @param pattern 字符串前缀
+     * @return 对象列表
+     */
+    public static Collection<String> keys(final String pattern) {
+        return  keys(KeysScanOptions.defaults().pattern(pattern).chunkSize(1000));
+    }
+
+    /**
+     * 通过扫描参数获取缓存的基本对象列表
+     * @param keysScanOptions 扫描参数
+     * <P>
+     * limit-设置扫描的限制数量(默认为0,查询全部)
+     * pattern-设置键的匹配模式(默认为null)
+     * chunkSize-设置每次扫描的块大小(默认为0)
+     * type-设置键的类型(默认为null,查询全部类型)
+     * </P>
+     * @see KeysScanOptions
+     */
+    public static Collection<String> keys(final KeysScanOptions keysScanOptions) {
+        Stream<String> keysStream = CLIENT.getKeys().getKeysStream(keysScanOptions);
+        return keysStream.collect(Collectors.toList());
+    }
+
+    /**
+     * 删除缓存的基本对象列表
+     *
+     * @param pattern 字符串前缀
+     */
+    public static void deleteKeys(final String pattern) {
+        CLIENT.getKeys().deleteByPattern(pattern);
+    }
+
+    /**
+     * 检查redis中是否存在key
+     *
+     * @param key 键
+     */
+    public static Boolean hasKey(String key) {
+        RKeys rKeys = CLIENT.getKeys();
+        return rKeys.countExists(key) > 0;
+    }
+}
diff --git a/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/utils/SequenceUtils.java b/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/utils/SequenceUtils.java
new file mode 100644
index 0000000..657dbbc
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/utils/SequenceUtils.java
@@ -0,0 +1,180 @@
+package org.dromara.common.redis.utils;
+
+import cn.hutool.core.date.DatePattern;
+import cn.hutool.core.date.DateUtil;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+import org.dromara.common.core.utils.SpringUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.redisson.api.RIdGenerator;
+import org.redisson.api.RedissonClient;
+
+import java.time.Duration;
+
+/**
+ * 发号器工具类
+ *
+ * @author 秋辞未寒
+ * @date 2024-12-10
+ */
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public class SequenceUtils {
+
+    /**
+     * 默认初始值
+     */
+    public static final Long DEFAULT_INIT_VALUE = 1L;
+
+    /**
+     * 默认步长
+     */
+    public static final Long DEFAULT_STEP_VALUE = 1L;
+
+    /**
+     * 默认过期时间-天
+     */
+    public static final Duration DEFAULT_EXPIRE_TIME_DAY = Duration.ofDays(1);
+
+    /**
+     * 默认过期时间-分钟
+     */
+    public static final Duration DEFAULT_EXPIRE_TIME_MINUTE = Duration.ofMinutes(1);
+
+    /**
+     * 获取Redisson客户端实例
+     */
+    private static final RedissonClient REDISSON_CLIENT = SpringUtils.getBean(RedissonClient.class);
+
+    /**
+     * 获取ID生成器
+     *
+     * @param key        业务key
+     * @param expireTime 过期时间
+     * @param initValue  ID初始值
+     * @param stepValue  ID步长
+     * @return ID生成器
+     */
+    private static RIdGenerator getIdGenerator(String key, Duration expireTime, Long initValue, Long stepValue) {
+        if (initValue == null || initValue <= 0) {
+            initValue = DEFAULT_INIT_VALUE;
+        }
+        if (stepValue == null || stepValue <= 0) {
+            stepValue = DEFAULT_STEP_VALUE;
+        }
+        RIdGenerator idGenerator = REDISSON_CLIENT.getIdGenerator(key);
+        // 设置初始值和步长
+        idGenerator.tryInit(initValue, stepValue);
+        // 设置过期时间
+        idGenerator.expire(expireTime);
+        return idGenerator;
+    }
+
+    /**
+     * 获取指定业务key的唯一id
+     *
+     * @param key        业务key
+     * @param expireTime 过期时间
+     * @param initValue  ID初始值
+     * @param stepValue  ID步长
+     * @return 唯一id
+     */
+    public static long nextId(String key, Duration expireTime, Long initValue, Long stepValue) {
+        return getIdGenerator(key, expireTime, initValue, stepValue).nextId();
+    }
+
+    /**
+     * 获取指定业务key的唯一id字符串
+     *
+     * @param key        业务key
+     * @param expireTime 过期时间
+     * @param initValue  ID初始值
+     * @param stepValue  ID步长
+     * @return 唯一id
+     */
+    public static String nextIdStr(String key, Duration expireTime, Long initValue, Long stepValue) {
+        return String.valueOf(nextId(key, expireTime, initValue, stepValue));
+    }
+
+    /**
+     * 获取指定业务key的唯一id (ID初始值=1,ID步长=1)
+     *
+     * @param key        业务key
+     * @param expireTime 过期时间
+     * @return 唯一id
+     */
+    public static long nextId(String key, Duration expireTime) {
+        return getIdGenerator(key, expireTime, DEFAULT_INIT_VALUE, DEFAULT_STEP_VALUE).nextId();
+    }
+
+    /**
+     * 获取指定业务key的唯一id字符串 (ID初始值=1,ID步长=1)
+     *
+     * @param key        业务key
+     * @param expireTime 过期时间
+     * @return 唯一id
+     */
+    public static String nextIdStr(String key, Duration expireTime) {
+        return String.valueOf(nextId(key, expireTime));
+    }
+
+    /**
+     * 获取指定业务key的唯一id字符串 (ID初始值=1,ID步长=1)，不足位数自动补零
+     *
+     * @param key        业务key
+     * @param expireTime 过期时间
+     * @param width      位数，不足左补0
+     * @return 补零后的唯一id字符串
+     */
+    public static String nextPaddedIdStr(String key, Duration expireTime, Integer width) {
+        return StringUtils.leftPad(nextIdStr(key, expireTime), width, '0');
+    }
+
+    /**
+     * 获取 yyyyMMdd 开头的唯一id
+     *
+     * @return 唯一id
+     */
+    public static String nextIdDate() {
+        return nextIdDate("");
+    }
+
+    /**
+     * 获取 prefix + yyyyMMdd 开头的唯一id
+     *
+     * @param prefix 业务前缀
+     * @return 唯一id
+     */
+    public static String nextIdDate(String prefix) {
+        // 前缀+日期 构建 prefixKey
+        String prefixKey = StringUtils.format("{}{}", StringUtils.blankToDefault(prefix, ""), DateUtil.format(DateUtil.date(), DatePattern.PURE_DATE_FORMATTER));
+        // 获取下一个id
+        long nextId = getIdGenerator(prefixKey, DEFAULT_EXPIRE_TIME_DAY, DEFAULT_INIT_VALUE, DEFAULT_STEP_VALUE).nextId();
+        // 返回完整id
+        return StringUtils.format("{}{}", prefixKey, nextId);
+    }
+
+    /**
+     * 获取 yyyyMMddHHmmss 开头的唯一id
+     *
+     * @return 唯一id
+     */
+    public static String nextIdDateTime() {
+        return nextIdDateTime("");
+    }
+
+    /**
+     * 获取 prefix + yyyyMMddHHmmss 开头的唯一id
+     *
+     * @param prefix 业务前缀
+     * @return 唯一id
+     */
+    public static String nextIdDateTime(String prefix) {
+        // 前缀+日期时间 构建 prefixKey
+        String prefixKey = StringUtils.format("{}{}", StringUtils.blankToDefault(prefix, ""), DateUtil.format(DateUtil.date(), DatePattern.PURE_DATETIME_FORMATTER));
+        // 获取下一个id
+        long nextId = getIdGenerator(prefixKey, DEFAULT_EXPIRE_TIME_MINUTE, DEFAULT_INIT_VALUE, DEFAULT_STEP_VALUE).nextId();
+        // 返回完整id
+        return StringUtils.format("{}{}", prefixKey, nextId);
+    }
+
+}
diff --git a/ruoyi-common/ruoyi-common-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
new file mode 100644
index 0000000..0475b19
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1,2 @@
+org.dromara.common.redis.config.RedisConfig
+org.dromara.common.redis.config.CacheConfig
diff --git a/ruoyi-common/ruoyi-common-satoken/pom.xml b/ruoyi-common/ruoyi-common-satoken/pom.xml
new file mode 100644
index 0000000..4df7d4d
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-satoken/pom.xml
@@ -0,0 +1,46 @@
+<?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>
+        <groupId>org.dromara</groupId>
+        <artifactId>ruoyi-common</artifactId>
+        <version>${revision}</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>ruoyi-common-satoken</artifactId>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-core</artifactId>
+        </dependency>
+
+        <!-- RuoYi Common Redis-->
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-redis</artifactId>
+        </dependency>
+
+        <!-- Sa-Token 权限认证, 在线文档：http://sa-token.dev33.cn/ -->
+        <dependency>
+            <groupId>cn.dev33</groupId>
+            <artifactId>sa-token-spring-boot3-starter</artifactId>
+        </dependency>
+
+        <!-- Sa-Token 整合 jwt -->
+        <dependency>
+            <groupId>cn.dev33</groupId>
+            <artifactId>sa-token-jwt</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.github.ben-manes.caffeine</groupId>
+            <artifactId>caffeine</artifactId>
+        </dependency>
+
+    </dependencies>
+
+</project>
diff --git a/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/config/SaTokenConfig.java b/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/config/SaTokenConfig.java
new file mode 100644
index 0000000..86106a7
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/config/SaTokenConfig.java
@@ -0,0 +1,54 @@
+package org.dromara.common.satoken.config;
+
+import cn.dev33.satoken.dao.SaTokenDao;
+import cn.dev33.satoken.jwt.StpLogicJwtForSimple;
+import cn.dev33.satoken.stp.StpInterface;
+import cn.dev33.satoken.stp.StpLogic;
+import org.dromara.common.core.factory.YmlPropertySourceFactory;
+import org.dromara.common.satoken.core.dao.PlusSaTokenDao;
+import org.dromara.common.satoken.core.service.SaPermissionImpl;
+import org.dromara.common.satoken.handler.SaTokenExceptionHandler;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.PropertySource;
+
+/**
+ * sa-token 配置
+ *
+ * @author pengles
+ */
+@AutoConfiguration
+@PropertySource(value = "classpath:common-satoken.yml", factory = YmlPropertySourceFactory.class)
+public class SaTokenConfig {
+
+    @Bean
+    public StpLogic getStpLogicJwt() {
+        // Sa-Token 整合 jwt (简单模式)
+        return new StpLogicJwtForSimple();
+    }
+
+    /**
+     * 权限接口实现(使用bean注入方便用户替换)
+     */
+    @Bean
+    public StpInterface stpInterface() {
+        return new SaPermissionImpl();
+    }
+
+    /**
+     * 自定义dao层存储
+     */
+    @Bean
+    public SaTokenDao saTokenDao() {
+        return new PlusSaTokenDao();
+    }
+
+    /**
+     * 异常处理器
+     */
+    @Bean
+    public SaTokenExceptionHandler saTokenExceptionHandler() {
+        return new SaTokenExceptionHandler();
+    }
+
+}
diff --git a/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/core/dao/PlusSaTokenDao.java b/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/core/dao/PlusSaTokenDao.java
new file mode 100644
index 0000000..06fab23
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/core/dao/PlusSaTokenDao.java
@@ -0,0 +1,196 @@
+package org.dromara.common.satoken.core.dao;
+
+import cn.dev33.satoken.dao.auto.SaTokenDaoBySessionFollowObject;
+import cn.dev33.satoken.util.SaFoxUtil;
+import com.github.benmanes.caffeine.cache.Cache;
+import com.github.benmanes.caffeine.cache.Caffeine;
+import org.dromara.common.redis.utils.RedisUtils;
+
+import java.time.Duration;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Sa-Token持久层接口(使用框架自带RedisUtils实现 协议统一)
+ * <p>
+ * 采用 caffeine + redis 多级缓存 优化并发查询效率
+ * <p>
+ * SaTokenDaoBySessionFollowObject 是 SaTokenDao 子集简化了session方法处理
+ *
+ * @author pengles
+ */
+public class PlusSaTokenDao implements SaTokenDaoBySessionFollowObject {
+
+    private static final Cache<String, Object> CAFFEINE = Caffeine.newBuilder()
+        // 设置最后一次写入或访问后经过固定时间过期
+        .expireAfterWrite(5, TimeUnit.SECONDS)
+        // 初始的缓存空间大小
+        .initialCapacity(100)
+        // 缓存的最大条数
+        .maximumSize(1000)
+        .build();
+
+    /**
+     * 获取Value，如无返空
+     */
+    @Override
+    public String get(String key) {
+        Object o = CAFFEINE.get(key, k -> RedisUtils.getCacheObject(key));
+        return (String) o;
+    }
+
+    /**
+     * 写入Value，并设定存活时间 (单位: 秒)
+     */
+    @Override
+    public void set(String key, String value, long timeout) {
+        if (timeout == 0 || timeout <= NOT_VALUE_EXPIRE) {
+            return;
+        }
+        // 判断是否为永不过期
+        if (timeout == NEVER_EXPIRE) {
+            RedisUtils.setCacheObject(key, value);
+        } else {
+            if (RedisUtils.hasKey(key)) {
+                RedisUtils.setCacheObject(key, value, true);
+            } else {
+                RedisUtils.setCacheObject(key, value, Duration.ofSeconds(timeout));
+            }
+        }
+        CAFFEINE.invalidate(key);
+    }
+
+    /**
+     * 修修改指定key-value键值对 (过期时间不变)
+     */
+    @Override
+    public void update(String key, String value) {
+        if (RedisUtils.hasKey(key)) {
+            RedisUtils.setCacheObject(key, value, true);
+            CAFFEINE.invalidate(key);
+        }
+    }
+
+    /**
+     * 删除Value
+     */
+    @Override
+    public void delete(String key) {
+        RedisUtils.deleteObject(key);
+    }
+
+    /**
+     * 获取Value的剩余存活时间 (单位: 秒)
+     */
+    @Override
+    public long getTimeout(String key) {
+        long timeout = RedisUtils.getTimeToLive(key);
+        // 加1的目的 解决sa-token使用秒 redis是毫秒导致1秒的精度问题 手动补偿
+        return timeout < 0 ? timeout : timeout / 1000 + 1;
+    }
+
+    /**
+     * 修改Value的剩余存活时间 (单位: 秒)
+     */
+    @Override
+    public void updateTimeout(String key, long timeout) {
+        RedisUtils.expire(key, Duration.ofSeconds(timeout));
+    }
+
+
+    /**
+     * 获取Object，如无返空
+     */
+    @Override
+    public Object getObject(String key) {
+        Object o = CAFFEINE.get(key, k -> RedisUtils.getCacheObject(key));
+        return o;
+    }
+
+    /**
+     * 获取 Object (指定反序列化类型)，如无返空
+     *
+     * @param key 键名称
+     * @return object
+     */
+    @SuppressWarnings("unchecked cast")
+    @Override
+    public <T> T getObject(String key, Class<T> classType) {
+        Object o = CAFFEINE.get(key, k -> RedisUtils.getCacheObject(key));
+        return (T) o;
+    }
+
+    /**
+     * 写入Object，并设定存活时间 (单位: 秒)
+     */
+    @Override
+    public void setObject(String key, Object object, long timeout) {
+        if (timeout == 0 || timeout <= NOT_VALUE_EXPIRE) {
+            return;
+        }
+        // 判断是否为永不过期
+        if (timeout == NEVER_EXPIRE) {
+            RedisUtils.setCacheObject(key, object);
+        } else {
+            if (RedisUtils.hasKey(key)) {
+                RedisUtils.setCacheObject(key, object, true);
+            } else {
+                RedisUtils.setCacheObject(key, object, Duration.ofSeconds(timeout));
+            }
+        }
+        CAFFEINE.invalidate(key);
+    }
+
+    /**
+     * 更新Object (过期时间不变)
+     */
+    @Override
+    public void updateObject(String key, Object object) {
+        if (RedisUtils.hasKey(key)) {
+            RedisUtils.setCacheObject(key, object, true);
+            CAFFEINE.invalidate(key);
+        }
+    }
+
+    /**
+     * 删除Object
+     */
+    @Override
+    public void deleteObject(String key) {
+        RedisUtils.deleteObject(key);
+    }
+
+    /**
+     * 获取Object的剩余存活时间 (单位: 秒)
+     */
+    @Override
+    public long getObjectTimeout(String key) {
+        long timeout = RedisUtils.getTimeToLive(key);
+        // 加1的目的 解决sa-token使用秒 redis是毫秒导致1秒的精度问题 手动补偿
+        return timeout < 0 ? timeout : timeout / 1000 + 1;
+    }
+
+    /**
+     * 修改Object的剩余存活时间 (单位: 秒)
+     */
+    @Override
+    public void updateObjectTimeout(String key, long timeout) {
+        RedisUtils.expire(key, Duration.ofSeconds(timeout));
+    }
+
+    /**
+     * 搜索数据
+     */
+    @SuppressWarnings("unchecked")
+    @Override
+    public List<String> searchData(String prefix, String keyword, int start, int size, boolean sortType) {
+        String keyStr = prefix + "*" + keyword + "*";
+        return (List<String>) CAFFEINE.get(keyStr, k -> {
+            Collection<String> keys = RedisUtils.keys(keyStr);
+            List<String> list = new ArrayList<>(keys);
+            return SaFoxUtil.searchList(list, start, size, sortType);
+        });
+    }
+}
diff --git a/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/core/service/SaPermissionImpl.java b/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/core/service/SaPermissionImpl.java
new file mode 100644
index 0000000..a59d13b
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/core/service/SaPermissionImpl.java
@@ -0,0 +1,77 @@
+package org.dromara.common.satoken.core.service;
+
+import cn.dev33.satoken.stp.StpInterface;
+import cn.hutool.core.util.ObjectUtil;
+import org.dromara.common.core.domain.model.LoginUser;
+import org.dromara.common.core.enums.UserType;
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.service.PermissionService;
+import org.dromara.common.core.utils.SpringUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.satoken.utils.LoginHelper;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * sa-token 权限管理实现类
+ *
+ * @author pengles
+ */
+public class SaPermissionImpl implements StpInterface {
+
+    /**
+     * 获取菜单权限列表
+     */
+    @Override
+    public List<String> getPermissionList(Object loginId, String loginType) {
+        LoginUser loginUser = LoginHelper.getLoginUser();
+        if (ObjectUtil.isNull(loginUser) || !loginUser.getLoginId().equals(loginId)) {
+            PermissionService permissionService = getPermissionService();
+            if (ObjectUtil.isNotNull(permissionService)) {
+                List<String> list = StringUtils.splitList(loginId.toString(), ":");
+                return new ArrayList<>(permissionService.getMenuPermission(Long.parseLong(list.get(1))));
+            } else {
+                throw new ServiceException("PermissionService 实现类不存在");
+            }
+        }
+        UserType userType = UserType.getUserType(loginUser.getUserType());
+        if (userType == UserType.APP_USER) {
+            // 其他端 自行根据业务编写
+        }
+        // SYS_USER 默认返回权限
+        return new ArrayList<>(loginUser.getMenuPermission());
+    }
+
+    /**
+     * 获取角色权限列表
+     */
+    @Override
+    public List<String> getRoleList(Object loginId, String loginType) {
+        LoginUser loginUser = LoginHelper.getLoginUser();
+        if (ObjectUtil.isNull(loginUser) || !loginUser.getLoginId().equals(loginId)) {
+            PermissionService permissionService = getPermissionService();
+            if (ObjectUtil.isNotNull(permissionService)) {
+                List<String> list = StringUtils.splitList(loginId.toString(), ":");
+                return new ArrayList<>(permissionService.getRolePermission(Long.parseLong(list.get(1))));
+            } else {
+                throw new ServiceException("PermissionService 实现类不存在");
+            }
+        }
+        UserType userType = UserType.getUserType(loginUser.getUserType());
+        if (userType == UserType.APP_USER) {
+            // 其他端 自行根据业务编写
+        }
+        // SYS_USER 默认返回权限
+        return new ArrayList<>(loginUser.getRolePermission());
+    }
+
+    private PermissionService getPermissionService() {
+        try {
+            return SpringUtils.getBean(PermissionService.class);
+        } catch (Exception e) {
+            return null;
+        }
+    }
+
+}
diff --git a/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/handler/SaTokenExceptionHandler.java b/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/handler/SaTokenExceptionHandler.java
new file mode 100644
index 0000000..9de05de
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/handler/SaTokenExceptionHandler.java
@@ -0,0 +1,63 @@
+package org.dromara.common.satoken.handler;
+
+import cn.dev33.satoken.exception.DisableServiceException;
+import cn.dev33.satoken.exception.NotLoginException;
+import cn.dev33.satoken.exception.NotPermissionException;
+import cn.dev33.satoken.exception.NotRoleException;
+import cn.hutool.http.HttpStatus;
+import jakarta.servlet.http.HttpServletRequest;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.domain.R;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
+
+/**
+ * SaToken异常处理器
+ *
+ * @author pengles
+ */
+@Slf4j
+@RestControllerAdvice
+public class SaTokenExceptionHandler {
+
+    /**
+     * 权限码异常
+     */
+    @ExceptionHandler(NotPermissionException.class)
+    public R<Void> handleNotPermissionException(NotPermissionException e, HttpServletRequest request) {
+        String requestURI = request.getRequestURI();
+        log.error("请求地址'{}',权限码校验失败'{}'", requestURI, e.getMessage());
+        return R.fail(HttpStatus.HTTP_FORBIDDEN, "没有访问权限，请联系管理员授权");
+    }
+
+    /**
+     * 角色权限异常
+     */
+    @ExceptionHandler(NotRoleException.class)
+    public R<Void> handleNotRoleException(NotRoleException e, HttpServletRequest request) {
+        String requestURI = request.getRequestURI();
+        log.error("请求地址'{}',角色权限校验失败'{}'", requestURI, e.getMessage());
+        return R.fail(HttpStatus.HTTP_FORBIDDEN, "没有访问权限，请联系管理员授权");
+    }
+
+    /**
+     * 认证失败
+     */
+    @ExceptionHandler(NotLoginException.class)
+    public R<Void> handleNotLoginException(NotLoginException e, HttpServletRequest request) {
+        String requestURI = request.getRequestURI();
+        log.error("请求地址'{}',认证失败'{}',无法访问系统资源", requestURI, e.getMessage());
+        return R.fail(HttpStatus.HTTP_UNAUTHORIZED, "认证失败，无法访问系统资源");
+    }
+
+    /**
+     * 服务封禁异常
+     */
+    @ExceptionHandler(DisableServiceException.class)
+    public R<Void> handleDisableServiceException(DisableServiceException e, HttpServletRequest request) {
+        String requestURI = request.getRequestURI();
+        log.error("请求地址'{}',账号被禁用'{}',无法访问系统资源", requestURI, e.getMessage());
+        return R.fail(HttpStatus.HTTP_FORBIDDEN, "账号已被禁用，请联系管理员");
+    }
+
+}
diff --git a/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/utils/LoginHelper.java b/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/utils/LoginHelper.java
new file mode 100644
index 0000000..05f107f
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/utils/LoginHelper.java
@@ -0,0 +1,178 @@
+package org.dromara.common.satoken.utils;
+
+import cn.dev33.satoken.session.SaSession;
+import cn.dev33.satoken.stp.StpUtil;
+import cn.dev33.satoken.stp.parameter.SaLoginParameter;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.convert.Convert;
+import cn.hutool.core.util.ObjectUtil;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+import org.dromara.common.core.constant.SystemConstants;
+import org.dromara.common.core.domain.model.LoginUser;
+import org.dromara.common.core.enums.UserType;
+
+
+/**
+ * 登录鉴权助手
+ * <p>
+ * user_type 为 用户类型 同一个用户表 可以有多种用户类型 例如 pc,app
+ * deivce 为 设备类型 同一个用户类型 可以有 多种设备类型 例如 web,ios
+ * 可以组成 用户类型与设备类型多对多的 权限灵活控制
+ * <p>
+ * 多用户体系 针对 多种用户类型 但权限控制不一致
+ * 可以组成 多用户类型表与多设备类型 分别控制权限
+ *
+ * @author pengles
+ */
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public class LoginHelper {
+
+    public static final String LOGIN_USER_KEY = "loginUser";
+    public static final String USER_KEY = "userId";
+    public static final String USER_NAME_KEY = "userName";
+    public static final String DEPT_KEY = "deptId";
+    public static final String DEPT_NAME_KEY = "deptName";
+    public static final String DEPT_CATEGORY_KEY = "deptCategory";
+    public static final String CLIENT_KEY = "clientid";
+
+    /**
+     * 登录系统 基于 设备类型
+     * 针对相同用户体系不同设备
+     *
+     * @param loginUser 登录用户信息
+     * @param model     配置参数
+     */
+    public static void login(LoginUser loginUser, SaLoginParameter model) {
+        model = ObjectUtil.defaultIfNull(model, new SaLoginParameter());
+        StpUtil.login(loginUser.getLoginId(),
+            model.setExtra(USER_KEY, loginUser.getUserId())
+                .setExtra(USER_NAME_KEY, loginUser.getUsername())
+                .setExtra(DEPT_KEY, loginUser.getDeptId())
+                .setExtra(DEPT_NAME_KEY, loginUser.getDeptName())
+                .setExtra(DEPT_CATEGORY_KEY, loginUser.getDeptCategory())
+        );
+        StpUtil.getTokenSession().set(LOGIN_USER_KEY, loginUser);
+    }
+
+    /**
+     * 获取用户(多级缓存)
+     */
+    @SuppressWarnings("unchecked cast")
+    public static <T extends LoginUser> T getLoginUser() {
+        SaSession session = StpUtil.getTokenSession();
+        if (ObjectUtil.isNull(session)) {
+            return null;
+        }
+        return (T) session.get(LOGIN_USER_KEY);
+    }
+
+    /**
+     * 获取用户基于token
+     */
+    @SuppressWarnings("unchecked cast")
+    public static <T extends LoginUser> T getLoginUser(String token) {
+        SaSession session = StpUtil.getTokenSessionByToken(token);
+        if (ObjectUtil.isNull(session)) {
+            return null;
+        }
+        return (T) session.get(LOGIN_USER_KEY);
+    }
+
+    /**
+     * 获取用户id
+     */
+    public static Long getUserId() {
+        return Convert.toLong(getExtra(USER_KEY));
+    }
+
+    /**
+     * 获取用户id
+     */
+    public static String getUserIdStr() {
+        return Convert.toStr(getExtra(USER_KEY));
+    }
+
+    /**
+     * 获取用户账户
+     */
+    public static String getUsername() {
+        return Convert.toStr(getExtra(USER_NAME_KEY));
+    }
+
+    /**
+     * 获取部门ID
+     */
+    public static Long getDeptId() {
+        return Convert.toLong(getExtra(DEPT_KEY));
+    }
+
+    /**
+     * 获取部门名
+     */
+    public static String getDeptName() {
+        return Convert.toStr(getExtra(DEPT_NAME_KEY));
+    }
+
+    /**
+     * 获取部门类别编码
+     */
+    public static String getDeptCategory() {
+        return Convert.toStr(getExtra(DEPT_CATEGORY_KEY));
+    }
+
+    /**
+     * 获取当前 Token 的扩展信息
+     *
+     * @param key 键值
+     * @return 对应的扩展数据
+     */
+    private static Object getExtra(String key) {
+        try {
+            return StpUtil.getExtra(key);
+        } catch (Exception e) {
+            return null;
+        }
+    }
+
+    /**
+     * 获取用户类型
+     */
+    public static UserType getUserType() {
+        String loginType = StpUtil.getLoginIdAsString();
+        return UserType.getUserType(loginType);
+    }
+
+    /**
+     * 是否为超级管理员
+     *
+     * @param userId 用户ID
+     * @return 结果
+     */
+    public static boolean isSuperAdmin(Long userId) {
+        return SystemConstants.SUPER_ADMIN_ID.equals(userId);
+    }
+
+    /**
+     * 是否为超级管理员
+     *
+     * @return 结果
+     */
+    public static boolean isSuperAdmin() {
+        return isSuperAdmin(getUserId());
+    }
+
+    /**
+     * 检查当前用户是否已登录
+     *
+     * @return 结果
+     */
+    public static boolean isLogin() {
+        try {
+            return getLoginUser() != null;
+        } catch (Exception e) {
+            return false;
+        }
+    }
+
+}
diff --git a/ruoyi-common/ruoyi-common-satoken/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-satoken/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
new file mode 100644
index 0000000..6dd284f
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-satoken/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1 @@
+org.dromara.common.satoken.config.SaTokenConfig
diff --git a/ruoyi-common/ruoyi-common-satoken/src/main/resources/common-satoken.yml b/ruoyi-common/ruoyi-common-satoken/src/main/resources/common-satoken.yml
new file mode 100644
index 0000000..95e1b41
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-satoken/src/main/resources/common-satoken.yml
@@ -0,0 +1,13 @@
+# 内置配置 不允许修改 如需修改请在 nacos 上写相同配置覆盖
+# Sa-Token配置
+sa-token:
+  # 允许动态设置 token 有效期
+  dynamic-active-timeout: true
+  # 允许从 请求参数 读取 token
+  is-read-body: true
+  # 允许从 header 读取 token
+  is-read-header: true
+  # 关闭 cookie 鉴权 从根源杜绝 csrf 漏洞风险
+  is-read-cookie: false
+  # token前缀
+  token-prefix: "Bearer"
diff --git a/ruoyi-common/ruoyi-common-security/pom.xml b/ruoyi-common/ruoyi-common-security/pom.xml
new file mode 100644
index 0000000..5b39df2
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-security/pom.xml
@@ -0,0 +1,26 @@
+<?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>
+        <groupId>org.dromara</groupId>
+        <artifactId>ruoyi-common</artifactId>
+        <version>${revision}</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>ruoyi-common-security</artifactId>
+
+    <description>
+        ruoyi-common-security 安全模块
+    </description>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-satoken</artifactId>
+        </dependency>
+
+    </dependencies>
+
+</project>
diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/org/dromara/common/security/config/SecurityConfig.java b/ruoyi-common/ruoyi-common-security/src/main/java/org/dromara/common/security/config/SecurityConfig.java
new file mode 100644
index 0000000..5415118
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-security/src/main/java/org/dromara/common/security/config/SecurityConfig.java
@@ -0,0 +1,100 @@
+package org.dromara.common.security.config;
+
+import cn.dev33.satoken.exception.NotLoginException;
+import cn.dev33.satoken.filter.SaServletFilter;
+import cn.dev33.satoken.httpauth.basic.SaHttpBasicUtil;
+import cn.dev33.satoken.interceptor.SaInterceptor;
+import cn.dev33.satoken.router.SaRouter;
+import cn.dev33.satoken.stp.StpUtil;
+import cn.dev33.satoken.util.SaResult;
+import jakarta.servlet.http.HttpServletRequest;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.constant.HttpStatus;
+import org.dromara.common.core.utils.ServletUtils;
+import org.dromara.common.core.utils.SpringUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.common.security.config.properties.SecurityProperties;
+import org.dromara.common.security.handler.AllUrlHandler;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+/**
+ * 权限安全配置
+ *
+ * @author pengles
+ */
+
+@Slf4j
+@AutoConfiguration
+@EnableConfigurationProperties(SecurityProperties.class)
+@RequiredArgsConstructor
+public class SecurityConfig implements WebMvcConfigurer {
+
+    private final SecurityProperties securityProperties;
+    @Value("${sse.path}")
+    private String ssePath;
+
+    /**
+     * 注册sa-token的拦截器
+     */
+    @Override
+    public void addInterceptors(InterceptorRegistry registry) {
+        // 注册路由拦截器，自定义验证规则
+        registry.addInterceptor(new SaInterceptor(handler -> {
+                AllUrlHandler allUrlHandler = SpringUtils.getBean(AllUrlHandler.class);
+                // 登录验证 -- 排除多个路径
+                SaRouter
+                    // 获取所有的
+                    .match(allUrlHandler.getUrls())
+                    // 对未排除的路径进行检查
+                    .check(() -> {
+                        HttpServletRequest request = ServletUtils.getRequest();
+                        // 检查是否登录 是否有token
+                        StpUtil.checkLogin();
+
+                        // 检查 header 与 param 里的 clientid 与 token 里的是否一致
+                        String headerCid = request.getHeader(LoginHelper.CLIENT_KEY);
+                        String paramCid = ServletUtils.getParameter(LoginHelper.CLIENT_KEY);
+                        String clientId = StpUtil.getExtra(LoginHelper.CLIENT_KEY).toString();
+                        if (!StringUtils.equalsAny(clientId, headerCid, paramCid)) {
+                            // token 无效
+                            throw NotLoginException.newInstance(StpUtil.getLoginType(),
+                                "-100", "客户端ID与Token不匹配",
+                                StpUtil.getTokenValue());
+                        }
+
+                        // 有效率影响 用于临时测试
+                        // if (log.isDebugEnabled()) {
+                        //     log.info("剩余有效时间: {}", StpUtil.getTokenTimeout());
+                        //     log.info("临时有效时间: {}", StpUtil.getTokenActivityTimeout());
+                        // }
+
+                    });
+            })).addPathPatterns("/**")
+            // 排除不需要拦截的路径
+            .excludePathPatterns(securityProperties.getExcludes())
+            .excludePathPatterns(ssePath);
+    }
+
+    /**
+     * 对 actuator 健康检查接口 做账号密码鉴权
+     */
+    @Bean
+    public SaServletFilter getSaServletFilter() {
+        String username = SpringUtils.getProperty("spring.boot.admin.client.username");
+        String password = SpringUtils.getProperty("spring.boot.admin.client.password");
+        return new SaServletFilter()
+            .addInclude("/actuator", "/actuator/**")
+            .setAuth(obj -> {
+                SaHttpBasicUtil.check(username + ":" + password);
+            })
+            .setError(e -> SaResult.error(e.getMessage()).setCode(HttpStatus.UNAUTHORIZED));
+    }
+
+}
diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/org/dromara/common/security/config/properties/SecurityProperties.java b/ruoyi-common/ruoyi-common-security/src/main/java/org/dromara/common/security/config/properties/SecurityProperties.java
new file mode 100644
index 0000000..9b1c3dd
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-security/src/main/java/org/dromara/common/security/config/properties/SecurityProperties.java
@@ -0,0 +1,21 @@
+package org.dromara.common.security.config.properties;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+/**
+ * Security 配置属性
+ *
+ * @author pengles
+ */
+@Data
+@ConfigurationProperties(prefix = "security")
+public class SecurityProperties {
+
+    /**
+     * 排除路径
+     */
+    private String[] excludes;
+
+
+}
diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/org/dromara/common/security/handler/AllUrlHandler.java b/ruoyi-common/ruoyi-common-security/src/main/java/org/dromara/common/security/handler/AllUrlHandler.java
new file mode 100644
index 0000000..2fc390a
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-security/src/main/java/org/dromara/common/security/handler/AllUrlHandler.java
@@ -0,0 +1,39 @@
+package org.dromara.common.security.handler;
+
+import cn.hutool.core.util.ReUtil;
+import lombok.Data;
+import org.dromara.common.core.utils.SpringUtils;
+import org.springframework.beans.factory.InitializingBean;
+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.regex.Pattern;
+
+/**
+ * 获取所有Url配置
+ *
+ * @author pengles
+ */
+@Data
+public class AllUrlHandler implements InitializingBean {
+
+    private static final Pattern PATTERN = Pattern.compile("\\{(.*?)\\}");
+
+    private List<String> urls = new ArrayList<>();
+
+    @Override
+    public void afterPropertiesSet() {
+        Set<String> set = new HashSet<>();
+        RequestMappingHandlerMapping mapping = SpringUtils.getBean("requestMappingHandlerMapping", RequestMappingHandlerMapping.class);
+        Map<RequestMappingInfo, HandlerMethod> map = mapping.getHandlerMethods();
+        map.keySet().forEach(info -> {
+            // 获取注解上边的 path 替代 path variable 为 *
+            Objects.requireNonNull(info.getPathPatternsCondition().getPatterns())
+                    .forEach(url -> set.add(ReUtil.replaceAll(url.getPatternString(), PATTERN, "*")));
+        });
+        urls.addAll(set);
+    }
+
+}
diff --git a/ruoyi-common/ruoyi-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
new file mode 100644
index 0000000..6def724
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1,2 @@
+org.dromara.common.security.handler.AllUrlHandler
+org.dromara.common.security.config.SecurityConfig
diff --git a/ruoyi-common/ruoyi-common-sensitive/pom.xml b/ruoyi-common/ruoyi-common-sensitive/pom.xml
new file mode 100644
index 0000000..fecdf09
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-sensitive/pom.xml
@@ -0,0 +1,25 @@
+<?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>
+        <groupId>org.dromara</groupId>
+        <artifactId>ruoyi-common</artifactId>
+        <version>${revision}</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>ruoyi-common-sensitive</artifactId>
+
+    <description>
+        ruoyi-common-sensitive 脱敏模块
+    </description>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-json</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>
diff --git a/ruoyi-common/ruoyi-common-sensitive/src/main/java/org/dromara/common/sensitive/annotation/Sensitive.java b/ruoyi-common/ruoyi-common-sensitive/src/main/java/org/dromara/common/sensitive/annotation/Sensitive.java
new file mode 100644
index 0000000..e75dc5b
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-sensitive/src/main/java/org/dromara/common/sensitive/annotation/Sensitive.java
@@ -0,0 +1,34 @@
+package org.dromara.common.sensitive.annotation;
+
+import com.fasterxml.jackson.annotation.JacksonAnnotationsInside;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import org.dromara.common.sensitive.core.SensitiveStrategy;
+import org.dromara.common.sensitive.handler.SensitiveHandler;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * 数据脱敏注解
+ *
+ * @author zhujie
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.FIELD)
+@JacksonAnnotationsInside
+@JsonSerialize(using = SensitiveHandler.class)
+public @interface Sensitive {
+    SensitiveStrategy strategy();
+
+    /**
+     * 角色标识符 多个角色满足一个即可
+     */
+    String[] roleKey() default {};
+
+    /**
+     * 权限标识符 多个权限满足一个即可
+     */
+    String[] perms() default {};
+}
diff --git a/ruoyi-common/ruoyi-common-sensitive/src/main/java/org/dromara/common/sensitive/core/SensitiveService.java b/ruoyi-common/ruoyi-common-sensitive/src/main/java/org/dromara/common/sensitive/core/SensitiveService.java
new file mode 100644
index 0000000..e8bdaee
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-sensitive/src/main/java/org/dromara/common/sensitive/core/SensitiveService.java
@@ -0,0 +1,18 @@
+package org.dromara.common.sensitive.core;
+
+/**
+ * 脱敏服务
+ * 默认管理员不过滤
+ * 需自行根据业务重写实现
+ *
+ * @author pengles
+ * @version 3.6.0
+ */
+public interface SensitiveService {
+
+    /**
+     * 是否脱敏
+     */
+    boolean isSensitive(String[] roleKey, String[] perms);
+
+}
diff --git a/ruoyi-common/ruoyi-common-sensitive/src/main/java/org/dromara/common/sensitive/core/SensitiveStrategy.java b/ruoyi-common/ruoyi-common-sensitive/src/main/java/org/dromara/common/sensitive/core/SensitiveStrategy.java
new file mode 100644
index 0000000..7af5cee
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-sensitive/src/main/java/org/dromara/common/sensitive/core/SensitiveStrategy.java
@@ -0,0 +1,99 @@
+package org.dromara.common.sensitive.core;
+
+import cn.hutool.core.util.DesensitizedUtil;
+import lombok.AllArgsConstructor;
+
+import java.util.function.Function;
+
+/**
+ * 脱敏策略
+ *
+ * @author Yjoioooo
+ * @version 3.6.0
+ */
+@AllArgsConstructor
+public enum SensitiveStrategy {
+
+    /**
+     * 身份证脱敏
+     */
+    ID_CARD(s -> DesensitizedUtil.idCardNum(s, 3, 4)),
+
+    /**
+     * 手机号脱敏
+     */
+    PHONE(DesensitizedUtil::mobilePhone),
+
+    /**
+     * 地址脱敏
+     */
+    ADDRESS(s -> DesensitizedUtil.address(s, 8)),
+
+    /**
+     * 邮箱脱敏
+     */
+    EMAIL(DesensitizedUtil::email),
+
+    /**
+     * 银行卡
+     */
+    BANK_CARD(DesensitizedUtil::bankCard),
+
+    /**
+     * 中文名
+     */
+    CHINESE_NAME(DesensitizedUtil::chineseName),
+
+    /**
+     * 固定电话
+     */
+    FIXED_PHONE(DesensitizedUtil::fixedPhone),
+
+    /**
+     * 用户ID
+     */
+    USER_ID(s -> String.valueOf(DesensitizedUtil.userId())),
+
+    /**
+     * 密码
+     */
+    PASSWORD(DesensitizedUtil::password),
+
+    /**
+     * ipv4
+     */
+    IPV4(DesensitizedUtil::ipv4),
+
+    /**
+     * ipv6
+     */
+    IPV6(DesensitizedUtil::ipv6),
+
+    /**
+     * 中国大陆车牌，包含普通车辆、新能源车辆
+     */
+    CAR_LICENSE(DesensitizedUtil::carLicense),
+
+    /**
+     * 只显示第一个字符
+     */
+    FIRST_MASK(DesensitizedUtil::firstMask),
+
+    /**
+     * 清空为""
+     */
+    CLEAR(s -> DesensitizedUtil.clear()),
+
+    /**
+     * 清空为null
+     */
+    CLEAR_TO_NULL(s -> DesensitizedUtil.clearToNull());
+
+    //可自行添加其他脱敏策略
+
+    private final Function<String, String> desensitizer;
+
+    public Function<String, String> desensitizer() {
+        return desensitizer;
+    }
+}
diff --git a/ruoyi-common/ruoyi-common-sensitive/src/main/java/org/dromara/common/sensitive/handler/SensitiveHandler.java b/ruoyi-common/ruoyi-common-sensitive/src/main/java/org/dromara/common/sensitive/handler/SensitiveHandler.java
new file mode 100644
index 0000000..bad2542
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-sensitive/src/main/java/org/dromara/common/sensitive/handler/SensitiveHandler.java
@@ -0,0 +1,58 @@
+package org.dromara.common.sensitive.handler;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.BeanProperty;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.JsonSerializer;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.ser.ContextualSerializer;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.utils.SpringUtils;
+import org.dromara.common.sensitive.annotation.Sensitive;
+import org.dromara.common.sensitive.core.SensitiveService;
+import org.dromara.common.sensitive.core.SensitiveStrategy;
+import org.springframework.beans.BeansException;
+
+import java.io.IOException;
+import java.util.Objects;
+
+/**
+ * 数据脱敏json序列化工具
+ *
+ * @author Yjoioooo
+ */
+@Slf4j
+public class SensitiveHandler extends JsonSerializer<String> implements ContextualSerializer {
+
+    private SensitiveStrategy strategy;
+    private String[] roleKey;
+    private String[] perms;
+
+    @Override
+    public void serialize(String value, JsonGenerator gen, SerializerProvider serializers) throws IOException {
+        try {
+            SensitiveService sensitiveService = SpringUtils.getBean(SensitiveService.class);
+            if (ObjectUtil.isNotNull(sensitiveService) && sensitiveService.isSensitive(roleKey, perms)) {
+                gen.writeString(strategy.desensitizer().apply(value));
+            } else {
+                gen.writeString(value);
+            }
+        } catch (BeansException e) {
+            log.error("脱敏实现不存在, 采用默认处理 => {}", e.getMessage());
+            gen.writeString(value);
+        }
+    }
+
+    @Override
+    public JsonSerializer<?> createContextual(SerializerProvider prov, BeanProperty property) throws JsonMappingException {
+        Sensitive annotation = property.getAnnotation(Sensitive.class);
+        if (Objects.nonNull(annotation) && Objects.equals(String.class, property.getType().getRawClass())) {
+            this.strategy = annotation.strategy();
+            this.roleKey = annotation.roleKey();
+            this.perms = annotation.perms();
+            return this;
+        }
+        return prov.findValueSerializer(property.getType(), property);
+    }
+}
diff --git a/ruoyi-common/ruoyi-common-sms/pom.xml b/ruoyi-common/ruoyi-common-sms/pom.xml
new file mode 100644
index 0000000..932cb9d
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-sms/pom.xml
@@ -0,0 +1,33 @@
+<?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>
+        <groupId>org.dromara</groupId>
+        <artifactId>ruoyi-common</artifactId>
+        <version>${revision}</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>ruoyi-common-sms</artifactId>
+
+    <description>
+        ruoyi-common-sms 短信模块
+    </description>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>org.dromara.sms4j</groupId>
+            <artifactId>sms4j-spring-boot-starter</artifactId>
+        </dependency>
+
+        <!-- RuoYi Common Redis-->
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-redis</artifactId>
+        </dependency>
+
+    </dependencies>
+
+</project>
diff --git a/ruoyi-common/ruoyi-common-sms/src/main/java/org/dromara/common/sms/config/SmsAutoConfiguration.java b/ruoyi-common/ruoyi-common-sms/src/main/java/org/dromara/common/sms/config/SmsAutoConfiguration.java
new file mode 100644
index 0000000..3a39cc2
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-sms/src/main/java/org/dromara/common/sms/config/SmsAutoConfiguration.java
@@ -0,0 +1,33 @@
+package org.dromara.common.sms.config;
+
+import org.dromara.common.sms.core.dao.PlusSmsDao;
+import org.dromara.common.sms.handler.SmsExceptionHandler;
+import org.dromara.sms4j.api.dao.SmsDao;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
+import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Primary;
+
+/**
+ * 短信配置类
+ *
+ * @author Feng
+ */
+@AutoConfiguration(after = {RedisAutoConfiguration.class})
+public class SmsAutoConfiguration {
+
+    @Primary
+    @Bean
+    public SmsDao smsDao() {
+        return new PlusSmsDao();
+    }
+
+    /**
+     * 异常处理器
+     */
+    @Bean
+    public SmsExceptionHandler smsExceptionHandler() {
+        return new SmsExceptionHandler();
+    }
+
+}
diff --git a/ruoyi-common/ruoyi-common-sms/src/main/java/org/dromara/common/sms/core/dao/PlusSmsDao.java b/ruoyi-common/ruoyi-common-sms/src/main/java/org/dromara/common/sms/core/dao/PlusSmsDao.java
new file mode 100644
index 0000000..05145e1
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-sms/src/main/java/org/dromara/common/sms/core/dao/PlusSmsDao.java
@@ -0,0 +1,71 @@
+package org.dromara.common.sms.core.dao;
+
+import org.dromara.common.core.constant.GlobalConstants;
+import org.dromara.common.redis.utils.RedisUtils;
+import org.dromara.sms4j.api.dao.SmsDao;
+
+import java.time.Duration;
+
+/**
+ * SmsDao缓存配置 (使用框架自带RedisUtils实现 协议统一)
+ * <p>主要用于短信重试和拦截的缓存
+ *
+ * @author Feng
+ */
+public class PlusSmsDao implements SmsDao {
+
+    /**
+     * 存储
+     *
+     * @param key       键
+     * @param value     值
+     * @param cacheTime 缓存时间（单位：秒)
+     */
+    @Override
+    public void set(String key, Object value, long cacheTime) {
+        RedisUtils.setCacheObject(GlobalConstants.GLOBAL_REDIS_KEY + key, value, Duration.ofSeconds(cacheTime));
+    }
+
+    /**
+     * 存储
+     *
+     * @param key   键
+     * @param value 值
+     */
+    @Override
+    public void set(String key, Object value) {
+        RedisUtils.setCacheObject(GlobalConstants.GLOBAL_REDIS_KEY + key, value, true);
+    }
+
+    /**
+     * 读取
+     *
+     * @param key 键
+     * @return 值
+     */
+    @Override
+    public Object get(String key) {
+        return RedisUtils.getCacheObject(GlobalConstants.GLOBAL_REDIS_KEY + key);
+    }
+
+    /**
+     * remove
+     * <p> 根据key移除缓存
+     *
+     * @param key 缓存键
+     * @return 被删除的value
+     */
+    @Override
+    public Object remove(String key) {
+        return RedisUtils.deleteObject(GlobalConstants.GLOBAL_REDIS_KEY + key);
+    }
+
+    /**
+     * 清空
+     */
+    @Override
+    public void clean() {
+        RedisUtils.deleteKeys(GlobalConstants.GLOBAL_REDIS_KEY + "sms:*");
+    }
+
+}
diff --git a/ruoyi-common/ruoyi-common-sms/src/main/java/org/dromara/common/sms/handler/SmsExceptionHandler.java b/ruoyi-common/ruoyi-common-sms/src/main/java/org/dromara/common/sms/handler/SmsExceptionHandler.java
new file mode 100644
index 0000000..2c619a3
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-sms/src/main/java/org/dromara/common/sms/handler/SmsExceptionHandler.java
@@ -0,0 +1,30 @@
+package org.dromara.common.sms.handler;
+
+import cn.hutool.http.HttpStatus;
+import jakarta.servlet.http.HttpServletRequest;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.domain.R;
+import org.dromara.sms4j.comm.exception.SmsBlendException;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
+
+/**
+ * SMS异常处理器
+ *
+ * @author AprilWind
+ */
+@Slf4j
+@RestControllerAdvice
+public class SmsExceptionHandler {
+
+    /**
+     * sms异常
+     */
+    @ExceptionHandler(SmsBlendException.class)
+    public R<Void> handleSmsBlendException(SmsBlendException e, HttpServletRequest request) {
+        String requestURI = request.getRequestURI();
+        log.error("请求地址'{}',发生sms短信异常.", requestURI, e);
+        return R.fail(HttpStatus.HTTP_INTERNAL_ERROR, "短信发送失败，请稍后再试...");
+    }
+
+}
diff --git a/ruoyi-common/ruoyi-common-sms/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-sms/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
new file mode 100644
index 0000000..5919ce3
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-sms/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1 @@
+org.dromara.common.sms.config.SmsAutoConfiguration
diff --git a/ruoyi-common/ruoyi-common-social/pom.xml b/ruoyi-common/ruoyi-common-social/pom.xml
new file mode 100644
index 0000000..c60d43d
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-social/pom.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>org.dromara</groupId>
+        <artifactId>ruoyi-common</artifactId>
+        <version>${revision}</version>
+    </parent>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>15</source>
+                    <target>15</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>ruoyi-common-social</artifactId>
+
+    <description>
+        ruoyi-common-social 授权认证
+    </description>
+
+    <dependencies>
+        <dependency>
+            <groupId>me.zhyd.oauth</groupId>
+            <artifactId>JustAuth</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-json</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-redis</artifactId>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/ruoyi-common/ruoyi-common-social/src/main/java/me/zhyd/oauth/request/AbstractAuthWeChatEnterpriseRequest.java b/ruoyi-common/ruoyi-common-social/src/main/java/me/zhyd/oauth/request/AbstractAuthWeChatEnterpriseRequest.java
new file mode 100644
index 0000000..f2a1f7b
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-social/src/main/java/me/zhyd/oauth/request/AbstractAuthWeChatEnterpriseRequest.java
@@ -0,0 +1,154 @@
+package me.zhyd.oauth.request;
+
+import com.alibaba.fastjson.JSONObject;
+import me.zhyd.oauth.cache.AuthStateCache;
+import me.zhyd.oauth.config.AuthConfig;
+import me.zhyd.oauth.config.AuthSource;
+import me.zhyd.oauth.enums.AuthResponseStatus;
+import me.zhyd.oauth.enums.AuthUserGender;
+import me.zhyd.oauth.exception.AuthException;
+import me.zhyd.oauth.model.AuthCallback;
+import me.zhyd.oauth.model.AuthToken;
+import me.zhyd.oauth.model.AuthUser;
+import me.zhyd.oauth.utils.HttpUtils;
+import me.zhyd.oauth.utils.StringUtils;
+import me.zhyd.oauth.utils.UrlBuilder;
+
+/**
+ * <p>
+ * 企业微信登录父类
+ * </p>
+ *
+ * @author liguanhua (347826496(a)qq.com)
+ * @since 1.15.9
+ */
+public abstract class AbstractAuthWeChatEnterpriseRequest extends AuthDefaultRequest {
+
+    public AbstractAuthWeChatEnterpriseRequest(AuthConfig config, AuthSource source) {
+        super(config,source);
+    }
+
+
+    public AbstractAuthWeChatEnterpriseRequest(AuthConfig config, AuthSource source, AuthStateCache authStateCache) {
+        super(config, source, authStateCache);
+    }
+
+    @Override
+    public AuthToken getAccessToken(AuthCallback authCallback) {
+        String response = doGetAuthorizationCode(accessTokenUrl(null));
+
+        JSONObject object = this.checkResponse(response);
+
+        return AuthToken.builder()
+            .accessToken(object.getString("access_token"))
+            .expireIn(object.getIntValue("expires_in"))
+            .code(authCallback.getCode())
+            .build();
+    }
+
+    @Override
+    public AuthUser getUserInfo(AuthToken authToken) {
+        String response = doGetUserInfo(authToken);
+        JSONObject object = this.checkResponse(response);
+
+        // 返回 OpenId 或其他，均代表非当前企业用户，不支持
+        // https://github.com/justauth/JustAuth/issues/227 修复bug
+        if (!object.containsKey("userid")) {
+            throw new AuthException(AuthResponseStatus.UNIDENTIFIED_PLATFORM, source);
+        }
+        String userId = object.getString("userid");
+        String userTicket = object.getString("user_ticket");
+        JSONObject userDetail = getUserDetail(authToken.getAccessToken(), userId, userTicket);
+
+        return AuthUser.builder()
+            .rawUserInfo(userDetail)
+            .username(userDetail.getString("name"))
+            .nickname(userDetail.getString("alias"))
+            .avatar(userDetail.getString("avatar"))
+            .location(userDetail.getString("address"))
+            .email(userDetail.getString("email"))
+            .uuid(userId)
+            .gender(AuthUserGender.getWechatRealGender(userDetail.getString("gender")))
+            .token(authToken)
+            .source(source.toString())
+            .build();
+    }
+
+    /**
+     * 校验请求结果
+     *
+     * @param response 请求结果
+     * @return 如果请求结果正常，则返回JSONObject
+     */
+    private JSONObject checkResponse(String response) {
+        JSONObject object = JSONObject.parseObject(response);
+
+        if (object.containsKey("errcode") && object.getIntValue("errcode") != 0) {
+            throw new AuthException(object.getString("errmsg"), source);
+        }
+
+        return object;
+    }
+
+
+    /**
+     * 返回获取accessToken的url
+     *
+     * @param code 授权码
+     * @return 返回获取accessToken的url
+     */
+    @Override
+    protected String accessTokenUrl(String code) {
+        return UrlBuilder.fromBaseUrl(source.accessToken())
+            .queryParam("corpid", config.getClientId())
+            .queryParam("corpsecret", config.getClientSecret())
+            .build();
+    }
+
+    /**
+     * 返回获取userInfo的url
+     *
+     * @param authToken 用户授权后的token
+     * @return 返回获取userInfo的url
+     */
+    @Override
+    protected String userInfoUrl(AuthToken authToken) {
+        return UrlBuilder.fromBaseUrl(source.userInfo())
+            .queryParam("access_token", authToken.getAccessToken())
+            .queryParam("code", authToken.getCode())
+            .build();
+    }
+
+    /**
+     * 用户详情
+     *
+     * @param accessToken accessToken
+     * @param userId      企业内用户id
+     * @param userTicket  成员票据，用于获取用户信息或敏感信息
+     * @return 用户详情
+     */
+    private JSONObject getUserDetail(String accessToken, String userId, String userTicket) {
+        // 用户基础信息
+        String userInfoUrl = UrlBuilder.fromBaseUrl("https://qyapi.weixin.qq.com/cgi-bin/user/get")
+            .queryParam("access_token", accessToken)
+            .queryParam("userid", userId)
+            .build();
+        String userInfoResponse = new HttpUtils(config.getHttpConfig()).get(userInfoUrl).getBody();
+        JSONObject userInfo = checkResponse(userInfoResponse);
+
+        // 用户敏感信息
+        if (StringUtils.isNotEmpty(userTicket)) {
+            String userDetailUrl = UrlBuilder.fromBaseUrl("https://qyapi.weixin.qq.com/cgi-bin/auth/getuserdetail")
+                .queryParam("access_token", accessToken)
+                .build();
+            JSONObject param = new JSONObject();
+            param.put("user_ticket", userTicket);
+            String userDetailResponse = new HttpUtils(config.getHttpConfig()).post(userDetailUrl, param.toJSONString()).getBody();
+            JSONObject userDetail = checkResponse(userDetailResponse);
+
+            userInfo.putAll(userDetail);
+        }
+        return userInfo;
+    }
+
+}
diff --git a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/config/SocialAutoConfiguration.java b/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/config/SocialAutoConfiguration.java
new file mode 100644
index 0000000..19b39d8
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/config/SocialAutoConfiguration.java
@@ -0,0 +1,23 @@
+package org.dromara.common.social.config;
+
+import me.zhyd.oauth.cache.AuthStateCache;
+import org.dromara.common.social.config.properties.SocialProperties;
+import org.dromara.common.social.utils.AuthRedisStateCache;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+
+/**
+ * Social 配置属性
+ * @author thiszhc
+ */
+@AutoConfiguration
+@EnableConfigurationProperties(SocialProperties.class)
+public class SocialAutoConfiguration {
+
+    @Bean
+    public AuthStateCache authStateCache() {
+        return new AuthRedisStateCache();
+    }
+
+}
diff --git a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/config/properties/SocialLoginConfigProperties.java b/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/config/properties/SocialLoginConfigProperties.java
new file mode 100644
index 0000000..5f49d9c
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/config/properties/SocialLoginConfigProperties.java
@@ -0,0 +1,75 @@
+package org.dromara.common.social.config.properties;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 社交登录配置
+ *
+ * @author thiszhc
+ */
+@Data
+public class SocialLoginConfigProperties {
+
+    /**
+     * 应用 ID
+     */
+    private String clientId;
+
+    /**
+     * 应用密钥
+     */
+    private String clientSecret;
+
+    /**
+     * 回调地址
+     */
+    private String redirectUri;
+
+    /**
+     * 是否获取unionId
+     */
+    private boolean unionId;
+
+    /**
+     * Coding 企业名称
+     */
+    private String codingGroupName;
+
+    /**
+     * 支付宝公钥
+     */
+    private String alipayPublicKey;
+
+    /**
+     * 企业微信应用ID
+     */
+    private String agentId;
+
+    /**
+     * stackoverflow api key
+     */
+    private String stackOverflowKey;
+
+    /**
+     * 设备ID
+     */
+    private String deviceId;
+
+    /**
+     * 客户端系统类型
+     */
+    private String clientOsType;
+
+    /**
+     * maxkey 服务器地址
+     */
+    private String serverUrl;
+
+    /**
+     * 请求范围
+     */
+    private List<String> scopes;
+
+}
diff --git a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/config/properties/SocialProperties.java b/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/config/properties/SocialProperties.java
new file mode 100644
index 0000000..1487a6a
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/config/properties/SocialProperties.java
@@ -0,0 +1,24 @@
+package org.dromara.common.social.config.properties;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+/**
+ * Social 配置属性
+ *
+ * @author thiszhc
+ */
+@Data
+@Component
+@ConfigurationProperties(prefix = "justauth")
+public class SocialProperties {
+
+    /**
+     * 授权类型
+     */
+    private Map<String, SocialLoginConfigProperties> type;
+
+}
diff --git a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/gitea/AuthGiteaRequest.java b/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/gitea/AuthGiteaRequest.java
new file mode 100644
index 0000000..d3fc751
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/gitea/AuthGiteaRequest.java
@@ -0,0 +1,92 @@
+package org.dromara.common.social.gitea;
+
+import cn.hutool.core.lang.Dict;
+import cn.hutool.http.HttpRequest;
+import cn.hutool.http.HttpResponse;
+import lombok.extern.slf4j.Slf4j;
+import me.zhyd.oauth.cache.AuthStateCache;
+import me.zhyd.oauth.config.AuthConfig;
+import me.zhyd.oauth.exception.AuthException;
+import me.zhyd.oauth.model.AuthCallback;
+import me.zhyd.oauth.model.AuthToken;
+import me.zhyd.oauth.model.AuthUser;
+import me.zhyd.oauth.request.AuthDefaultRequest;
+import org.dromara.common.core.utils.SpringUtils;
+import org.dromara.common.json.utils.JsonUtils;
+
+/**
+ * @author lcry
+ */
+@Slf4j
+public class AuthGiteaRequest extends AuthDefaultRequest {
+
+    public static final String SERVER_URL = SpringUtils.getProperty("justauth.type.gitea.server-url");
+
+    /**
+     * 设定归属域
+     */
+    public AuthGiteaRequest(AuthConfig config) {
+        super(config, AuthGiteaSource.GITEA);
+    }
+
+    public AuthGiteaRequest(AuthConfig config, AuthStateCache authStateCache) {
+        super(config, AuthGiteaSource.GITEA, authStateCache);
+    }
+
+    @Override
+    public AuthToken getAccessToken(AuthCallback authCallback) {
+        String body = doPostAuthorizationCode(authCallback.getCode());
+        Dict object = JsonUtils.parseMap(body);
+        // oauth/token 验证异常
+        if (object.containsKey("error")) {
+            throw new AuthException(object.getStr("error_description"));
+        }
+        // user 验证异常
+        if (object.containsKey("message")) {
+            throw new AuthException(object.getStr("message"));
+        }
+        return AuthToken.builder()
+                .accessToken(object.getStr("access_token"))
+                .refreshToken(object.getStr("refresh_token"))
+                .idToken(object.getStr("id_token"))
+                .tokenType(object.getStr("token_type"))
+                .scope(object.getStr("scope"))
+                .build();
+    }
+
+    @Override
+    protected String doPostAuthorizationCode(String code) {
+        HttpRequest request = HttpRequest.post(source.accessToken())
+                .form("client_id", config.getClientId())
+                .form("client_secret", config.getClientSecret())
+                .form("grant_type", "authorization_code")
+                .form("code", code)
+                .form("redirect_uri", config.getRedirectUri());
+        HttpResponse response = request.execute();
+        return response.body();
+    }
+
+    @Override
+    public AuthUser getUserInfo(AuthToken authToken) {
+        String body = doGetUserInfo(authToken);
+        Dict object = JsonUtils.parseMap(body);
+        // oauth/token 验证异常
+        if (object.containsKey("error")) {
+            throw new AuthException(object.getStr("error_description"));
+        }
+        // user 验证异常
+        if (object.containsKey("message")) {
+            throw new AuthException(object.getStr("message"));
+        }
+        return AuthUser.builder()
+                .uuid(object.getStr("sub"))
+                .username(object.getStr("name"))
+                .nickname(object.getStr("preferred_username"))
+                .avatar(object.getStr("picture"))
+                .email(object.getStr("email"))
+                .token(authToken)
+                .source(source.toString())
+                .build();
+    }
+
+}
diff --git a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/gitea/AuthGiteaSource.java b/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/gitea/AuthGiteaSource.java
new file mode 100644
index 0000000..201b223
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/gitea/AuthGiteaSource.java
@@ -0,0 +1,50 @@
+package org.dromara.common.social.gitea;
+
+import me.zhyd.oauth.config.AuthSource;
+import me.zhyd.oauth.request.AuthDefaultRequest;
+
+/**
+ * gitea Oauth2 默认接口说明
+ *
+ * @author lcry
+ */
+public enum AuthGiteaSource implements AuthSource {
+
+    /**
+     * 自己搭建的 gitea 私服
+     */
+    GITEA {
+        /**
+         * 授权的api
+         */
+        @Override
+        public String authorize() {
+            return AuthGiteaRequest.SERVER_URL + "/login/oauth/authorize";
+        }
+
+        /**
+         * 获取accessToken的api
+         */
+        @Override
+        public String accessToken() {
+            return AuthGiteaRequest.SERVER_URL + "/login/oauth/access_token";
+        }
+
+        /**
+         * 获取用户信息的api
+         */
+        @Override
+        public String userInfo() {
+            return AuthGiteaRequest.SERVER_URL + "/login/oauth/userinfo";
+        }
+
+        /**
+         * 平台对应的 AuthRequest 实现类，必须继承自 {@link AuthDefaultRequest}
+         */
+        @Override
+        public Class<? extends AuthDefaultRequest> getTargetClass() {
+            return AuthGiteaRequest.class;
+        }
+
+    }
+}
diff --git a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/maxkey/AuthMaxKeyRequest.java b/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/maxkey/AuthMaxKeyRequest.java
new file mode 100644
index 0000000..97774ac
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/maxkey/AuthMaxKeyRequest.java
@@ -0,0 +1,80 @@
+package org.dromara.common.social.maxkey;
+
+import cn.hutool.core.lang.Dict;
+import me.zhyd.oauth.cache.AuthStateCache;
+import me.zhyd.oauth.config.AuthConfig;
+import me.zhyd.oauth.exception.AuthException;
+import me.zhyd.oauth.model.AuthCallback;
+import me.zhyd.oauth.model.AuthToken;
+import me.zhyd.oauth.model.AuthUser;
+import me.zhyd.oauth.request.AuthDefaultRequest;
+import org.dromara.common.core.utils.SpringUtils;
+import org.dromara.common.json.utils.JsonUtils;
+
+/**
+ *  @author 长春叭哥 2023年03月26日
+ */
+public class AuthMaxKeyRequest extends AuthDefaultRequest {
+
+    public static final String SERVER_URL = SpringUtils.getProperty("justauth.type.maxkey.server-url");
+
+    /**
+     * 设定归属域
+     */
+    public AuthMaxKeyRequest(AuthConfig config) {
+        super(config, AuthMaxKeySource.MAXKEY);
+    }
+
+    public AuthMaxKeyRequest(AuthConfig config, AuthStateCache authStateCache) {
+        super(config, AuthMaxKeySource.MAXKEY, authStateCache);
+    }
+
+    @Override
+    public AuthToken getAccessToken(AuthCallback authCallback) {
+        String body = doPostAuthorizationCode(authCallback.getCode());
+        Dict object = JsonUtils.parseMap(body);
+        // oauth/token 验证异常
+        if (object.containsKey("error")) {
+            throw new AuthException(object.getStr("error_description"));
+        }
+        // user 验证异常
+        if (object.containsKey("message")) {
+            throw new AuthException(object.getStr("message"));
+        }
+        return AuthToken.builder()
+            .accessToken(object.getStr("access_token"))
+            .refreshToken(object.getStr("refresh_token"))
+            .idToken(object.getStr("id_token"))
+            .tokenType(object.getStr("token_type"))
+            .scope(object.getStr("scope"))
+            .build();
+    }
+
+    @Override
+    public AuthUser getUserInfo(AuthToken authToken) {
+        String body = doGetUserInfo(authToken);
+        Dict object = JsonUtils.parseMap(body);
+        // oauth/token 验证异常
+        if (object.containsKey("error")) {
+            throw new AuthException(object.getStr("error_description"));
+        }
+        // user 验证异常
+        if (object.containsKey("message")) {
+            throw new AuthException(object.getStr("message"));
+        }
+        return AuthUser.builder()
+            .uuid(object.getStr("userId"))
+            .username(object.getStr("username"))
+            .nickname(object.getStr("displayName"))
+            .avatar(object.getStr("avatar_url"))
+            .blog(object.getStr("web_url"))
+            .company(object.getStr("organization"))
+            .location(object.getStr("location"))
+            .email(object.getStr("email"))
+            .remark(object.getStr("bio"))
+            .token(authToken)
+            .source(source.toString())
+            .build();
+    }
+
+}
diff --git a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/maxkey/AuthMaxKeySource.java b/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/maxkey/AuthMaxKeySource.java
new file mode 100644
index 0000000..1ff57f7
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/maxkey/AuthMaxKeySource.java
@@ -0,0 +1,52 @@
+package org.dromara.common.social.maxkey;
+
+import me.zhyd.oauth.config.AuthSource;
+import me.zhyd.oauth.request.AuthDefaultRequest;
+
+/**
+ * Oauth2 默认接口说明
+ *
+ * @author 长春叭哥 2023年03月26日
+ *
+ */
+public enum AuthMaxKeySource implements AuthSource {
+
+    /**
+     * 自己搭建的 maxkey 私服
+     */
+    MAXKEY {
+
+        /**
+         * 授权的api
+         */
+        @Override
+        public String authorize() {
+            return AuthMaxKeyRequest.SERVER_URL + "/sign/authz/oauth/v20/authorize";
+        }
+
+        /**
+         * 获取accessToken的api
+         */
+        @Override
+        public String accessToken() {
+            return AuthMaxKeyRequest.SERVER_URL + "/sign/authz/oauth/v20/token";
+        }
+
+        /**
+         * 获取用户信息的api
+         */
+        @Override
+        public String userInfo() {
+            return AuthMaxKeyRequest.SERVER_URL + "/sign/api/oauth/v20/me";
+        }
+
+        /**
+         * 平台对应的 AuthRequest 实现类，必须继承自 {@link AuthDefaultRequest}
+         */
+        @Override
+        public Class<? extends AuthDefaultRequest> getTargetClass() {
+            return AuthMaxKeyRequest.class;
+        }
+
+    }
+}
diff --git a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/topiam/AuthTopIamRequest.java b/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/topiam/AuthTopIamRequest.java
new file mode 100644
index 0000000..080c97a
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/topiam/AuthTopIamRequest.java
@@ -0,0 +1,113 @@
+package org.dromara.common.social.topiam;
+
+import cn.hutool.core.codec.Base64;
+import cn.hutool.core.lang.Dict;
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.http.HttpRequest;
+import cn.hutool.http.HttpResponse;
+import com.xkcoding.http.support.HttpHeader;
+import lombok.extern.slf4j.Slf4j;
+import me.zhyd.oauth.cache.AuthStateCache;
+import me.zhyd.oauth.config.AuthConfig;
+import me.zhyd.oauth.exception.AuthException;
+import me.zhyd.oauth.model.AuthCallback;
+import me.zhyd.oauth.model.AuthToken;
+import me.zhyd.oauth.model.AuthUser;
+import me.zhyd.oauth.request.AuthDefaultRequest;
+import me.zhyd.oauth.utils.HttpUtils;
+import me.zhyd.oauth.utils.UrlBuilder;
+import org.dromara.common.core.utils.SpringUtils;
+import org.dromara.common.json.utils.JsonUtils;
+
+import static org.dromara.common.social.topiam.AuthTopIamSource.TOPIAM;
+
+/**
+ * TopIAM 认证请求
+ *
+ * @author xlsea
+ * @since 2024-01-06
+ */
+@Slf4j
+public class AuthTopIamRequest extends AuthDefaultRequest {
+
+    public static final String SERVER_URL = SpringUtils.getProperty("justauth.type.topiam.server-url");
+
+    /**
+     * 设定归属域
+     */
+    public AuthTopIamRequest(AuthConfig config) {
+        super(config, TOPIAM);
+    }
+
+    public AuthTopIamRequest(AuthConfig config, AuthStateCache authStateCache) {
+        super(config, TOPIAM, authStateCache);
+    }
+
+    @Override
+    public AuthToken getAccessToken(AuthCallback authCallback) {
+        String body = doPostAuthorizationCode(authCallback.getCode());
+        Dict object = JsonUtils.parseMap(body);
+        checkResponse(object);
+        return AuthToken.builder()
+            .accessToken(object.getStr("access_token"))
+            .refreshToken(object.getStr("refresh_token"))
+            .idToken(object.getStr("id_token"))
+            .tokenType(object.getStr("token_type"))
+            .scope(object.getStr("scope"))
+            .build();
+    }
+
+    @Override
+    public AuthUser getUserInfo(AuthToken authToken) {
+        String body = doGetUserInfo(authToken);
+        Dict object = JsonUtils.parseMap(body);
+        checkResponse(object);
+        return AuthUser.builder()
+            .uuid(object.getStr("sub"))
+            .username(object.getStr("preferred_username"))
+            .nickname(object.getStr("nickname"))
+            .avatar(object.getStr("picture"))
+            .email(object.getStr("email"))
+            .token(authToken)
+            .source(source.toString())
+            .build();
+    }
+
+    @Override
+    protected String doPostAuthorizationCode(String code) {
+        HttpRequest request = HttpRequest.post(source.accessToken())
+            .header("Authorization", "Basic " + Base64.encode("%s:%s".formatted(config.getClientId(), config.getClientSecret())))
+            .form("grant_type", "authorization_code")
+            .form("code", code)
+            .form("redirect_uri", config.getRedirectUri());
+        HttpResponse response = request.execute();
+        return response.body();
+    }
+
+    @Override
+    protected String doGetUserInfo(AuthToken authToken) {
+        return new HttpUtils(config.getHttpConfig()).get(source.userInfo(), null, new HttpHeader()
+            .add("Content-Type", "application/json")
+            .add("Authorization", "Bearer " + authToken.getAccessToken()), false).getBody();
+    }
+
+
+    @Override
+    public String authorize(String state) {
+        return UrlBuilder.fromBaseUrl(super.authorize(state))
+            .queryParam("scope", StrUtil.join("%20", config.getScopes()))
+            .build();
+    }
+
+    private static void checkResponse(Dict object) {
+        // oauth/token 验证异常
+        if (object.containsKey("error")) {
+            throw new AuthException(object.getStr("error_description"));
+        }
+        // user 验证异常
+        if (object.containsKey("message")) {
+            throw new AuthException(object.getStr("message"));
+        }
+    }
+
+}
diff --git a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/topiam/AuthTopIamSource.java b/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/topiam/AuthTopIamSource.java
new file mode 100644
index 0000000..852d7f5
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/topiam/AuthTopIamSource.java
@@ -0,0 +1,51 @@
+package org.dromara.common.social.topiam;
+
+import me.zhyd.oauth.config.AuthSource;
+import me.zhyd.oauth.request.AuthDefaultRequest;
+
+/**
+ * Oauth2 默认接口说明
+ *
+ * @author xlsea
+ * @since 2024-01-06
+ */
+public enum AuthTopIamSource implements AuthSource {
+
+    /**
+     * 测试
+     */
+    TOPIAM {
+        /**
+         * 授权的api
+         */
+        @Override
+        public String authorize() {
+            return AuthTopIamRequest.SERVER_URL + "/oauth2/auth";
+        }
+
+        /**
+         * 获取accessToken的api
+         */
+        @Override
+        public String accessToken() {
+            return AuthTopIamRequest.SERVER_URL + "/oauth2/token";
+        }
+
+        /**
+         * 获取用户信息的api
+         */
+        @Override
+        public String userInfo() {
+            return AuthTopIamRequest.SERVER_URL + "/oauth2/userinfo";
+        }
+
+        /**
+         * 平台对应的 AuthRequest 实现类，必须继承自 {@link AuthDefaultRequest}
+         */
+        @Override
+        public Class<? extends AuthDefaultRequest> getTargetClass() {
+            return AuthTopIamRequest.class;
+        }
+
+    }
+}
diff --git a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/utils/AuthRedisStateCache.java b/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/utils/AuthRedisStateCache.java
new file mode 100644
index 0000000..0b6ec20
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/utils/AuthRedisStateCache.java
@@ -0,0 +1,61 @@
+package org.dromara.common.social.utils;
+
+import lombok.AllArgsConstructor;
+import me.zhyd.oauth.cache.AuthStateCache;
+import org.dromara.common.core.constant.GlobalConstants;
+import org.dromara.common.redis.utils.RedisUtils;
+
+import java.time.Duration;
+
+/**
+ * 授权状态缓存
+ */
+@AllArgsConstructor
+public class AuthRedisStateCache implements AuthStateCache {
+
+    /**
+     * 存入缓存
+     *
+     * @param key   缓存key
+     * @param value 缓存内容
+     */
+    @Override
+    public void cache(String key, String value) {
+        // 授权超时时间 默认三分钟
+        RedisUtils.setCacheObject(GlobalConstants.SOCIAL_AUTH_CODE_KEY + key, value, Duration.ofMinutes(3));
+    }
+
+    /**
+     * 存入缓存
+     *
+     * @param key     缓存key
+     * @param value   缓存内容
+     * @param timeout 指定缓存过期时间(毫秒)
+     */
+    @Override
+    public void cache(String key, String value, long timeout) {
+        RedisUtils.setCacheObject(GlobalConstants.SOCIAL_AUTH_CODE_KEY + key, value, Duration.ofMillis(timeout));
+    }
+
+    /**
+     * 获取缓存内容
+     *
+     * @param key 缓存key
+     * @return 缓存内容
+     */
+    @Override
+    public String get(String key) {
+        return RedisUtils.getCacheObject(GlobalConstants.SOCIAL_AUTH_CODE_KEY + key);
+    }
+
+    /**
+     * 是否存在key，如果对应key的value值已过期，也返回false
+     *
+     * @param key 缓存key
+     * @return true：存在key，并且value没过期；false：key不存在或者已过期
+     */
+    @Override
+    public boolean containsKey(String key) {
+        return RedisUtils.hasKey(GlobalConstants.SOCIAL_AUTH_CODE_KEY + key);
+    }
+}
diff --git a/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/utils/SocialUtils.java b/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/utils/SocialUtils.java
new file mode 100644
index 0000000..fd921e3
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/utils/SocialUtils.java
@@ -0,0 +1,82 @@
+package org.dromara.common.social.utils;
+
+import cn.hutool.core.util.ObjectUtil;
+import me.zhyd.oauth.config.AuthConfig;
+import me.zhyd.oauth.exception.AuthException;
+import me.zhyd.oauth.model.AuthCallback;
+import me.zhyd.oauth.model.AuthResponse;
+import me.zhyd.oauth.model.AuthUser;
+import me.zhyd.oauth.request.*;
+import me.zhyd.oauth.request.AuthWechatMiniProgramRequest;
+import org.dromara.common.core.utils.SpringUtils;
+import org.dromara.common.social.config.properties.SocialLoginConfigProperties;
+import org.dromara.common.social.config.properties.SocialProperties;
+import org.dromara.common.social.gitea.AuthGiteaRequest;
+import org.dromara.common.social.maxkey.AuthMaxKeyRequest;
+import org.dromara.common.social.topiam.AuthTopIamRequest;
+
+/**
+ * 认证授权工具类
+ *
+ * @author thiszhc
+ */
+public class SocialUtils  {
+
+    private static final AuthRedisStateCache STATE_CACHE = SpringUtils.getBean(AuthRedisStateCache.class);
+
+    public static AuthResponse<AuthUser> loginAuth(String source, String code, String state, SocialProperties socialProperties) throws AuthException {
+        AuthRequest authRequest = getAuthRequest(source, socialProperties);
+        AuthCallback callback = new AuthCallback();
+        callback.setCode(code);
+        callback.setState(state);
+        return authRequest.login(callback);
+    }
+
+    /**
+     * 根据来源标识构造对应的第三方授权请求
+     * 说明：
+     * - 配置来源：application*.yml 的 justauth.type.{source}
+     * - 常见 source：wechat_mp / wechat_open / wechat_miniprogram / github / gitee 等
+     * - 返回的 AuthRequest 由 JustAuth 不同平台实现提供
+     */
+    public static AuthRequest getAuthRequest(String source, SocialProperties socialProperties) throws AuthException {
+        SocialLoginConfigProperties obj = socialProperties.getType().get(source);
+         if (ObjectUtil.isNull(obj)) {
+            throw new AuthException("不支持的第三方登录类型");
+        }
+        AuthConfig.AuthConfigBuilder builder = AuthConfig.builder()
+            .clientId(obj.getClientId())
+            .clientSecret(obj.getClientSecret())
+            .redirectUri(obj.getRedirectUri())
+            .scopes(obj.getScopes());
+        return switch (source.toLowerCase()) {
+            case "dingtalk" -> new AuthDingTalkV2Request(builder.build(), STATE_CACHE);
+            case "baidu" -> new AuthBaiduRequest(builder.build(), STATE_CACHE);
+            case "github" -> new AuthGithubRequest(builder.build(), STATE_CACHE);
+            case "gitee" -> new AuthGiteeRequest(builder.build(), STATE_CACHE);
+            case "weibo" -> new AuthWeiboRequest(builder.build(), STATE_CACHE);
+            case "coding" -> new AuthCodingRequest(builder.build(), STATE_CACHE);
+            case "oschina" -> new AuthOschinaRequest(builder.build(), STATE_CACHE);
+            // 支付宝在创建回调地址时，不允许使用localhost或者127.0.0.1，所以这儿的回调地址使用的局域网内的ip
+            case "alipay_wallet" -> new AuthAlipayRequest(builder.build(), socialProperties.getType().get("alipay_wallet").getAlipayPublicKey(), STATE_CACHE);
+            case "qq" -> new AuthQqRequest(builder.build(), STATE_CACHE);
+            case "wechat_open" -> new AuthWeChatOpenRequest(builder.build(), STATE_CACHE);
+            case "taobao" -> new AuthTaobaoRequest(builder.build(), STATE_CACHE);
+            case "douyin" -> new AuthDouyinRequest(builder.build(), STATE_CACHE);
+            case "linkedin" -> new AuthLinkedinRequest(builder.build(), STATE_CACHE);
+            case "microsoft" -> new AuthMicrosoftRequest(builder.build(), STATE_CACHE);
+            case "renren" -> new AuthRenrenRequest(builder.build(), STATE_CACHE);
+            case "stack_overflow" -> new AuthStackOverflowRequest(builder.stackOverflowKey(obj.getStackOverflowKey()).build(), STATE_CACHE);
+            case "huawei" -> new AuthHuaweiV3Request(builder.build(), STATE_CACHE);
+            case "wechat_enterprise" -> new AuthWeChatEnterpriseQrcodeV2Request(builder.agentId(obj.getAgentId()).build(), STATE_CACHE);
+            case "gitlab" -> new AuthGitlabRequest(builder.build(), STATE_CACHE);
+            case "wechat_mp" -> new AuthWeChatMpRequest(builder.build(), STATE_CACHE);
+            case "wechat_miniprogram" -> new AuthWechatMiniProgramRequest(builder.ignoreCheckRedirectUri(true).ignoreCheckState(true).build());
+            case "aliyun" -> new AuthAliyunRequest(builder.build(), STATE_CACHE);
+            case "maxkey" -> new AuthMaxKeyRequest(builder.build(), STATE_CACHE);
+            case "topiam" -> new AuthTopIamRequest(builder.build(), STATE_CACHE);
+            case "gitea" -> new AuthGiteaRequest(builder.build(), STATE_CACHE);
+            default -> throw new AuthException("未获取到有效的Auth配置");
+        };
+    }
+}
diff --git a/ruoyi-common/ruoyi-common-social/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-social/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
new file mode 100644
index 0000000..fc544a0
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-social/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1 @@
+org.dromara.common.social.config.SocialAutoConfiguration
diff --git a/ruoyi-common/ruoyi-common-sse/pom.xml b/ruoyi-common/ruoyi-common-sse/pom.xml
new file mode 100644
index 0000000..ae44c98
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-sse/pom.xml
@@ -0,0 +1,36 @@
+<?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>
+        <groupId>org.dromara</groupId>
+        <artifactId>ruoyi-common</artifactId>
+        <version>${revision}</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>ruoyi-common-sse</artifactId>
+
+    <description>
+        ruoyi-common-sse 模块
+    </description>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-redis</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-satoken</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-json</artifactId>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/config/SseAutoConfiguration.java b/ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/config/SseAutoConfiguration.java
new file mode 100644
index 0000000..8cab229
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/config/SseAutoConfiguration.java
@@ -0,0 +1,36 @@
+package org.dromara.common.sse.config;
+
+import org.dromara.common.sse.controller.SseController;
+import org.dromara.common.sse.core.SseEmitterManager;
+import org.dromara.common.sse.listener.SseTopicListener;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+
+/**
+ * SSE 自动装配
+ *
+ * @author pengles
+ */
+@AutoConfiguration
+@ConditionalOnProperty(value = "sse.enabled", havingValue = "true")
+@EnableConfigurationProperties(SseProperties.class)
+public class SseAutoConfiguration {
+
+    @Bean
+    public SseEmitterManager sseEmitterManager() {
+        return new SseEmitterManager();
+    }
+
+    @Bean
+    public SseTopicListener sseTopicListener() {
+        return new SseTopicListener();
+    }
+
+    @Bean
+    public SseController sseController(SseEmitterManager sseEmitterManager) {
+        return new SseController(sseEmitterManager);
+    }
+
+}
diff --git a/ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/config/SseProperties.java b/ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/config/SseProperties.java
new file mode 100644
index 0000000..a9d7a10
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/config/SseProperties.java
@@ -0,0 +1,21 @@
+package org.dromara.common.sse.config;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+/**
+ * SSE 配置项
+ *
+ * @author pengles
+ */
+@Data
+@ConfigurationProperties("sse")
+public class SseProperties {
+
+    private Boolean enabled;
+
+    /**
+     * 路径
+     */
+    private String path;
+}
diff --git a/ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/controller/SseController.java b/ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/controller/SseController.java
new file mode 100644
index 0000000..8a75ba9
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/controller/SseController.java
@@ -0,0 +1,88 @@
+package org.dromara.common.sse.controller;
+
+import cn.dev33.satoken.annotation.SaIgnore;
+import cn.dev33.satoken.stp.StpUtil;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.common.sse.core.SseEmitterManager;
+import org.dromara.common.sse.dto.SseMessageDto;
+import org.springframework.beans.factory.DisposableBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
+
+import java.util.List;
+
+/**
+ * SSE 控制器
+ *
+ * @author pengles
+ */
+@RestController
+@ConditionalOnProperty(value = "sse.enabled", havingValue = "true")
+@RequiredArgsConstructor
+public class SseController implements DisposableBean {
+
+    private final SseEmitterManager sseEmitterManager;
+
+    /**
+     * 建立 SSE 连接
+     */
+    @GetMapping(value = "${sse.path}", produces = MediaType.TEXT_EVENT_STREAM_VALUE)
+    public SseEmitter connect() {
+        StpUtil.checkLogin();
+        String tokenValue = StpUtil.getTokenValue();
+        Long userId = LoginHelper.getUserId();
+        return sseEmitterManager.connect(userId, tokenValue);
+    }
+
+    /**
+     * 关闭 SSE 连接
+     */
+    @SaIgnore
+    @GetMapping(value = "${sse.path}/close")
+    public R<Void> close() {
+        String tokenValue = StpUtil.getTokenValue();
+        Long userId = LoginHelper.getUserId();
+        sseEmitterManager.disconnect(userId, tokenValue);
+        return R.ok();
+    }
+
+    /**
+     * 向特定用户发送消息
+     *
+     * @param userId 目标用户的 ID
+     * @param msg    要发送的消息内容
+     */
+    @GetMapping(value = "${sse.path}/send")
+    public R<Void> send(Long userId, String msg) {
+        SseMessageDto dto = new SseMessageDto();
+        dto.setUserIds(List.of(userId));
+        dto.setMessage(msg);
+        sseEmitterManager.publishMessage(dto);
+        return R.ok();
+    }
+
+    /**
+     * 向所有用户发送消息
+     *
+     * @param msg 要发送的消息内容
+     */
+    @GetMapping(value = "${sse.path}/sendAll")
+    public R<Void> send(String msg) {
+        sseEmitterManager.publishAll(msg);
+        return R.ok();
+    }
+
+    /**
+     * 清理资源。此方法目前不执行任何操作，但避免因未实现而导致错误
+     */
+    @Override
+    public void destroy() throws Exception {
+        // 销毁时不需要做什么 此方法避免无用操作报错
+    }
+
+}
diff --git a/ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/core/SseEmitterManager.java b/ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/core/SseEmitterManager.java
new file mode 100644
index 0000000..5498716
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/core/SseEmitterManager.java
@@ -0,0 +1,173 @@
+package org.dromara.common.sse.core;
+
+import cn.hutool.core.map.MapUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.redis.utils.RedisUtils;
+import org.dromara.common.sse.dto.SseMessageDto;
+import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
+
+import java.io.IOException;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Consumer;
+
+/**
+ * 管理 Server-Sent Events (SSE) 连接
+ *
+ * @author pengles
+ */
+@Slf4j
+public class SseEmitterManager {
+
+    /**
+     * 订阅的频道
+     */
+    private final static String SSE_TOPIC = "global:sse";
+
+    private final static Map<Long, Map<String, SseEmitter>> USER_TOKEN_EMITTERS = new ConcurrentHashMap<>();
+
+    /**
+     * 建立与指定用户的 SSE 连接
+     *
+     * @param userId 用户的唯一标识符，用于区分不同用户的连接
+     * @param token  用户的唯一令牌，用于识别具体的连接
+     * @return 返回一个 SseEmitter 实例，客户端可以通过该实例接收 SSE 事件
+     */
+    public SseEmitter connect(Long userId, String token) {
+        // 从 USER_TOKEN_EMITTERS 中获取或创建当前用户的 SseEmitter 映射表（ConcurrentHashMap）
+        // 每个用户可以有多个 SSE 连接，通过 token 进行区分
+        Map<String, SseEmitter> emitters = USER_TOKEN_EMITTERS.computeIfAbsent(userId, k -> new ConcurrentHashMap<>());
+
+        // 创建一个新的 SseEmitter 实例，超时时间设置为一天 避免连接之后直接关闭浏览器导致连接停滞
+        SseEmitter emitter = new SseEmitter(86400000L);
+
+        emitters.put(token, emitter);
+
+        // 当 emitter 完成、超时或发生错误时，从映射表中移除对应的 token
+        emitter.onCompletion(() -> {
+            SseEmitter remove = emitters.remove(token);
+            if (remove != null) {
+                remove.complete();
+            }
+        });
+        emitter.onTimeout(() -> {
+            SseEmitter remove = emitters.remove(token);
+            if (remove != null) {
+                remove.complete();
+            }
+        });
+        emitter.onError((e) -> {
+            SseEmitter remove = emitters.remove(token);
+            if (remove != null) {
+                remove.complete();
+            }
+        });
+
+        try {
+            // 向客户端发送一条连接成功的事件
+            emitter.send(SseEmitter.event().comment("connected"));
+        } catch (IOException e) {
+            // 如果发送消息失败，则从映射表中移除 emitter
+            emitters.remove(token);
+        }
+        return emitter;
+    }
+
+    /**
+     * 断开指定用户的 SSE 连接
+     *
+     * @param userId 用户的唯一标识符，用于区分不同用户的连接
+     * @param token  用户的唯一令牌，用于识别具体的连接
+     */
+    public void disconnect(Long userId, String token) {
+        if (userId == null || token == null) {
+            return;
+        }
+        Map<String, SseEmitter> emitters = USER_TOKEN_EMITTERS.get(userId);
+        if (MapUtil.isNotEmpty(emitters)) {
+            try {
+                SseEmitter sseEmitter = emitters.get(token);
+                sseEmitter.send(SseEmitter.event().comment("disconnected"));
+                sseEmitter.complete();
+            } catch (Exception ignore) {
+            }
+            emitters.remove(token);
+        } else {
+            USER_TOKEN_EMITTERS.remove(userId);
+        }
+    }
+
+    /**
+     * 订阅SSE消息主题，并提供一个消费者函数来处理接收到的消息
+     *
+     * @param consumer 处理SSE消息的消费者函数
+     */
+    public void subscribeMessage(Consumer<SseMessageDto> consumer) {
+        RedisUtils.subscribe(SSE_TOPIC, SseMessageDto.class, consumer);
+    }
+
+    /**
+     * 向指定的用户会话发送消息
+     *
+     * @param userId  要发送消息的用户id
+     * @param message 要发送的消息内容
+     */
+    public void sendMessage(Long userId, String message) {
+        Map<String, SseEmitter> emitters = USER_TOKEN_EMITTERS.get(userId);
+        if (MapUtil.isNotEmpty(emitters)) {
+            for (Map.Entry<String, SseEmitter> entry : emitters.entrySet()) {
+                try {
+                    entry.getValue().send(SseEmitter.event()
+                        .name("message")
+                        .data(message));
+                } catch (Exception e) {
+                    SseEmitter remove = emitters.remove(entry.getKey());
+                    if (remove != null) {
+                        remove.complete();
+                    }
+                }
+            }
+        } else {
+            USER_TOKEN_EMITTERS.remove(userId);
+        }
+    }
+
+    /**
+     * 本机全用户会话发送消息
+     *
+     * @param message 要发送的消息内容
+     */
+    public void sendMessage(String message) {
+        for (Long userId : USER_TOKEN_EMITTERS.keySet()) {
+            sendMessage(userId, message);
+        }
+    }
+
+    /**
+     * 发布SSE订阅消息
+     *
+     * @param sseMessageDto 要发布的SSE消息对象
+     */
+    public void publishMessage(SseMessageDto sseMessageDto) {
+        SseMessageDto broadcastMessage = new SseMessageDto();
+        broadcastMessage.setMessage(sseMessageDto.getMessage());
+        broadcastMessage.setUserIds(sseMessageDto.getUserIds());
+        RedisUtils.publish(SSE_TOPIC, broadcastMessage, consumer -> {
+            log.info("SSE发送主题订阅消息topic:{} session keys:{} message:{}",
+                SSE_TOPIC, sseMessageDto.getUserIds(), sseMessageDto.getMessage());
+        });
+    }
+
+    /**
+     * 向所有的用户发布订阅的消息(群发)
+     *
+     * @param message 要发布的消息内容
+     */
+    public void publishAll(String message) {
+        SseMessageDto broadcastMessage = new SseMessageDto();
+        broadcastMessage.setMessage(message);
+        RedisUtils.publish(SSE_TOPIC, broadcastMessage, consumer -> {
+            log.info("SSE发送主题订阅消息topic:{} message:{}", SSE_TOPIC, message);
+        });
+    }
+}
diff --git a/ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/dto/SseMessageDto.java b/ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/dto/SseMessageDto.java
new file mode 100644
index 0000000..a2e1210
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/dto/SseMessageDto.java
@@ -0,0 +1,29 @@
+package org.dromara.common.sse.dto;
+
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 消息的dto
+ *
+ * @author zendwang
+ */
+@Data
+public class SseMessageDto implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 需要推送到的session key 列表
+     */
+    private List<Long> userIds;
+
+    /**
+     * 需要发送的消息
+     */
+    private String message;
+}
diff --git a/ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/listener/SseTopicListener.java b/ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/listener/SseTopicListener.java
new file mode 100644
index 0000000..c0ef0b4
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/listener/SseTopicListener.java
@@ -0,0 +1,48 @@
+package org.dromara.common.sse.listener;
+
+import cn.hutool.core.collection.CollUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.sse.core.SseEmitterManager;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.ApplicationArguments;
+import org.springframework.boot.ApplicationRunner;
+import org.springframework.core.Ordered;
+
+/**
+ * SSE 主题订阅监听器
+ *
+ * @author pengles
+ */
+@Slf4j
+public class SseTopicListener implements ApplicationRunner, Ordered {
+
+    @Autowired
+    private SseEmitterManager sseEmitterManager;
+
+    /**
+     * 在Spring Boot应用程序启动时初始化SSE主题订阅监听器
+     *
+     * @param args 应用程序参数
+     * @throws Exception 初始化过程中可能抛出的异常
+     */
+    @Override
+    public void run(ApplicationArguments args) throws Exception {
+        sseEmitterManager.subscribeMessage((message) -> {
+            log.info("SSE主题订阅收到消息session keys={} message={}", message.getUserIds(), message.getMessage());
+            // 如果key不为空就按照key发消息 如果为空就群发
+            if (CollUtil.isNotEmpty(message.getUserIds())) {
+                message.getUserIds().forEach(key -> {
+                    sseEmitterManager.sendMessage(key, message.getMessage());
+                });
+            } else {
+                sseEmitterManager.sendMessage(message.getMessage());
+            }
+        });
+        log.info("初始化SSE主题订阅监听器成功");
+    }
+
+    @Override
+    public int getOrder() {
+        return -1;
+    }
+}
diff --git a/ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/utils/SseMessageUtils.java b/ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/utils/SseMessageUtils.java
new file mode 100644
index 0000000..7c39729
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/utils/SseMessageUtils.java
@@ -0,0 +1,84 @@
+package org.dromara.common.sse.utils;
+
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.utils.SpringUtils;
+import org.dromara.common.sse.core.SseEmitterManager;
+import org.dromara.common.sse.dto.SseMessageDto;
+
+/**
+ * SSE工具类
+ *
+ * @author pengles
+ */
+@Slf4j
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public class SseMessageUtils {
+
+    private final static Boolean SSE_ENABLE = SpringUtils.getProperty("sse.enabled", Boolean.class, true);
+    private static SseEmitterManager MANAGER;
+
+    static {
+        if (isEnable() && MANAGER == null) {
+            MANAGER = SpringUtils.getBean(SseEmitterManager.class);
+        }
+    }
+
+    /**
+     * 向指定的SSE会话发送消息
+     *
+     * @param userId  要发送消息的用户id
+     * @param message 要发送的消息内容
+     */
+    public static void sendMessage(Long userId, String message) {
+        if (!isEnable()) {
+            return;
+        }
+        MANAGER.sendMessage(userId, message);
+    }
+
+    /**
+     * 本机全用户会话发送消息
+     *
+     * @param message 要发送的消息内容
+     */
+    public static void sendMessage(String message) {
+        if (!isEnable()) {
+            return;
+        }
+        MANAGER.sendMessage(message);
+    }
+
+    /**
+     * 发布SSE订阅消息
+     *
+     * @param sseMessageDto 要发布的SSE消息对象
+     */
+    public static void publishMessage(SseMessageDto sseMessageDto) {
+        if (!isEnable()) {
+            return;
+        }
+        MANAGER.publishMessage(sseMessageDto);
+    }
+
+    /**
+     * 向所有的用户发布订阅的消息(群发)
+     *
+     * @param message 要发布的消息内容
+     */
+    public static void publishAll(String message) {
+        if (!isEnable()) {
+            return;
+        }
+        MANAGER.publishAll(message);
+    }
+
+    /**
+     * 是否开启
+     */
+    public static Boolean isEnable() {
+        return SSE_ENABLE;
+    }
+
+}
diff --git a/ruoyi-common/ruoyi-common-sse/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-sse/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
new file mode 100644
index 0000000..b809713
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-sse/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1 @@
+org.dromara.common.sse.config.SseAutoConfiguration
diff --git a/ruoyi-common/ruoyi-common-translation/pom.xml b/ruoyi-common/ruoyi-common-translation/pom.xml
new file mode 100644
index 0000000..e77b868
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-translation/pom.xml
@@ -0,0 +1,27 @@
+<?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>
+        <groupId>org.dromara</groupId>
+        <artifactId>ruoyi-common</artifactId>
+        <version>${revision}</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>ruoyi-common-translation</artifactId>
+
+    <description>
+        ruoyi-common-translation 通用翻译功能
+    </description>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-json</artifactId>
+        </dependency>
+
+    </dependencies>
+
+</project>
diff --git a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/annotation/Translation.java b/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/annotation/Translation.java
new file mode 100644
index 0000000..5b6d3e5
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/annotation/Translation.java
@@ -0,0 +1,39 @@
+package org.dromara.common.translation.annotation;
+
+import com.fasterxml.jackson.annotation.JacksonAnnotationsInside;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import org.dromara.common.translation.core.handler.TranslationHandler;
+
+import java.lang.annotation.*;
+
+/**
+ * 通用翻译注解
+ *
+ * @author pengles
+ */
+@Inherited
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.FIELD, ElementType.METHOD})
+@Documented
+@JacksonAnnotationsInside
+@JsonSerialize(using = TranslationHandler.class)
+public @interface Translation {
+
+    /**
+     * 类型 (需与实现类上的 {@link TranslationType} 注解type对应)
+     * <p>
+     * 默认取当前字段的值 如果设置了 @{@link Translation#mapper()} 则取映射字段的值
+     */
+    String type();
+
+    /**
+     * 映射字段 (如果不为空则取此字段的值)
+     */
+    String mapper() default "";
+
+    /**
+     * 其他条件 例如: 字典type(sys_user_sex)
+     */
+    String other() default "";
+
+}
diff --git a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/annotation/TranslationType.java b/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/annotation/TranslationType.java
new file mode 100644
index 0000000..73f6341
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/annotation/TranslationType.java
@@ -0,0 +1,23 @@
+package org.dromara.common.translation.annotation;
+
+import org.dromara.common.translation.core.TranslationInterface;
+
+import java.lang.annotation.*;
+
+/**
+ * 翻译类型注解 (标注到{@link TranslationInterface} 的实现类)
+ *
+ * @author pengles
+ */
+@Inherited
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.TYPE})
+@Documented
+public @interface TranslationType {
+
+    /**
+     * 类型
+     */
+    String type();
+
+}
diff --git a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/config/TranslationConfig.java b/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/config/TranslationConfig.java
new file mode 100644
index 0000000..2a06812
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/config/TranslationConfig.java
@@ -0,0 +1,50 @@
+package org.dromara.common.translation.config;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.annotation.PostConstruct;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.translation.annotation.TranslationType;
+import org.dromara.common.translation.core.TranslationInterface;
+import org.dromara.common.translation.core.handler.TranslationBeanSerializerModifier;
+import org.dromara.common.translation.core.handler.TranslationHandler;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 翻译模块配置类
+ *
+ * @author pengles
+ */
+@Slf4j
+@AutoConfiguration
+public class TranslationConfig {
+
+    @Autowired
+    private List<TranslationInterface<?>> list;
+
+    @Autowired
+    private ObjectMapper objectMapper;
+
+    @PostConstruct
+    public void init() {
+        Map<String, TranslationInterface<?>> map = new HashMap<>(list.size());
+        for (TranslationInterface<?> trans : list) {
+            if (trans.getClass().isAnnotationPresent(TranslationType.class)) {
+                TranslationType annotation = trans.getClass().getAnnotation(TranslationType.class);
+                map.put(annotation.type(), trans);
+            } else {
+                log.warn(trans.getClass().getName() + " 翻译实现类未标注 TranslationType 注解!");
+            }
+        }
+        TranslationHandler.TRANSLATION_MAPPER.putAll(map);
+        // 设置 Bean 序列化修改器
+        objectMapper.setSerializerFactory(
+            objectMapper.getSerializerFactory()
+                .withSerializerModifier(new TranslationBeanSerializerModifier()));
+    }
+
+}
diff --git a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/constant/TransConstant.java b/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/constant/TransConstant.java
new file mode 100644
index 0000000..0881cc8
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/constant/TransConstant.java
@@ -0,0 +1,35 @@
+package org.dromara.common.translation.constant;
+
+/**
+ * 翻译常量
+ *
+ * @author pengles
+ */
+public interface TransConstant {
+
+    /**
+     * 用户id转账号
+     */
+    String USER_ID_TO_NAME = "user_id_to_name";
+
+    /**
+     * 用户id转用户名称
+     */
+    String USER_ID_TO_NICKNAME = "user_id_to_nickname";
+
+    /**
+     * 部门id转名称
+     */
+    String DEPT_ID_TO_NAME = "dept_id_to_name";
+
+    /**
+     * 字典type转label
+     */
+    String DICT_TYPE_TO_LABEL = "dict_type_to_label";
+
+    /**
+     * ossId转url
+     */
+    String OSS_ID_TO_URL = "oss_id_to_url";
+
+}
diff --git a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/TranslationInterface.java b/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/TranslationInterface.java
new file mode 100644
index 0000000..ded4710
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/TranslationInterface.java
@@ -0,0 +1,20 @@
+package org.dromara.common.translation.core;
+
+import org.dromara.common.translation.annotation.TranslationType;
+
+/**
+ * 翻译接口 (实现类需标注 {@link TranslationType} 注解标明翻译类型)
+ *
+ * @author pengles
+ */
+public interface TranslationInterface<T> {
+
+    /**
+     * 翻译
+     *
+     * @param key   需要被翻译的键(不为空)
+     * @param other 其他参数
+     * @return 返回键对应的值
+     */
+    T translation(Object key, String other);
+}
diff --git a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/handler/TranslationBeanSerializerModifier.java b/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/handler/TranslationBeanSerializerModifier.java
new file mode 100644
index 0000000..e025f0c
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/handler/TranslationBeanSerializerModifier.java
@@ -0,0 +1,29 @@
+package org.dromara.common.translation.core.handler;
+
+import com.fasterxml.jackson.databind.BeanDescription;
+import com.fasterxml.jackson.databind.SerializationConfig;
+import com.fasterxml.jackson.databind.ser.BeanPropertyWriter;
+import com.fasterxml.jackson.databind.ser.BeanSerializerModifier;
+
+import java.util.List;
+
+/**
+ * Bean 序列化修改器 解决 Null 被单独处理问题
+ *
+ * @author pengles
+ */
+public class TranslationBeanSerializerModifier extends BeanSerializerModifier {
+
+    @Override
+    public List<BeanPropertyWriter> changeProperties(SerializationConfig config, BeanDescription beanDesc,
+                                                     List<BeanPropertyWriter> beanProperties) {
+        for (BeanPropertyWriter writer : beanProperties) {
+            // 如果序列化器为 TranslationHandler 的话 将 Null 值也交给他处理
+            if (writer.getSerializer() instanceof TranslationHandler serializer) {
+                writer.assignNullSerializer(serializer);
+            }
+        }
+        return beanProperties;
+    }
+
+}
diff --git a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/handler/TranslationHandler.java b/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/handler/TranslationHandler.java
new file mode 100644
index 0000000..5d24197
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/handler/TranslationHandler.java
@@ -0,0 +1,65 @@
+package org.dromara.common.translation.core.handler;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.BeanProperty;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.JsonSerializer;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.ser.ContextualSerializer;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.core.utils.reflect.ReflectUtils;
+import org.dromara.common.translation.annotation.Translation;
+import org.dromara.common.translation.core.TranslationInterface;
+
+import java.io.IOException;
+import java.util.Map;
+import java.util.Objects;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * 翻译处理器
+ *
+ * @author pengles
+ */
+@Slf4j
+public class TranslationHandler extends JsonSerializer<Object> implements ContextualSerializer {
+
+    /**
+     * 全局翻译实现类映射器
+     */
+    public static final Map<String, TranslationInterface<?>> TRANSLATION_MAPPER = new ConcurrentHashMap<>();
+
+    private Translation translation;
+
+    @Override
+    public void serialize(Object value, JsonGenerator gen, SerializerProvider serializers) throws IOException {
+        TranslationInterface<?> trans = TRANSLATION_MAPPER.get(translation.type());
+        if (ObjectUtil.isNotNull(trans)) {
+            // 如果映射字段不为空 则取映射字段的值
+            if (StringUtils.isNotBlank(translation.mapper())) {
+                value = ReflectUtils.invokeGetter(gen.currentValue(), translation.mapper());
+            }
+            // 如果为 null 直接写出
+            if (ObjectUtil.isNull(value)) {
+                gen.writeNull();
+                return;
+            }
+            Object result = trans.translation(value, translation.other());
+            gen.writeObject(result);
+        } else {
+            gen.writeObject(value);
+        }
+    }
+
+    @Override
+    public JsonSerializer<?> createContextual(SerializerProvider prov, BeanProperty property) throws JsonMappingException {
+        Translation translation = property.getAnnotation(Translation.class);
+        if (Objects.nonNull(translation)) {
+            this.translation = translation;
+            return this;
+        }
+        return prov.findValueSerializer(property.getType(), property);
+    }
+}
diff --git a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/DeptNameTranslationImpl.java b/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/DeptNameTranslationImpl.java
new file mode 100644
index 0000000..832d2c9
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/DeptNameTranslationImpl.java
@@ -0,0 +1,29 @@
+package org.dromara.common.translation.core.impl;
+
+import lombok.AllArgsConstructor;
+import org.dromara.common.core.service.DeptService;
+import org.dromara.common.translation.annotation.TranslationType;
+import org.dromara.common.translation.constant.TransConstant;
+import org.dromara.common.translation.core.TranslationInterface;
+
+/**
+ * 部门翻译实现
+ *
+ * @author pengles
+ */
+@AllArgsConstructor
+@TranslationType(type = TransConstant.DEPT_ID_TO_NAME)
+public class DeptNameTranslationImpl implements TranslationInterface<String> {
+
+    private final DeptService deptService;
+
+    @Override
+    public String translation(Object key, String other) {
+        if (key instanceof String ids) {
+            return deptService.selectDeptNameByIds(ids);
+        } else if (key instanceof Long id) {
+            return deptService.selectDeptNameByIds(id.toString());
+        }
+        return null;
+    }
+}
diff --git a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/DictTypeTranslationImpl.java b/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/DictTypeTranslationImpl.java
new file mode 100644
index 0000000..dd65e14
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/DictTypeTranslationImpl.java
@@ -0,0 +1,28 @@
+package org.dromara.common.translation.core.impl;
+
+import lombok.AllArgsConstructor;
+import org.dromara.common.core.service.DictService;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.translation.annotation.TranslationType;
+import org.dromara.common.translation.constant.TransConstant;
+import org.dromara.common.translation.core.TranslationInterface;
+
+/**
+ * 字典翻译实现
+ *
+ * @author pengles
+ */
+@AllArgsConstructor
+@TranslationType(type = TransConstant.DICT_TYPE_TO_LABEL)
+public class DictTypeTranslationImpl implements TranslationInterface<String> {
+
+    private final DictService dictService;
+
+    @Override
+    public String translation(Object key, String other) {
+        if (key instanceof String dictValue && StringUtils.isNotBlank(other)) {
+            return dictService.getDictLabel(other, dictValue);
+        }
+        return null;
+    }
+}
diff --git a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/NicknameTranslationImpl.java b/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/NicknameTranslationImpl.java
new file mode 100644
index 0000000..b92c7f0
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/NicknameTranslationImpl.java
@@ -0,0 +1,29 @@
+package org.dromara.common.translation.core.impl;
+
+import lombok.AllArgsConstructor;
+import org.dromara.common.core.service.UserService;
+import org.dromara.common.translation.annotation.TranslationType;
+import org.dromara.common.translation.constant.TransConstant;
+import org.dromara.common.translation.core.TranslationInterface;
+
+/**
+ * 用户名称翻译实现
+ *
+ * @author may
+ */
+@AllArgsConstructor
+@TranslationType(type = TransConstant.USER_ID_TO_NICKNAME)
+public class NicknameTranslationImpl implements TranslationInterface<String> {
+
+    private final UserService userService;
+
+    @Override
+    public String translation(Object key, String other) {
+        if (key instanceof Long id) {
+            return userService.selectNicknameByIds(id.toString());
+        } else if (key instanceof String ids) {
+            return userService.selectNicknameByIds(ids);
+        }
+        return null;
+    }
+}
diff --git a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/OssUrlTranslationImpl.java b/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/OssUrlTranslationImpl.java
new file mode 100644
index 0000000..be7c6d1
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/OssUrlTranslationImpl.java
@@ -0,0 +1,29 @@
+package org.dromara.common.translation.core.impl;
+
+import lombok.AllArgsConstructor;
+import org.dromara.common.core.service.OssService;
+import org.dromara.common.translation.annotation.TranslationType;
+import org.dromara.common.translation.constant.TransConstant;
+import org.dromara.common.translation.core.TranslationInterface;
+
+/**
+ * OSS翻译实现
+ *
+ * @author pengles
+ */
+@AllArgsConstructor
+@TranslationType(type = TransConstant.OSS_ID_TO_URL)
+public class OssUrlTranslationImpl implements TranslationInterface<String> {
+
+    private final OssService ossService;
+
+    @Override
+    public String translation(Object key, String other) {
+        if (key instanceof String ids) {
+            return ossService.selectUrlByIds(ids);
+        } else if (key instanceof Long id) {
+            return ossService.selectUrlByIds(id.toString());
+        }
+        return null;
+    }
+}
diff --git a/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/UserNameTranslationImpl.java b/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/UserNameTranslationImpl.java
new file mode 100644
index 0000000..8ce24c9
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-translation/src/main/java/org/dromara/common/translation/core/impl/UserNameTranslationImpl.java
@@ -0,0 +1,27 @@
+package org.dromara.common.translation.core.impl;
+
+import lombok.AllArgsConstructor;
+import org.dromara.common.core.service.UserService;
+import org.dromara.common.translation.annotation.TranslationType;
+import org.dromara.common.translation.constant.TransConstant;
+import org.dromara.common.translation.core.TranslationInterface;
+
+/**
+ * 用户名翻译实现
+ *
+ * @author pengles
+ */
+@AllArgsConstructor
+@TranslationType(type = TransConstant.USER_ID_TO_NAME)
+public class UserNameTranslationImpl implements TranslationInterface<String> {
+
+    private final UserService userService;
+
+    @Override
+    public String translation(Object key, String other) {
+        if (key instanceof Long id) {
+            return userService.selectUserNameById(id);
+        }
+        return null;
+    }
+}
diff --git a/ruoyi-common/ruoyi-common-translation/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-translation/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
new file mode 100644
index 0000000..ad40205
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-translation/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1,6 @@
+org.dromara.common.translation.config.TranslationConfig
+org.dromara.common.translation.core.impl.DeptNameTranslationImpl
+org.dromara.common.translation.core.impl.DictTypeTranslationImpl
+org.dromara.common.translation.core.impl.OssUrlTranslationImpl
+org.dromara.common.translation.core.impl.UserNameTranslationImpl
+org.dromara.common.translation.core.impl.NicknameTranslationImpl
diff --git a/ruoyi-common/ruoyi-common-web/pom.xml b/ruoyi-common/ruoyi-common-web/pom.xml
new file mode 100644
index 0000000..b250fa9
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-web/pom.xml
@@ -0,0 +1,62 @@
+<?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>
+        <groupId>org.dromara</groupId>
+        <artifactId>ruoyi-common</artifactId>
+        <version>${revision}</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>ruoyi-common-web</artifactId>
+
+    <description>
+        ruoyi-common-web web服务
+    </description>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-json</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-redis</artifactId>
+        </dependency>
+
+        <!-- SpringBoot Web容器 -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>spring-boot-starter-tomcat</artifactId>
+                    <groupId>org.springframework.boot</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <!-- web 容器使用 undertow 性能更强 -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-undertow</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-captcha</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-crypto</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>
diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/CaptchaConfig.java b/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/CaptchaConfig.java
new file mode 100644
index 0000000..4bbe9c1
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/CaptchaConfig.java
@@ -0,0 +1,65 @@
+package org.dromara.common.web.config;
+
+import cn.hutool.captcha.CaptchaUtil;
+import cn.hutool.captcha.CircleCaptcha;
+import cn.hutool.captcha.LineCaptcha;
+import cn.hutool.captcha.ShearCaptcha;
+import org.dromara.common.web.config.properties.CaptchaProperties;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Lazy;
+
+import java.awt.*;
+
+/**
+ * 验证码配置
+ *
+ * @author pengles
+ */
+@AutoConfiguration
+@EnableConfigurationProperties(CaptchaProperties.class)
+public class CaptchaConfig {
+
+    private static final int WIDTH = 160;
+    private static final int HEIGHT = 60;
+    private static final Color BACKGROUND = Color.LIGHT_GRAY;
+    private static final Font FONT = new Font("Arial", Font.BOLD, 48);
+
+    /**
+     * 圆圈干扰验证码
+     */
+    @Lazy
+    @Bean
+    public CircleCaptcha circleCaptcha() {
+        CircleCaptcha captcha = CaptchaUtil.createCircleCaptcha(WIDTH, HEIGHT);
+        captcha.setBackground(BACKGROUND);
+        captcha.setFont(FONT);
+        return captcha;
+    }
+
+    /**
+     * 线段干扰的验证码
+     */
+    @Lazy
+    @Bean
+    public LineCaptcha lineCaptcha() {
+        LineCaptcha captcha = CaptchaUtil.createLineCaptcha(WIDTH, HEIGHT);
+        captcha.setBackground(BACKGROUND);
+        captcha.setFont(FONT);
+        return captcha;
+    }
+
+    /**
+     * 扭曲干扰验证码
+     */
+    @Lazy
+    @Bean
+    public ShearCaptcha shearCaptcha() {
+        ShearCaptcha captcha = CaptchaUtil.createShearCaptcha(WIDTH, HEIGHT);
+        captcha.setBackground(BACKGROUND);
+        captcha.setFont(FONT);
+        return captcha;
+    }
+
+}
diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/FilterConfig.java b/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/FilterConfig.java
new file mode 100644
index 0000000..6fd733c
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/FilterConfig.java
@@ -0,0 +1,44 @@
+package org.dromara.common.web.config;
+
+import jakarta.servlet.DispatcherType;
+import org.dromara.common.web.config.properties.XssProperties;
+import org.dromara.common.web.filter.RepeatableFilter;
+import org.dromara.common.web.filter.XssFilter;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.boot.web.servlet.FilterRegistrationBean;
+import org.springframework.context.annotation.Bean;
+
+/**
+ * Filter配置
+ *
+ * @author pengles
+ */
+@AutoConfiguration
+@EnableConfigurationProperties(XssProperties.class)
+public class FilterConfig {
+
+    @Bean
+    @ConditionalOnProperty(value = "xss.enabled", havingValue = "true")
+    public FilterRegistrationBean<XssFilter> xssFilterRegistration() {
+        FilterRegistrationBean<XssFilter> registration = new FilterRegistrationBean<>();
+        registration.setDispatcherTypes(DispatcherType.REQUEST);
+        registration.setFilter(new XssFilter());
+        registration.addUrlPatterns("/*");
+        registration.setName("xssFilter");
+        registration.setOrder(FilterRegistrationBean.HIGHEST_PRECEDENCE + 1);
+        return registration;
+    }
+
+    @Bean
+    public FilterRegistrationBean<RepeatableFilter> someFilterRegistration() {
+        FilterRegistrationBean<RepeatableFilter> registration = new FilterRegistrationBean<>();
+        registration.setFilter(new RepeatableFilter());
+        registration.addUrlPatterns("/*");
+        registration.setName("repeatableFilter");
+        registration.setOrder(FilterRegistrationBean.LOWEST_PRECEDENCE);
+        return registration;
+    }
+
+}
diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/I18nConfig.java b/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/I18nConfig.java
new file mode 100644
index 0000000..0adb2d6
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/I18nConfig.java
@@ -0,0 +1,22 @@
+package org.dromara.common.web.config;
+
+import org.dromara.common.web.core.I18nLocaleResolver;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
+import org.springframework.boot.autoconfigure.web.servlet.WebMvcAutoConfiguration;
+import org.springframework.context.annotation.Bean;
+import org.springframework.web.servlet.LocaleResolver;
+
+/**
+ * 国际化配置
+ *
+ * @author pengles
+ */
+@AutoConfiguration(before = WebMvcAutoConfiguration.class)
+public class I18nConfig {
+
+    @Bean
+    public LocaleResolver localeResolver() {
+        return new I18nLocaleResolver();
+    }
+
+}
diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/ResourcesConfig.java b/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/ResourcesConfig.java
new file mode 100644
index 0000000..3f319bd
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/ResourcesConfig.java
@@ -0,0 +1,77 @@
+package org.dromara.common.web.config;
+
+import cn.hutool.core.date.DateUtil;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.web.handler.GlobalExceptionHandler;
+import org.dromara.common.web.interceptor.PlusWebInvokeTimeInterceptor;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
+import org.springframework.context.annotation.Bean;
+import org.springframework.format.FormatterRegistry;
+import org.springframework.web.cors.CorsConfiguration;
+import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
+import org.springframework.web.filter.CorsFilter;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+import java.util.Date;
+
+/**
+ * 通用配置
+ *
+ * @author pengles
+ */
+@AutoConfiguration
+public class ResourcesConfig implements WebMvcConfigurer {
+
+    @Override
+    public void addInterceptors(InterceptorRegistry registry) {
+        // 全局访问性能拦截
+        registry.addInterceptor(new PlusWebInvokeTimeInterceptor());
+    }
+
+    @Override
+    public void addFormatters(FormatterRegistry registry) {
+        // 全局日期格式转换配置
+        registry.addConverter(String.class, Date.class, source -> {
+            if (StringUtils.isBlank(source)) {
+                return null;
+            }
+            return DateUtil.parse(source);
+        });
+    }
+
+    @Override
+    public void addResourceHandlers(ResourceHandlerRegistry registry) {
+    }
+
+    /**
+     * 跨域配置
+     */
+    @Bean
+    public CorsFilter corsFilter() {
+        CorsConfiguration config = new CorsConfiguration();
+        config.setAllowCredentials(true);
+        // 设置访问源地址
+        config.addAllowedOriginPattern("*");
+        // 设置访问源请求头
+        config.addAllowedHeader("*");
+        // 设置访问源请求方法
+        config.addAllowedMethod("*");
+        // 有效期 1800秒
+        config.setMaxAge(1800L);
+        // 添加映射路径，拦截一切请求
+        UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
+        source.registerCorsConfiguration("/**", config);
+        // 返回新的CorsFilter
+        return new CorsFilter(source);
+    }
+
+    /**
+     * 全局异常处理器
+     */
+    @Bean
+    public GlobalExceptionHandler globalExceptionHandler() {
+        return new GlobalExceptionHandler();
+    }
+}
diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/UndertowConfig.java b/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/UndertowConfig.java
new file mode 100644
index 0000000..283935c
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/UndertowConfig.java
@@ -0,0 +1,63 @@
+package org.dromara.common.web.config;
+
+import io.undertow.server.DefaultByteBufferPool;
+import io.undertow.server.handlers.DisallowedMethodsHandler;
+import io.undertow.util.HttpString;
+import io.undertow.websockets.jsr.WebSocketDeploymentInfo;
+import org.dromara.common.core.utils.SpringUtils;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
+import org.springframework.boot.web.embedded.undertow.UndertowServletWebServerFactory;
+import org.springframework.boot.web.server.WebServerFactoryCustomizer;
+import org.springframework.core.task.VirtualThreadTaskExecutor;
+
+/**
+ * Undertow 自定义配置
+ *
+ * @author pengles
+ */
+@AutoConfiguration
+public class UndertowConfig implements WebServerFactoryCustomizer<UndertowServletWebServerFactory> {
+
+    /**
+     * 自定义 Undertow 配置
+     * <p>
+     * 主要配置内容包括：
+     * 1. 配置 WebSocket 部署信息
+     * 2. 在虚拟线程模式下使用虚拟线程池
+     * 3. 禁用不安全的 HTTP 方法，如 CONNECT、TRACE、TRACK
+     * </p>
+     *
+     * @param factory Undertow 的 Web 服务器工厂
+     */
+    @Override
+    public void customize(UndertowServletWebServerFactory factory) {
+        factory.addDeploymentInfoCustomizers(deploymentInfo -> {
+            // 配置 WebSocket 部署信息，设置 WebSocket 使用的缓冲区池
+            WebSocketDeploymentInfo webSocketDeploymentInfo = new WebSocketDeploymentInfo();
+            webSocketDeploymentInfo.setBuffers(new DefaultByteBufferPool(true, 1024));
+            deploymentInfo.addServletContextAttribute("io.undertow.websockets.jsr.WebSocketDeploymentInfo", webSocketDeploymentInfo);
+
+            // 如果启用了虚拟线程，配置 Undertow 使用虚拟线程池
+            if (SpringUtils.isVirtual()) {
+                // 创建虚拟线程池，线程池前缀为 "undertow-"
+                VirtualThreadTaskExecutor executor = new VirtualThreadTaskExecutor("undertow-");
+                // 设置虚拟线程池为执行器和异步执行器
+                deploymentInfo.setExecutor(executor);
+                deploymentInfo.setAsyncExecutor(executor);
+            }
+
+            // 配置禁止某些不安全的 HTTP 方法（如 CONNECT、TRACE、TRACK）
+            deploymentInfo.addInitialHandlerChainWrapper(handler -> {
+                // 禁止三个方法 CONNECT/TRACE/TRACK 也是不安全的 避免爬虫骚扰
+                HttpString[] disallowedHttpMethods = {
+                    HttpString.tryFromString("CONNECT"),
+                    HttpString.tryFromString("TRACE"),
+                    HttpString.tryFromString("TRACK")
+                };
+                // 使用 DisallowedMethodsHandler 拦截并拒绝这些方法的请求
+                return new DisallowedMethodsHandler(handler, disallowedHttpMethods);
+            });
+        });
+    }
+
+}
diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/properties/CaptchaProperties.java b/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/properties/CaptchaProperties.java
new file mode 100644
index 0000000..c53c765
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/properties/CaptchaProperties.java
@@ -0,0 +1,38 @@
+package org.dromara.common.web.config.properties;
+
+import lombok.Data;
+import org.dromara.common.web.enums.CaptchaCategory;
+import org.dromara.common.web.enums.CaptchaType;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+/**
+ * 验证码 配置属性
+ *
+ * @author pengles
+ */
+@Data
+@ConfigurationProperties(prefix = "captcha")
+public class CaptchaProperties {
+
+    private Boolean enable;
+
+    /**
+     * 验证码类型
+     */
+    private CaptchaType type;
+
+    /**
+     * 验证码类别
+     */
+    private CaptchaCategory category;
+
+    /**
+     * 数字验证码位数
+     */
+    private Integer numberLength;
+
+    /**
+     * 字符验证码长度
+     */
+    private Integer charLength;
+}
diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/properties/XssProperties.java b/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/properties/XssProperties.java
new file mode 100644
index 0000000..a3c14d1
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/config/properties/XssProperties.java
@@ -0,0 +1,28 @@
+package org.dromara.common.web.config.properties;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * xss过滤 配置属性
+ *
+ * @author pengles
+ */
+@Data
+@ConfigurationProperties(prefix = "xss")
+public class XssProperties {
+
+    /**
+     * Xss开关
+     */
+    private Boolean enabled;
+
+    /**
+     * 排除路径
+     */
+    private List<String> excludeUrls = new ArrayList<>();
+
+}
diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/core/BaseController.java b/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/core/BaseController.java
new file mode 100644
index 0000000..ff370e1
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/core/BaseController.java
@@ -0,0 +1,40 @@
+package org.dromara.common.web.core;
+
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.utils.StringUtils;
+
+/**
+ * web层通用数据处理
+ *
+ * @author pengles
+ */
+public class BaseController {
+
+    /**
+     * 响应返回结果
+     *
+     * @param rows 影响行数
+     * @return 操作结果
+     */
+    protected R<Void> toAjax(int rows) {
+        return rows > 0 ? R.ok() : R.fail();
+    }
+
+    /**
+     * 响应返回结果
+     *
+     * @param result 结果
+     * @return 操作结果
+     */
+    protected R<Void> toAjax(boolean result) {
+        return result ? R.ok() : R.fail();
+    }
+
+    /**
+     * 页面跳转
+     */
+    public String redirect(String url) {
+        return StringUtils.format("redirect:{}", url);
+    }
+
+}
diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/core/I18nLocaleResolver.java b/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/core/I18nLocaleResolver.java
new file mode 100644
index 0000000..a82ac30
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/core/I18nLocaleResolver.java
@@ -0,0 +1,31 @@
+package org.dromara.common.web.core;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import org.springframework.web.servlet.LocaleResolver;
+
+import java.util.Locale;
+
+/**
+ * 获取请求头国际化信息
+ *
+ * @author pengles
+ */
+public class I18nLocaleResolver implements LocaleResolver {
+
+    @Override
+    public Locale resolveLocale(HttpServletRequest httpServletRequest) {
+        String language = httpServletRequest.getHeader("content-language");
+        Locale locale = Locale.getDefault();
+        if (language != null && language.length() > 0) {
+            String[] split = language.split("_");
+            locale = new Locale(split[0], split[1]);
+        }
+        return locale;
+    }
+
+    @Override
+    public void setLocale(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, Locale locale) {
+
+    }
+}
diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/enums/CaptchaCategory.java b/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/enums/CaptchaCategory.java
new file mode 100644
index 0000000..9860a3b
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/enums/CaptchaCategory.java
@@ -0,0 +1,35 @@
+package org.dromara.common.web.enums;
+
+import cn.hutool.captcha.AbstractCaptcha;
+import cn.hutool.captcha.CircleCaptcha;
+import cn.hutool.captcha.LineCaptcha;
+import cn.hutool.captcha.ShearCaptcha;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 验证码类别
+ *
+ * @author pengles
+ */
+@Getter
+@AllArgsConstructor
+public enum CaptchaCategory {
+
+    /**
+     * 线段干扰
+     */
+    LINE(LineCaptcha.class),
+
+    /**
+     * 圆圈干扰
+     */
+    CIRCLE(CircleCaptcha.class),
+
+    /**
+     * 扭曲干扰
+     */
+    SHEAR(ShearCaptcha.class);
+
+    private final Class<? extends AbstractCaptcha> clazz;
+}
diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/enums/CaptchaType.java b/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/enums/CaptchaType.java
new file mode 100644
index 0000000..10f9c23
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/enums/CaptchaType.java
@@ -0,0 +1,29 @@
+package org.dromara.common.web.enums;
+
+import cn.hutool.captcha.generator.CodeGenerator;
+import cn.hutool.captcha.generator.RandomGenerator;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import org.dromara.common.web.utils.UnsignedMathGenerator;
+
+/**
+ * 验证码类型
+ *
+ * @author pengles
+ */
+@Getter
+@AllArgsConstructor
+public enum CaptchaType {
+
+    /**
+     * 数字
+     */
+    MATH(UnsignedMathGenerator.class),
+
+    /**
+     * 字符
+     */
+    CHAR(RandomGenerator.class);
+
+    private final Class<? extends CodeGenerator> clazz;
+}
diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/filter/RepeatableFilter.java b/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/filter/RepeatableFilter.java
new file mode 100644
index 0000000..91b5240
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/filter/RepeatableFilter.java
@@ -0,0 +1,40 @@
+package org.dromara.common.web.filter;
+
+import jakarta.servlet.*;
+import jakarta.servlet.http.HttpServletRequest;
+import org.dromara.common.core.utils.StringUtils;
+import org.springframework.http.MediaType;
+
+import java.io.IOException;
+
+/**
+ * Repeatable 过滤器
+ *
+ * @author pengles
+ */
+public class RepeatableFilter implements Filter {
+    @Override
+    public void init(FilterConfig filterConfig) throws ServletException {
+
+    }
+
+    @Override
+    public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
+        throws IOException, ServletException {
+        ServletRequest requestWrapper = null;
+        if (request instanceof HttpServletRequest
+            && StringUtils.startsWithIgnoreCase(request.getContentType(), MediaType.APPLICATION_JSON_VALUE)) {
+            requestWrapper = new RepeatedlyRequestWrapper((HttpServletRequest) request, response);
+        }
+        if (null == requestWrapper) {
+            chain.doFilter(request, response);
+        } else {
+            chain.doFilter(requestWrapper, response);
+        }
+    }
+
+    @Override
+    public void destroy() {
+
+    }
+}
diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/filter/RepeatedlyRequestWrapper.java b/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/filter/RepeatedlyRequestWrapper.java
new file mode 100644
index 0000000..ff79876
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/filter/RepeatedlyRequestWrapper.java
@@ -0,0 +1,67 @@
+package org.dromara.common.web.filter;
+
+import cn.hutool.core.io.IoUtil;
+import jakarta.servlet.ReadListener;
+import jakarta.servlet.ServletInputStream;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequestWrapper;
+import org.dromara.common.core.constant.Constants;
+
+import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+
+/**
+ * 构建可重复读取inputStream的request
+ *
+ * @author pengles
+ */
+public class RepeatedlyRequestWrapper extends HttpServletRequestWrapper {
+    private final byte[] body;
+
+    public RepeatedlyRequestWrapper(HttpServletRequest request, ServletResponse response) throws IOException {
+        super(request);
+        request.setCharacterEncoding(Constants.UTF8);
+        response.setCharacterEncoding(Constants.UTF8);
+
+        body = IoUtil.readBytes(request.getInputStream(), false);
+    }
+
+    @Override
+    public BufferedReader getReader() throws IOException {
+        return new BufferedReader(new InputStreamReader(getInputStream()));
+    }
+
+    @Override
+    public ServletInputStream getInputStream() throws IOException {
+        final ByteArrayInputStream bais = new ByteArrayInputStream(body);
+        return new ServletInputStream() {
+            @Override
+            public int read() throws IOException {
+                return bais.read();
+            }
+
+            @Override
+            public int available() throws IOException {
+                return body.length;
+            }
+
+            @Override
+            public boolean isFinished() {
+                return false;
+            }
+
+            @Override
+            public boolean isReady() {
+                return false;
+            }
+
+            @Override
+            public void setReadListener(ReadListener readListener) {
+
+            }
+        };
+    }
+}
diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/filter/XssFilter.java b/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/filter/XssFilter.java
new file mode 100644
index 0000000..3a0ce98
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/filter/XssFilter.java
@@ -0,0 +1,59 @@
+package org.dromara.common.web.filter;
+
+import jakarta.servlet.*;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import org.dromara.common.core.utils.SpringUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.web.config.properties.XssProperties;
+import org.springframework.http.HttpMethod;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 防止XSS攻击的过滤器
+ *
+ * @author pengles
+ */
+public class XssFilter implements Filter {
+    /**
+     * 排除链接
+     */
+    public List<String> excludes = new ArrayList<>();
+
+    @Override
+    public void init(FilterConfig filterConfig) throws ServletException {
+        XssProperties properties = SpringUtils.getBean(XssProperties.class);
+        excludes.addAll(properties.getExcludeUrls());
+    }
+
+    @Override
+    public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
+        throws IOException, ServletException {
+        HttpServletRequest req = (HttpServletRequest) request;
+        HttpServletResponse resp = (HttpServletResponse) response;
+        if (handleExcludeURL(req, resp)) {
+            chain.doFilter(request, response);
+            return;
+        }
+        XssHttpServletRequestWrapper xssRequest = new XssHttpServletRequestWrapper((HttpServletRequest) request);
+        chain.doFilter(xssRequest, response);
+    }
+
+    private boolean handleExcludeURL(HttpServletRequest request, HttpServletResponse response) {
+        String url = request.getServletPath();
+        String method = request.getMethod();
+        // GET DELETE 不过滤
+        if (method == null || HttpMethod.GET.matches(method) || HttpMethod.DELETE.matches(method)) {
+            return true;
+        }
+        return StringUtils.matches(url, excludes);
+    }
+
+    @Override
+    public void destroy() {
+
+    }
+}
diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/filter/XssHttpServletRequestWrapper.java b/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/filter/XssHttpServletRequestWrapper.java
new file mode 100644
index 0000000..21ff1b5
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/filter/XssHttpServletRequestWrapper.java
@@ -0,0 +1,134 @@
+package org.dromara.common.web.filter;
+
+import cn.hutool.core.io.IoUtil;
+import cn.hutool.core.map.MapUtil;
+import cn.hutool.core.util.ArrayUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.http.HtmlUtil;
+import jakarta.servlet.ReadListener;
+import jakarta.servlet.ServletInputStream;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequestWrapper;
+import org.dromara.common.core.utils.StringUtils;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * XSS过滤处理
+ *
+ * @author pengles
+ */
+public class XssHttpServletRequestWrapper extends HttpServletRequestWrapper {
+    /**
+     * @param request
+     */
+    public XssHttpServletRequestWrapper(HttpServletRequest request) {
+        super(request);
+    }
+
+    @Override
+    public String getParameter(String name) {
+        String value = super.getParameter(name);
+        if (value == null) {
+            return null;
+        }
+        return HtmlUtil.cleanHtmlTag(value).trim();
+    }
+
+    @Override
+    public Map<String, String[]> getParameterMap() {
+        Map<String, String[]> valueMap = super.getParameterMap();
+        if (MapUtil.isEmpty(valueMap)) {
+            return valueMap;
+        }
+        // 避免某些容器不允许改参数的情况 copy一份重新改
+        Map<String, String[]> map = new HashMap<>(valueMap.size());
+        map.putAll(valueMap);
+        for (Map.Entry<String, String[]> entry : map.entrySet()) {
+            String[] values = entry.getValue();
+            if (values != null) {
+                int length = values.length;
+                String[] escapseValues = new String[length];
+                for (int i = 0; i < length; i++) {
+                    // 防xss攻击和过滤前后空格
+                    escapseValues[i] = HtmlUtil.cleanHtmlTag(values[i]).trim();
+                }
+                map.put(entry.getKey(), escapseValues);
+            }
+        }
+        return map;
+    }
+
+    @Override
+    public String[] getParameterValues(String name) {
+        String[] values = super.getParameterValues(name);
+        if (ArrayUtil.isEmpty(values)) {
+            return values;
+        }
+        int length = values.length;
+        String[] escapseValues = new String[length];
+        for (int i = 0; i < length; i++) {
+            // 防xss攻击和过滤前后空格
+            escapseValues[i] = HtmlUtil.cleanHtmlTag(values[i]).trim();
+        }
+        return escapseValues;
+    }
+
+    @Override
+    public ServletInputStream getInputStream() throws IOException {
+        // 非json类型，直接返回
+        if (!isJsonRequest()) {
+            return super.getInputStream();
+        }
+
+        // 为空，直接返回
+        String json = StrUtil.str(IoUtil.readBytes(super.getInputStream(), false), StandardCharsets.UTF_8);
+        if (StringUtils.isEmpty(json)) {
+            return super.getInputStream();
+        }
+
+        // xss过滤
+        json = HtmlUtil.cleanHtmlTag(json).trim();
+        byte[] jsonBytes = json.getBytes(StandardCharsets.UTF_8);
+        final ByteArrayInputStream bis = IoUtil.toStream(jsonBytes);
+        return new ServletInputStream() {
+            @Override
+            public boolean isFinished() {
+                return true;
+            }
+
+            @Override
+            public boolean isReady() {
+                return true;
+            }
+
+            @Override
+            public int available() throws IOException {
+                return jsonBytes.length;
+            }
+
+            @Override
+            public void setReadListener(ReadListener readListener) {
+            }
+
+            @Override
+            public int read() throws IOException {
+                return bis.read();
+            }
+        };
+    }
+
+    /**
+     * 是否是Json请求
+     */
+    public boolean isJsonRequest() {
+        String header = super.getHeader(HttpHeaders.CONTENT_TYPE);
+        return StringUtils.startsWithIgnoreCase(header, MediaType.APPLICATION_JSON_VALUE);
+    }
+}
diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/handler/GlobalExceptionHandler.java b/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/handler/GlobalExceptionHandler.java
new file mode 100644
index 0000000..53d2fe2
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/handler/GlobalExceptionHandler.java
@@ -0,0 +1,205 @@
+package org.dromara.common.web.handler;
+
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.http.HttpStatus;
+import com.fasterxml.jackson.core.JsonParseException;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.ConstraintViolationException;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.exception.SseException;
+import org.dromara.common.core.exception.base.BaseException;
+import org.dromara.common.core.utils.StreamUtils;
+import org.dromara.common.json.utils.JsonUtils;
+import org.springframework.context.support.DefaultMessageSourceResolvable;
+import org.springframework.http.converter.HttpMessageNotReadableException;
+import org.springframework.validation.BindException;
+import org.springframework.web.HttpRequestMethodNotSupportedException;
+import org.springframework.web.bind.MethodArgumentNotValidException;
+import org.springframework.web.bind.MissingPathVariableException;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
+import org.springframework.web.method.annotation.MethodArgumentTypeMismatchException;
+import org.springframework.web.servlet.NoHandlerFoundException;
+
+import java.io.IOException;
+
+/**
+ * 全局异常处理器
+ *
+ * @author pengles
+ */
+@Slf4j
+@RestControllerAdvice
+public class GlobalExceptionHandler {
+
+    /**
+     * 请求方式不支持
+     */
+    @ExceptionHandler(HttpRequestMethodNotSupportedException.class)
+    public R<Void> handleHttpRequestMethodNotSupported(HttpRequestMethodNotSupportedException e,
+                                                                HttpServletRequest request) {
+        String requestURI = request.getRequestURI();
+        log.error("请求地址'{}',不支持'{}'请求", requestURI, e.getMethod());
+        return R.fail(HttpStatus.HTTP_BAD_METHOD, e.getMessage());
+    }
+
+    /**
+     * 业务异常
+     */
+    @ExceptionHandler(ServiceException.class)
+    public R<Void> handleServiceException(ServiceException e, HttpServletRequest request) {
+        log.error(e.getMessage());
+        Integer code = e.getCode();
+        return ObjectUtil.isNotNull(code) ? R.fail(code, e.getMessage()) : R.fail(e.getMessage());
+    }
+
+    /**
+     * 认证失败
+     */
+    @ResponseStatus(org.springframework.http.HttpStatus.UNAUTHORIZED)
+    @ExceptionHandler(SseException.class)
+    public String handleNotLoginException(SseException e, HttpServletRequest request) {
+        String requestURI = request.getRequestURI();
+        log.debug("请求地址'{}',认证失败'{}',无法访问系统资源", requestURI, e.getMessage());
+        return JsonUtils.toJsonString(R.fail(HttpStatus.HTTP_UNAUTHORIZED, "认证失败，无法访问系统资源"));
+    }
+
+    /**
+     * servlet异常
+     */
+    @ExceptionHandler(ServletException.class)
+    public R<Void> handleServletException(ServletException e, HttpServletRequest request) {
+        String requestURI = request.getRequestURI();
+        log.error("请求地址'{}',发生未知异常.", requestURI, e);
+        return R.fail(e.getMessage());
+    }
+
+    /**
+     * 业务异常
+     */
+    @ExceptionHandler(BaseException.class)
+    public R<Void> handleBaseException(BaseException e, HttpServletRequest request) {
+        log.error(e.getMessage());
+        return R.fail(e.getMessage());
+    }
+
+    /**
+     * 请求路径中缺少必需的路径变量
+     */
+    @ExceptionHandler(MissingPathVariableException.class)
+    public R<Void> handleMissingPathVariableException(MissingPathVariableException e, HttpServletRequest request) {
+        String requestURI = request.getRequestURI();
+        log.error("请求路径中缺少必需的路径变量'{}',发生系统异常.", requestURI);
+        return R.fail(String.format("请求路径中缺少必需的路径变量[%s]", e.getVariableName()));
+    }
+
+    /**
+     * 请求参数类型不匹配
+     */
+    @ExceptionHandler(MethodArgumentTypeMismatchException.class)
+    public R<Void> handleMethodArgumentTypeMismatchException(MethodArgumentTypeMismatchException e, HttpServletRequest request) {
+        String requestURI = request.getRequestURI();
+        log.error("请求参数类型不匹配'{}',发生系统异常.", requestURI);
+        return R.fail(String.format("请求参数类型不匹配，参数[%s]要求类型为：'%s'，但输入值为：'%s'", e.getName(), e.getRequiredType().getName(), e.getValue()));
+    }
+
+    /**
+     * 找不到路由
+     */
+    @ExceptionHandler(NoHandlerFoundException.class)
+    public R<Void> handleNoHandlerFoundException(NoHandlerFoundException e, HttpServletRequest request) {
+        String requestURI = request.getRequestURI();
+        log.error("请求地址'{}'不存在.", requestURI);
+        return R.fail(HttpStatus.HTTP_NOT_FOUND, e.getMessage());
+    }
+
+    /**
+     * 拦截未知的运行时异常
+     */
+    @ResponseStatus(org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR)
+    @ExceptionHandler(IOException.class)
+    public void handleRuntimeException(IOException e, HttpServletRequest request) {
+        String requestURI = request.getRequestURI();
+        if (requestURI.contains("sse")) {
+            // sse 经常性连接中断 例如关闭浏览器 直接屏蔽
+            return;
+        }
+        log.error("请求地址'{}',连接中断", requestURI, e);
+    }
+
+    /**
+     * 拦截未知的运行时异常
+     */
+    @ExceptionHandler(RuntimeException.class)
+    public R<Void> handleRuntimeException(RuntimeException e, HttpServletRequest request) {
+        String requestURI = request.getRequestURI();
+        log.error("请求地址'{}',发生未知异常.", requestURI, e);
+        return R.fail(e.getMessage());
+    }
+
+    /**
+     * 系统异常
+     */
+    @ExceptionHandler(Exception.class)
+    public R<Void> handleException(Exception e, HttpServletRequest request) {
+        String requestURI = request.getRequestURI();
+        log.error("请求地址'{}',发生系统异常.", requestURI, e);
+        return R.fail(e.getMessage());
+    }
+
+    /**
+     * 自定义验证异常
+     */
+    @ExceptionHandler(BindException.class)
+    public R<Void> handleBindException(BindException e) {
+        log.error(e.getMessage());
+        String message = StreamUtils.join(e.getAllErrors(), DefaultMessageSourceResolvable::getDefaultMessage, ", ");
+        return R.fail(message);
+    }
+
+    /**
+     * 自定义验证异常
+     */
+    @ExceptionHandler(ConstraintViolationException.class)
+    public R<Void> constraintViolationException(ConstraintViolationException e) {
+        log.error(e.getMessage());
+        String message = StreamUtils.join(e.getConstraintViolations(), ConstraintViolation::getMessage, ", ");
+        return R.fail(message);
+    }
+
+    /**
+     * 自定义验证异常
+     */
+    @ExceptionHandler(MethodArgumentNotValidException.class)
+    public R<Void> handleMethodArgumentNotValidException(MethodArgumentNotValidException e) {
+        log.error(e.getMessage());
+        String message = StreamUtils.join(e.getBindingResult().getAllErrors(), DefaultMessageSourceResolvable::getDefaultMessage, ", ");
+        return R.fail(message);
+    }
+
+    /**
+     * JSON 解析异常（Jackson 在处理 JSON 格式出错时抛出）
+     * 可能是请求体格式非法，也可能是服务端反序列化失败
+     */
+    @ExceptionHandler(JsonParseException.class)
+    public R<Void> handleJsonParseException(JsonParseException e, HttpServletRequest request) {
+        String requestURI = request.getRequestURI();
+        log.error("请求地址'{}' 发生 JSON 解析异常: {}", requestURI, e.getMessage());
+        return R.fail(HttpStatus.HTTP_BAD_REQUEST, "请求数据格式错误（JSON 解析失败）：" + e.getMessage());
+    }
+
+    /**
+     * 请求体读取异常（通常是请求参数格式非法、字段类型不匹配等）
+     */
+    @ExceptionHandler(HttpMessageNotReadableException.class)
+    public R<Void> handleHttpMessageNotReadableException(HttpMessageNotReadableException e, HttpServletRequest request) {
+        log.error("请求地址'{}', 参数解析失败: {}", request.getRequestURI(), e.getMessage());
+        return R.fail(HttpStatus.HTTP_BAD_REQUEST, "请求参数格式错误：" + e.getMostSpecificCause().getMessage());
+    }
+
+}
diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/interceptor/PlusWebInvokeTimeInterceptor.java b/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/interceptor/PlusWebInvokeTimeInterceptor.java
new file mode 100644
index 0000000..77d5ad4
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/interceptor/PlusWebInvokeTimeInterceptor.java
@@ -0,0 +1,89 @@
+package org.dromara.common.web.interceptor;
+
+import cn.hutool.core.io.IoUtil;
+import cn.hutool.core.map.MapUtil;
+import cn.hutool.core.util.ObjectUtil;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.time.StopWatch;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.json.utils.JsonUtils;
+import org.dromara.common.web.filter.RepeatedlyRequestWrapper;
+import org.springframework.http.MediaType;
+import org.springframework.web.servlet.HandlerInterceptor;
+import org.springframework.web.servlet.ModelAndView;
+
+import java.io.BufferedReader;
+import java.util.Map;
+
+/**
+ * web的调用时间统计拦截器
+ *
+ * @author pengles
+ * @since 3.3.0
+ */
+@Slf4j
+public class PlusWebInvokeTimeInterceptor implements HandlerInterceptor {
+
+    private final static ThreadLocal<StopWatch> KEY_CACHE = new ThreadLocal<>();
+
+    @Override
+    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
+        String url = request.getMethod() + " " + request.getRequestURI();
+
+        // 打印请求参数
+        if (isJsonRequest(request)) {
+            String jsonParam = "";
+            if (request instanceof RepeatedlyRequestWrapper) {
+                BufferedReader reader = request.getReader();
+                jsonParam = IoUtil.read(reader);
+            }
+            log.info("[PLUS]开始请求 => URL[{}],参数类型[json],参数:[{}]", url, jsonParam);
+        } else {
+            Map<String, String[]> parameterMap = request.getParameterMap();
+            if (MapUtil.isNotEmpty(parameterMap)) {
+                String parameters = JsonUtils.toJsonString(parameterMap);
+                log.info("[PLUS]开始请求 => URL[{}],参数类型[param],参数:[{}]", url, parameters);
+            } else {
+                log.info("[PLUS]开始请求 => URL[{}],无参数", url);
+            }
+        }
+
+        StopWatch stopWatch = new StopWatch();
+        KEY_CACHE.set(stopWatch);
+        stopWatch.start();
+
+        return true;
+    }
+
+    @Override
+    public void postHandle(HttpServletRequest request, HttpServletResponse response, Object handler, ModelAndView modelAndView) throws Exception {
+
+    }
+
+    @Override
+    public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) throws Exception {
+        StopWatch stopWatch = KEY_CACHE.get();
+        if (ObjectUtil.isNotNull(stopWatch)) {
+            stopWatch.stop();
+            log.info("[PLUS]结束请求 => URL[{}],耗时:[{}]毫秒", request.getMethod() + " " + request.getRequestURI(), stopWatch.getDuration().toMillis());
+            KEY_CACHE.remove();
+        }
+    }
+
+    /**
+     * 判断本次请求的数据类型是否为json
+     *
+     * @param request request
+     * @return boolean
+     */
+    private boolean isJsonRequest(HttpServletRequest request) {
+        String contentType = request.getContentType();
+        if (contentType != null) {
+            return StringUtils.startsWithIgnoreCase(contentType, MediaType.APPLICATION_JSON_VALUE);
+        }
+        return false;
+    }
+
+}
diff --git a/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/utils/UnsignedMathGenerator.java b/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/utils/UnsignedMathGenerator.java
new file mode 100644
index 0000000..1acf65c
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/utils/UnsignedMathGenerator.java
@@ -0,0 +1,88 @@
+package org.dromara.common.web.utils;
+
+import cn.hutool.captcha.generator.CodeGenerator;
+import cn.hutool.core.math.Calculator;
+import cn.hutool.core.util.CharUtil;
+import cn.hutool.core.util.RandomUtil;
+import org.dromara.common.core.utils.StringUtils;
+
+import java.io.Serial;
+
+/**
+ * 无符号计算生成器
+ *
+ * @author pengles
+ */
+public class UnsignedMathGenerator implements CodeGenerator {
+
+    @Serial
+    private static final long serialVersionUID = -5514819971774091076L;
+
+    private static final String OPERATORS = "+-*";
+
+    /**
+     * 参与计算数字最大长度
+     */
+    private final int numberLength;
+
+    /**
+     * 构造
+     */
+    public UnsignedMathGenerator() {
+        this(2);
+    }
+
+    /**
+     * 构造
+     *
+     * @param numberLength 参与计算最大数字位数
+     */
+    public UnsignedMathGenerator(int numberLength) {
+        this.numberLength = numberLength;
+    }
+
+    @Override
+    public String generate() {
+        final int limit = getLimit();
+        int a = RandomUtil.randomInt(limit);
+        int b = RandomUtil.randomInt(limit);
+        String max = Integer.toString(Math.max(a,b));
+        String min = Integer.toString(Math.min(a,b));
+        max = StringUtils.rightPad(max, this.numberLength, CharUtil.SPACE);
+        min = StringUtils.rightPad(min, this.numberLength, CharUtil.SPACE);
+
+        return max + RandomUtil.randomChar(OPERATORS) + min + '=';
+    }
+
+    @Override
+    public boolean verify(String code, String userInputCode) {
+        int result;
+        try {
+            result = Integer.parseInt(userInputCode);
+        } catch (NumberFormatException e) {
+            // 用户输入非数字
+            return false;
+        }
+
+        final int calculateResult = (int) Calculator.conversion(code);
+        return result == calculateResult;
+    }
+
+    /**
+     * 获取验证码长度
+     *
+     * @return 验证码长度
+     */
+    public int getLength() {
+        return this.numberLength * 2 + 2;
+    }
+
+    /**
+     * 根据长度获取参与计算数字最大值
+     *
+     * @return 最大值
+     */
+    private int getLimit() {
+        return Integer.parseInt("1" + StringUtils.repeat('0', this.numberLength));
+    }
+}
diff --git a/ruoyi-common/ruoyi-common-web/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-web/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
new file mode 100644
index 0000000..fc10a36
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-web/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1,5 @@
+org.dromara.common.web.config.CaptchaConfig
+org.dromara.common.web.config.FilterConfig
+org.dromara.common.web.config.I18nConfig
+org.dromara.common.web.config.ResourcesConfig
+org.dromara.common.web.config.UndertowConfig
diff --git a/ruoyi-common/ruoyi-common-websocket/pom.xml b/ruoyi-common/ruoyi-common-websocket/pom.xml
new file mode 100644
index 0000000..0587cd7
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-websocket/pom.xml
@@ -0,0 +1,46 @@
+<?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>
+        <groupId>org.dromara</groupId>
+        <artifactId>ruoyi-common</artifactId>
+        <version>${revision}</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>ruoyi-common-websocket</artifactId>
+
+    <description>
+        ruoyi-common-websocket 模块
+    </description>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-redis</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-satoken</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-json</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-websocket</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-tomcat</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/config/WebSocketConfig.java b/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/config/WebSocketConfig.java
new file mode 100644
index 0000000..ef5cfc9
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/config/WebSocketConfig.java
@@ -0,0 +1,63 @@
+package org.dromara.common.websocket.config;
+
+import cn.hutool.core.util.StrUtil;
+import org.dromara.common.websocket.config.properties.WebSocketProperties;
+import org.dromara.common.websocket.handler.PlusWebSocketHandler;
+import org.dromara.common.websocket.interceptor.PlusWebSocketInterceptor;
+import org.dromara.common.websocket.listener.WebSocketTopicListener;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.web.socket.WebSocketHandler;
+import org.springframework.web.socket.config.annotation.EnableWebSocket;
+import org.springframework.web.socket.config.annotation.WebSocketConfigurer;
+import org.springframework.web.socket.server.HandshakeInterceptor;
+
+/**
+ * WebSocket 配置
+ *
+ * @author zendwang
+ */
+@AutoConfiguration
+@ConditionalOnProperty(value = "websocket.enabled", havingValue = "true")
+@EnableConfigurationProperties(WebSocketProperties.class)
+@EnableWebSocket
+public class WebSocketConfig {
+
+    @Bean
+    public WebSocketConfigurer webSocketConfigurer(HandshakeInterceptor handshakeInterceptor,
+                                                   WebSocketHandler webSocketHandler, WebSocketProperties webSocketProperties) {
+        // 如果WebSocket的路径为空，则设置默认路径为 "/websocket"
+        if (StrUtil.isBlank(webSocketProperties.getPath())) {
+            webSocketProperties.setPath("/websocket");
+        }
+
+        // 如果允许跨域访问的地址为空，则设置为 "*"，表示允许所有来源的跨域请求
+        if (StrUtil.isBlank(webSocketProperties.getAllowedOrigins())) {
+            webSocketProperties.setAllowedOrigins("*");
+        }
+
+        // 返回一个WebSocketConfigurer对象，用于配置WebSocket
+        return registry -> registry
+            // 添加WebSocket处理程序和拦截器到指定路径，设置允许的跨域来源
+            .addHandler(webSocketHandler, webSocketProperties.getPath())
+            .addInterceptors(handshakeInterceptor)
+            .setAllowedOrigins(webSocketProperties.getAllowedOrigins());
+    }
+
+    @Bean
+    public HandshakeInterceptor handshakeInterceptor() {
+        return new PlusWebSocketInterceptor();
+    }
+
+    @Bean
+    public WebSocketHandler webSocketHandler() {
+        return new PlusWebSocketHandler();
+    }
+
+    @Bean
+    public WebSocketTopicListener topicListener() {
+        return new WebSocketTopicListener();
+    }
+}
diff --git a/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/config/properties/WebSocketProperties.java b/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/config/properties/WebSocketProperties.java
new file mode 100644
index 0000000..d629fe5
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/config/properties/WebSocketProperties.java
@@ -0,0 +1,26 @@
+package org.dromara.common.websocket.config.properties;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+/**
+ * WebSocket 配置项
+ *
+ * @author zendwang
+ */
+@ConfigurationProperties("websocket")
+@Data
+public class WebSocketProperties {
+
+    private Boolean enabled;
+
+    /**
+     * 路径
+     */
+    private String path;
+
+    /**
+     *  设置访问源地址
+     */
+    private String allowedOrigins;
+}
diff --git a/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/constant/WebSocketConstants.java b/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/constant/WebSocketConstants.java
new file mode 100644
index 0000000..e243279
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/constant/WebSocketConstants.java
@@ -0,0 +1,29 @@
+package org.dromara.common.websocket.constant;
+
+/**
+ * websocket的常量配置
+ *
+ * @author zendwang
+ */
+public interface WebSocketConstants {
+
+    /**
+     * websocketSession中的参数的key
+     */
+    String LOGIN_USER_KEY = "loginUser";
+
+    /**
+     * 订阅的频道
+     */
+    String WEB_SOCKET_TOPIC = "global:websocket";
+
+    /**
+     * 前端心跳检查的命令
+     */
+    String PING = "ping";
+
+    /**
+     * 服务端心跳恢复的字符串
+     */
+    String PONG = "pong";
+}
diff --git a/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/dto/WebSocketMessageDto.java b/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/dto/WebSocketMessageDto.java
new file mode 100644
index 0000000..e2d4456
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/dto/WebSocketMessageDto.java
@@ -0,0 +1,29 @@
+package org.dromara.common.websocket.dto;
+
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 消息的dto
+ *
+ * @author zendwang
+ */
+@Data
+public class WebSocketMessageDto implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 需要推送到的session key 列表
+     */
+    private List<Long> sessionKeys;
+
+    /**
+     * 需要发送的消息
+     */
+    private String message;
+}
diff --git a/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/handler/PlusWebSocketHandler.java b/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/handler/PlusWebSocketHandler.java
new file mode 100644
index 0000000..8b1cc5d
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/handler/PlusWebSocketHandler.java
@@ -0,0 +1,122 @@
+package org.dromara.common.websocket.handler;
+
+import cn.hutool.core.util.ObjectUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.domain.model.LoginUser;
+import org.dromara.common.websocket.dto.WebSocketMessageDto;
+import org.dromara.common.websocket.holder.WebSocketSessionHolder;
+import org.dromara.common.websocket.utils.WebSocketUtils;
+import org.springframework.web.socket.*;
+import org.springframework.web.socket.handler.AbstractWebSocketHandler;
+
+import java.io.IOException;
+import java.util.List;
+
+import static org.dromara.common.websocket.constant.WebSocketConstants.LOGIN_USER_KEY;
+
+/**
+ * WebSocketHandler 实现类
+ *
+ * @author zendwang
+ */
+@Slf4j
+public class PlusWebSocketHandler extends AbstractWebSocketHandler {
+
+    /**
+     * 连接成功后
+     */
+    @Override
+    public void afterConnectionEstablished(WebSocketSession session) throws IOException {
+        LoginUser loginUser = (LoginUser) session.getAttributes().get(LOGIN_USER_KEY);
+        if (ObjectUtil.isNull(loginUser)) {
+            session.close(CloseStatus.BAD_DATA);
+            log.info("[connect] invalid token received. sessionId: {}", session.getId());
+            return;
+        }
+        WebSocketSessionHolder.addSession(loginUser.getUserId(), session);
+        log.info("[connect] sessionId: {},userId:{},userType:{}", session.getId(), loginUser.getUserId(), loginUser.getUserType());
+    }
+
+    /**
+     * 处理接收到的文本消息
+     *
+     * @param session WebSocket会话
+     * @param message 接收到的文本消息
+     * @throws Exception 处理消息过程中可能抛出的异常
+     */
+    @Override
+    protected void handleTextMessage(WebSocketSession session, TextMessage message) throws Exception {
+        // 从WebSocket会话中获取登录用户信息
+        LoginUser loginUser = (LoginUser) session.getAttributes().get(LOGIN_USER_KEY);
+
+        // 创建WebSocket消息DTO对象
+        WebSocketMessageDto webSocketMessageDto = new WebSocketMessageDto();
+        webSocketMessageDto.setSessionKeys(List.of(loginUser.getUserId()));
+        webSocketMessageDto.setMessage(message.getPayload());
+        WebSocketUtils.publishMessage(webSocketMessageDto);
+    }
+
+    /**
+     * 处理接收到的二进制消息
+     *
+     * @param session WebSocket会话
+     * @param message 接收到的二进制消息
+     * @throws Exception 处理消息过程中可能抛出的异常
+     */
+    @Override
+    protected void handleBinaryMessage(WebSocketSession session, BinaryMessage message) throws Exception {
+        super.handleBinaryMessage(session, message);
+    }
+
+    /**
+     * 处理接收到的Pong消息（心跳监测）
+     *
+     * @param session WebSocket会话
+     * @param message 接收到的Pong消息
+     * @throws Exception 处理消息过程中可能抛出的异常
+     */
+    @Override
+    protected void handlePongMessage(WebSocketSession session, PongMessage message) throws Exception {
+        WebSocketUtils.sendPongMessage(session);
+    }
+
+    /**
+     * 处理WebSocket传输错误
+     *
+     * @param session   WebSocket会话
+     * @param exception 发生的异常
+     * @throws Exception 处理过程中可能抛出的异常
+     */
+    @Override
+    public void handleTransportError(WebSocketSession session, Throwable exception) throws Exception {
+        log.error("[transport error] sessionId: {} , exception:{}", session.getId(), exception.getMessage());
+    }
+
+    /**
+     * 在WebSocket连接关闭后执行清理操作
+     *
+     * @param session WebSocket会话
+     * @param status  关闭状态信息
+     */
+    @Override
+    public void afterConnectionClosed(WebSocketSession session, CloseStatus status) {
+        LoginUser loginUser = (LoginUser) session.getAttributes().get(LOGIN_USER_KEY);
+        if (ObjectUtil.isNull(loginUser)) {
+            log.info("[disconnect] invalid token received. sessionId: {}", session.getId());
+            return;
+        }
+        WebSocketSessionHolder.removeSession(loginUser.getUserId());
+        log.info("[disconnect] sessionId: {},userId:{},userType:{}", session.getId(), loginUser.getUserId(), loginUser.getUserType());
+    }
+
+    /**
+     * 指示处理程序是否支持接收部分消息
+     *
+     * @return 如果支持接收部分消息，则返回true；否则返回false
+     */
+    @Override
+    public boolean supportsPartialMessages() {
+        return false;
+    }
+
+}
diff --git a/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/holder/WebSocketSessionHolder.java b/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/holder/WebSocketSessionHolder.java
new file mode 100644
index 0000000..9c2372b
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/holder/WebSocketSessionHolder.java
@@ -0,0 +1,74 @@
+package org.dromara.common.websocket.holder;
+
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+import org.springframework.web.socket.CloseStatus;
+import org.springframework.web.socket.WebSocketSession;
+
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * WebSocketSession 用于保存当前所有在线的会话信息
+ *
+ * @author zendwang
+ */
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public class WebSocketSessionHolder {
+
+    private static final Map<Long, WebSocketSession> USER_SESSION_MAP = new ConcurrentHashMap<>();
+
+    /**
+     * 将WebSocket会话添加到用户会话Map中
+     *
+     * @param sessionKey 会话键，用于检索会话
+     * @param session    要添加的WebSocket会话
+     */
+    public static void addSession(Long sessionKey, WebSocketSession session) {
+        removeSession(sessionKey);
+        USER_SESSION_MAP.put(sessionKey, session);
+    }
+
+    /**
+     * 从用户会话Map中移除指定会话键对应的WebSocket会话
+     *
+     * @param sessionKey 要移除的会话键
+     */
+    public static void removeSession(Long sessionKey) {
+        WebSocketSession session = USER_SESSION_MAP.remove(sessionKey);
+        try {
+            session.close(CloseStatus.BAD_DATA);
+        } catch (Exception ignored) {
+        }
+    }
+
+    /**
+     * 根据会话键从用户会话Map中获取WebSocket会话
+     *
+     * @param sessionKey 要获取的会话键
+     * @return 与给定会话键对应的WebSocket会话，如果不存在则返回null
+     */
+    public static WebSocketSession getSessions(Long sessionKey) {
+        return USER_SESSION_MAP.get(sessionKey);
+    }
+
+    /**
+     * 获取存储在用户会话Map中所有WebSocket会话的会话键集合
+     *
+     * @return 所有WebSocket会话的会话键集合
+     */
+    public static Set<Long> getSessionsAll() {
+        return USER_SESSION_MAP.keySet();
+    }
+
+    /**
+     * 检查给定的会话键是否存在于用户会话Map中
+     *
+     * @param sessionKey 要检查的会话键
+     * @return 如果存在对应的会话键，则返回true；否则返回false
+     */
+    public static Boolean existSession(Long sessionKey) {
+        return USER_SESSION_MAP.containsKey(sessionKey);
+    }
+}
diff --git a/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/interceptor/PlusWebSocketInterceptor.java b/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/interceptor/PlusWebSocketInterceptor.java
new file mode 100644
index 0000000..c70e377
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/interceptor/PlusWebSocketInterceptor.java
@@ -0,0 +1,75 @@
+package org.dromara.common.websocket.interceptor;
+
+import cn.dev33.satoken.exception.NotLoginException;
+import cn.dev33.satoken.stp.StpUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.domain.model.LoginUser;
+import org.dromara.common.core.utils.ServletUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.satoken.utils.LoginHelper;
+import org.springframework.http.server.ServerHttpRequest;
+import org.springframework.http.server.ServerHttpResponse;
+import org.springframework.web.socket.WebSocketHandler;
+import org.springframework.web.socket.server.HandshakeInterceptor;
+
+import java.util.Map;
+
+import static org.dromara.common.websocket.constant.WebSocketConstants.LOGIN_USER_KEY;
+
+/**
+ * WebSocket握手请求的拦截器
+ *
+ * @author zendwang
+ */
+@Slf4j
+public class PlusWebSocketInterceptor implements HandshakeInterceptor {
+
+    /**
+     * WebSocket握手之前执行的前置处理方法
+     *
+     * @param request    WebSocket握手请求
+     * @param response   WebSocket握手响应
+     * @param wsHandler  WebSocket处理程序
+     * @param attributes 与WebSocket会话关联的属性
+     * @return 如果允许握手继续进行，则返回true；否则返回false
+     */
+    @Override
+    public boolean beforeHandshake(ServerHttpRequest request, ServerHttpResponse response, WebSocketHandler wsHandler, Map<String, Object> attributes) {
+        try {
+            // 检查是否登录 是否有token
+            LoginUser loginUser = LoginHelper.getLoginUser();
+
+            // 解决 ws 不走 mvc 拦截器问题(cloud 版本不受影响)
+            // 检查 header 与 param 里的 clientid 与 token 里的是否一致
+            String headerCid = ServletUtils.getRequest().getHeader(LoginHelper.CLIENT_KEY);
+            String paramCid = ServletUtils.getParameter(LoginHelper.CLIENT_KEY);
+            String clientId = StpUtil.getExtra(LoginHelper.CLIENT_KEY).toString();
+            if (!StringUtils.equalsAny(clientId, headerCid, paramCid)) {
+                // token 无效
+                throw NotLoginException.newInstance(StpUtil.getLoginType(),
+                    "-100", "客户端ID与Token不匹配",
+                    StpUtil.getTokenValue());
+            }
+
+            attributes.put(LOGIN_USER_KEY, loginUser);
+            return true;
+        } catch (NotLoginException e) {
+            log.error("WebSocket 认证失败'{}',无法访问系统资源", e.getMessage());
+            return false;
+        }
+    }
+
+    /**
+     * WebSocket握手成功后执行的后置处理方法
+     *
+     * @param request   WebSocket握手请求
+     * @param response  WebSocket握手响应
+     * @param wsHandler WebSocket处理程序
+     * @param exception 握手过程中可能出现的异常
+     */
+    @Override
+    public void afterHandshake(ServerHttpRequest request, ServerHttpResponse response, WebSocketHandler wsHandler, Exception exception) {
+        // 在这个方法中可以执行一些握手成功后的后续处理逻辑，比如记录日志或者其他操作
+    }
+
+}
diff --git a/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/listener/WebSocketTopicListener.java b/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/listener/WebSocketTopicListener.java
new file mode 100644
index 0000000..0ad39af
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/listener/WebSocketTopicListener.java
@@ -0,0 +1,50 @@
+package org.dromara.common.websocket.listener;
+
+import cn.hutool.core.collection.CollUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.websocket.holder.WebSocketSessionHolder;
+import org.dromara.common.websocket.utils.WebSocketUtils;
+import org.springframework.boot.ApplicationArguments;
+import org.springframework.boot.ApplicationRunner;
+import org.springframework.core.Ordered;
+
+/**
+ * WebSocket 主题订阅监听器
+ *
+ * @author zendwang
+ */
+@Slf4j
+public class WebSocketTopicListener implements ApplicationRunner, Ordered {
+
+    /**
+     * 在Spring Boot应用程序启动时初始化WebSocket主题订阅监听器
+     *
+     * @param args 应用程序参数
+     * @throws Exception 初始化过程中可能抛出的异常
+     */
+    @Override
+    public void run(ApplicationArguments args) throws Exception {
+        // 订阅WebSocket消息
+        WebSocketUtils.subscribeMessage((message) -> {
+            log.info("WebSocket主题订阅收到消息session keys={} message={}", message.getSessionKeys(), message.getMessage());
+            // 如果key不为空就按照key发消息 如果为空就群发
+            if (CollUtil.isNotEmpty(message.getSessionKeys())) {
+                message.getSessionKeys().forEach(key -> {
+                    if (WebSocketSessionHolder.existSession(key)) {
+                        WebSocketUtils.sendMessage(key, message.getMessage());
+                    }
+                });
+            } else {
+                WebSocketSessionHolder.getSessionsAll().forEach(key -> {
+                    WebSocketUtils.sendMessage(key, message.getMessage());
+                });
+            }
+        });
+        log.info("初始化WebSocket主题订阅监听器成功");
+    }
+
+    @Override
+    public int getOrder() {
+        return -1;
+    }
+}
diff --git a/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/utils/WebSocketUtils.java b/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/utils/WebSocketUtils.java
new file mode 100644
index 0000000..8c4170a
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/utils/WebSocketUtils.java
@@ -0,0 +1,127 @@
+package org.dromara.common.websocket.utils;
+
+import cn.hutool.core.collection.CollUtil;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.redis.utils.RedisUtils;
+import org.dromara.common.websocket.dto.WebSocketMessageDto;
+import org.dromara.common.websocket.holder.WebSocketSessionHolder;
+import org.springframework.web.socket.PongMessage;
+import org.springframework.web.socket.TextMessage;
+import org.springframework.web.socket.WebSocketMessage;
+import org.springframework.web.socket.WebSocketSession;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.Consumer;
+
+import static org.dromara.common.websocket.constant.WebSocketConstants.WEB_SOCKET_TOPIC;
+
+/**
+ * 工具类
+ *
+ * @author zendwang
+ */
+@Slf4j
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public class WebSocketUtils {
+
+    /**
+     * 向指定的WebSocket会话发送消息
+     *
+     * @param sessionKey 要发送消息的用户id
+     * @param message    要发送的消息内容
+     */
+    public static void sendMessage(Long sessionKey, String message) {
+        WebSocketSession session = WebSocketSessionHolder.getSessions(sessionKey);
+        sendMessage(session, message);
+    }
+
+    /**
+     * 订阅WebSocket消息主题，并提供一个消费者函数来处理接收到的消息
+     *
+     * @param consumer 处理WebSocket消息的消费者函数
+     */
+    public static void subscribeMessage(Consumer<WebSocketMessageDto> consumer) {
+        RedisUtils.subscribe(WEB_SOCKET_TOPIC, WebSocketMessageDto.class, consumer);
+    }
+
+    /**
+     * 发布WebSocket订阅消息
+     *
+     * @param webSocketMessage 要发布的WebSocket消息对象
+     */
+    public static void publishMessage(WebSocketMessageDto webSocketMessage) {
+        List<Long> unsentSessionKeys = new ArrayList<>();
+        // 当前服务内session,直接发送消息
+        for (Long sessionKey : webSocketMessage.getSessionKeys()) {
+            if (WebSocketSessionHolder.existSession(sessionKey)) {
+                WebSocketUtils.sendMessage(sessionKey, webSocketMessage.getMessage());
+                continue;
+            }
+            unsentSessionKeys.add(sessionKey);
+        }
+        // 不在当前服务内session,发布订阅消息
+        if (CollUtil.isNotEmpty(unsentSessionKeys)) {
+            WebSocketMessageDto broadcastMessage = new WebSocketMessageDto();
+            broadcastMessage.setMessage(webSocketMessage.getMessage());
+            broadcastMessage.setSessionKeys(unsentSessionKeys);
+            RedisUtils.publish(WEB_SOCKET_TOPIC, broadcastMessage, consumer -> {
+                log.info(" WebSocket发送主题订阅消息topic:{} session keys:{} message:{}",
+                    WEB_SOCKET_TOPIC, unsentSessionKeys, webSocketMessage.getMessage());
+            });
+        }
+    }
+
+    /**
+     * 向所有的WebSocket会话发布订阅的消息(群发)
+     *
+     * @param message 要发布的消息内容
+     */
+    public static void publishAll(String message) {
+        WebSocketMessageDto broadcastMessage = new WebSocketMessageDto();
+        broadcastMessage.setMessage(message);
+        RedisUtils.publish(WEB_SOCKET_TOPIC, broadcastMessage, consumer -> {
+            log.info("WebSocket发送主题订阅消息topic:{} message:{}", WEB_SOCKET_TOPIC, message);
+        });
+    }
+
+    /**
+     * 向指定的WebSocket会话发送Pong消息
+     *
+     * @param session 要发送Pong消息的WebSocket会话
+     */
+    public static void sendPongMessage(WebSocketSession session) {
+        sendMessage(session, new PongMessage());
+    }
+
+    /**
+     * 向指定的WebSocket会话发送文本消息
+     *
+     * @param session WebSocket会话
+     * @param message 要发送的文本消息内容
+     */
+    public static void sendMessage(WebSocketSession session, String message) {
+        sendMessage(session, new TextMessage(message));
+    }
+
+    /**
+     * 向指定的WebSocket会话发送WebSocket消息对象
+     *
+     * @param session WebSocket会话
+     * @param message 要发送的WebSocket消息对象
+     */
+    private synchronized static void sendMessage(WebSocketSession session, WebSocketMessage<?> message) {
+        if (session == null || !session.isOpen()) {
+            log.warn("[send] session会话已经关闭");
+        } else {
+            try {
+                session.sendMessage(message);
+            } catch (IOException e) {
+                log.error("[send] session({}) 发送消息({}) 异常", session, message, e);
+            }
+        }
+    }
+}
diff --git a/ruoyi-common/ruoyi-common-websocket/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-websocket/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
new file mode 100644
index 0000000..c3a7305
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-websocket/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -0,0 +1 @@
+org.dromara.common.websocket.config.WebSocketConfig
diff --git a/ruoyi-extend/pom.xml b/ruoyi-extend/pom.xml
new file mode 100644
index 0000000..f4755b6
--- /dev/null
+++ b/ruoyi-extend/pom.xml
@@ -0,0 +1,19 @@
+<?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>PoJie</artifactId>
+        <groupId>org.dromara</groupId>
+        <version>${revision}</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>ruoyi-extend</artifactId>
+    <packaging>pom</packaging>
+
+    <modules>
+        <module>ruoyi-monitor-admin</module>
+        <module>ruoyi-snailjob-server</module>
+    </modules>
+
+</project>
diff --git a/ruoyi-extend/ruoyi-monitor-admin/Dockerfile b/ruoyi-extend/ruoyi-monitor-admin/Dockerfile
new file mode 100644
index 0000000..0cae0f6
--- /dev/null
+++ b/ruoyi-extend/ruoyi-monitor-admin/Dockerfile
@@ -0,0 +1,21 @@
+# 贝尔实验室 Spring 官方推荐镜像 JDK下载地址 https://bell-sw.com/pages/downloads/
+FROM bellsoft/liberica-openjdk-rocky:17.0.15-cds
+#FROM bellsoft/liberica-openjdk-rocky:21.0.7-cds
+
+LABEL maintainer="Lion Li"
+
+RUN mkdir -p /ruoyi/monitor/logs
+
+WORKDIR /ruoyi/monitor
+
+ENV LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS=""
+
+EXPOSE 9090
+
+ADD ./target/ruoyi-monitor-admin.jar ./app.jar
+
+SHELL ["/bin/bash", "-c"]
+
+ENTRYPOINT java -Djava.security.egd=file:/dev/./urandom \
+           -XX:+HeapDumpOnOutOfMemoryError -XX:+UseZGC ${JAVA_OPTS} \
+           -jar app.jar
diff --git a/ruoyi-extend/ruoyi-monitor-admin/pom.xml b/ruoyi-extend/ruoyi-monitor-admin/pom.xml
new file mode 100644
index 0000000..538ffbd
--- /dev/null
+++ b/ruoyi-extend/ruoyi-monitor-admin/pom.xml
@@ -0,0 +1,73 @@
+<?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-extend</artifactId>
+        <groupId>org.dromara</groupId>
+        <version>${revision}</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <packaging>jar</packaging>
+    <artifactId>ruoyi-monitor-admin</artifactId>
+
+    <dependencies>
+        <!-- SpringBoot Web容器 -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>spring-boot-starter-tomcat</artifactId>
+                    <groupId>org.springframework.boot</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <!-- web 容器使用 undertow 性能更强 -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-undertow</artifactId>
+        </dependency>
+
+        <!-- spring security 安全认证 -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-security</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>de.codecentric</groupId>
+            <artifactId>spring-boot-admin-starter-server</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>de.codecentric</groupId>
+            <artifactId>spring-boot-admin-starter-client</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </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>
+        </plugins>
+    </build>
+
+</project>
diff --git a/ruoyi-extend/ruoyi-monitor-admin/src/main/java/org/dromara/monitor/admin/MonitorAdminApplication.java b/ruoyi-extend/ruoyi-monitor-admin/src/main/java/org/dromara/monitor/admin/MonitorAdminApplication.java
new file mode 100644
index 0000000..4c6750b
--- /dev/null
+++ b/ruoyi-extend/ruoyi-monitor-admin/src/main/java/org/dromara/monitor/admin/MonitorAdminApplication.java
@@ -0,0 +1,19 @@
+package org.dromara.monitor.admin;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+/**
+ * Admin 监控启动程序
+ *
+ * @author pengles
+ */
+@SpringBootApplication
+public class MonitorAdminApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(MonitorAdminApplication.class, args);
+        System.out.println("Admin 监控启动成功");
+    }
+
+}
diff --git a/ruoyi-extend/ruoyi-monitor-admin/src/main/java/org/dromara/monitor/admin/config/AdminServerConfig.java b/ruoyi-extend/ruoyi-monitor-admin/src/main/java/org/dromara/monitor/admin/config/AdminServerConfig.java
new file mode 100644
index 0000000..1481c88
--- /dev/null
+++ b/ruoyi-extend/ruoyi-monitor-admin/src/main/java/org/dromara/monitor/admin/config/AdminServerConfig.java
@@ -0,0 +1,31 @@
+package org.dromara.monitor.admin.config;
+
+import de.codecentric.boot.admin.server.config.EnableAdminServer;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.task.TaskExecutionAutoConfiguration;
+import org.springframework.boot.task.ThreadPoolTaskExecutorBuilder;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
+
+import java.util.concurrent.Executor;
+
+/**
+ * springboot-admin server配置类
+ *
+ * @author pengles
+ */
+@Configuration
+@EnableAdminServer
+public class AdminServerConfig {
+
+    @Lazy
+    @Bean(name = TaskExecutionAutoConfiguration.APPLICATION_TASK_EXECUTOR_BEAN_NAME)
+    @ConditionalOnMissingBean(Executor.class)
+    public ThreadPoolTaskExecutor applicationTaskExecutor(ThreadPoolTaskExecutorBuilder builder) {
+        return builder.build();
+    }
+
+
+}
diff --git a/ruoyi-extend/ruoyi-monitor-admin/src/main/java/org/dromara/monitor/admin/config/SecurityConfig.java b/ruoyi-extend/ruoyi-monitor-admin/src/main/java/org/dromara/monitor/admin/config/SecurityConfig.java
new file mode 100644
index 0000000..ace4f41
--- /dev/null
+++ b/ruoyi-extend/ruoyi-monitor-admin/src/main/java/org/dromara/monitor/admin/config/SecurityConfig.java
@@ -0,0 +1,54 @@
+package org.dromara.monitor.admin.config;
+
+import de.codecentric.boot.admin.server.config.AdminServerProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.config.Customizer;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
+import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;
+import org.springframework.security.config.annotation.web.configurers.HeadersConfigurer;
+import org.springframework.security.web.SecurityFilterChain;
+import org.springframework.security.web.authentication.SavedRequestAwareAuthenticationSuccessHandler;
+import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
+
+/**
+ * admin 监控 安全配置
+ *
+ * @author pengles
+ */
+@EnableWebSecurity
+@Configuration
+public class SecurityConfig {
+
+    private final String adminContextPath;
+
+    public SecurityConfig(AdminServerProperties adminServerProperties) {
+        this.adminContextPath = adminServerProperties.getContextPath();
+    }
+
+    @Bean
+    public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Exception {
+        SavedRequestAwareAuthenticationSuccessHandler successHandler = new SavedRequestAwareAuthenticationSuccessHandler();
+        successHandler.setTargetUrlParameter("redirectTo");
+        successHandler.setDefaultTargetUrl(adminContextPath + "/");
+
+        return httpSecurity
+                .headers((header) ->
+                        header.frameOptions(HeadersConfigurer.FrameOptionsConfig::disable))
+                .authorizeHttpRequests((authorize) ->
+                        authorize.requestMatchers(
+                                        new AntPathRequestMatcher(adminContextPath + "/assets/**"),
+                                        new AntPathRequestMatcher(adminContextPath + "/login")
+                                ).permitAll()
+                                .anyRequest().authenticated())
+                .formLogin((formLogin) ->
+                        formLogin.loginPage(adminContextPath + "/login").successHandler(successHandler))
+                .logout((logout) ->
+                        logout.logoutUrl(adminContextPath + "/logout"))
+                .httpBasic(Customizer.withDefaults())
+                .csrf(AbstractHttpConfigurer::disable)
+                .build();
+    }
+
+}
diff --git a/ruoyi-extend/ruoyi-monitor-admin/src/main/java/org/dromara/monitor/admin/notifier/CustomNotifier.java b/ruoyi-extend/ruoyi-monitor-admin/src/main/java/org/dromara/monitor/admin/notifier/CustomNotifier.java
new file mode 100644
index 0000000..069f78b
--- /dev/null
+++ b/ruoyi-extend/ruoyi-monitor-admin/src/main/java/org/dromara/monitor/admin/notifier/CustomNotifier.java
@@ -0,0 +1,55 @@
+package org.dromara.monitor.admin.notifier;
+
+import de.codecentric.boot.admin.server.domain.entities.Instance;
+import de.codecentric.boot.admin.server.domain.entities.InstanceRepository;
+import de.codecentric.boot.admin.server.domain.events.InstanceEvent;
+import de.codecentric.boot.admin.server.domain.events.InstanceStatusChangedEvent;
+import de.codecentric.boot.admin.server.notify.AbstractEventNotifier;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+import reactor.core.publisher.Mono;
+
+import static de.codecentric.boot.admin.server.domain.values.StatusInfo.*;
+
+/**
+ * 自定义事件通知处理
+ *
+ * @author pengles
+ */
+@Slf4j
+@Component
+public class CustomNotifier extends AbstractEventNotifier {
+
+    protected CustomNotifier(InstanceRepository repository) {
+        super(repository);
+    }
+
+    @Override
+    @SuppressWarnings("all")
+    protected Mono<Void> doNotify(InstanceEvent event, Instance instance) {
+        return Mono.fromRunnable(() -> {
+            // 实例状态改变事件
+            if (event instanceof InstanceStatusChangedEvent) {
+                // 获取实例注册名称
+                String registName = instance.getRegistration().getName();
+                // 获取实例ID
+                String instanceId = event.getInstance().getValue();
+                // 获取实例状态
+                String status = ((InstanceStatusChangedEvent) event).getStatusInfo().getStatus();
+                // 获取服务URL
+                String serviceUrl = instance.getRegistration().getServiceUrl();
+                String statusName = switch (status) {
+                    case STATUS_UP -> "服务上线"; // 实例成功启动并可以正常处理请求
+                    case STATUS_OFFLINE -> "服务离线"; //实例被手动或自动地从服务中移除
+                    case STATUS_RESTRICTED -> "服务受限"; //表示实例在某些方面受限，可能无法完全提供所有服务
+                    case STATUS_OUT_OF_SERVICE -> "停止服务状态"; //表示实例已被标记为停止提供服务，可能是计划内维护或测试
+                    case STATUS_DOWN -> "服务下线"; //实例因崩溃、错误或其他原因停止运行
+                    case STATUS_UNKNOWN -> "服务未知异常"; //监控系统无法确定实例的当前状态
+                    default -> "未知状态"; //没有匹配的状态
+                };
+                log.info("Instance Status Change: 状态名称【{}】, 注册名称【{}】, 实例ID【{}】, 状态【{}】, 服务URL【{}】",
+                        statusName, registName, instanceId, status, serviceUrl);
+            }
+        });
+    }
+}
diff --git a/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application.yml b/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application.yml
new file mode 100644
index 0000000..622c93d
--- /dev/null
+++ b/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application.yml
@@ -0,0 +1,48 @@
+server:
+  port: 9090
+spring:
+  application:
+    name: ruoyi-monitor-admin
+  profiles:
+    active: @profiles.active@
+
+logging:
+  config: classpath:logback-plus.xml
+
+--- # 监控中心服务端配置
+spring:
+  security:
+    user:
+      name: @monitor.username@
+      password: @monitor.password@
+  boot:
+    admin:
+      ui:
+        title: RuoYi-Vue-Plus服务监控中心
+      context-path: /admin
+
+--- # Actuator 监控端点的配置项
+management:
+  endpoints:
+    web:
+      exposure:
+        include: '*'
+  endpoint:
+    health:
+      show-details: ALWAYS
+    logfile:
+      external-file: ./logs/ruoyi-monitor-admin.log
+
+--- # 监控配置
+spring.boot.admin.client:
+  # 增加客户端开关
+  enabled: true
+  # 设置 Spring Boot Admin Server 地址
+  url: http://localhost:9090/admin
+  instance:
+    service-host-type: IP
+    metadata:
+      username: ${spring.boot.admin.client.username}
+      userpassword: ${spring.boot.admin.client.password}
+  username: @monitor.username@
+  password: @monitor.password@
diff --git a/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/banner.txt b/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/banner.txt
new file mode 100644
index 0000000..5d24152
--- /dev/null
+++ b/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/banner.txt
@@ -0,0 +1,8 @@
+Application Version: ${revision}
+Spring Boot Version: ${spring-boot.version}
+ __  __             _ _                              _           _
+|  \/  |           (_) |                    /\      | |         (_)
+| \  / | ___  _ __  _| |_ ___  _ __ ______ /  \   __| |_ __ ___  _ _ __
+| |\/| |/ _ \| '_ \| | __/ _ \| '__|______/ /\ \ / _` | '_ ` _ \| | '_ \
+| |  | | (_) | | | | | || (_) | |        / ____ \ (_| | | | | | | | | | |
+|_|  |_|\___/|_| |_|_|\__\___/|_|       /_/    \_\__,_|_| |_| |_|_|_| |_|
diff --git a/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/logback-plus.xml b/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/logback-plus.xml
new file mode 100644
index 0000000..45cbbba
--- /dev/null
+++ b/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/logback-plus.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration debug="false" scan="true" scanPeriod="1 seconds">
+
+    <contextName>logback</contextName>
+    <property name="log.path" value="./logs/ruoyi-monitor-admin"/>
+    <property name="console.log.pattern"
+              value="%cyan(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}%n) - %msg%n"/>
+    <property name="log.pattern" value="%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n"/>
+
+    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>${console.log.pattern}</pattern>
+            <charset>utf-8</charset>
+        </encoder>
+    </appender>
+
+    <appender name="file" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${log.path}.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${log.path}.%d{yyyy-MM-dd}.log</fileNamePattern>
+            <!-- 日志最大的历史 60天 -->
+            <maxHistory>60</maxHistory>
+        </rollingPolicy>
+        <encoder>
+            <pattern>${log.pattern}</pattern>
+        </encoder>
+    </appender>
+
+    <root level="info">
+        <appender-ref ref="console"/>
+        <appender-ref ref="file"/>
+    </root>
+
+</configuration>
diff --git a/ruoyi-extend/ruoyi-snailjob-server/Dockerfile b/ruoyi-extend/ruoyi-snailjob-server/Dockerfile
new file mode 100644
index 0000000..2384411
--- /dev/null
+++ b/ruoyi-extend/ruoyi-snailjob-server/Dockerfile
@@ -0,0 +1,22 @@
+# 贝尔实验室 Spring 官方推荐镜像 JDK下载地址 https://bell-sw.com/pages/downloads/
+FROM bellsoft/liberica-openjdk-rocky:17.0.15-cds
+#FROM bellsoft/liberica-openjdk-rocky:21.0.7-cds
+
+LABEL maintainer="Lion Li"
+
+RUN mkdir -p /ruoyi/snailjob/logs
+
+WORKDIR /ruoyi/snailjob
+
+ENV LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS=""
+
+EXPOSE 8800
+EXPOSE 17888
+
+ADD ./target/ruoyi-snailjob-server.jar ./app.jar
+
+SHELL ["/bin/bash", "-c"]
+
+ENTRYPOINT java -Djava.security.egd=file:/dev/./urandom \
+           -XX:+HeapDumpOnOutOfMemoryError -XX:+UseZGC ${JAVA_OPTS} \
+           -jar app.jar
diff --git a/ruoyi-extend/ruoyi-snailjob-server/pom.xml b/ruoyi-extend/ruoyi-snailjob-server/pom.xml
new file mode 100644
index 0000000..0b3afd3
--- /dev/null
+++ b/ruoyi-extend/ruoyi-snailjob-server/pom.xml
@@ -0,0 +1,58 @@
+<?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>
+        <groupId>org.dromara</groupId>
+        <artifactId>ruoyi-extend</artifactId>
+        <version>${revision}</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <packaging>jar</packaging>
+    <artifactId>ruoyi-snailjob-server</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.aizuda</groupId>
+            <artifactId>snail-job-server-starter</artifactId>
+            <version>${snailjob.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.scala-lang</groupId>
+                    <artifactId>scala-library</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>org.scala-lang</groupId>
+            <artifactId>scala-library</artifactId>
+            <version>2.13.9</version>
+        </dependency>
+
+        <dependency>
+            <groupId>de.codecentric</groupId>
+            <artifactId>spring-boot-admin-starter-client</artifactId>
+            <version>${spring-boot-admin.version}</version>
+        </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>
+        </plugins>
+    </build>
+
+</project>
diff --git a/ruoyi-extend/ruoyi-snailjob-server/src/main/java/com/aizuda/snailjob/server/starter/filter/ActuatorAuthFilter.java b/ruoyi-extend/ruoyi-snailjob-server/src/main/java/com/aizuda/snailjob/server/starter/filter/ActuatorAuthFilter.java
new file mode 100644
index 0000000..00f6eee
--- /dev/null
+++ b/ruoyi-extend/ruoyi-snailjob-server/src/main/java/com/aizuda/snailjob/server/starter/filter/ActuatorAuthFilter.java
@@ -0,0 +1,64 @@
+package com.aizuda.snailjob.server.starter.filter;
+
+import jakarta.servlet.*;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.Base64;
+
+public class ActuatorAuthFilter implements Filter {
+
+    private final String username;
+    private final String password;
+
+    public ActuatorAuthFilter(String username, String password) {
+        this.username = username;
+        this.password = password;
+    }
+
+    @Override
+    public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException {
+        HttpServletRequest request = (HttpServletRequest) servletRequest;
+        HttpServletResponse response = (HttpServletResponse) servletResponse;
+
+        // 获取 Authorization 头
+        String authHeader = request.getHeader("Authorization");
+
+        if (authHeader == null || !authHeader.startsWith("Basic ")) {
+            // 如果没有提供 Authorization 或者格式不对，则返回 401
+            response.setHeader("WWW-Authenticate", "Basic realm=\"realm\"");
+            response.sendError(HttpServletResponse.SC_UNAUTHORIZED, "Unauthorized");
+            return;
+        }
+
+        // 解码 Base64 编码的用户名和密码
+        String base64Credentials = authHeader.substring("Basic ".length());
+        byte[] credDecoded = Base64.getDecoder().decode(base64Credentials);
+        String credentials = new String(credDecoded, StandardCharsets.UTF_8);
+        String[] split = credentials.split(":");
+        if (split.length != 2) {
+            response.setHeader("WWW-Authenticate", "Basic realm=\"realm\"");
+            response.sendError(HttpServletResponse.SC_UNAUTHORIZED, "Unauthorized");
+            return;
+        }
+        // 验证用户名和密码
+        if (!username.equals(split[0]) || !password.equals(split[1])) {
+            response.setHeader("WWW-Authenticate", "Basic realm=\"realm\"");
+            response.sendError(HttpServletResponse.SC_UNAUTHORIZED, "Unauthorized");
+            return;
+        }
+        // 如果认证成功，继续处理请求
+        filterChain.doFilter(request, response);
+    }
+
+    @Override
+    public void init(FilterConfig filterConfig) {
+    }
+
+    @Override
+    public void destroy() {
+    }
+
+}
diff --git a/ruoyi-extend/ruoyi-snailjob-server/src/main/java/com/aizuda/snailjob/server/starter/filter/SecurityConfig.java b/ruoyi-extend/ruoyi-snailjob-server/src/main/java/com/aizuda/snailjob/server/starter/filter/SecurityConfig.java
new file mode 100644
index 0000000..a0578ad
--- /dev/null
+++ b/ruoyi-extend/ruoyi-snailjob-server/src/main/java/com/aizuda/snailjob/server/starter/filter/SecurityConfig.java
@@ -0,0 +1,29 @@
+package com.aizuda.snailjob.server.starter.filter;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.web.servlet.FilterRegistrationBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * 权限安全配置
+ *
+ * @author pengles
+ */
+@Configuration
+public class SecurityConfig {
+
+    @Value("${spring.boot.admin.client.username}")
+    private String username;
+    @Value("${spring.boot.admin.client.password}")
+    private String password;
+
+    @Bean
+    public FilterRegistrationBean<ActuatorAuthFilter> actuatorFilterRegistrationBean() {
+        FilterRegistrationBean<ActuatorAuthFilter> registrationBean = new FilterRegistrationBean<>();
+        registrationBean.setFilter(new ActuatorAuthFilter(username, password));
+        registrationBean.addUrlPatterns("/actuator", "/actuator/*");
+        return registrationBean;
+    }
+
+}
diff --git a/ruoyi-extend/ruoyi-snailjob-server/src/main/java/org/dromara/snailjob/SnailJobServerApplication.java b/ruoyi-extend/ruoyi-snailjob-server/src/main/java/org/dromara/snailjob/SnailJobServerApplication.java
new file mode 100644
index 0000000..7848061
--- /dev/null
+++ b/ruoyi-extend/ruoyi-snailjob-server/src/main/java/org/dromara/snailjob/SnailJobServerApplication.java
@@ -0,0 +1,18 @@
+package org.dromara.snailjob;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+/**
+ * SnailJob Server 启动程序
+ *
+ * @author pengles
+ */
+@SpringBootApplication
+public class SnailJobServerApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(com.aizuda.snailjob.server.SnailJobServerApplication.class, args);
+    }
+
+}
diff --git a/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application-dev.yml b/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application-dev.yml
new file mode 100644
index 0000000..17588b6
--- /dev/null
+++ b/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application-dev.yml
@@ -0,0 +1,40 @@
+spring:
+  datasource:
+    type: com.zaxxer.hikari.HikariDataSource
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    url: jdbc:mysql://localhost3306/ry-vue?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
+    username: root
+    password: root
+    hikari:
+      connection-timeout: 30000
+      validation-timeout: 5000
+      minimum-idle: 10
+      maximum-pool-size: 20
+      idle-timeout: 600000
+      max-lifetime: 900000
+      keepaliveTime: 30000
+
+--- # snail-job 服务端配置
+snail-job:
+  # 拉取重试数据的每批次的大小
+  retry-pull-page-size: 1000
+  # 拉取重试数据的每批次的大小
+  job-pull-page-size: 1000
+  # 服务器端口
+  server-port: 17888
+  # 日志保存时间(单位: day)
+  log-storage: 7
+  rpc-type: grpc
+
+--- # 监控中心配置
+spring.boot.admin.client:
+  # 增加客户端开关
+  enabled: true
+  url: http://localhost:9090/admin
+  instance:
+    service-host-type: IP
+    metadata:
+      username: ${spring.boot.admin.client.username}
+      userpassword: ${spring.boot.admin.client.password}
+  username: @monitor.username@
+  password: @monitor.password@
diff --git a/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application-prod.yml b/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application-prod.yml
new file mode 100644
index 0000000..aaf4748
--- /dev/null
+++ b/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application-prod.yml
@@ -0,0 +1,40 @@
+spring:
+  datasource:
+    type: com.zaxxer.hikari.HikariDataSource
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
+    username: root
+    password: root
+    hikari:
+      connection-timeout: 30000
+      validation-timeout: 5000
+      minimum-idle: 10
+      maximum-pool-size: 20
+      idle-timeout: 600000
+      max-lifetime: 900000
+      keepaliveTime: 30000
+
+--- # snail-job 服务端配置
+snail-job:
+  # 拉取重试数据的每批次的大小
+  retry-pull-page-size: 1000
+  # 拉取重试数据的每批次的大小
+  job-pull-page-size: 1000
+  # 服务器端口
+  server-port: 17888
+  # 日志保存时间(单位: day)
+  log-storage: 7
+  rpc-type: grpc
+
+--- # 监控中心配置
+spring.boot.admin.client:
+  # 增加客户端开关
+  enabled: true
+  url: http://localhost:9090/admin
+  instance:
+    service-host-type: IP
+    metadata:
+      username: ${spring.boot.admin.client.username}
+      userpassword: ${spring.boot.admin.client.password}
+  username: @monitor.username@
+  password: @monitor.password@
diff --git a/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application.yml b/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application.yml
new file mode 100644
index 0000000..ba6df45
--- /dev/null
+++ b/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application.yml
@@ -0,0 +1,39 @@
+server:
+  port: 8800
+  servlet:
+    context-path: /snail-job
+
+spring:
+  application:
+    name: ruoyi-snailjob-server
+  profiles:
+    active: @profiles.active@
+  web:
+    resources:
+      static-locations: classpath:admin/
+
+mybatis-plus:
+  typeAliasesPackage: com.aizuda.snailjob.template.datasource.persistence.po
+  global-config:
+    db-config:
+      where-strategy: NOT_EMPTY
+      capital-mode: false
+      logic-delete-value: 1
+      logic-not-delete-value: 0
+  configuration:
+    map-underscore-to-camel-case: true
+    cache-enabled: true
+
+logging:
+  config: classpath:logback-plus.xml
+
+management:
+  endpoints:
+    web:
+      exposure:
+        include: '*'
+  endpoint:
+    health:
+      show-details: ALWAYS
+    logfile:
+      external-file: ./logs/ruoyi-snailjob-server/console.log
diff --git a/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/banner.txt b/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/banner.txt
new file mode 100644
index 0000000..adb96c5
--- /dev/null
+++ b/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/banner.txt
@@ -0,0 +1,11 @@
+Application Version: ${revision}
+Spring Boot Version: ${spring-boot.version}
+                 _ _ _       _
+                (_) (_)     | |
+ ___ _ __   __ _ _| |_  ___ | |__ ______ ___  ___ _ ____   _____ _ __
+/ __| '_ \ / _` | | | |/ _ \| '_ \______/ __|/ _ \ '__\ \ / / _ \ '__|
+\__ \ | | | (_| | | | | (_) | |_) |     \__ \  __/ |   \ V /  __/ |
+|___/_| |_|\__,_|_|_| |\___/|_.__/      |___/\___|_|    \_/ \___|_|
+                   _/ |
+                  |__/
+
diff --git a/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/logback-plus.xml b/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/logback-plus.xml
new file mode 100644
index 0000000..b1eef72
--- /dev/null
+++ b/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/logback-plus.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <property name="log.path" value="./logs/ruoyi-snailjob-server"/>
+    <property name="console.log.pattern"
+              value="%cyan(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}%n) - %msg%n"/>
+    <property name="log.pattern" value="%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n"/>
+
+
+    <!-- 控制台输出 -->
+    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>${console.log.pattern}</pattern>
+            <charset>utf-8</charset>
+        </encoder>
+    </appender>
+
+    <!-- 控制台输出 -->
+    <appender name="file_console" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${log.path}/console.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 日志文件名格式 -->
+            <fileNamePattern>${log.path}/console.%d{yyyy-MM-dd}.log</fileNamePattern>
+            <!-- 日志最大 1天 -->
+            <maxHistory>1</maxHistory>
+        </rollingPolicy>
+        <encoder>
+            <pattern>${log.pattern}</pattern>
+            <charset>utf-8</charset>
+        </encoder>
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <!-- 过滤的级别 -->
+            <level>INFO</level>
+        </filter>
+    </appender>
+
+    <appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${log.path}/info.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <FileNamePattern>${log.path}/info.%d{yyyy-MM-dd}.log</FileNamePattern>
+            <MaxHistory>60</MaxHistory>
+        </rollingPolicy>
+        <encoder>
+            <pattern>${log.pattern}</pattern>
+        </encoder>
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>INFO</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${log.path}/error.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <FileNamePattern>${log.path}/error.%d{yyyy-MM-dd}.log
+            </FileNamePattern>
+            <MaxHistory>60</MaxHistory>
+        </rollingPolicy>
+        <encoder>
+            <pattern>${log.pattern}</pattern>
+        </encoder>
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>ERROR</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <appender name="async_info" class="ch.qos.logback.classic.AsyncAppender">
+        <discardingThreshold>100</discardingThreshold>
+        <queueSize>1024</queueSize>
+        <appender-ref ref="file_info"/>
+    </appender>
+
+    <appender name="async_error" class="ch.qos.logback.classic.AsyncAppender">
+        <discardingThreshold>100</discardingThreshold>
+        <queueSize>1024</queueSize>
+        <appender-ref ref="file_error"/>
+    </appender>
+
+    <!-- SnailJob appender -->
+    <appender name="snail_log_server_appender"
+              class="com.aizuda.snailjob.server.common.appender.SnailJobServerLogbackAppender">
+    </appender>
+
+    <!-- 控制台输出日志级别 -->
+    <root level="info">
+        <appender-ref ref="console"/>
+        <appender-ref ref="async_info"/>
+        <appender-ref ref="async_error"/>
+        <appender-ref ref="snail_log_server_appender"/>
+    </root>
+</configuration>
diff --git a/ruoyi-modules/pom.xml b/ruoyi-modules/pom.xml
new file mode 100644
index 0000000..e5aa929
--- /dev/null
+++ b/ruoyi-modules/pom.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>org.dromara</groupId>
+        <artifactId>PoJie</artifactId>
+        <version>${revision}</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <modules>
+        <module>ruoyi-member</module>
+        <module>ruoyi-generator</module>
+        <module>ruoyi-job</module>
+        <module>ruoyi-mp</module>
+        <module>ruoyi-system</module>
+        <module>ruoyi-workflow</module>
+        <module>ruoyi-ai</module>
+        <module>ruoyi-knowledge</module>
+        <module>ruoyi-chat</module>
+        <module>ruoyi-pay</module>
+        <module>ruoyi-mall</module>
+    </modules>
+
+    <artifactId>ruoyi-modules</artifactId>
+    <packaging>pom</packaging>
+
+    <description>
+        ruoyi-modules 业务模块
+    </description>
+
+</project>
diff --git a/ruoyi-modules/ruoyi-ai/MODULE_STRUCTURE.md b/ruoyi-modules/ruoyi-ai/MODULE_STRUCTURE.md
new file mode 100644
index 0000000..8098a40
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/MODULE_STRUCTURE.md
@@ -0,0 +1,1066 @@
+# AI模块结构说明
+
+## 模块简介
+
+`ruoyi-ai` 是 PoJie 项目的 AI 服务中心模块，提供统一的 AI 能力接入，标准化接入主流模型与平台，支持聊天、流式对话、AI创作、智能PPT、多模态理解、代码助手、RAG增强与统一监控等功能。
+
+## 模块结构
+
+`ruoyi-ai` 是一个独立的业务模块，采用分层架构设计：
+
+```
+org.dromara.ai
+├── config/              # 模块配置类
+│   ├── AiAutoConfiguration.java          # 自动配置类
+│   ├── AiGatewayProperties.java          # 网关配置属性
+│   ├── AiProviderRegistrar.java          # Provider注册器
+│   ├── AiConfigurationManager.java       # 配置管理器
+│   ├── AiApiConfig.java                  # API配置
+│   └── *ProviderConfig.java              # 各Provider配置类（OpenAI、Azure、Qwen、Zhipu等）
+├── controller/          # REST API控制器
+│   ├── admin/                           # 管理端接口
+│   │   ├── AdminAiChatRecordController.java    # 聊天记录管理接口
+│   │   ├── AdminAiUsageStatsController.java    # 使用统计管理接口
+│   │   ├── AdminAiRatingRecordController.java  # 评价记录管理接口
+│   │   ├── AdminAiProviderController.java      # Provider管理接口
+│   │   ├── AdminAiProviderConfigController.java # Provider配置管理接口
+│   │   ├── AdminAiProviderConfigHistoryController.java # Provider配置历史管理接口
+│   │   ├── AdminAiSensitiveWordController.java # 敏感词管理接口
+│   │   ├── AdminAiPaintingRecordController.java # 绘画历史记录管理接口
+│   │   ├── AdminAiPaintingTemplateController.java # 绘画参数模板管理接口
+│   │   ├── AdminAiPaintingFavoriteController.java # 绘画作品收藏管理接口
+│   │   ├── AdminAiUserQuotaController.java # 用户配额管理接口
+│   │   └── AdminSysModelController.java        # 系统模型管理接口
+│   └── app/                             # 用户端接口
+│       ├── AiChatController.java                # 聊天接口
+│       ├── AiAssistantController.java           # 代码助手接口
+│       ├── AiPaintingController.java            # 绘画接口
+│       ├── AiImageController.java               # DALL·E-3接口
+│       ├── PptController.java                   # PPT生成接口
+│       ├── MultimodalController.java            # 多模态接口
+│       ├── SimpleAiController.java              # Simple AI接口
+│       ├── FastGptController.java               # FastGPT接口
+│       ├── CozeController.java                  # Coze接口
+│       ├── DifyController.java                  # DIFY接口
+│       ├── McpController.java                   # MCP工具接口
+│       ├── QueueMetricsController.java          # 队列指标接口
+│       ├── AppAiRatingRecordController.java     # 评价记录接口（用户端）
+│       ├── AppAiPaintingFavoriteController.java # 绘画作品收藏接口（用户端）
+│       └── AppAiUserQuotaController.java        # 用户配额接口（用户端）
+├── domain/              # 领域对象
+│   ├── AiChatRecord.java                # 聊天记录实体
+│   ├── AiUsageStats.java                # 使用统计实体
+│   ├── AiRatingRecord.java              # 评价记录实体
+│   ├── AiProviderConfig.java            # Provider配置实体
+│   ├── AiProviderConfigHistory.java     # Provider配置历史实体
+│   ├── AiSensitiveWord.java             # 敏感词实体
+│   ├── AiPaintingRecord.java            # 绘画历史记录实体
+│   ├── AiPaintingTemplate.java          # 绘画参数模板实体
+│   ├── AiPaintingFavorite.java          # 绘画作品收藏实体
+│   ├── AiUserQuota.java                 # 用户配额实体
+│   ├── bo/                              # 业务对象(BO)
+│   │   ├── AiChatRecordBo.java          # 聊天记录BO
+│   │   ├── AiUsageStatsBo.java          # 使用统计BO
+│   │   ├── AiRatingRecordBo.java        # 评价记录BO
+│   │   ├── AiProviderConfigBo.java      # Provider配置BO
+│   │   ├── AiProviderConfigHistoryBo.java # Provider配置历史BO
+│   │   ├── AiSensitiveWordBo.java       # 敏感词BO
+│   │   ├── AiPaintingRecordBo.java      # 绘画历史记录BO
+│   │   ├── AiPaintingTemplateBo.java    # 绘画参数模板BO
+│   │   ├── AiPaintingFavoriteBo.java    # 绘画作品收藏BO
+│   │   └── AiUserQuotaBo.java           # 用户配额BO
+│   ├── vo/                              # 视图对象(VO)
+│   │   ├── AiChatRecordVo.java          # 聊天记录VO
+│   │   ├── AiUsageStatsVo.java          # 使用统计VO
+│   │   ├── AiRatingRecordVo.java        # 评价记录VO
+│   │   ├── AiProviderConfigVo.java      # Provider配置VO
+│   │   ├── AiProviderConfigHistoryVo.java # Provider配置历史VO
+│   │   ├── AiSensitiveWordVo.java       # 敏感词VO
+│   │   ├── AiPaintingRecordVo.java      # 绘画历史记录VO
+│   │   ├── AiPaintingTemplateVo.java    # 绘画参数模板VO
+│   │   ├── AiPaintingFavoriteVo.java    # 绘画作品收藏VO
+│   │   └── AiUserQuotaVo.java           # 用户配额VO
+│   ├── dto/                             # 数据传输对象(DTO)
+│   │   ├── AiChatRequest.java           # 聊天请求DTO
+│   │   ├── AiChatResponse.java          # 聊天响应DTO
+│   │   └── AiModelInfo.java             # 模型信息DTO
+│   └── enums/                           # 枚举类
+│       └── AiProviderType.java          # Provider类型枚举
+├── provider/            # 模型 Provider 实现
+│   ├── AiProvider.java                  # Provider接口
+│   ├── AbstractAiProvider.java          # Provider抽象基类
+│   ├── AiProviderManager.java           # Provider管理器
+│   ├── OpenAiProvider.java              # OpenAI Provider
+│   ├── AzureOpenAiProvider.java         # Azure OpenAI Provider
+│   ├── QwenProvider.java                # 通义千问 Provider
+│   ├── ZhipuAiProvider.java             # 智谱AI Provider
+│   ├── FastGptProvider.java             # FastGPT Provider
+│   ├── CozeProvider.java                # Coze Provider
+│   ├── DifyProvider.java                # DIFY Provider
+│   └── impl/                            # Provider实现
+│       └── MockAiProvider.java          # Mock Provider（测试用）
+├── service/             # 核心业务服务
+│   ├── AiChatService.java               # 聊天服务
+│   ├── AiChatHistoryService.java        # 聊天历史服务
+│   ├── AiCodingAssistantService.java    # 代码助手服务
+│   ├── AiModelService.java              # 模型服务
+│   ├── AiPaintingService.java           # 绘画服务
+│   └── SimpleAiService.java             # Simple AI服务
+├── orchestration/       # AI 编排引擎
+│   └── AiOrchestrationEngine.java       # 编排引擎（智能路由、负载均衡、降级）
+├── painting/            # 绘画服务与 Provider
+│   ├── PaintingEngineType.java          # 绘画引擎类型枚举
+│   ├── PaintingTask.java                # 绘画任务模型
+│   ├── PaintingStatus.java              # 绘画状态枚举
+│   ├── PaintingProvider.java            # 绘画Provider接口
+│   └── provider/                        # 绘画Provider实现
+│       ├── DallE3Provider.java          # DALL·E-3 Provider
+│       ├── MidJourneyProvider.java      # MidJourney Provider
+│       └── StableDiffusionProvider.java # Stable Diffusion Provider
+├── platform/            # 外部平台集成
+│   ├── FastGptService.java              # FastGPT服务
+│   ├── CozeService.java                 # Coze服务
+│   └── DifyClientService.java           # DIFY客户端服务
+├── mcp/                 # MCP 工具链与集成
+│   ├── McpToolRegistry.java             # MCP工具注册表
+│   ├── McpTool.java                     # MCP工具接口
+│   ├── McpIntegrationService.java       # MCP集成服务
+│   └── tools/                           # MCP工具实现
+│       ├── ProjectScaffoldTool.java     # 项目脚手架工具
+│       ├── DataTransformTool.java       # 数据转换工具
+│       ├── ApiCallTool.java             # API调用工具
+│       ├── AlgorithmComputeTool.java    # 算法计算工具
+│       ├── FileParseTool.java           # 文件解析工具
+│       └── HttpFetchTool.java           # HTTP获取工具
+├── queue/               # 任务队列服务
+│   └── TaskQueueService.java            # 任务队列服务（优先级队列、任务状态管理）
+├── security/            # 安全管理器
+│   ├── AiSecurityManager.java           # 安全管理器
+│   ├── AiContentFilterService.java      # 内容过滤服务
+│   └── AiAccessControlService.java      # 访问控制服务
+├── monitor/             # 监控指标与度量
+│   ├── AiMonitorService.java            # 监控服务
+│   ├── BaseMetrics.java                 # 基础指标
+│   ├── SystemMetrics.java               # 系统指标
+│   ├── ProviderMetrics.java             # Provider指标
+│   ├── ModelMetrics.java                # 模型指标
+│   └── UserMetrics.java                 # 用户指标
+├── websocket/           # WebSocket 处理器
+│   ├── ChatWebSocketConfig.java         # WebSocket配置
+│   └── ChatWebSocketHandler.java        # WebSocket处理器
+├── error/               # 全局异常处理
+│   └── AiErrorHandler.java              # AI异常处理器
+└── model/               # 通用模型
+    └── ApiResult.java                   # API结果模型
+```
+
+## 已完成工作
+
+### 1. 模块结构
+
+- ✅ 创建了完整的模块目录结构
+- ✅ 创建了 `pom.xml` 配置文件
+- ✅ 配置了模块依赖关系（ruoyi-common-*、ruoyi-knowledge等）
+
+### 2. 自动配置
+
+- ✅ 创建了 `AiAutoConfiguration` 自动配置类
+- ✅ 配置了组件扫描
+- ✅ 支持通过 `ruoyi.ai.enabled` 配置启用/禁用模块
+
+### 3. Provider 管理与编排 ✅
+
+- ✅ 统一接口：`AiProviderManager` 管理所有模型提供商，支持热切换
+- ✅ 智能路由：`AiOrchestrationEngine` 支持最快响应、最佳质量、成本最优、负载均衡等策略
+- ✅ 自动降级：错误率>30%或响应超时自动熔断与故障转移
+- ✅ 多模型接入：统一调度 OpenAI、Azure、ChatGLM、通义千问、智谱等主流模型
+- ✅ Provider配置管理：支持数据库配置和动态更新
+- ✅ Provider配置可视化界面（管理端）：CRUD管理、启用/禁用、导出功能
+- ✅ Provider配置历史管理：自动记录配置变更历史，支持查询、导出
+
+### 4. 聊天与流式交互 ✅
+
+- ✅ 同步/异步聊天接口
+- ✅ SSE 流式推送
+- ✅ WebSocket 实时通道 (`/ws/ai/chat`)
+- ✅ 聊天历史管理：自动保存聊天记录到Redis和数据库，支持历史查询、清除和会话统计
+- ✅ 聊天记录持久化：Redis + 数据库双重存储
+- ✅ 聊天记录管理：查询、导出、批量删除
+- ✅ 批量聊天支持
+
+### 5. AI 辅助编码 ✅
+
+- ✅ 代码分析：提供代码审查与重构建议
+- ✅ 脚手架生成：自动生成项目结构与配置
+
+### 6. Simple AI & RAG ✅
+
+- ✅ 知识库问答：基于知识库的精准问答
+- ✅ 向量检索：支持多模型向量相似度搜索
+- ✅ 知识库统计
+
+### 7. AI 创作与多模态 ✅
+
+- ✅ 绘画调度：统一管理 DALL·E-3、MidJourney、Stable Diffusion 任务
+- ✅ 绘画历史管理：数据库存储、CRUD管理、查询、导出功能
+- ✅ 绘画参数模板：数据库存储、CRUD管理、公开/私有模板、用户模板管理
+- ✅ 绘画作品收藏：数据库存储、CRUD管理、收藏/取消收藏、收藏列表查询
+- ✅ 智能 PPT：文本生成 PPTX，支持导出图片序列
+- ✅ 多模态：文件解析（PDF/Word）、OCR识别、图像理解（部分占位）
+
+### 8. 平台集成 ✅
+
+- ✅ FastGPT：深度对接 FastGPT 平台
+- ✅ Coze：深度对接 Coze 平台（SSE流式）
+- ✅ DIFY：深度对接 DIFY 平台
+
+### 9. MCP 生态 ✅
+
+- ✅ 工具注册：`McpToolRegistry` 支持动态工具加载与调用
+- ✅ 工具模板：提供多个内置工具（ProjectScaffold、DataTransform、ApiCall、AlgorithmCompute、FileParse、HttpFetch）
+
+### 10. 安全与监控 ✅
+
+- ✅ 安全卫士：`AiSecurityManager` 提供内容过滤、IP黑白名单、速率限制
+- ✅ 敏感词库管理：数据库存储、CRUD管理、启用/禁用、导出功能
+- ✅ 全链路监控：实时监控队列深度、模型健康度、响应时间与 Token 消耗
+- ✅ 使用统计：记录和统计AI使用情况
+
+### 11. 数据库
+
+- ✅ 创建了 `script/sql/ry_ai.sql` 文件
+- ✅ 添加了 Provider配置表（`ai_provider_config`）
+- ✅ 添加了 Provider配置历史表（`ai_provider_config_history`）
+- ✅ 添加了聊天记录表（`ai_chat_record`）
+- ✅ 添加了使用统计表（`ai_usage_stats`）
+- ✅ 添加了评价记录表（`ai_rating_record`）
+- ✅ 添加了敏感词库表（`ai_sensitive_word`）
+- ✅ 添加了绘画历史记录表（`ai_painting_record`）
+- ✅ 添加了绘画参数模板表（`ai_painting_template`）
+- ✅ 添加了绘画作品收藏表（`ai_painting_favorite`）
+- ✅ 添加了用户配额管理表（`ai_user_quota`）
+
+### 12. 文档
+
+- ✅ 创建了模块 README.md 文件
+
+## 数据库表结构说明
+
+### 1. AI Provider配置表 (ai_provider_config)
+
+- **功能**: 存储AI模型提供商的配置信息
+- **关键字段**: `provider_name`, `provider_type`, `enabled`, `priority`, `weight`, `max_concurrency`, `timeout_seconds`, `max_retries`, `api_config`, `model_config`
+- **索引**: `uk_provider_name` (唯一), `idx_provider_type`, `idx_enabled`, `idx_priority`
+- **状态说明**:
+  - `enabled`: 0=禁用, 1=启用
+- **配置说明**:
+  - `priority`: 优先级（数字越小优先级越高）
+  - `weight`: 权重（用于负载均衡）
+  - `max_concurrency`: 最大并发数
+  - `timeout_seconds`: 超时时间（秒）
+  - `max_retries`: 最大重试次数
+  - `api_config`: API配置（JSON格式，包含apiKey、baseUrl等）
+  - `model_config`: 模型配置（JSON格式，包含defaultModel、supportedModels等）
+
+### 2. AI Provider配置历史表 (ai_provider_config_history)
+
+- **功能**: 记录Provider配置的变更历史
+- **关键字段**: `config_id`, `provider_name`, `config_data`, `operation_type`, `operation_time`, `operation_by`
+- **索引**: `idx_config_id`, `idx_provider_name`, `idx_operation_time`
+- **操作类型说明**:
+  - CREATE: 创建配置
+  - UPDATE: 更新配置
+  - DELETE: 删除配置
+
+### 3. AI聊天记录表 (ai_chat_record)
+
+- **功能**: 存储AI聊天记录
+- **关键字段**: `session_id`, `user_id`, `provider_name`, `model_name`, `message_type`, `content`, `tokens_used`, `cost`, `response_time`, `is_stream`
+- **索引**: `idx_session_id`, `idx_user_id`, `idx_provider_name`, `idx_create_time`
+- **消息类型说明**:
+  - USER: 用户消息
+  - ASSISTANT: AI助手消息
+- **状态说明**:
+  - `is_stream`: 0=非流式, 1=流式响应
+
+### 4. AI使用统计表 (ai_usage_stats)
+
+- **功能**: 按用户、Provider、模型、日期统计AI使用情况
+- **关键字段**: `user_id`, `provider_name`, `model_name`, `stat_date`, `request_count`, `success_count`, `error_count`, `total_tokens`, `total_cost`, `avg_response_time`
+- **索引**: `uk_user_provider_date` (唯一), `idx_provider_name`, `idx_stat_date`
+- **统计说明**:
+  - `request_count`: 请求次数
+  - `success_count`: 成功次数
+  - `error_count`: 错误次数
+  - `total_tokens`: 总Token数
+  - `total_cost`: 总成本
+  - `avg_response_time`: 平均响应时间（毫秒）
+
+### 5. AI评价记录表 (ai_rating_record)
+
+- **功能**: 记录用户对AI回复的评价
+- **关键字段**: `message_id`, `user_id`, `provider_name`, `rating`, `feedback`, `dimension`, `anonymous`
+- **索引**: `uk_message_user` (唯一), `idx_provider_name`, `idx_rating`, `idx_create_time`
+- **评价说明**:
+  - `rating`: 评分（1-5）
+  - `dimension`: 评价维度（可选）
+  - `anonymous`: 0=非匿名, 1=匿名
+
+## 功能清单
+
+### 已实现功能 ✅
+
+#### 1. Provider 管理与编排
+
+- ✅ Provider配置管理（数据库配置、动态更新）
+- ✅ Provider注册与发现
+- ✅ 智能路由策略（最快响应、最佳质量、成本最优、负载均衡）
+- ✅ 自动降级与熔断
+- ✅ Provider健康检查
+- ✅ Provider统计与监控
+
+#### 2. 聊天与流式交互
+
+- ✅ 同步聊天接口
+- ✅ 异步聊天接口
+- ✅ SSE流式推送
+- ✅ WebSocket实时通道
+- ✅ 聊天历史管理（Redis存储）
+- ✅ 会话统计
+- ✅ 批量聊天支持
+
+#### 3. AI 辅助编码
+
+- ✅ 代码分析（代码审查、重构建议）
+- ✅ 项目脚手架生成
+
+#### 4. Simple AI & RAG
+
+- ✅ 知识库问答（基于ruoyi-knowledge模块）
+- ✅ 向量检索
+- ✅ 知识库统计
+
+#### 5. AI 创作与多模态
+
+- ✅ 绘画任务管理（DALL·E-3、MidJourney、Stable Diffusion）
+- ✅ 绘画任务状态查询
+- ✅ 绘画任务流式进度推送（SSE）
+- ✅ 智能PPT生成（文本生成PPTX）
+- ✅ PPT导出PNG序列
+- ✅ 文件解析（PDF/Word等，基于Apache Tika）
+- ✅ 文本分析
+- ✅ OCR识别（占位接口，需配置OCR服务）
+- ⏳ 图像识别（占位接口）
+- ⏳ 图生文（占位接口）
+
+#### 6. 平台集成
+
+- ✅ FastGPT平台集成（知识搜索、工作流运行、上下文管理）
+- ✅ Coze平台集成（SSE流式对话）
+- ✅ DIFY平台集成（应用列表、创建/更新应用）
+
+#### 7. MCP 生态
+
+- ✅ MCP工具注册与管理
+- ✅ 工具调用接口
+- ✅ 内置工具（ProjectScaffold、DataTransform、ApiCall、AlgorithmCompute、FileParse、HttpFetch）
+
+#### 8. 安全与监控
+
+- ✅ 内容过滤
+- ✅ IP访问控制（黑白名单）
+- ✅ 速率限制
+- ✅ 全链路监控（队列深度、模型健康度、响应时间、Token消耗）
+- ✅ 使用统计（用户、Provider、模型维度）
+
+#### 9. AI评价功能 ✅
+
+- ✅ 评价记录管理（用户评价AI回复）
+- ✅ 评价记录查询与导出
+- ✅ 评价记录统计（平均评分）
+- ✅ 用户端评价接口（提交评价、查询评价）
+
+#### 10. 系统模型管理
+
+- ✅ 模型信息查询
+- ✅ 模型可用性检查
+
+### 待实现功能 ⏳
+
+#### 1. 聊天功能增强
+
+- ✅ 聊天记录持久化到数据库（Redis + 数据库双重存储）
+- ✅ 聊天记录导出（Excel格式）
+- ✅ 聊天记录搜索（支持多条件查询）
+- ✅ 聊天记录批量删除
+- ✅ 聊天记录归档（删除指定日期之前的记录）
+- [ ] 多轮对话上下文优化
+
+#### 2. Provider管理增强
+
+- ✅ Provider配置可视化界面（管理端）
+- ✅ Provider配置导入导出（Excel导出）
+- ✅ Provider配置版本管理增强（配置历史记录、查询、导出）
+- [ ] Provider性能分析报告
+- [ ] Provider成本分析
+- [ ] Provider自动故障恢复
+
+#### 3. 监控与统计增强
+
+- ✅ 使用统计报表导出（Excel格式）
+- [ ] 使用趋势分析（图表）
+- [ ] 成本分析报表
+- [ ] 性能分析报表
+- [ ] 异常告警（邮件、短信、Webhook等）
+- [ ] 实时大屏展示
+
+#### 4. 安全功能增强
+
+- ✅ 敏感词库管理（可配置）：数据库存储、CRUD管理、启用/禁用、导出功能
+- ✅ 用户配额管理：数据库存储、CRUD管理、配额重置、使用量统计
+- [ ] 内容审核规则配置
+- [ ] 企业级权限控制
+- [ ] 审计日志
+
+#### 5. 多模态功能完善
+
+- [ ] OCR识别完整实现（集成OCR服务）
+- [ ] 图像识别完整实现
+- [ ] 图生文完整实现
+- [ ] 视频理解（占位）
+- [ ] 音频处理（占位）
+
+#### 6. 绘画功能增强
+
+- ✅ 绘画历史管理：数据库存储、CRUD管理、查询、导出功能
+- ✅ 绘画参数模板：数据库存储、CRUD管理、公开/私有模板、用户模板管理
+- ✅ 绘画作品收藏：数据库存储、CRUD管理、收藏/取消收藏、收藏列表查询
+- ✅ 绘画作品分享：分享码生成、取消分享、通过分享码查看作品（无需登录）
+- [ ] 批量绘画任务
+
+#### 7. PPT功能增强
+
+- [ ] PPT主题模板管理
+- [ ] PPT样式自定义
+- [ ] PPT动画支持
+- [ ] PPT导出PDF
+- [ ] PPT在线预览
+
+#### 8. MCP工具生态扩展
+
+- [ ] 工具市场/插件系统
+- [ ] 工具版本管理
+- [ ] 工具权限控制
+- [ ] 工具性能监控
+- [ ] 自定义工具开发框架
+
+#### 9. 代码助手增强
+
+- [ ] 代码生成（根据需求生成代码）
+- [ ] 代码优化建议
+- [ ] 代码测试用例生成
+- [ ] 代码文档生成
+- [ ] 代码安全扫描集成
+
+#### 10. RAG功能增强
+
+- [ ] 多知识库联合检索
+- [ ] 检索结果排序优化
+- [ ] 检索结果来源标注
+- [ ] RAG效果评估
+- [ ] 知识库更新通知
+
+#### 11. 平台集成扩展
+
+- [ ] 更多平台集成（如：LangChain、LlamaIndex等）
+- [ ] 平台配置管理界面
+- [ ] 平台使用统计
+
+#### 12. 其他功能
+
+- [ ] 用户评价反馈系统完善
+- [ ] 客服机器人集成
+- [ ] 多语言支持
+- [ ] API限流策略细化
+- [ ] 任务队列持久化（当前仅内存）
+- [ ] 分布式任务调度
+
+## API接口详细说明
+
+### 管理端接口
+
+#### 1. AI聊天记录管理 (`/ai/chat/record`)
+
+- `GET /ai/chat/record/list` - 查询AI聊天记录列表（分页、多条件搜索）
+- `GET /ai/chat/record/{id}` - 获取AI聊天记录详情
+- `DELETE /ai/chat/record/{ids}` - 批量删除AI聊天记录
+- `POST /ai/chat/record/export` - 导出AI聊天记录到Excel
+- `POST /ai/chat/record/archive` - 归档聊天记录（删除指定日期之前的记录）
+
+#### 2. AI使用统计管理 (`/ai/usage/stats`)
+
+- `GET /ai/usage/stats/list` - 查询AI使用统计列表（分页、多条件搜索）
+- `GET /ai/usage/stats/{id}` - 获取AI使用统计详情
+- `POST /ai/usage/stats/export` - 导出AI使用统计到Excel
+- `GET /ai/usage/stats/summary` - 获取汇总统计
+- `GET /ai/usage/stats/user/{userId}` - 获取用户统计
+- `GET /ai/usage/stats/provider/{providerName}` - 获取Provider统计
+- `GET /ai/usage/stats/trend` - 获取趋势数据
+
+#### 3. Provider管理 (`/ai/provider`)
+
+- `GET /ai/provider/list` - 列出所有Provider
+- `GET /ai/provider/models` - 列出所有模型
+- `GET /ai/provider/default` - 获取默认Provider
+- `POST /ai/provider/setDefault` - 设置默认Provider
+- `GET /ai/provider/stats/system` - 系统统计
+- `GET /ai/provider/stats/providers` - Provider统计
+- `POST /ai/provider/stats/reset` - 重置统计
+
+#### 3.1. Provider配置管理 (`/ai/provider/config`)
+
+- `GET /ai/provider/config/list` - 查询Provider配置列表（分页、多条件搜索）
+- `GET /ai/provider/config/{id}` - 获取Provider配置详情
+- `POST /ai/provider/config` - 新增Provider配置
+- `PUT /ai/provider/config` - 修改Provider配置
+- `DELETE /ai/provider/config/{ids}` - 批量删除Provider配置
+- `POST /ai/provider/config/export` - 导出Provider配置到Excel
+- `PUT /ai/provider/config/changeEnabled` - 启用/禁用Provider配置
+- `GET /ai/provider/config/name/{providerName}` - 根据Provider名称查询配置
+
+#### 3.2. Provider配置历史管理 (`/ai/provider/config/history`)
+
+- `GET /ai/provider/config/history/list` - 查询Provider配置历史列表（分页、多条件搜索）
+- `GET /ai/provider/config/history/{id}` - 获取Provider配置历史详情
+- `GET /ai/provider/config/history/config/{configId}` - 根据配置ID查询历史记录列表
+- `DELETE /ai/provider/config/history/{ids}` - 批量删除Provider配置历史
+- `POST /ai/provider/config/history/export` - 导出Provider配置历史到Excel
+
+#### 4. 系统模型管理 (`/system/model`)
+
+- `GET /system/model/modelList` - 获取模型列表（用于前端下拉选择）
+- `GET /system/model/list` - 根据分类获取模型列表
+
+#### 5. AI评价记录管理 (`/ai/rating/record`)
+
+- `GET /ai/rating/record/list` - 查询AI评价记录列表（分页、多条件搜索）
+- `GET /ai/rating/record/{id}` - 获取AI评价记录详情
+- `DELETE /ai/rating/record/{ids}` - 批量删除AI评价记录
+- `POST /ai/rating/record/export` - 导出AI评价记录到Excel
+- `GET /ai/rating/record/average/{providerName}` - 获取指定Provider的平均评分
+
+#### 6. AI敏感词管理 (`/ai/sensitive/word`)
+
+- `GET /ai/sensitive/word/list` - 查询AI敏感词列表（分页、多条件搜索）
+- `GET /ai/sensitive/word/{id}` - 获取AI敏感词详情
+- `POST /ai/sensitive/word` - 新增AI敏感词
+- `PUT /ai/sensitive/word` - 修改AI敏感词
+- `DELETE /ai/sensitive/word/{ids}` - 批量删除AI敏感词
+- `POST /ai/sensitive/word/export` - 导出AI敏感词到Excel
+- `PUT /ai/sensitive/word/changeEnabled` - 启用/禁用敏感词
+
+#### 7. AI绘画历史记录管理 (`/ai/painting/record`)
+
+- `GET /ai/painting/record/list` - 查询AI绘画历史记录列表（分页、多条件搜索）
+- `GET /ai/painting/record/{id}` - 获取AI绘画历史记录详情
+- `GET /ai/painting/record/task/{taskId}` - 根据任务ID获取记录
+- `DELETE /ai/painting/record/{ids}` - 批量删除AI绘画历史记录
+- `POST /ai/painting/record/export` - 导出AI绘画历史记录到Excel
+- `POST /ai/painting/record/{id}/share` - 生成分享码
+- `DELETE /ai/painting/record/{id}/share` - 取消分享
+
+#### 8. AI绘画参数模板管理 (`/ai/painting/template`)
+
+- `GET /ai/painting/template/list` - 查询AI绘画参数模板列表（分页、多条件搜索）
+- `GET /ai/painting/template/{id}` - 获取AI绘画参数模板详情
+- `POST /ai/painting/template` - 新增AI绘画参数模板
+- `PUT /ai/painting/template` - 修改AI绘画参数模板
+- `DELETE /ai/painting/template/{ids}` - 批量删除AI绘画参数模板
+- `POST /ai/painting/template/export` - 导出AI绘画参数模板到Excel
+
+#### 9. AI绘画作品收藏管理 (`/ai/painting/favorite`)
+
+- `GET /ai/painting/favorite/list` - 查询AI绘画作品收藏列表（分页、多条件搜索）
+- `GET /ai/painting/favorite/{id}` - 获取AI绘画作品收藏详情
+- `DELETE /ai/painting/favorite/{ids}` - 批量删除AI绘画作品收藏
+- `POST /ai/painting/favorite/export` - 导出AI绘画作品收藏到Excel
+
+#### 10. AI用户配额管理 (`/ai/user/quota`)
+
+- `GET /ai/user/quota/list` - 查询AI用户配额列表（分页、多条件搜索）
+- `GET /ai/user/quota/{id}` - 获取AI用户配额详情
+- `GET /ai/user/quota/user/{userId}` - 根据用户ID获取配额信息
+- `POST /ai/user/quota` - 新增AI用户配额
+- `PUT /ai/user/quota` - 修改AI用户配额
+- `DELETE /ai/user/quota/{ids}` - 批量删除AI用户配额
+- `POST /ai/user/quota/reset/{userId}` - 重置用户配额（按日/按月）
+- `POST /ai/user/quota/export` - 导出AI用户配额到Excel
+
+### 用户端接口
+
+#### 1. 聊天接口 (`/ai/chat`)
+
+#### 同步聊天
+- `POST /ai/chat/sync` - 同步聊天（返回完整响应）
+  - 请求体：`AiChatRequest`（包含model、messages、sessionId等）
+  - 响应：`AiChatResponse`（包含content、tokensUsed、cost等）
+
+#### 异步聊天
+- `POST /ai/chat/async` - 异步聊天（返回任务ID）
+  - 请求体：`AiChatRequest`
+  - 响应：`CompletableFuture<AiChatResponse>`
+
+#### 流式聊天
+- `POST /ai/chat/stream` - SSE流式聊天
+  - 请求体：`AiChatRequest`（stream=true）
+  - 响应：SSE流（事件类型：chunk、done、error）
+- `POST /ai/chat/stream-chunks` - 流式聊天（分块返回）
+  - 请求体：`AiChatRequest`
+  - 响应：分块响应列表
+
+#### 批量聊天
+- `POST /ai/chat/batch` - 批量聊天请求
+  - 请求体：批量`AiChatRequest`列表
+  - 响应：批量`AiChatResponse`列表
+
+#### 聊天历史
+- `GET /ai/chat/history/{sessionId}` - 获取聊天历史
+  - 路径参数：`sessionId`（会话ID）
+  - 查询参数：`limit`（限制数量，可选）
+  - 响应：聊天记录列表
+- `DELETE /ai/chat/history/{sessionId}` - 清除聊天历史
+  - 路径参数：`sessionId`（会话ID）
+
+#### 会话统计
+- `GET /ai/chat/stats/{sessionId}` - 获取会话统计
+  - 路径参数：`sessionId`（会话ID）
+  - 响应：会话统计数据（消息数、Token数、成本等）
+
+#### 2. AI代码助手接口 (`/ai/assistant`)
+
+- `POST /ai/assistant/analyze` - 代码分析
+  - 请求参数：`code`（代码内容）、`model`（模型名称，可选）
+  - 响应：代码分析结果（审查建议、重构建议等）
+- `POST /ai/assistant/scaffold` - 生成项目脚手架
+  - 请求参数：`appType`（应用类型）、`options`（选项JSON）
+  - 响应：项目结构（文件列表、内容等）
+
+#### 3. Simple AI接口 (`/ai`)
+
+- `POST /ai/ask` - 知识库问答
+  - 查询参数：`knowledgeId`（知识库ID）、`question`（问题）
+  - 响应：问答结果
+- `POST /ai/search` - 向量搜索
+  - 查询参数：`knowledgeId`（知识库ID）、`queryText`（查询文本）、`topK`（返回数量，可选）
+  - 响应：搜索结果列表
+- `GET /ai/stats/{knowledgeId}` - 知识库统计
+  - 路径参数：`knowledgeId`（知识库ID）
+  - 响应：知识库统计数据
+- `GET /ai/model/check/{modelName}` - 检查模型可用性
+  - 路径参数：`modelName`（模型名称）
+  - 响应：模型可用性状态
+- `GET /ai/models` - 获取可用模型列表
+  - 响应：可用模型列表
+- `GET /ai/health` - 健康检查
+  - 响应：健康状态
+
+#### 4. 绘画接口 (`/ai/painting`)
+
+- `POST /ai/painting/task` - 创建绘画任务
+  - 请求体：`{"engine": "DALL_E_3", "prompt": "描述", "params": {...}}`
+  - 响应：`{"taskId": "..."}`
+- `GET /ai/painting/status/{taskId}` - 查询任务状态
+  - 路径参数：`taskId`（任务ID）
+  - 响应：任务状态（pending、processing、completed、failed）
+- `GET /ai/painting/stream/{taskId}` - SSE流式获取任务进度
+  - 路径参数：`taskId`（任务ID）
+  - 响应：SSE流（任务状态更新）
+
+#### 5. AI绘画参数模板 (`/ai/painting/template`)
+
+- `GET /ai/painting/template/list/{engineType}` - 查询可用的模板列表（公开模板 + 用户私有模板）
+- `GET /ai/painting/template/{id}` - 获取模板详情
+- `POST /ai/painting/template` - 新增用户私有模板
+- `PUT /ai/painting/template` - 修改用户私有模板
+- `DELETE /ai/painting/template/{id}` - 删除用户私有模板
+
+#### 6. AI绘画作品收藏 (`/ai/painting/favorite`)
+
+- `GET /ai/painting/favorite/list` - 查询当前用户的收藏列表
+- `POST /ai/painting/favorite` - 收藏绘画作品
+- `DELETE /ai/painting/favorite/{paintingRecordId}` - 取消收藏
+- `GET /ai/painting/favorite/check/{paintingRecordId}` - 检查是否已收藏
+
+#### 6.1. AI绘画作品分享 (`/app/ai/painting/record`)
+
+- `POST /app/ai/painting/record/{id}/share` - 生成分享码
+- `DELETE /app/ai/painting/record/{id}/share` - 取消分享
+- `GET /app/ai/painting/record/share/{shareCode}` - 根据分享码查看作品（无需登录）
+
+#### 7. DALL·E-3接口 (`/dall3`)
+
+- `POST /dall3` - 文生图
+  - 请求体：`{"prompt": "描述", "size": "1024x1024"}`
+  - 响应：图片URL或Base64
+- `POST /dall3/edit` - 图片编辑（image+mask）
+  - 请求体：`{"prompt": "描述", "image": "base64", "mask": "base64", "size": "1024x1024"}`
+  - 响应：编辑后的图片URL或Base64
+- `POST /dall3/variations` - 图片变体
+  - 请求体：`{"image": "base64", "size": "1024x1024"}`
+  - 响应：变体图片URL或Base64
+
+#### 8. 智能PPT接口 (`/ppt`)
+
+- `POST /ppt/generate` - 生成PPTX文件
+  - 查询参数：`content`（内容，按行分隔，空行分隔不同页）
+  - 响应：PPTX文件（下载）
+- `POST /ppt/export/pngs` - 导出PNG序列
+  - 查询参数：`content`（内容）
+  - 响应：PNG图片Base64列表
+
+#### 9. 多模态接口 (`/multimodal`)
+
+- `POST /multimodal/extract` - 文件解析（PDF/Word等）
+  - 请求：`multipart/form-data`，字段：`file`
+  - 响应：解析后的文本内容
+- `POST /multimodal/ocr` - OCR识别
+  - 请求：`multipart/form-data`，字段：`file`
+  - 响应：OCR识别结果（需配置OCR服务）
+- `POST /multimodal/analyze/text` - 文本分析
+  - 请求体：`{"text": "文本内容"}`
+  - 响应：分析结果（title、summary、keywords等）
+- `POST /multimodal/analyze/image` - 图像识别（占位）
+  - 请求：`multipart/form-data`，字段：`file`
+  - 响应：识别结果（占位接口）
+- `POST /multimodal/caption` - 图生文（占位）
+  - 请求：`multipart/form-data`，字段：`file`
+  - 响应：图片描述（占位接口）
+
+#### 10. 平台集成接口
+
+##### FastGPT (`/ai/fastgpt`)
+- `POST /ai/fastgpt/knowledge/search` - 知识搜索
+  - 请求体：`{"query": "查询内容"}`
+  - 响应：搜索结果
+- `POST /ai/fastgpt/workflow/run` - 运行工作流
+  - 请求体：`{"workflowId": "...", "inputs": {...}}`
+  - 响应：工作流执行结果
+- `GET /ai/fastgpt/context/{sessionId}` - 获取上下文
+  - 路径参数：`sessionId`（会话ID）
+  - 响应：上下文信息
+
+##### Coze (`/ai/coze`)
+- `POST /ai/coze/stream` - SSE流式对话
+  - 请求体：`{"botId": "...", "message": "消息内容"}`
+  - 响应：SSE流
+
+##### DIFY (`/ai/dify`)
+- `GET /ai/dify/apps` - 获取应用列表
+  - 响应：应用列表
+- `POST /ai/dify/apps` - 创建/更新应用
+  - 请求体：应用配置
+  - 响应：应用信息
+
+#### 11. MCP工具接口 (`/ai/mcp`)
+
+- `GET /ai/mcp/tools` - 获取工具列表
+  - 响应：可用工具列表
+- `POST /ai/mcp/invoke/{name}` - 调用工具
+  - 路径参数：`name`（工具名称）
+  - 请求体：工具参数（JSON）
+  - 响应：工具执行结果
+
+#### 12. 队列指标接口 (`/ai/queue`)
+
+- `GET /ai/queue/metrics` - 获取队列指标
+  - 响应：队列指标（队列深度、处理速率等）
+
+#### 13. AI评价接口 (`/ai/rating`)
+
+- `POST /ai/rating/submit` - 提交评价（用户对AI回复进行评价）
+  - 请求体：`AiRatingRecordBo`（包含messageId、rating、feedback等）
+- `GET /ai/rating/{messageId}` - 查询评价记录（根据消息ID查询当前用户的评价记录）
+
+#### 13. AI用户配额 (`/ai/user/quota`)
+
+- `GET /ai/user/quota` - 查询当前用户的配额信息
+
+## WebSocket实时通道
+
+### 聊天WebSocket
+- **端点**: `ws://localhost:8080/ws/ai/chat`
+- **协议**: JSON格式，支持实时双向对话
+- **消息格式**: `AiChatRequest`（JSON）
+- **响应格式**: `AiChatResponse`（JSON）
+
+## 模块依赖关系
+
+```
+ruoyi-ai (AI模块)
+├── 依赖: ruoyi-common-core (通用核心工具)
+├── 依赖: ruoyi-common-web (Web通用组件)
+├── 依赖: ruoyi-common-redis (Redis缓存)
+├── 依赖: ruoyi-common-security (安全组件)
+├── 依赖: ruoyi-common-log (日志组件)
+├── 依赖: ruoyi-common-mybatis (MyBatis组件)
+├── 依赖: ruoyi-common-doc (文档组件)
+├── 依赖: ruoyi-knowledge (知识库模块，RAG增强)
+└── 外部依赖:
+    ├── okhttp (HTTP客户端)
+    ├── okhttp-sse (SSE支持)
+    ├── jackson (JSON解析)
+    ├── spring-boot-starter-websocket (WebSocket支持)
+    ├── poi-ooxml (PPT生成)
+    └── tika-core (文件解析)
+```
+
+## 技术栈与开发规范
+
+### 技术栈
+
+- **框架**: Spring Boot 3.x
+- **ORM**: MyBatis-Plus（部分功能）
+- **数据库**: MySQL 8.0+
+- **缓存**: Redis
+- **认证**: Sa-Token（通过ruoyi-common-security）
+- **API文档**: Swagger/OpenAPI 3.0
+- **构建工具**: Maven
+- **HTTP客户端**: OkHttp
+- **JSON解析**: Jackson
+- **WebSocket**: Spring WebSocket
+
+### 开发规范
+
+#### 包结构规范
+
+- `config` - 配置类（自动配置类、属性配置类）
+- `controller` - 控制器层（REST API）
+  - `controller/admin` - 管理端接口（需要权限控制）
+  - `controller/app` - 用户端接口
+- `domain` - 数据传输对象（包含 `dto` 和 `enums` 子包）
+- `provider` - Provider实现（模型提供商实现）
+- `service` - 服务接口和实现
+- `orchestration` - 编排引擎
+- `painting` - 绘画相关（任务模型、Provider等）
+- `platform` - 外部平台集成
+- `mcp` - MCP工具链
+- `queue` - 任务队列
+- `security` - 安全管理
+- `monitor` - 监控指标
+- `websocket` - WebSocket处理器
+- `error` - 异常处理
+
+#### 代码规范
+
+- 统一使用 Lombok 简化代码
+- 统一异常处理，使用 `ServiceException` 抛出业务异常
+- 统一返回格式，使用 `R<T>` 封装返回结果
+- 统一日志记录，使用 `@Log` 注解记录操作日志
+- 统一权限控制，管理端接口使用 `@SaCheckPermission` 注解
+- Provider实现需继承 `AbstractAiProvider` 或实现 `AiProvider` 接口
+- 配置类使用 `@ConfigurationProperties` 绑定配置属性
+
+#### 数据库设计规范
+
+- 表名使用 `ai_` 前缀
+- 字段命名使用下划线命名法（snake_case）
+- 必须包含 `create_by`, `create_time`, `update_by`, `update_time` 字段
+- 删除标记使用逻辑删除（`deleted` 字段，如需要）
+- 状态字段统一使用 `status` 或 `enabled`，0表示禁用/异常，1表示启用/正常
+- JSON字段使用 `json` 类型存储配置信息
+
+#### API设计规范
+
+- RESTful 风格设计
+- 接口路径：
+  - 管理端接口：`/ai/{module}/{resource}` 或 `/system/{resource}`
+  - 用户端接口：`/ai/{module}/{resource}`
+- 使用 HTTP 标准方法：GET（查询）、POST（新增/操作）、PUT（修改）、DELETE（删除）
+- 统一使用 JSON 格式进行数据交互
+- 使用 Swagger 注解完善接口文档
+- 管理端接口使用 `@SaCheckPermission` 进行权限控制
+- 流式接口使用 SSE（Server-Sent Events）或 WebSocket
+
+## 模块集成说明
+
+### 知识库模块集成 (ruoyi-knowledge)
+
+- **集成方式**: Maven依赖
+- **核心功能**:
+  - RAG增强（知识库问答）
+  - 向量检索
+  - 知识库管理
+- **配置要求**: 在 `application.yml` 中配置知识库相关配置
+
+### Redis集成
+
+- **用途**: 
+  - 聊天历史存储
+  - 任务状态缓存
+  - 会话管理
+  - 缓存热点数据
+- **配置要求**: 在 `application.yml` 中配置Redis连接信息
+
+### 外部服务集成
+
+- **OpenAI**: 通过API Key访问
+- **Azure OpenAI**: 通过Endpoint和API Key访问
+- **通义千问**: 通过API Key访问
+- **智谱AI**: 通过API Key访问
+- **FastGPT/Coze/DIFY**: 通过平台API访问
+- **OCR服务**: 需配置OCR服务地址（可选）
+
+## 开发指南
+
+### 新增Provider开发步骤
+
+1. **创建Provider配置类**
+   - 在 `config` 包下创建配置类（如 `XxxProviderConfig.java`）
+   - 使用 `@ConfigurationProperties` 绑定配置
+
+2. **实现Provider接口**
+   - 实现 `AiProvider` 接口或继承 `AbstractAiProvider`
+   - 实现核心方法：`chat()`、`chatStream()`等
+
+3. **注册Provider**
+   - 在 `AiProviderRegistrar` 中注册Provider
+   - 在 `AiProviderType` 枚举中添加新的Provider类型
+
+4. **配置数据库**
+   - 在 `ai_provider_config` 表中添加Provider配置记录
+   - 配置API密钥等信息
+
+5. **测试验证**
+   - 编写单元测试
+   - 使用Swagger UI测试接口
+   - 验证Provider功能
+
+### 新增MCP工具开发步骤
+
+1. **实现工具接口**
+   - 实现 `McpTool` 接口
+   - 实现 `execute()` 方法
+
+2. **注册工具**
+   - 在 `McpToolRegistry` 中注册工具（可通过Spring Bean自动注册）
+   - 工具会自动出现在工具列表中
+
+3. **测试验证**
+   - 使用 `/ai/mcp/tools` 接口查看工具列表
+   - 使用 `/ai/mcp/invoke/{name}` 接口测试工具调用
+
+### 新增功能开发步骤
+
+1. **数据库设计**（如需要）
+   - 在 `script/sql/ry_ai.sql` 中设计表结构
+   - 确保字段命名规范，包含必要的索引
+
+2. **创建DTO/实体类**（如需要）
+   - 在 `domain/dto` 包下创建DTO类
+   - 创建对应的请求/响应对象
+
+3. **创建Service**
+   - 在 `service` 包下创建Service接口
+   - 在 `service/impl` 包下创建Service实现类（如需要）
+
+4. **创建Controller**
+   - 管理端接口：在 `controller/admin` 包下创建Controller
+   - 用户端接口：在 `controller/app` 包下创建Controller
+   - 添加Swagger注解完善接口文档
+   - 管理端接口添加权限控制注解（`@SaCheckPermission`）
+
+5. **测试验证**
+   - 编写单元测试（可选）
+   - 使用Swagger UI测试接口
+   - 验证业务逻辑正确性
+
+## 后续功能完善计划
+
+### 短期计划（1-2个月）
+
+1. **聊天功能增强** ✅（大部分已完成）
+   - ✅ 聊天记录持久化到数据库
+   - ✅ 聊天记录导出功能（Excel）
+   - ✅ 聊天记录搜索功能
+   - ✅ 聊天记录批量删除功能
+
+2. **监控与统计增强**
+   - 使用统计报表导出
+   - 使用趋势分析图表
+   - 异常告警功能
+
+3. **多模态功能完善**
+   - OCR识别完整实现
+   - 图像识别完整实现
+   - 图生文完整实现
+
+4. **安全功能增强**
+   - 敏感词库管理
+   - 用户配额管理
+   - 审计日志
+
+### 中期计划（3-6个月）
+
+1. **Provider管理增强**
+   - Provider配置可视化界面
+   - Provider性能分析报告
+   - Provider成本分析
+
+2. **绘画功能增强**
+   - 绘画历史管理
+   - 绘画作品收藏
+   - 批量绘画任务
+
+3. **PPT功能增强**
+   - PPT主题模板管理
+   - PPT样式自定义
+   - PPT导出PDF
+
+4. **代码助手增强**
+   - 代码生成功能
+   - 代码优化建议
+   - 代码测试用例生成
+
+5. **RAG功能增强**
+   - 多知识库联合检索
+   - 检索结果排序优化
+   - RAG效果评估
+
+### 长期计划（6个月以上）
+
+1. **MCP工具生态扩展**
+   - 工具市场/插件系统
+   - 工具版本管理
+   - 自定义工具开发框架
+
+2. **平台集成扩展**
+   - 更多平台集成
+   - 平台配置管理界面
+
+3. **系统优化**
+   - 分布式任务调度
+   - 任务队列持久化
+   - 性能优化与扩展
+
+4. **企业级功能**
+   - 多租户支持
+   - 企业级权限控制
+   - 数据隔离
+
+## 注意事项
+
+1. **密钥安全**：生产环境务必通过环境变量注入 API Key，不要将密钥写入配置文件或代码中
+2. **流式代理**：Nginx/Gateway 需配置 `proxy_buffering off` 以支持 SSE
+3. **依赖服务**：Redis 必须可用，用于存储任务状态与缓存
+4. **性能优化**：建议对热点数据使用Redis缓存
+5. **错误处理**：模块提供自动降级和熔断机制，但建议监控错误率
+6. **并发控制**：Provider支持最大并发数配置，合理设置以避免资源耗尽
+7. **成本控制**：建议设置使用配额和成本预警，避免意外高额费用
+8. **内容安全**：启用内容过滤和安全检查，防止不当内容生成
+9. **数据隐私**：注意用户数据隐私保护，敏感信息加密存储
+10. **API限流**：合理配置API限流策略，防止API滥用
+11. **监控告警**：建议配置监控告警，及时发现和解决问题
+12. **版本兼容**：升级Provider SDK时注意API兼容性
+13. **文档更新**：新增功能时及时更新API文档和README
+14. **测试覆盖**：关键功能建议编写单元测试和集成测试
+15. **日志规范**：关键操作记录日志，便于问题排查
diff --git a/ruoyi-modules/ruoyi-ai/README.md b/ruoyi-modules/ruoyi-ai/README.md
new file mode 100644
index 0000000..0b69280
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/README.md
@@ -0,0 +1,549 @@
+# AI模块 (ruoyi-ai)
+
+## 模块简介
+
+`ruoyi-ai` 是 PoJie 项目的 AI 服务中心模块，提供统一的 AI 能力接入，标准化接入主流模型与平台，支持聊天、流式对话、AI创作、智能PPT、多模态理解、代码助手、RAG增强与统一监控等功能。
+
+## 功能特性
+
+### 1. Provider 管理与编排 ✅
+- ✅ 统一接口：`AiProviderManager` 管理所有模型提供商，支持热切换
+- ✅ 智能路由：`AiOrchestrationEngine` 支持最快响应、最佳质量、成本最优、负载均衡等策略
+- ✅ 自动降级：错误率>30%或响应超时自动熔断与故障转移
+- ✅ 多模型接入：统一调度 OpenAI、Azure、ChatGLM、通义千问、智谱等主流模型
+
+### 2. 聊天与流式交互 ✅
+- ✅ 同步/异步聊天
+- ✅ SSE 流式推送
+- ✅ WebSocket 实时通道 (`/ws/ai/chat`)
+- ✅ 聊天历史管理：自动保存聊天记录到Redis，支持历史查询、清除和会话统计
+
+### 3. AI 辅助编码 ✅
+- ✅ 代码分析：提供代码审查与重构建议
+- ✅ 脚手架生成：自动生成项目结构与配置
+
+### 4. Simple AI & RAG ✅
+- ✅ 知识库问答：基于知识库的精准问答
+- ✅ 向量检索：支持多模型向量相似度搜索
+
+### 5. AI 创作与多模态 ✅
+- ✅ 绘画调度：统一管理 DALL·E-3、MidJourney、Stable Diffusion 任务
+- ✅ 智能 PPT：文本生成 PPTX，支持导出图片序列
+- ✅ 多模态：文件解析（PDF/Word）、OCR识别、图像理解
+
+### 6. 平台集成 ✅
+- ✅ FastGPT：深度对接 FastGPT 平台
+- ✅ Coze：深度对接 Coze 平台（SSE流式）
+- ✅ DIFY：深度对接 DIFY 平台
+
+### 7. MCP 生态 ✅
+- ✅ 工具注册：`McpToolRegistry` 支持动态工具加载与调用
+- ✅ 工具模板：提供多个内置工具（ProjectScaffold、DataTransform、ApiCall、AlgorithmCompute、FileParse、HttpFetch）
+
+### 8. 安全与监控 ✅
+- ✅ 安全卫士：`AiSecurityManager` 提供内容过滤、IP黑白名单、速率限制
+- ✅ 全链路监控：实时监控队列深度、模型健康度、响应时间与 Token 消耗
+- ✅ 使用统计：记录和统计AI使用情况
+
+## 数据库表
+
+- `ai_provider_config` - AI Provider配置表
+- `ai_provider_config_history` - AI Provider配置历史表
+- `ai_chat_record` - AI聊天记录表
+- `ai_usage_stats` - AI使用统计表
+- `ai_rating_record` - AI评价记录表
+
+详细表结构请参考：`script/sql/ry_ai.sql`
+
+## 模块结构
+
+```
+org.dromara.ai
+├── config/              # 模块配置类
+│   ├── AiAutoConfiguration.java
+│   ├── AiGatewayProperties.java
+│   ├── AiProviderRegistrar.java
+│   └── *ProviderConfig.java (各Provider配置)
+├── controller/          # REST API控制器
+│   ├── admin/                         # 管理端接口
+│   │   ├── AdminAiChatRecordController.java    # 聊天记录管理接口
+│   │   ├── AdminAiUsageStatsController.java    # 使用统计管理接口
+│   │   ├── AdminAiProviderController.java      # Provider管理接口
+│   │   └── AdminSysModelController.java        # 系统模型管理接口
+│   └── app/                           # 用户端接口
+│       ├── AiChatController.java                # 聊天接口
+│       ├── AiAssistantController.java           # 代码助手接口
+│       ├── AiPaintingController.java            # 绘画接口
+│       ├── AiImageController.java               # DALL·E-3接口
+│       ├── PptController.java                   # PPT生成接口
+│       ├── MultimodalController.java            # 多模态接口
+│       ├── SimpleAiController.java              # Simple AI接口
+│       ├── FastGptController.java               # FastGPT接口
+│       ├── CozeController.java                  # Coze接口
+│       ├── DifyController.java                  # DIFY接口
+│       ├── McpController.java                   # MCP工具接口
+│       └── QueueMetricsController.java          # 队列指标接口
+├── domain/              # 数据传输对象 (DTO) 与枚举
+│   ├── dto/
+│   └── enums/
+│       └── AiProviderType.java
+├── provider/            # 模型 Provider 实现
+│   ├── AiProvider.java
+│   ├── AiProviderManager.java
+│   ├── OpenAiProvider.java
+│   ├── AzureOpenAiProvider.java
+│   ├── QwenProvider.java
+│   ├── ZhipuAiProvider.java
+│   └── *Provider.java
+├── service/             # 核心业务服务
+│   ├── AiChatService.java
+│   ├── AiChatHistoryService.java
+│   ├── AiCodingAssistantService.java
+│   ├── AiModelService.java
+│   ├── AiPaintingService.java
+│   └── SimpleAiService.java
+├── orchestration/       # AI 编排引擎
+│   └── AiOrchestrationEngine.java
+├── painting/            # 绘画服务与 Provider
+│   ├── PaintingEngineType.java
+│   ├── PaintingTask.java
+│   ├── PaintingStatus.java
+│   └── provider/
+├── platform/            # 外部平台集成
+│   ├── FastGptService.java
+│   ├── CozeService.java
+│   └── DifyClientService.java
+├── mcp/                 # MCP 工具链与集成
+│   ├── McpToolRegistry.java
+│   ├── McpTool.java
+│   └── tools/
+├── queue/               # 任务队列服务
+│   └── TaskQueueService.java
+├── security/            # 安全管理器
+│   ├── AiSecurityManager.java
+│   ├── AiContentFilterService.java
+│   └── AiAccessControlService.java
+├── monitor/             # 监控指标与度量
+│   ├── AiMonitorService.java
+│   └── *Metrics.java
+├── websocket/           # WebSocket 处理器
+│   ├── ChatWebSocketConfig.java
+│   └── ChatWebSocketHandler.java
+└── error/               # 全局异常处理
+    └── AiErrorHandler.java
+```
+
+## 配置说明
+
+在 `application.yml` 中添加以下配置：
+
+```yaml
+ai:
+  gateway:
+    enabled: true
+    auth-required: true
+    base-path: /api/ai
+  provider:
+    timeout-ms: 60000
+    retry: 1
+
+ruoyi:
+  ai:
+    enabled: true
+    external-ai:
+      openai:
+        base-url: https://api.openai.com
+        api-key: sk-xxxx
+      azure-openai:
+        endpoint: https://your-endpoint.openai.azure.com
+        api-key: your-api-key
+        api-version: 2023-12-01-preview
+      qwen:
+        base-url: https://dashscope.aliyuncs.com/api/v1
+        api-key: sk-xxxx
+      zhipu:
+        base-url: https://open.bigmodel.cn/api/paas/v4
+        api-key: sk-xxxx
+      sd:
+        base-url: http://localhost:7860
+      midjourney:
+        base-url: https://mj.example.com
+        token: mj-xxxx
+    ocr:
+      base-url: https://ocr.example.com
+    platform:
+      fastgpt:
+        base-url: https://fastgpt.example.com
+        token: fgpt-xxxx
+      coze:
+        base-url: https://coze.example.com
+        token: coze-xxxx
+      dify:
+        base-url: https://dify.example.com
+        token: dify-xxxx
+```
+
+## API接口
+
+### 聊天接口 (`/ai/chat`)
+
+#### 同步聊天
+- `POST /ai/chat/sync` - 同步聊天（返回完整响应）
+
+#### 异步聊天
+- `POST /ai/chat/async` - 异步聊天（返回任务ID）
+
+#### 流式聊天
+- `POST /ai/chat/stream` - SSE流式聊天
+- `POST /ai/chat/stream-chunks` - 流式聊天（分块返回）
+
+#### 批量聊天
+- `POST /ai/chat/batch` - 批量聊天请求
+
+#### 聊天历史
+- `GET /ai/chat/history/{sessionId}` - 获取聊天历史
+- `DELETE /ai/chat/history/{sessionId}` - 清除聊天历史
+
+#### 会话统计
+- `GET /ai/chat/stats/{sessionId}` - 获取会话统计
+
+### AI代码助手接口 (`/ai/assistant`)
+
+- `POST /ai/assistant/analyze` - 代码分析
+- `POST /ai/assistant/scaffold` - 生成项目脚手架
+
+### Provider管理接口 (`/ai/provider`)
+
+- `GET /ai/provider/list` - 列出所有Provider
+- `GET /ai/provider/models` - 列出所有模型
+- `GET /ai/provider/default` - 获取默认Provider
+- `POST /ai/provider/setDefault` - 设置默认Provider
+- `GET /ai/provider/stats/system` - 系统统计
+- `GET /ai/provider/stats/providers` - Provider统计
+- `POST /ai/provider/stats/reset` - 重置统计
+
+### Simple AI接口 (`/ai`)
+
+- `POST /ai/ask` - 知识库问答
+- `POST /ai/search` - 向量搜索
+- `GET /ai/stats/{knowledgeId}` - 知识库统计
+- `GET /ai/model/check/{modelName}` - 检查模型可用性
+- `GET /ai/models` - 获取可用模型列表
+- `GET /ai/health` - 健康检查
+
+### 绘画接口 (`/ai/painting`)
+
+- `POST /ai/painting/task` - 创建绘画任务
+- `GET /ai/painting/status/{taskId}` - 查询任务状态
+- `GET /ai/painting/stream/{taskId}` - SSE流式获取任务进度
+
+### DALL·E-3接口
+
+- `POST /dall3` - 文生图
+- `POST /dall3/edit` - 图片编辑（image+mask）
+- `POST /dall3/variations` - 图片变体
+
+### 智能PPT接口 (`/ppt`)
+
+- `POST /ppt/generate` - 生成PPTX文件
+- `POST /ppt/export/pngs` - 导出PNG序列
+
+### 多模态接口 (`/multimodal`)
+
+- `POST /multimodal/extract` - 文件解析（PDF/Word等）
+- `POST /multimodal/ocr` - OCR识别
+- `POST /multimodal/analyze/text` - 文本分析
+- `POST /multimodal/analyze/image` - 图像识别（占位）
+- `POST /multimodal/caption` - 图生文（占位）
+
+### 平台集成接口
+
+#### FastGPT (`/ai/fastgpt`)
+- `POST /ai/fastgpt/knowledge/search` - 知识搜索
+- `POST /ai/fastgpt/workflow/run` - 运行工作流
+- `GET /ai/fastgpt/context/{sessionId}` - 获取上下文
+
+#### Coze (`/ai/coze`)
+- `POST /ai/coze/stream` - SSE流式对话
+
+#### DIFY (`/ai/dify`)
+- `GET /ai/dify/apps` - 获取应用列表
+- `POST /ai/dify/apps` - 创建/更新应用
+
+### MCP工具接口 (`/ai/mcp`)
+
+- `GET /ai/mcp/tools` - 获取工具列表
+- `POST /ai/mcp/invoke/{name}` - 调用工具
+
+### 队列指标接口 (`/ai/queue`)
+
+- `GET /ai/queue/metrics` - 获取队列指标
+
+## WebSocket实时通道
+
+### 聊天WebSocket
+- **端点**: `ws://localhost:8080/ws/ai/chat`
+- **协议**: JSON格式 `AiChatRequest`，支持实时双向对话
+
+## 依赖模块
+
+- `ruoyi-common-core` - 通用核心工具
+- `ruoyi-common-web` - Web通用组件
+- `ruoyi-common-redis` - Redis缓存
+- `ruoyi-common-security` - 安全组件
+- `ruoyi-common-log` - 日志组件
+- `ruoyi-common-mybatis` - MyBatis组件
+- `ruoyi-knowledge` - 知识库模块（RAG增强，可选）
+
+## 使用示例
+
+### 1. 聊天与流式对话
+
+```bash
+# 同步聊天
+curl -X POST http://localhost:8080/api/ai/chat/sync \
+  -H "Authorization: Bearer <token>" \
+  -H "Content-Type: application/json" \
+  -d '{"model":"gpt-4o","messages":[{"role":"user","content":"你好"}],"sessionId":"session_123"}'
+
+# 流式聊天
+curl -X POST http://localhost:8080/api/ai/chat/stream \
+  -H "Authorization: Bearer <token>" \
+  -d '{"model":"gpt-4o","messages":[{"role":"user","content":"你好"}],"stream":true,"sessionId":"session_123"}'
+
+# 获取聊天历史
+curl -X GET "http://localhost:8080/api/ai/chat/history/session_123?limit=50" \
+  -H "Authorization: Bearer <token>"
+```
+
+### 2. AI代码助手
+
+```bash
+# 代码分析
+curl -X POST http://localhost:8080/api/ai/assistant/analyze \
+  -d 'code=public void test(){...}&model=gpt-4'
+
+# 生成脚手架
+curl -X POST http://localhost:8080/api/ai/assistant/scaffold \
+  -d 'appType=SpringBoot&options={"db":"mysql"}'
+```
+
+### 3. Simple AI (RAG)
+
+```bash
+# 知识库问答
+curl -X POST "http://localhost:8080/api/ai/ask?knowledgeId=kb_123&question=合同流程是怎样的"
+
+# 向量搜索
+curl -X POST "http://localhost:8080/api/ai/search?knowledgeId=kb_123&queryText=条款&topK=3"
+```
+
+### 4. AI绘画任务
+
+```bash
+# 创建绘画任务
+curl -X POST http://localhost:8080/api/ai/painting/task \
+  -H "Content-Type: application/json" \
+  -d '{"engine":"DALL_E_3","prompt":"未来城市","params":{"size":"1024x1024"}}'
+
+# 查询任务状态
+curl http://localhost:8080/api/ai/painting/status/{taskId}
+```
+
+### 5. 智能PPT生成
+
+```bash
+curl -X POST "http://localhost:8080/api/ai/ppt/generate?content=第一页标题\n内容1\n第二页标题\n内容2"
+```
+
+### 6. MCP工具调用
+
+```bash
+curl -X POST http://localhost:8080/api/ai/mcp/invoke/api_call \
+  -H "Content-Type: application/json" \
+  -d '{"url":"https://httpbin.org/get"}'
+```
+
+## 安全与合规
+
+`AiSecurityManager` 默认开启，提供以下保护：
+
+- **API密钥验证**：校验请求中的 `apiKey`
+- **IP访问控制**：基于策略拦截非法IP
+- **内容过滤**：输入/输出双向敏感词过滤（Moderate策略）
+- **资源限额**：基于Token数与模型复杂度的动态配额扣除
+- **速率限制**：防止API滥用
+
+## 监控与统计
+
+### 监控指标
+- 队列深度监控
+- 模型健康度监控
+- 响应时间监控
+- Token消耗监控
+- 错误率监控
+
+### 使用统计
+- 用户使用统计（按用户、Provider、模型）
+- 请求次数统计
+- 成功率统计
+- 成本统计
+
+## 注意事项
+
+1. **密钥安全**：生产环境务必通过环境变量注入 API Key，不要将密钥写入配置文件
+2. **流式代理**：Nginx/Gateway 需配置 `proxy_buffering off` 以支持 SSE
+3. **依赖服务**：Redis 必须可用，用于存储任务状态与缓存
+4. **性能优化**：建议对热点数据使用Redis缓存
+5. **错误处理**：模块提供自动降级和熔断机制，但建议监控错误率
+6. **并发控制**：Provider支持最大并发数配置，合理设置以避免资源耗尽
+
+## 扩展开发
+
+### 添加新的Provider
+
+1. 实现 `AiProvider` 接口
+2. 创建对应的配置类（如 `XxxProviderConfig.java`）
+3. 在 `AiProviderRegistrar` 中注册Provider
+4. 在 `AiProviderType` 枚举中添加新的Provider类型
+
+### 添加新的MCP工具
+
+1. 实现 `McpTool` 接口
+2. 在 `AiProviderRegistrar` 中注册工具
+3. 工具会自动出现在工具列表中
+
+## 相关文档
+
+- [API详细文档](docs/API.md)
+- [配置说明](docs/CONFIG.md)
+- [集成指南](docs/INTEGRATION.md)
+- [AI创作系统开发指南](#ruoyi-ai-创作系统开发指南)
+
+---
+
+# RuoYi-AI 创作系统开发指南
+
+本指南介绍 `ruoyi-ai` 模块中的 AI 创作能力，包括绘画引擎接入、智能 PPT 生成、多模态内容理解，以及统一的任务流与接口规范。
+
+> 该文档同时覆盖平台深度集成（FastGPT/Coze/DIFY）、MCP生态扩展、RAG增强、队列与长任务监控、质量与性能保障等内容，便于端到端落地与运维。
+
+## 模块概览
+
+### 绘画引擎集成（DALL·E-3 / MidJourney / Stable Diffusion）
+- 统一引擎枚举：`painting/PaintingEngineType.java`
+- 任务模型：`painting/PaintingTask.java`
+- 任务状态：`painting/PaintingStatus.java`
+- 引擎适配：
+  - DALL·E-3：`painting/provider/DallE3Provider.java`
+  - MidJourney：`painting/provider/MidJourneyProvider.java`
+  - Stable Diffusion：`painting/provider/StableDiffusionProvider.java`
+- 统一服务：`service/AiPaintingService.java`
+- 控制器：`controller/AiPaintingController.java`
+
+### 智能 PPT 生成
+- 控制器：`controller/PptController.java`
+- 能力：按文本生成 PPTX、导出每页 PNG 序列、主题占位与扩展点
+
+### 多模态内容理解
+- 控制器：`controller/MultimodalController.java`
+- 能力：文件解析（Tika）、文本分析、OCR占位、图像识别占位、图生文占位
+
+### DALL·E-3 扩展
+- 控制器：`controller/AiImageController.java`
+- 能力：文生图、编辑（image+mask）、变体（variations）
+
+### 平台接入与统一API
+- FastGPT：服务 `platform/FastGptService.java`，接口 `controller/FastGptController.java`
+- Coze：服务 `platform/CozeService.java`，接口 `controller/CozeController.java`（SSE流式）
+- DIFY：服务 `platform/DifyClientService.java`，接口 `controller/DifyController.java`
+
+### MCP生态扩展
+- 工具注册：`mcp/McpToolRegistry.java`（动态加载/版本管理/热重载）
+- 工具模板：`mcp/tools/*.java`（≥5个：ProjectScaffold/DataTransform/ApiCall/AlgorithmCompute/FileParse/HttpFetch）
+- 控制器：`controller/McpController.java`（工具列表与调用）
+
+### 统一模型调度与降级
+- 管理器：`provider/AiProviderManager.java`（模型优先→性能优选→近似轮询、自动降级）
+- 管理接口：`controller/admin/AdminAiProviderController.java`（列表/模型/默认/统计）
+
+### 队列与长任务
+- 服务：`queue/TaskQueueService.java`（优先级队列、任务状态与指标）
+- 指标接口：`controller/QueueMetricsController.java`
+
+## 配置项
+
+### OpenAI
+- `ruoyi.ai.external-ai.openai.base-url`（默认 `https://api.openai.com`）
+- `ruoyi.ai.external-ai.openai.api-key`
+
+### Azure OpenAI
+- `ruoyi.ai.external-ai.azure-openai.endpoint`
+- `ruoyi.ai.external-ai.azure-openai.api-key`
+- `ruoyi.ai.external-ai.azure-openai.api-version`
+
+### MidJourney
+- `ruoyi.ai.external-ai.midjourney.base-url`
+- `ruoyi.ai.external-ai.midjourney.token`
+
+### Stable Diffusion
+- `ruoyi.ai.external-ai.sd.base-url`（例如 `http://localhost:7860`）
+
+### OCR
+- `ruoyi.ai.ocr.base-url`
+
+### 平台
+- `ruoyi.ai.platform.fastgpt.base-url`、`ruoyi.ai.platform.fastgpt.token`
+- `ruoyi.ai.platform.coze.base-url`、`ruoyi.ai.platform.coze.token`
+- `ruoyi.ai.platform.dify.base-url`、`ruoyi.ai.platform.dify.token`
+
+## API 速览
+
+### 绘画任务统一接口（REST + SSE）
+- 创建任务：`POST /ai/painting/task`
+  - body：`{"engine":"DALL_E_3","prompt":"海边日落","params":{"size":"1024x1024"}}`
+  - 返回：`{"taskId":"..."}`（任务 ID）
+- 查询状态：`GET /ai/painting/status/{taskId}`
+- 进度流：`GET /ai/painting/stream/{taskId}`（SSE，[DONE] 结束）
+
+### DALL·E-3
+- 文生图：`POST /dall3`（`prompt`,`size`）
+- 编辑：`POST /dall3/edit`（`prompt`,`size`,`image`,`mask?`）
+- 变体：`POST /dall3/variations`（`size`,`image`）
+
+### 智能 PPT
+- 生成 PPTX：`POST /ppt/generate`（按行拆分内容为多页）
+- 导出 PNG 序列：`POST /ppt/export/pngs`（返回 `data:image/png;base64,...` 列表）
+
+### 多模态
+- 文件解析：`POST /multimodal/extract`（`multipart/form-data:file`）
+- OCR识别：`POST /multimodal/ocr`（需配置 OCR 服务）
+- 文本分析：`POST /multimodal/analyze/text`（返回 `title/summary/keywords`）
+- 图像识别占位：`POST /multimodal/analyze/image`
+- 图生文占位：`POST /multimodal/caption`
+
+## 流式与实时
+
+- **SSE**：`/ai/painting/stream/{taskId}` 推送任务状态与进度；统一以 `[DONE]` 结束
+- **WebSocket**：模块已提供聊天通道 `ws/ai/chat`；如需绘画通道，可参考该模式新增 `/ws/ai/painting`
+
+## 任务与历史
+
+- 任务创建后进入线程池异步执行，状态与结果存储于 Redis：键 `ai:painting:task:{taskId}`
+- 可基于该结构扩展作品历史管理、检索与归档
+
+## 扩展建议
+
+- **引擎负载均衡**：为 Provider 增加实例列表与健康检查，依据权重分配
+- **任务队列**：接入消息队列（如 Kafka/RabbitMQ）实现更大的并发与可靠性
+- **权限与用量**：接入 `sa-token` 与用量计费，限制频率与配额
+- **监控与审计**：统一接入日志、指标与告警，便于运维与合规
+- **RAG增强**：在 `ruoyi-knowledge` 实现 `VectorDbClient` 接入层（Milvus/Weaviate/Qdrant），集成 BGE-large-zh-v1.5 批量嵌入与缓存，混合检索（关键词+向量）召回≥90%
+- **队列看板**：在管理端提供队列深度/处理速率可视化与失败重试控制
+
+## 测试与质量
+
+- **单元测试**：建议使用 MockWebServer 模拟外部 API，覆盖率目标 ≥ 80%
+- **性能**：核心 API 响应时间 < 500ms（外部调用除外），并发可通过线程池与队列扩展至 1000+
+- **压测与限流**：模拟 1000+ 并发，结合令牌桶限流，P99 延迟控制在 2s 以内
+- **可用性**：关键服务可用性目标 ≥ 99.9%，结合自动降级与熔断策略
diff --git a/ruoyi-modules/ruoyi-ai/pom.xml b/ruoyi-modules/ruoyi-ai/pom.xml
new file mode 100644
index 0000000..52c2ae1
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/pom.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>org.dromara</groupId>
+        <artifactId>ruoyi-modules</artifactId>
+        <version>${revision}</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>ruoyi-ai</artifactId>
+
+    <description>
+        AI模块
+    </description>
+
+    <dependencies>
+
+        <!-- HTTP 客户端 -->
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp-sse</artifactId>
+        </dependency>
+
+        <!-- JSON 解析 -->
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+        </dependency>
+
+        <!-- WebSocket -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-websocket</artifactId>
+        </dependency>
+
+
+        <!-- 通用工具-->
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-core</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-doc</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-mybatis</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-log</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-security</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-web</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-redis</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-excel</artifactId>
+        </dependency>
+
+        <!-- Spring Boot Validation -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+        </dependency>
+
+        <!-- 配置处理 -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-configuration-processor</artifactId>
+            <optional>true</optional>
+        </dependency>
+
+        <!-- 知识库模块依赖 -->
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-knowledge</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi-ooxml</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tika</groupId>
+            <artifactId>tika-core</artifactId>
+            <version>2.9.1</version>
+        </dependency>
+
+    </dependencies>
+
+</project>
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/config/AiApiConfig.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/config/AiApiConfig.java
new file mode 100644
index 0000000..dcf2277
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/config/AiApiConfig.java
@@ -0,0 +1,53 @@
+package org.dromara.ai.config;
+
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+// springdoc group
+// Use class name to avoid hard dependency if springdoc is absent at compile-time
+@Configuration
+@EnableConfigurationProperties(AiGatewayProperties.class)
+public class AiApiConfig {
+
+    @Bean
+    public Object aiGroupedOpenApi() {
+        try {
+            Class<?> groupedOpenApiClass = Class.forName("org.springdoc.core.models.GroupedOpenApi");
+            return groupedOpenApiClass
+                    .getMethod("builder")
+                    .invoke(null)
+                    .getClass()
+                    .getMethod("group", String.class)
+                    .invoke(
+                            groupedOpenApiClass.getMethod("builder").invoke(null),
+                            "AI"
+                    )
+                    .getClass()
+                    .getMethod("packagesToScan", String[].class)
+                    .invoke(
+                            groupedOpenApiClass.getMethod("builder").invoke(null)
+                                    .getClass().getMethod("group", String.class)
+                                    .invoke(groupedOpenApiClass.getMethod("builder").invoke(null), "AI"),
+                            (Object) new String[]{"org.dromara.ai.api"}
+                    )
+                    .getClass()
+                    .getMethod("build")
+                    .invoke(
+                            groupedOpenApiClass.getMethod("builder").invoke(null)
+                                    .getClass().getMethod("group", String.class)
+                                    .invoke(groupedOpenApiClass.getMethod("builder").invoke(null), "AI")
+                                    .getClass().getMethod("packagesToScan", String[].class)
+                                    .invoke(
+                                            groupedOpenApiClass.getMethod("builder").invoke(null)
+                                                    .getClass().getMethod("group", String.class)
+                                                    .invoke(groupedOpenApiClass.getMethod("builder").invoke(null), "AI"),
+                                            (Object) new String[]{"org.dromara.ai.api"}
+                                    )
+                    );
+        } catch (Throwable ignore) {
+            return new Object();
+        }
+    }
+}
+
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/config/AiAutoConfiguration.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/config/AiAutoConfiguration.java
new file mode 100644
index 0000000..a9ddaa3
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/config/AiAutoConfiguration.java
@@ -0,0 +1,23 @@
+package org.dromara.ai.config;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * 简化的AI自动配置类
+ * 主要用于扫描AI模块的组件
+ *
+ * @author pengles
+ */
+@Slf4j
+@Configuration
+@ComponentScan(basePackages = "org.dromara.ai")
+@ConditionalOnProperty(prefix = "ruoyi.ai", name = "enabled", havingValue = "true", matchIfMissing = true)
+public class AiAutoConfiguration {
+
+    public AiAutoConfiguration() {
+        log.info("AI模块已启用");
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/config/AiConfigurationManager.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/config/AiConfigurationManager.java
new file mode 100644
index 0000000..293765a
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/config/AiConfigurationManager.java
@@ -0,0 +1,532 @@
+package org.dromara.ai.config;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.boot.context.event.ApplicationReadyEvent;
+import org.springframework.context.ApplicationEventPublisher;
+import org.springframework.context.event.EventListener;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Consumer;
+
+/**
+ * AI配置管理服务
+ * 支持动态配置和热更新
+ *
+ * @author pengles
+ */
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class AiConfigurationManager {
+
+    private final ApplicationEventPublisher eventPublisher;
+    private final ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(2);
+
+    // 配置存储
+    private final Map<String, AiConfiguration> configurations = new ConcurrentHashMap<>();
+
+    // 配置监听器
+    private final Map<String, Consumer<AiConfiguration>> configListeners = new ConcurrentHashMap<>();
+
+    // 配置版本
+    private final Map<String, Long> configVersions = new ConcurrentHashMap<>();
+
+    // 配置历史
+    private final Map<String, Map<Long, AiConfiguration>> configHistory = new ConcurrentHashMap<>();
+
+    /**
+     * AI配置类
+     */
+    public static class AiConfiguration {
+        private String key;
+        private Object value;
+        private String description;
+        private ConfigType type;
+        private boolean hotReloadable;
+        private LocalDateTime createTime;
+        private LocalDateTime updateTime;
+        private String updatedBy;
+        private Map<String, Object> metadata;
+
+        // Getters and Setters
+        public String getKey() {
+            return key;
+        }
+
+        public AiConfiguration setKey(String key) {
+            this.key = key;
+            return this;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public AiConfiguration setValue(Object value) {
+            this.value = value;
+            return this;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public AiConfiguration setDescription(String description) {
+            this.description = description;
+            return this;
+        }
+
+        public ConfigType getType() {
+            return type;
+        }
+
+        public AiConfiguration setType(ConfigType type) {
+            this.type = type;
+            return this;
+        }
+
+        public boolean isHotReloadable() {
+            return hotReloadable;
+        }
+
+        public AiConfiguration setHotReloadable(boolean hotReloadable) {
+            this.hotReloadable = hotReloadable;
+            return this;
+        }
+
+        public LocalDateTime getCreateTime() {
+            return createTime;
+        }
+
+        public AiConfiguration setCreateTime(LocalDateTime createTime) {
+            this.createTime = createTime;
+            return this;
+        }
+
+        public LocalDateTime getUpdateTime() {
+            return updateTime;
+        }
+
+        public AiConfiguration setUpdateTime(LocalDateTime updateTime) {
+            this.updateTime = updateTime;
+            return this;
+        }
+
+        public String getUpdatedBy() {
+            return updatedBy;
+        }
+
+        public AiConfiguration setUpdatedBy(String updatedBy) {
+            this.updatedBy = updatedBy;
+            return this;
+        }
+
+        public Map<String, Object> getMetadata() {
+            return metadata;
+        }
+
+        public AiConfiguration setMetadata(Map<String, Object> metadata) {
+            this.metadata = metadata;
+            return this;
+        }
+    }
+
+    /**
+     * 配置类型枚举
+     */
+    public enum ConfigType {
+        PROVIDER_CONFIG,    // Provider配置
+        MODEL_CONFIG,       // 模型配置
+        SECURITY_CONFIG,    // 安全配置
+        MONITOR_CONFIG,     // 监控配置
+        SYSTEM_CONFIG       // 系统配置
+    }
+
+    /**
+     * 配置变更事件
+     */
+    public static class ConfigChangeEvent {
+        private String key;
+        private Object oldValue;
+        private Object newValue;
+        private ConfigType type;
+        private LocalDateTime changeTime;
+        private String changedBy;
+
+        public ConfigChangeEvent(String key, Object oldValue, Object newValue, ConfigType type, String changedBy) {
+            this.key = key;
+            this.oldValue = oldValue;
+            this.newValue = newValue;
+            this.type = type;
+            this.changeTime = LocalDateTime.now();
+            this.changedBy = changedBy;
+        }
+
+        // Getters
+        public String getKey() {
+            return key;
+        }
+
+        public Object getOldValue() {
+            return oldValue;
+        }
+
+        public Object getNewValue() {
+            return newValue;
+        }
+
+        public ConfigType getType() {
+            return type;
+        }
+
+        public LocalDateTime getChangeTime() {
+            return changeTime;
+        }
+
+        public String getChangedBy() {
+            return changedBy;
+        }
+    }
+
+    /**
+     * 应用启动后初始化
+     */
+    @EventListener(ApplicationReadyEvent.class)
+    public void initialize() {
+        log.info("初始化AI配置管理器");
+
+        // 加载默认配置
+        loadDefaultConfigurations();
+
+        // 启动配置监控
+        startConfigMonitoring();
+
+        log.info("AI配置管理器初始化完成，已加载{}个配置项", configurations.size());
+    }
+
+    /**
+     * 获取配置
+     *
+     * @param key 配置键
+     * @return 配置值
+     */
+    @SuppressWarnings("unchecked")
+    public <T> T getConfig(String key) {
+        AiConfiguration config = configurations.get(key);
+        return config != null ? (T) config.getValue() : null;
+    }
+
+    /**
+     * 获取配置（带默认值）
+     *
+     * @param key          配置键
+     * @param defaultValue 默认值
+     * @return 配置值
+     */
+    @SuppressWarnings("unchecked")
+    public <T> T getConfig(String key, T defaultValue) {
+        AiConfiguration config = configurations.get(key);
+        return config != null ? (T) config.getValue() : defaultValue;
+    }
+
+    /**
+     * 设置配置
+     *
+     * @param key       配置键
+     * @param value     配置值
+     * @param type      配置类型
+     * @param updatedBy 更新者
+     */
+    public void setConfig(String key, Object value, ConfigType type, String updatedBy) {
+        setConfig(key, value, type, true, null, updatedBy);
+    }
+
+    /**
+     * 设置配置（完整参数）
+     *
+     * @param key           配置键
+     * @param value         配置值
+     * @param type          配置类型
+     * @param hotReloadable 是否支持热更新
+     * @param description   配置描述
+     * @param updatedBy     更新者
+     */
+    public void setConfig(String key, Object value, ConfigType type, boolean hotReloadable,
+                          String description, String updatedBy) {
+        AiConfiguration oldConfig = configurations.get(key);
+        Object oldValue = oldConfig != null ? oldConfig.getValue() : null;
+
+        AiConfiguration newConfig = new AiConfiguration()
+                .setKey(key)
+                .setValue(value)
+                .setType(type)
+                .setHotReloadable(hotReloadable)
+                .setDescription(description)
+                .setUpdatedBy(updatedBy)
+                .setUpdateTime(LocalDateTime.now());
+
+        if (oldConfig == null) {
+            newConfig.setCreateTime(LocalDateTime.now());
+        } else {
+            newConfig.setCreateTime(oldConfig.getCreateTime());
+        }
+
+        configurations.put(key, newConfig);
+
+        // 更新版本
+        long newVersion = configVersions.getOrDefault(key, 0L) + 1;
+        configVersions.put(key, newVersion);
+
+        // 保存历史
+        configHistory.computeIfAbsent(key, k -> new ConcurrentHashMap<>())
+                .put(newVersion, newConfig);
+
+        // 触发配置变更事件
+        ConfigChangeEvent event = new ConfigChangeEvent(key, oldValue, value, type, updatedBy);
+        eventPublisher.publishEvent(event);
+
+        // 通知监听器
+        Consumer<AiConfiguration> listener = configListeners.get(key);
+        if (listener != null && hotReloadable) {
+            try {
+                listener.accept(newConfig);
+                log.info("配置热更新成功: {} = {}", key, value);
+            } catch (Exception e) {
+                log.error("配置热更新失败: {}", key, e);
+            }
+        }
+
+        log.info("配置已更新: {} = {} (版本: {})", key, value, newVersion);
+    }
+
+    /**
+     * 删除配置
+     *
+     * @param key       配置键
+     * @param updatedBy 操作者
+     */
+    public void removeConfig(String key, String updatedBy) {
+        AiConfiguration config = configurations.remove(key);
+        if (config != null) {
+            // 触发配置变更事件
+            ConfigChangeEvent event = new ConfigChangeEvent(key, config.getValue(), null, config.getType(), updatedBy);
+            eventPublisher.publishEvent(event);
+
+            log.info("配置已删除: {}", key);
+        }
+    }
+
+    /**
+     * 注册配置监听器
+     *
+     * @param key      配置键
+     * @param listener 监听器
+     */
+    public void addConfigListener(String key, Consumer<AiConfiguration> listener) {
+        configListeners.put(key, listener);
+        log.debug("已注册配置监听器: {}", key);
+    }
+
+    /**
+     * 移除配置监听器
+     *
+     * @param key 配置键
+     */
+    public void removeConfigListener(String key) {
+        configListeners.remove(key);
+        log.debug("已移除配置监听器: {}", key);
+    }
+
+    /**
+     * 获取所有配置
+     *
+     * @return 配置映射
+     */
+    public Map<String, AiConfiguration> getAllConfigurations() {
+        return new ConcurrentHashMap<>(configurations);
+    }
+
+    /**
+     * 获取指定类型的配置
+     *
+     * @param type 配置类型
+     * @return 配置映射
+     */
+    public Map<String, AiConfiguration> getConfigurationsByType(ConfigType type) {
+        Map<String, AiConfiguration> result = new ConcurrentHashMap<>();
+        configurations.forEach((key, config) -> {
+            if (config.getType() == type) {
+                result.put(key, config);
+            }
+        });
+        return result;
+    }
+
+    /**
+     * 获取配置历史
+     *
+     * @param key 配置键
+     * @return 配置历史
+     */
+    public Map<Long, AiConfiguration> getConfigHistory(String key) {
+        return configHistory.getOrDefault(key, new ConcurrentHashMap<>());
+    }
+
+    /**
+     * 回滚配置到指定版本
+     *
+     * @param key       配置键
+     * @param version   版本号
+     * @param updatedBy 操作者
+     */
+    public void rollbackConfig(String key, long version, String updatedBy) {
+        Map<Long, AiConfiguration> history = configHistory.get(key);
+        if (history == null || !history.containsKey(version)) {
+            throw new IllegalArgumentException("配置版本不存在: " + key + " v" + version);
+        }
+
+        AiConfiguration historicalConfig = history.get(version);
+        setConfig(key, historicalConfig.getValue(), historicalConfig.getType(),
+                historicalConfig.isHotReloadable(), historicalConfig.getDescription(), updatedBy);
+
+        log.info("配置已回滚: {} 到版本 {}", key, version);
+    }
+
+    /**
+     * 重新加载所有配置
+     */
+    public void reloadAllConfigurations() {
+        log.info("开始重新加载所有配置");
+
+        configurations.forEach((key, config) -> {
+            if (config.isHotReloadable()) {
+                Consumer<AiConfiguration> listener = configListeners.get(key);
+                if (listener != null) {
+                    try {
+                        listener.accept(config);
+                        log.debug("配置重新加载成功: {}", key);
+                    } catch (Exception e) {
+                        log.error("配置重新加载失败: {}", key, e);
+                    }
+                }
+            }
+        });
+
+        log.info("所有配置重新加载完成");
+    }
+
+    /**
+     * 加载默认配置
+     */
+    private void loadDefaultConfigurations() {
+        // Provider配置
+        setConfig("ai.provider.openai.enabled", true, ConfigType.PROVIDER_CONFIG, true,
+                "OpenAI Provider启用状态", "system");
+        setConfig("ai.provider.openai.timeout", 30000, ConfigType.PROVIDER_CONFIG, true,
+                "OpenAI Provider超时时间(ms)", "system");
+        setConfig("ai.provider.openai.retry.max", 3, ConfigType.PROVIDER_CONFIG, true,
+                "OpenAI Provider最大重试次数", "system");
+
+        // 模型配置
+        setConfig("ai.model.default", "gpt-3.5-turbo", ConfigType.MODEL_CONFIG, true,
+                "默认AI模型", "system");
+        setConfig("ai.model.temperature.default", 0.7, ConfigType.MODEL_CONFIG, true,
+                "默认温度参数", "system");
+        setConfig("ai.model.max_tokens.default", 2048, ConfigType.MODEL_CONFIG, true,
+                "默认最大token数", "system");
+
+        // 安全配置
+        setConfig("ai.security.content_filter.enabled", true, ConfigType.SECURITY_CONFIG, true,
+                "内容过滤启用状态", "system");
+        setConfig("ai.security.rate_limit.enabled", true, ConfigType.SECURITY_CONFIG, true,
+                "速率限制启用状态", "system");
+        setConfig("ai.security.rate_limit.requests_per_minute", 60, ConfigType.SECURITY_CONFIG, true,
+                "每分钟请求限制", "system");
+
+        // 监控配置
+        setConfig("ai.monitor.enabled", true, ConfigType.MONITOR_CONFIG, true,
+                "监控启用状态", "system");
+        setConfig("ai.monitor.metrics.retention_days", 30, ConfigType.MONITOR_CONFIG, true,
+                "监控数据保留天数", "system");
+        setConfig("ai.monitor.health_check.interval", 60, ConfigType.MONITOR_CONFIG, true,
+                "健康检查间隔(秒)", "system");
+
+        // 系统配置
+        setConfig("ai.system.thread_pool.core_size", 10, ConfigType.SYSTEM_CONFIG, true,
+                "线程池核心大小", "system");
+        setConfig("ai.system.thread_pool.max_size", 50, ConfigType.SYSTEM_CONFIG, true,
+                "线程池最大大小", "system");
+        setConfig("ai.system.cache.enabled", true, ConfigType.SYSTEM_CONFIG, true,
+                "缓存启用状态", "system");
+    }
+
+    /**
+     * 启动配置监控
+     */
+    private void startConfigMonitoring() {
+        // 定期检查配置变更
+        scheduler.scheduleWithFixedDelay(() -> {
+            try {
+                // 这里可以实现从外部数据源检查配置变更
+                // 例如数据库、配置中心等
+                log.debug("配置监控检查完成");
+            } catch (Exception e) {
+                log.error("配置监控检查失败", e);
+            }
+        }, 30, 30, TimeUnit.SECONDS);
+
+        // 定期清理历史配置
+        scheduler.scheduleWithFixedDelay(() -> {
+            try {
+                cleanupConfigHistory();
+            } catch (Exception e) {
+                log.error("配置历史清理失败", e);
+            }
+        }, 1, 24, TimeUnit.HOURS);
+    }
+
+    /**
+     * 清理配置历史
+     */
+    private void cleanupConfigHistory() {
+        int maxHistoryVersions = getConfig("ai.config.history.max_versions", 10);
+
+        configHistory.forEach((key, history) -> {
+            if (history.size() > maxHistoryVersions) {
+                // 保留最新的版本
+                history.entrySet().stream()
+                        .sorted(Map.Entry.<Long, AiConfiguration>comparingByKey().reversed())
+                        .skip(maxHistoryVersions)
+                        .map(Map.Entry::getKey)
+                        .forEach(history::remove);
+            }
+        });
+
+        log.debug("配置历史清理完成");
+    }
+
+    /**
+     * 销毁资源
+     */
+    public void destroy() {
+        if (scheduler != null && !scheduler.isShutdown()) {
+            scheduler.shutdown();
+            try {
+                if (!scheduler.awaitTermination(5, TimeUnit.SECONDS)) {
+                    scheduler.shutdownNow();
+                }
+            } catch (InterruptedException e) {
+                scheduler.shutdownNow();
+                Thread.currentThread().interrupt();
+            }
+        }
+        log.info("AI配置管理器已销毁");
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/config/AiGatewayProperties.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/config/AiGatewayProperties.java
new file mode 100644
index 0000000..fb17e2c
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/config/AiGatewayProperties.java
@@ -0,0 +1,35 @@
+package org.dromara.ai.config;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+@ConfigurationProperties(prefix = "ai.gateway")
+public class AiGatewayProperties {
+    private boolean enabled = true;
+    private boolean authRequired = true;
+    private String basePath = "/api/ai";
+
+    public boolean isEnabled() {
+        return enabled;
+    }
+
+    public void setEnabled(boolean enabled) {
+        this.enabled = enabled;
+    }
+
+    public boolean isAuthRequired() {
+        return authRequired;
+    }
+
+    public void setAuthRequired(boolean authRequired) {
+        this.authRequired = authRequired;
+    }
+
+    public String getBasePath() {
+        return basePath;
+    }
+
+    public void setBasePath(String basePath) {
+        this.basePath = basePath;
+    }
+}
+
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/config/AiProviderRegistrar.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/config/AiProviderRegistrar.java
new file mode 100644
index 0000000..5051f29
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/config/AiProviderRegistrar.java
@@ -0,0 +1,44 @@
+package org.dromara.ai.config;
+
+import jakarta.annotation.PostConstruct;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.ai.provider.AiProvider;
+import org.dromara.ai.provider.AiProviderManager;
+import org.springframework.stereotype.Component;
+
+import java.util.Collections;
+import java.util.List;
+
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class AiProviderRegistrar {
+
+    private final AiProviderManager providerManager;
+    private final List<AiProvider> providers;
+    private final org.dromara.ai.mcp.McpToolRegistry registry;
+
+    @PostConstruct
+    public void register() {
+        for (AiProvider provider : providers) {
+            try {
+                provider.initialize(Collections.emptyMap());
+                providerManager.registerProvider(provider);
+                log.info("已注册AI提供商: {}", provider.getProviderName());
+            } catch (Exception e) {
+                log.error("注册AI提供商失败: {}", provider.getProviderName(), e);
+            }
+        }
+        try {
+            registry.register(new org.dromara.ai.mcp.tools.ProjectScaffoldTool());
+            registry.register(new org.dromara.ai.mcp.tools.DataTransformTool());
+            registry.register(new org.dromara.ai.mcp.tools.ApiCallTool());
+            registry.register(new org.dromara.ai.mcp.tools.AlgorithmComputeTool());
+            registry.register(new org.dromara.ai.mcp.tools.FileParseTool());
+            registry.register(new org.dromara.ai.mcp.tools.HttpFetchTool());
+        } catch (Exception e) {
+            log.error("注册MCP工具失败", e);
+        }
+    }
+}
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/config/AzureOpenAiProviderConfig.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/config/AzureOpenAiProviderConfig.java
new file mode 100644
index 0000000..18ffe08
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/config/AzureOpenAiProviderConfig.java
@@ -0,0 +1,72 @@
+package org.dromara.ai.config;
+
+import jakarta.annotation.PostConstruct;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.ai.provider.AiProviderManager;
+import org.dromara.ai.provider.AzureOpenAiProvider;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Configuration;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Slf4j
+@Configuration
+@RequiredArgsConstructor
+@ConditionalOnProperty(prefix = "ruoyi.ai.external-ai.azure", name = "enabled", havingValue = "true")
+public class AzureOpenAiProviderConfig {
+
+    private final AiProviderManager providerManager;
+
+    @Value("${ruoyi.ai.external-ai.azure.api-key:}")
+    private String apiKey;
+    @Value("${ruoyi.ai.external-ai.azure.endpoint:}")
+    private String endpoint;
+    @Value("${ruoyi.ai.external-ai.azure.deployment-name:}")
+    private String deploymentName;
+    @Value("${ruoyi.ai.external-ai.azure.api-version:2023-12-01-preview}")
+    private String apiVersion;
+    @Value("${ruoyi.ai.providers.azure-openai.supported-models[0]:gpt-35-turbo}")
+    private String supportedModel0;
+    @Value("${ruoyi.ai.providers.azure-openai.supported-models[1]:gpt-4}")
+    private String supportedModel1;
+    @Value("${ruoyi.ai.providers.azure-openai.default-model:gpt-35-turbo}")
+    private String defaultModel;
+    @Value("${ruoyi.ai.external-ai.openai.timeout:60s}")
+    private String timeout;
+
+    @PostConstruct
+    public void register() {
+        if (apiKey == null || apiKey.isBlank() || endpoint == null || endpoint.isBlank() || deploymentName == null || deploymentName.isBlank()) {
+            log.warn("Azure OpenAI 配置不完整，Provider 不注册");
+            return;
+        }
+        AzureOpenAiProvider provider = new AzureOpenAiProvider();
+        Map<String, Object> cfg = new HashMap<>();
+        cfg.put("api-key", apiKey);
+        cfg.put("endpoint", endpoint);
+        cfg.put("deployment-name", deploymentName);
+        cfg.put("api-version", apiVersion);
+        cfg.put("default-model", defaultModel);
+        cfg.put("timeout-ms", parseTimeoutMs(timeout));
+        cfg.put("supported-models", List.of(supportedModel0, supportedModel1));
+        provider.initialize(cfg);
+        providerManager.registerProvider(provider);
+        log.info("Azure OpenAI Provider 已注册");
+    }
+
+    private int parseTimeoutMs(String t) {
+        try {
+            if (t == null || t.isBlank()) return 60000;
+            if (t.endsWith("ms")) return Integer.parseInt(t.substring(0, t.length() - 2));
+            if (t.endsWith("s")) return Integer.parseInt(t.substring(0, t.length() - 1)) * 1000;
+            if (t.endsWith("m")) return Integer.parseInt(t.substring(0, t.length() - 1)) * 60_000;
+            return Integer.parseInt(t);
+        } catch (Exception e) {
+            return 60000;
+        }
+    }
+}
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/config/CozePlatformConfig.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/config/CozePlatformConfig.java
new file mode 100644
index 0000000..6c4d124
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/config/CozePlatformConfig.java
@@ -0,0 +1,64 @@
+package org.dromara.ai.config;
+
+import jakarta.annotation.PostConstruct;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.ai.provider.AiProviderManager;
+import org.dromara.ai.provider.CozeProvider;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Configuration;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Slf4j
+@Configuration
+@RequiredArgsConstructor
+@ConditionalOnProperty(prefix = "ruoyi.ai.ai-platform.coze", name = "enabled", havingValue = "true")
+public class CozePlatformConfig {
+
+    private final AiProviderManager providerManager;
+
+    @Value("${ruoyi.ai.ai-platform.coze.api-key:}")
+    private String apiKey;
+    @Value("${ruoyi.ai.ai-platform.coze.base-url:}")
+    private String baseUrl;
+    @Value("${ruoyi.ai.ai-platform.coze.default-bot-id:}")
+    private String defaultBotId;
+    @Value("${ruoyi.ai.providers.coze.supported-models[0]:coze}")
+    private String supportedModel0;
+    @Value("${ruoyi.ai.external-ai.openai.timeout:60s}")
+    private String timeout;
+
+    @PostConstruct
+    public void register() {
+        if (apiKey == null || apiKey.isBlank() || baseUrl == null || baseUrl.isBlank() || defaultBotId == null || defaultBotId.isBlank()) {
+            log.warn("Coze 配置不完整，Provider 不注册");
+            return;
+        }
+        CozeProvider provider = new CozeProvider();
+        Map<String, Object> cfg = new HashMap<>();
+        cfg.put("api-key", apiKey);
+        cfg.put("base-url", baseUrl);
+        cfg.put("default-bot-id", defaultBotId);
+        cfg.put("timeout-ms", parseTimeoutMs(timeout));
+        cfg.put("supported-models", List.of(supportedModel0));
+        provider.initialize(cfg);
+        providerManager.registerProvider(provider);
+        log.info("Coze Provider 已注册");
+    }
+
+    private int parseTimeoutMs(String t) {
+        try {
+            if (t == null || t.isBlank()) return 60000;
+            if (t.endsWith("ms")) return Integer.parseInt(t.substring(0, t.length() - 2));
+            if (t.endsWith("s")) return Integer.parseInt(t.substring(0, t.length() - 1)) * 1000;
+            if (t.endsWith("m")) return Integer.parseInt(t.substring(0, t.length() - 1)) * 60_000;
+            return Integer.parseInt(t);
+        } catch (Exception e) {
+            return 60000;
+        }
+    }
+}
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/config/DifyPlatformConfig.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/config/DifyPlatformConfig.java
new file mode 100644
index 0000000..73d2c8e
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/config/DifyPlatformConfig.java
@@ -0,0 +1,64 @@
+package org.dromara.ai.config;
+
+import jakarta.annotation.PostConstruct;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.ai.provider.AiProviderManager;
+import org.dromara.ai.provider.DifyProvider;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Configuration;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Slf4j
+@Configuration
+@RequiredArgsConstructor
+@ConditionalOnProperty(prefix = "ruoyi.ai.ai-platform.dify", name = "enabled", havingValue = "true")
+public class DifyPlatformConfig {
+
+    private final AiProviderManager providerManager;
+
+    @Value("${ruoyi.ai.ai-platform.dify.api-key:}")
+    private String apiKey;
+    @Value("${ruoyi.ai.ai-platform.dify.base-url:}")
+    private String baseUrl;
+    @Value("${ruoyi.ai.ai-platform.dify.default-app-id:}")
+    private String defaultAppId;
+    @Value("${ruoyi.ai.providers.dify.supported-models[0]:dify}")
+    private String supportedModel0;
+    @Value("${ruoyi.ai.external-ai.openai.timeout:60s}")
+    private String timeout;
+
+    @PostConstruct
+    public void register() {
+        if (apiKey == null || apiKey.isBlank() || baseUrl == null || baseUrl.isBlank() || defaultAppId == null || defaultAppId.isBlank()) {
+            log.warn("Dify 配置不完整，Provider 不注册");
+            return;
+        }
+        DifyProvider provider = new DifyProvider();
+        Map<String, Object> cfg = new HashMap<>();
+        cfg.put("api-key", apiKey);
+        cfg.put("base-url", baseUrl);
+        cfg.put("default-app-id", defaultAppId);
+        cfg.put("timeout-ms", parseTimeoutMs(timeout));
+        cfg.put("supported-models", List.of(supportedModel0));
+        provider.initialize(cfg);
+        providerManager.registerProvider(provider);
+        log.info("Dify Provider 已注册");
+    }
+
+    private int parseTimeoutMs(String t) {
+        try {
+            if (t == null || t.isBlank()) return 60000;
+            if (t.endsWith("ms")) return Integer.parseInt(t.substring(0, t.length() - 2));
+            if (t.endsWith("s")) return Integer.parseInt(t.substring(0, t.length() - 1)) * 1000;
+            if (t.endsWith("m")) return Integer.parseInt(t.substring(0, t.length() - 1)) * 60_000;
+            return Integer.parseInt(t);
+        } catch (Exception e) {
+            return 60000;
+        }
+    }
+}
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/config/FastGptPlatformConfig.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/config/FastGptPlatformConfig.java
new file mode 100644
index 0000000..fabd08c
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/config/FastGptPlatformConfig.java
@@ -0,0 +1,64 @@
+package org.dromara.ai.config;
+
+import jakarta.annotation.PostConstruct;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.ai.provider.AiProviderManager;
+import org.dromara.ai.provider.FastGptProvider;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Configuration;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Slf4j
+@Configuration
+@RequiredArgsConstructor
+@ConditionalOnProperty(prefix = "ruoyi.ai.ai-platform.fastgpt", name = "enabled", havingValue = "true")
+public class FastGptPlatformConfig {
+
+    private final AiProviderManager providerManager;
+
+    @Value("${ruoyi.ai.ai-platform.fastgpt.api-key:}")
+    private String apiKey;
+    @Value("${ruoyi.ai.ai-platform.fastgpt.base-url:}")
+    private String baseUrl;
+    @Value("${ruoyi.ai.ai-platform.fastgpt.default-app-id:}")
+    private String defaultAppId;
+    @Value("${ruoyi.ai.providers.fastgpt.supported-models[0]:fastgpt}")
+    private String supportedModel0;
+    @Value("${ruoyi.ai.external-ai.openai.timeout:60s}")
+    private String timeout;
+
+    @PostConstruct
+    public void register() {
+        if (apiKey == null || apiKey.isBlank() || baseUrl == null || baseUrl.isBlank() || defaultAppId == null || defaultAppId.isBlank()) {
+            log.warn("FastGPT 配置不完整，Provider 不注册");
+            return;
+        }
+        FastGptProvider provider = new FastGptProvider();
+        Map<String, Object> cfg = new HashMap<>();
+        cfg.put("api-key", apiKey);
+        cfg.put("base-url", baseUrl);
+        cfg.put("default-app-id", defaultAppId);
+        cfg.put("timeout-ms", parseTimeoutMs(timeout));
+        cfg.put("supported-models", List.of(supportedModel0));
+        provider.initialize(cfg);
+        providerManager.registerProvider(provider);
+        log.info("FastGPT Provider 已注册");
+    }
+
+    private int parseTimeoutMs(String t) {
+        try {
+            if (t == null || t.isBlank()) return 60000;
+            if (t.endsWith("ms")) return Integer.parseInt(t.substring(0, t.length() - 2));
+            if (t.endsWith("s")) return Integer.parseInt(t.substring(0, t.length() - 1)) * 1000;
+            if (t.endsWith("m")) return Integer.parseInt(t.substring(0, t.length() - 1)) * 60_000;
+            return Integer.parseInt(t);
+        } catch (Exception e) {
+            return 60000;
+        }
+    }
+}
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/config/OpenAiProviderConfig.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/config/OpenAiProviderConfig.java
new file mode 100644
index 0000000..498e513
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/config/OpenAiProviderConfig.java
@@ -0,0 +1,71 @@
+package org.dromara.ai.config;
+
+import jakarta.annotation.PostConstruct;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.ai.provider.AiProviderManager;
+import org.dromara.ai.provider.OpenAiProvider;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Configuration;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Slf4j
+@Configuration
+@RequiredArgsConstructor
+@ConditionalOnProperty(prefix = "ruoyi.ai.external-ai.openai", name = "enabled", havingValue = "true")
+public class OpenAiProviderConfig {
+
+    private final AiProviderManager providerManager;
+
+    @Value("${ruoyi.ai.external-ai.openai.api-key:}")
+    private String apiKey;
+
+    @Value("${ruoyi.ai.external-ai.openai.base-url:https://api.openai.com}")
+    private String baseUrl;
+
+    @Value("${ruoyi.ai.external-ai.openai.default-model:gpt-3.5-turbo}")
+    private String defaultModel;
+
+    @Value("${ruoyi.ai.providers.openai.supported-models[0]:gpt-3.5-turbo}")
+    private String supportedModel0;
+    @Value("${ruoyi.ai.providers.openai.supported-models[1]:gpt-4}")
+    private String supportedModel1;
+
+    @Value("${ruoyi.ai.external-ai.openai.timeout:60s}")
+    private String timeout;
+
+    @PostConstruct
+    public void register() {
+        if (apiKey == null || apiKey.isBlank()) {
+            log.warn("OpenAI api-key 未配置，Provider 不注册");
+            return;
+        }
+        OpenAiProvider provider = new OpenAiProvider();
+        Map<String, Object> cfg = new HashMap<>();
+        cfg.put("api-key", apiKey);
+        cfg.put("base-url", baseUrl);
+        cfg.put("default-model", defaultModel);
+        cfg.put("timeout-ms", parseTimeoutMs(timeout));
+        cfg.put("supported-models", List.of(supportedModel0, supportedModel1));
+        provider.initialize(cfg);
+        providerManager.registerProvider(provider);
+        log.info("OpenAI Provider 已注册");
+    }
+
+    private int parseTimeoutMs(String t) {
+        try {
+            if (t == null || t.isBlank()) return 60000;
+            if (t.endsWith("ms")) return Integer.parseInt(t.substring(0, t.length() - 2));
+            if (t.endsWith("s")) return Integer.parseInt(t.substring(0, t.length() - 1)) * 1000;
+            if (t.endsWith("m")) return Integer.parseInt(t.substring(0, t.length() - 1)) * 60_000;
+            return Integer.parseInt(t);
+        } catch (Exception e) {
+            return 60000;
+        }
+    }
+}
+
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/config/QwenProviderConfig.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/config/QwenProviderConfig.java
new file mode 100644
index 0000000..1a96f80
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/config/QwenProviderConfig.java
@@ -0,0 +1,66 @@
+package org.dromara.ai.config;
+
+import jakarta.annotation.PostConstruct;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.ai.provider.AiProviderManager;
+import org.dromara.ai.provider.QwenProvider;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Configuration;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Slf4j
+@Configuration
+@RequiredArgsConstructor
+@ConditionalOnProperty(prefix = "ruoyi.ai.external-ai.qwen", name = "enabled", havingValue = "true")
+public class QwenProviderConfig {
+
+    private final AiProviderManager providerManager;
+
+    @Value("${ruoyi.ai.external-ai.qwen.api-key:}")
+    private String apiKey;
+    @Value("${ruoyi.ai.external-ai.qwen.base-url:https://dashscope.aliyuncs.com}")
+    private String baseUrl;
+    @Value("${ruoyi.ai.providers.qwen.default-model:qwen-turbo}")
+    private String defaultModel;
+    @Value("${ruoyi.ai.providers.qwen.supported-models[0]:qwen-turbo}")
+    private String supportedModel0;
+    @Value("${ruoyi.ai.providers.qwen.supported-models[1]:qwen-plus}")
+    private String supportedModel1;
+    @Value("${ruoyi.ai.external-ai.openai.timeout:60s}")
+    private String timeout;
+
+    @PostConstruct
+    public void register() {
+        if (apiKey == null || apiKey.isBlank()) {
+            log.warn("Qwen api-key 未配置，Provider 不注册");
+            return;
+        }
+        QwenProvider provider = new QwenProvider();
+        Map<String, Object> cfg = new HashMap<>();
+        cfg.put("api-key", apiKey);
+        cfg.put("base-url", baseUrl);
+        cfg.put("default-model", defaultModel);
+        cfg.put("timeout-ms", parseTimeoutMs(timeout));
+        cfg.put("supported-models", List.of(supportedModel0, supportedModel1));
+        provider.initialize(cfg);
+        providerManager.registerProvider(provider);
+        log.info("Qwen Provider 已注册");
+    }
+
+    private int parseTimeoutMs(String t) {
+        try {
+            if (t == null || t.isBlank()) return 60000;
+            if (t.endsWith("ms")) return Integer.parseInt(t.substring(0, t.length() - 2));
+            if (t.endsWith("s")) return Integer.parseInt(t.substring(0, t.length() - 1)) * 1000;
+            if (t.endsWith("m")) return Integer.parseInt(t.substring(0, t.length() - 1)) * 60_000;
+            return Integer.parseInt(t);
+        } catch (Exception e) {
+            return 60000;
+        }
+    }
+}
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/config/ZhipuAiProviderConfig.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/config/ZhipuAiProviderConfig.java
new file mode 100644
index 0000000..b1d93b9
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/config/ZhipuAiProviderConfig.java
@@ -0,0 +1,66 @@
+package org.dromara.ai.config;
+
+import jakarta.annotation.PostConstruct;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.ai.provider.AiProviderManager;
+import org.dromara.ai.provider.ZhipuAiProvider;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Configuration;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Slf4j
+@Configuration
+@RequiredArgsConstructor
+@ConditionalOnProperty(prefix = "ruoyi.ai.external-ai.zhipu", name = "enabled", havingValue = "true")
+public class ZhipuAiProviderConfig {
+
+    private final AiProviderManager providerManager;
+
+    @Value("${ruoyi.ai.external-ai.zhipu.api-key:}")
+    private String apiKey;
+    @Value("${ruoyi.ai.external-ai.zhipu.base-url:https://open.bigmodel.cn}")
+    private String baseUrl;
+    @Value("${ruoyi.ai.providers.zhipu.default-model:glm-4}")
+    private String defaultModel;
+    @Value("${ruoyi.ai.providers.zhipu.supported-models[0]:glm-4}")
+    private String supportedModel0;
+    @Value("${ruoyi.ai.providers.zhipu.supported-models[1]:glm-3-turbo}")
+    private String supportedModel1;
+    @Value("${ruoyi.ai.external-ai.openai.timeout:60s}")
+    private String timeout;
+
+    @PostConstruct
+    public void register() {
+        if (apiKey == null || apiKey.isBlank()) {
+            log.warn("ZhipuAI api-key 未配置，Provider 不注册");
+            return;
+        }
+        ZhipuAiProvider provider = new ZhipuAiProvider();
+        Map<String, Object> cfg = new HashMap<>();
+        cfg.put("api-key", apiKey);
+        cfg.put("base-url", baseUrl);
+        cfg.put("default-model", defaultModel);
+        cfg.put("timeout-ms", parseTimeoutMs(timeout));
+        cfg.put("supported-models", List.of(supportedModel0, supportedModel1));
+        provider.initialize(cfg);
+        providerManager.registerProvider(provider);
+        log.info("ZhipuAI Provider 已注册");
+    }
+
+    private int parseTimeoutMs(String t) {
+        try {
+            if (t == null || t.isBlank()) return 60000;
+            if (t.endsWith("ms")) return Integer.parseInt(t.substring(0, t.length() - 2));
+            if (t.endsWith("s")) return Integer.parseInt(t.substring(0, t.length() - 1)) * 1000;
+            if (t.endsWith("m")) return Integer.parseInt(t.substring(0, t.length() - 1)) * 60_000;
+            return Integer.parseInt(t);
+        } catch (Exception e) {
+            return 60000;
+        }
+    }
+}
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/controller/admin/AdminAiChatRecordController.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/controller/admin/AdminAiChatRecordController.java
new file mode 100644
index 0000000..631204f
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/controller/admin/AdminAiChatRecordController.java
@@ -0,0 +1,102 @@
+package org.dromara.ai.controller.admin;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.ai.domain.bo.AiChatRecordBo;
+import org.dromara.ai.domain.vo.AiChatRecordVo;
+import org.dromara.ai.service.AiChatRecordService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * AI聊天记录管理
+ *
+ * @author pengles
+ */
+@Tag(name = "管理端-AI聊天记录管理", description = "AI聊天记录管理接口")
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/ai/chat/record")
+public class AdminAiChatRecordController extends BaseController {
+
+    private final AiChatRecordService aiChatRecordService;
+
+    /**
+     * 查询AI聊天记录列表
+     */
+    @Operation(summary = "查询AI聊天记录列表", description = "分页查询AI聊天记录列表，支持多条件搜索")
+    @SaCheckPermission("ai:chat:record:list")
+    @GetMapping("/list")
+    public TableDataInfo<AiChatRecordVo> list(@Parameter(description = "聊天记录查询条件") AiChatRecordBo bo,
+                                               @Parameter(description = "分页参数") PageQuery pageQuery) {
+        return aiChatRecordService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出AI聊天记录列表
+     */
+    @Operation(summary = "导出AI聊天记录列表", description = "导出AI聊天记录到Excel")
+    @SaCheckPermission("ai:chat:record:export")
+    @Log(title = "AI聊天记录", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(@Parameter(description = "聊天记录查询条件") AiChatRecordBo bo,
+                       @Parameter(description = "响应对象") HttpServletResponse response) {
+        List<AiChatRecordVo> list = aiChatRecordService.queryList(bo);
+        ExcelUtil.exportExcel(list, "AI聊天记录", AiChatRecordVo.class, response);
+    }
+
+    /**
+     * 获取AI聊天记录详细信息
+     */
+    @Operation(summary = "获取AI聊天记录详情", description = "根据记录ID获取详细信息")
+    @SaCheckPermission("ai:chat:record:query")
+    @GetMapping("/{id}")
+    public R<AiChatRecordVo> getInfo(@Parameter(description = "记录ID", required = true)
+                                      @NotNull(message = "主键不能为空")
+                                      @PathVariable Long id) {
+        return R.ok(aiChatRecordService.queryById(id));
+    }
+
+    /**
+     * 批量删除AI聊天记录
+     */
+    @Operation(summary = "批量删除AI聊天记录", description = "根据ID数组批量删除AI聊天记录")
+    @SaCheckPermission("ai:chat:record:remove")
+    @Log(title = "AI聊天记录", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@Parameter(description = "记录ID数组", required = true)
+                           @NotNull(message = "主键不能为空")
+                           @PathVariable Long[] ids) {
+        return toAjax(aiChatRecordService.deleteWithValidByIds(Arrays.asList(ids), true));
+    }
+
+    /**
+     * 归档聊天记录（删除指定日期之前的记录）
+     */
+    @Operation(summary = "归档聊天记录", description = "删除指定日期之前的聊天记录")
+    @SaCheckPermission("ai:chat:record:remove")
+    @Log(title = "AI聊天记录归档", businessType = BusinessType.DELETE)
+    @PostMapping("/archive")
+    public R<Integer> archive(@Parameter(description = "归档日期（删除此日期之前的记录）", required = true)
+                               @RequestParam java.util.Date beforeDate) {
+        Integer count = aiChatRecordService.archiveChatRecords(beforeDate);
+        return R.ok(count);
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/controller/admin/AdminAiPaintingFavoriteController.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/controller/admin/AdminAiPaintingFavoriteController.java
new file mode 100644
index 0000000..50079b6
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/controller/admin/AdminAiPaintingFavoriteController.java
@@ -0,0 +1,89 @@
+package org.dromara.ai.controller.admin;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.ai.domain.bo.AiPaintingFavoriteBo;
+import org.dromara.ai.domain.vo.AiPaintingFavoriteVo;
+import org.dromara.ai.service.AiPaintingFavoriteService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * AI绘画作品收藏管理
+ *
+ * @author pengles
+ */
+@Tag(name = "管理端-AI绘画作品收藏管理", description = "AI绘画作品收藏管理接口")
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/ai/painting/favorite")
+public class AdminAiPaintingFavoriteController extends BaseController {
+
+    private final AiPaintingFavoriteService aiPaintingFavoriteService;
+
+    /**
+     * 查询AI绘画作品收藏列表
+     */
+    @Operation(summary = "查询AI绘画作品收藏列表", description = "分页查询AI绘画作品收藏列表，支持多条件搜索")
+    @SaCheckPermission("ai:painting:favorite:list")
+    @GetMapping("/list")
+    public TableDataInfo<AiPaintingFavoriteVo> list(@Parameter(description = "收藏查询条件") AiPaintingFavoriteBo bo,
+                                                      @Parameter(description = "分页参数") PageQuery pageQuery) {
+        return aiPaintingFavoriteService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出AI绘画作品收藏列表
+     */
+    @Operation(summary = "导出AI绘画作品收藏列表", description = "导出AI绘画作品收藏到Excel")
+    @SaCheckPermission("ai:painting:favorite:export")
+    @Log(title = "AI绘画作品收藏", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(@Parameter(description = "收藏查询条件") AiPaintingFavoriteBo bo,
+                       @Parameter(description = "响应对象") HttpServletResponse response) {
+        List<AiPaintingFavoriteVo> list = aiPaintingFavoriteService.queryList(bo);
+        ExcelUtil.exportExcel(list, "AI绘画作品收藏", AiPaintingFavoriteVo.class, response);
+    }
+
+    /**
+     * 获取AI绘画作品收藏详细信息
+     */
+    @Operation(summary = "获取AI绘画作品收藏详情", description = "根据收藏ID获取详细信息")
+    @SaCheckPermission("ai:painting:favorite:query")
+    @GetMapping("/{id}")
+    public R<AiPaintingFavoriteVo> getInfo(@Parameter(description = "收藏ID", required = true)
+                                            @NotNull(message = "主键不能为空")
+                                            @PathVariable Long id) {
+        return R.ok(aiPaintingFavoriteService.queryById(id));
+    }
+
+    /**
+     * 批量删除AI绘画作品收藏
+     */
+    @Operation(summary = "批量删除AI绘画作品收藏", description = "根据ID数组批量删除AI绘画作品收藏")
+    @SaCheckPermission("ai:painting:favorite:remove")
+    @Log(title = "AI绘画作品收藏", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@Parameter(description = "收藏ID数组", required = true)
+                           @NotNull(message = "主键不能为空")
+                           @PathVariable Long[] ids) {
+        return toAjax(aiPaintingFavoriteService.deleteWithValidByIds(Arrays.asList(ids), true));
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/controller/admin/AdminAiPaintingRecordController.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/controller/admin/AdminAiPaintingRecordController.java
new file mode 100644
index 0000000..4c13a00
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/controller/admin/AdminAiPaintingRecordController.java
@@ -0,0 +1,129 @@
+package org.dromara.ai.controller.admin;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.ai.domain.bo.AiPaintingRecordBo;
+import org.dromara.ai.domain.vo.AiPaintingRecordVo;
+import org.dromara.ai.service.AiPaintingRecordService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * AI绘画历史记录管理
+ *
+ * @author pengles
+ */
+@Tag(name = "管理端-AI绘画历史记录管理", description = "AI绘画历史记录管理接口")
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/ai/painting/record")
+public class AdminAiPaintingRecordController extends BaseController {
+
+    private final AiPaintingRecordService aiPaintingRecordService;
+
+    /**
+     * 查询AI绘画历史记录列表
+     */
+    @Operation(summary = "查询AI绘画历史记录列表", description = "分页查询AI绘画历史记录列表，支持多条件搜索")
+    @SaCheckPermission("ai:painting:record:list")
+    @GetMapping("/list")
+    public TableDataInfo<AiPaintingRecordVo> list(@Parameter(description = "绘画历史记录查询条件") AiPaintingRecordBo bo,
+                                                    @Parameter(description = "分页参数") PageQuery pageQuery) {
+        return aiPaintingRecordService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出AI绘画历史记录列表
+     */
+    @Operation(summary = "导出AI绘画历史记录列表", description = "导出AI绘画历史记录到Excel")
+    @SaCheckPermission("ai:painting:record:export")
+    @Log(title = "AI绘画历史记录", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(@Parameter(description = "绘画历史记录查询条件") AiPaintingRecordBo bo,
+                       @Parameter(description = "响应对象") HttpServletResponse response) {
+        List<AiPaintingRecordVo> list = aiPaintingRecordService.queryList(bo);
+        ExcelUtil.exportExcel(list, "AI绘画历史记录", AiPaintingRecordVo.class, response);
+    }
+
+    /**
+     * 获取AI绘画历史记录详细信息
+     */
+    @Operation(summary = "获取AI绘画历史记录详情", description = "根据记录ID获取详细信息")
+    @SaCheckPermission("ai:painting:record:query")
+    @GetMapping("/{id}")
+    public R<AiPaintingRecordVo> getInfo(@Parameter(description = "记录ID", required = true)
+                                          @NotNull(message = "主键不能为空")
+                                          @PathVariable Long id) {
+        return R.ok(aiPaintingRecordService.queryById(id));
+    }
+
+    /**
+     * 根据任务ID获取记录
+     */
+    @Operation(summary = "根据任务ID获取记录", description = "根据任务ID获取绘画记录")
+    @SaCheckPermission("ai:painting:record:query")
+    @GetMapping("/task/{taskId}")
+    public R<AiPaintingRecordVo> getByTaskId(@Parameter(description = "任务ID", required = true)
+                                               @NotNull(message = "任务ID不能为空")
+                                               @PathVariable String taskId) {
+        return R.ok(aiPaintingRecordService.queryByTaskId(taskId));
+    }
+
+    /**
+     * 批量删除AI绘画历史记录
+     */
+    @Operation(summary = "批量删除AI绘画历史记录", description = "根据ID数组批量删除AI绘画历史记录")
+    @SaCheckPermission("ai:painting:record:remove")
+    @Log(title = "AI绘画历史记录", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@Parameter(description = "记录ID数组", required = true)
+                           @NotNull(message = "主键不能为空")
+                           @PathVariable Long[] ids) {
+        return toAjax(aiPaintingRecordService.deleteWithValidByIds(Arrays.asList(ids), true));
+    }
+
+    /**
+     * 生成分享码
+     */
+    @Operation(summary = "生成分享码", description = "为指定的绘画作品生成分享码")
+    @SaCheckPermission("ai:painting:record:edit")
+    @Log(title = "AI绘画历史记录分享", businessType = BusinessType.UPDATE)
+    @PostMapping("/{id}/share")
+    public R<Map<String, String>> generateShareCode(@Parameter(description = "记录ID", required = true)
+                                                     @NotNull(message = "记录ID不能为空")
+                                                     @PathVariable Long id) {
+        String shareCode = aiPaintingRecordService.generateShareCode(id);
+        return R.ok(Map.of("shareCode", shareCode));
+    }
+
+    /**
+     * 取消分享
+     */
+    @Operation(summary = "取消分享", description = "取消指定绘画作品的分享")
+    @SaCheckPermission("ai:painting:record:edit")
+    @Log(title = "AI绘画历史记录取消分享", businessType = BusinessType.UPDATE)
+    @DeleteMapping("/{id}/share")
+    public R<Void> cancelShare(@Parameter(description = "记录ID", required = true)
+                                @NotNull(message = "记录ID不能为空")
+                                @PathVariable Long id) {
+        return toAjax(aiPaintingRecordService.cancelShare(id));
+    }
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/controller/admin/AdminAiPaintingTemplateController.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/controller/admin/AdminAiPaintingTemplateController.java
new file mode 100644
index 0000000..1a18507
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/controller/admin/AdminAiPaintingTemplateController.java
@@ -0,0 +1,112 @@
+package org.dromara.ai.controller.admin;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.ai.domain.bo.AiPaintingTemplateBo;
+import org.dromara.ai.domain.vo.AiPaintingTemplateVo;
+import org.dromara.ai.service.AiPaintingTemplateService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * AI绘画参数模板管理
+ *
+ * @author pengles
+ */
+@Tag(name = "管理端-AI绘画参数模板管理", description = "AI绘画参数模板管理接口")
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/ai/painting/template")
+public class AdminAiPaintingTemplateController extends BaseController {
+
+    private final AiPaintingTemplateService aiPaintingTemplateService;
+
+    /**
+     * 查询AI绘画参数模板列表
+     */
+    @Operation(summary = "查询AI绘画参数模板列表", description = "分页查询AI绘画参数模板列表，支持多条件搜索")
+    @SaCheckPermission("ai:painting:template:list")
+    @GetMapping("/list")
+    public TableDataInfo<AiPaintingTemplateVo> list(@Parameter(description = "模板查询条件") AiPaintingTemplateBo bo,
+                                                      @Parameter(description = "分页参数") PageQuery pageQuery) {
+        return aiPaintingTemplateService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出AI绘画参数模板列表
+     */
+    @Operation(summary = "导出AI绘画参数模板列表", description = "导出AI绘画参数模板到Excel")
+    @SaCheckPermission("ai:painting:template:export")
+    @Log(title = "AI绘画参数模板", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(@Parameter(description = "模板查询条件") AiPaintingTemplateBo bo,
+                       @Parameter(description = "响应对象") HttpServletResponse response) {
+        List<AiPaintingTemplateVo> list = aiPaintingTemplateService.queryList(bo);
+        ExcelUtil.exportExcel(list, "AI绘画参数模板", AiPaintingTemplateVo.class, response);
+    }
+
+    /**
+     * 获取AI绘画参数模板详细信息
+     */
+    @Operation(summary = "获取AI绘画参数模板详情", description = "根据模板ID获取详细信息")
+    @SaCheckPermission("ai:painting:template:query")
+    @GetMapping("/{id}")
+    public R<AiPaintingTemplateVo> getInfo(@Parameter(description = "模板ID", required = true)
+                                            @NotNull(message = "主键不能为空")
+                                            @PathVariable Long id) {
+        return R.ok(aiPaintingTemplateService.queryById(id));
+    }
+
+    /**
+     * 新增AI绘画参数模板
+     */
+    @Operation(summary = "新增AI绘画参数模板", description = "新增AI绘画参数模板")
+    @SaCheckPermission("ai:painting:template:add")
+    @Log(title = "AI绘画参数模板", businessType = BusinessType.INSERT)
+    @PostMapping
+    public R<Void> add(@Valid @RequestBody AiPaintingTemplateBo bo) {
+        return toAjax(aiPaintingTemplateService.insertByBo(bo));
+    }
+
+    /**
+     * 修改AI绘画参数模板
+     */
+    @Operation(summary = "修改AI绘画参数模板", description = "修改AI绘画参数模板")
+    @SaCheckPermission("ai:painting:template:edit")
+    @Log(title = "AI绘画参数模板", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public R<Void> edit(@Valid @RequestBody AiPaintingTemplateBo bo) {
+        return toAjax(aiPaintingTemplateService.updateByBo(bo));
+    }
+
+    /**
+     * 批量删除AI绘画参数模板
+     */
+    @Operation(summary = "批量删除AI绘画参数模板", description = "根据ID数组批量删除AI绘画参数模板")
+    @SaCheckPermission("ai:painting:template:remove")
+    @Log(title = "AI绘画参数模板", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@Parameter(description = "模板ID数组", required = true)
+                           @NotNull(message = "主键不能为空")
+                           @PathVariable Long[] ids) {
+        return toAjax(aiPaintingTemplateService.deleteWithValidByIds(Arrays.asList(ids), true));
+    }
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/controller/admin/AdminAiProviderConfigController.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/controller/admin/AdminAiProviderConfigController.java
new file mode 100644
index 0000000..489c414
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/controller/admin/AdminAiProviderConfigController.java
@@ -0,0 +1,138 @@
+package org.dromara.ai.controller.admin;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.ai.domain.bo.AiProviderConfigBo;
+import org.dromara.ai.domain.vo.AiProviderConfigVo;
+import org.dromara.ai.service.AiProviderConfigService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * AI Provider配置管理
+ *
+ * @author pengles
+ */
+@Tag(name = "管理端-AI Provider配置管理", description = "AI Provider配置管理接口")
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/ai/provider/config")
+public class AdminAiProviderConfigController extends BaseController {
+
+    private final AiProviderConfigService aiProviderConfigService;
+
+    /**
+     * 查询AI Provider配置列表
+     */
+    @Operation(summary = "查询AI Provider配置列表", description = "分页查询AI Provider配置列表，支持多条件搜索")
+    @SaCheckPermission("ai:provider:config:list")
+    @GetMapping("/list")
+    public TableDataInfo<AiProviderConfigVo> list(@Parameter(description = "Provider配置查询条件") AiProviderConfigBo bo,
+                                                   @Parameter(description = "分页参数") PageQuery pageQuery) {
+        return aiProviderConfigService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出AI Provider配置列表
+     */
+    @Operation(summary = "导出AI Provider配置列表", description = "导出AI Provider配置到Excel")
+    @SaCheckPermission("ai:provider:config:export")
+    @Log(title = "AI Provider配置", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(@Parameter(description = "Provider配置查询条件") AiProviderConfigBo bo,
+                       @Parameter(description = "响应对象") HttpServletResponse response) {
+        List<AiProviderConfigVo> list = aiProviderConfigService.queryList(bo);
+        ExcelUtil.exportExcel(list, "AI Provider配置", AiProviderConfigVo.class, response);
+    }
+
+    /**
+     * 获取AI Provider配置详细信息
+     */
+    @Operation(summary = "获取AI Provider配置详情", description = "根据配置ID获取详细信息")
+    @SaCheckPermission("ai:provider:config:query")
+    @GetMapping("/{id}")
+    public R<AiProviderConfigVo> getInfo(@Parameter(description = "配置ID", required = true)
+                                          @NotNull(message = "主键不能为空")
+                                          @PathVariable Long id) {
+        return R.ok(aiProviderConfigService.queryById(id));
+    }
+
+    /**
+     * 新增AI Provider配置
+     */
+    @Operation(summary = "新增AI Provider配置", description = "新增AI Provider配置")
+    @SaCheckPermission("ai:provider:config:add")
+    @Log(title = "AI Provider配置", businessType = BusinessType.INSERT)
+    @PostMapping
+    public R<Void> add(@Validated @RequestBody AiProviderConfigBo bo) {
+        return toAjax(aiProviderConfigService.insertByBo(bo));
+    }
+
+    /**
+     * 修改AI Provider配置
+     */
+    @Operation(summary = "修改AI Provider配置", description = "修改AI Provider配置")
+    @SaCheckPermission("ai:provider:config:edit")
+    @Log(title = "AI Provider配置", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public R<Void> edit(@Validated @RequestBody AiProviderConfigBo bo) {
+        return toAjax(aiProviderConfigService.updateByBo(bo));
+    }
+
+    /**
+     * 批量删除AI Provider配置
+     */
+    @Operation(summary = "批量删除AI Provider配置", description = "根据ID数组批量删除AI Provider配置")
+    @SaCheckPermission("ai:provider:config:remove")
+    @Log(title = "AI Provider配置", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@Parameter(description = "配置ID数组", required = true)
+                           @NotNull(message = "主键不能为空")
+                           @PathVariable Long[] ids) {
+        return toAjax(aiProviderConfigService.deleteWithValidByIds(Arrays.asList(ids), true));
+    }
+
+    /**
+     * 启用/禁用Provider配置
+     */
+    @Operation(summary = "启用/禁用Provider配置", description = "启用或禁用AI Provider配置")
+    @SaCheckPermission("ai:provider:config:edit")
+    @Log(title = "AI Provider配置", businessType = BusinessType.UPDATE)
+    @PutMapping("/changeEnabled")
+    public R<Void> changeEnabled(@Parameter(description = "配置ID", required = true)
+                                  @NotNull(message = "配置ID不能为空")
+                                  @RequestParam Long id,
+                                  @Parameter(description = "启用状态(0=禁用 1=启用)", required = true)
+                                  @NotNull(message = "启用状态不能为空")
+                                  @RequestParam Integer enabled) {
+        return toAjax(aiProviderConfigService.changeEnabled(id, enabled));
+    }
+
+    /**
+     * 根据Provider名称查询配置
+     */
+    @Operation(summary = "根据Provider名称查询配置", description = "根据Provider名称获取配置信息")
+    @SaCheckPermission("ai:provider:config:query")
+    @GetMapping("/name/{providerName}")
+    public R<AiProviderConfigVo> getByProviderName(@Parameter(description = "Provider名称", required = true)
+                                                     @PathVariable String providerName) {
+        return R.ok(aiProviderConfigService.queryByProviderName(providerName));
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/controller/admin/AdminAiProviderConfigHistoryController.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/controller/admin/AdminAiProviderConfigHistoryController.java
new file mode 100644
index 0000000..c59e3fd
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/controller/admin/AdminAiProviderConfigHistoryController.java
@@ -0,0 +1,101 @@
+package org.dromara.ai.controller.admin;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.ai.domain.bo.AiProviderConfigHistoryBo;
+import org.dromara.ai.domain.vo.AiProviderConfigHistoryVo;
+import org.dromara.ai.service.AiProviderConfigHistoryService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * AI Provider配置历史管理
+ *
+ * @author pengles
+ */
+@Tag(name = "管理端-AI Provider配置历史管理", description = "AI Provider配置历史管理接口")
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/ai/provider/config/history")
+public class AdminAiProviderConfigHistoryController extends BaseController {
+
+    private final AiProviderConfigHistoryService aiProviderConfigHistoryService;
+
+    /**
+     * 查询AI Provider配置历史列表
+     */
+    @Operation(summary = "查询AI Provider配置历史列表", description = "分页查询AI Provider配置历史列表，支持多条件搜索")
+    @SaCheckPermission("ai:provider:config:history:list")
+    @GetMapping("/list")
+    public TableDataInfo<AiProviderConfigHistoryVo> list(@Parameter(description = "配置历史查询条件") AiProviderConfigHistoryBo bo,
+                                                          @Parameter(description = "分页参数") PageQuery pageQuery) {
+        return aiProviderConfigHistoryService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出AI Provider配置历史列表
+     */
+    @Operation(summary = "导出AI Provider配置历史列表", description = "导出AI Provider配置历史到Excel")
+    @SaCheckPermission("ai:provider:config:history:export")
+    @Log(title = "AI Provider配置历史", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(@Parameter(description = "配置历史查询条件") AiProviderConfigHistoryBo bo,
+                       @Parameter(description = "响应对象") HttpServletResponse response) {
+        List<AiProviderConfigHistoryVo> list = aiProviderConfigHistoryService.queryList(bo);
+        ExcelUtil.exportExcel(list, "AI Provider配置历史", AiProviderConfigHistoryVo.class, response);
+    }
+
+    /**
+     * 获取AI Provider配置历史详细信息
+     */
+    @Operation(summary = "获取AI Provider配置历史详情", description = "根据记录ID获取详细信息")
+    @SaCheckPermission("ai:provider:config:history:query")
+    @GetMapping("/{id}")
+    public R<AiProviderConfigHistoryVo> getInfo(@Parameter(description = "记录ID", required = true)
+                                                 @NotNull(message = "主键不能为空")
+                                                 @PathVariable Long id) {
+        return R.ok(aiProviderConfigHistoryService.queryById(id));
+    }
+
+    /**
+     * 根据配置ID查询历史记录列表
+     */
+    @Operation(summary = "根据配置ID查询历史记录", description = "根据配置ID查询该配置的所有历史记录")
+    @SaCheckPermission("ai:provider:config:history:query")
+    @GetMapping("/config/{configId}")
+    public R<List<AiProviderConfigHistoryVo>> getHistoryByConfigId(@Parameter(description = "配置ID", required = true)
+                                                                    @NotNull(message = "配置ID不能为空")
+                                                                    @PathVariable Long configId) {
+        return R.ok(aiProviderConfigHistoryService.queryByConfigId(configId));
+    }
+
+    /**
+     * 批量删除AI Provider配置历史
+     */
+    @Operation(summary = "批量删除AI Provider配置历史", description = "根据ID数组批量删除AI Provider配置历史")
+    @SaCheckPermission("ai:provider:config:history:remove")
+    @Log(title = "AI Provider配置历史", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@Parameter(description = "记录ID数组", required = true)
+                          @NotNull(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(aiProviderConfigHistoryService.deleteWithValidByIds(Arrays.asList(ids), true));
+    }
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/controller/admin/AdminAiProviderController.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/controller/admin/AdminAiProviderController.java
new file mode 100644
index 0000000..a2c1860
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/controller/admin/AdminAiProviderController.java
@@ -0,0 +1,170 @@
+package org.dromara.ai.controller.admin;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.ai.monitor.AiMonitorService;
+import org.dromara.ai.provider.AiProvider;
+import org.dromara.ai.provider.AiProviderManager;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.web.core.BaseController;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * AI提供商管理
+ *
+ * @author pengles
+ */
+@Tag(name = "管理端-AI提供商管理", description = "AI提供商管理和监控接口")
+@Slf4j
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/ai/provider")
+public class AdminAiProviderController extends BaseController {
+    
+    private final AiProviderManager providerManager;
+    private final AiMonitorService monitorService;
+
+    /**
+     * 获取所有提供商列表
+     */
+    @Operation(summary = "提供商列表", description = "获取所有已注册的AI服务提供商信息")
+    @SaCheckPermission("ai:provider:list")
+    @GetMapping("/list")
+    public R<List<Map<String, Object>>> list() {
+        try {
+            List<Map<String, Object>> items = providerManager.getAllProviders().stream().map(p -> Map.of(
+                    "name", p.getProviderName(),
+                    "type", p.getProviderType().getCode(),
+                    "version", p.getVersion(),
+                    "available", p.isAvailable(),
+                    "statistics", p.getStatistics()
+            )).collect(Collectors.toList());
+            log.debug("获取提供商列表，共{}个提供商", items.size());
+            return R.ok(items);
+        } catch (Exception e) {
+            log.error("获取提供商列表失败", e);
+            return R.fail("获取提供商列表失败: " + e.getMessage());
+        }
+    }
+
+    /**
+     * 获取支持的模型列表
+     */
+    @Operation(summary = "支持的模型列表", description = "获取所有提供商支持的所有模型信息")
+    @SaCheckPermission("ai:provider:list")
+    @GetMapping("/models")
+    public R<List<Object>> models() {
+        try {
+            List<Object> models = providerManager.getAllSupportedModels().stream().map(m -> Map.of(
+                    "id", m.getId(),
+                    "name", m.getName(),
+                    "provider", m.getProvider(),
+                    "capabilities", m.getCapabilities(),
+                    "type", m.getType() != null ? m.getType().getCode() : null
+            )).collect(Collectors.toList());
+            log.debug("获取模型列表，共{}个模型", models.size());
+            return R.ok(models);
+        } catch (Exception e) {
+            log.error("获取模型列表失败", e);
+            return R.fail("获取模型列表失败: " + e.getMessage());
+        }
+    }
+
+    /**
+     * 获取默认提供商
+     */
+    @Operation(summary = "获取默认提供商", description = "获取当前系统默认的AI服务提供商")
+    @SaCheckPermission("ai:provider:query")
+    @GetMapping("/default")
+    public R<Map<String, Object>> getDefault() {
+        try {
+            AiProvider p = providerManager.getDefaultProvider();
+            if (p == null) {
+                log.warn("未设置默认提供商");
+                return R.fail("NO_DEFAULT_PROVIDER");
+            }
+            return R.ok(Map.of("name", p.getProviderName(), "version", p.getVersion(), "type", p.getProviderType().getCode()));
+        } catch (Exception e) {
+            log.error("获取默认提供商失败", e);
+            return R.fail("获取默认提供商失败: " + e.getMessage());
+        }
+    }
+
+    /**
+     * 设置默认提供商
+     */
+    @Operation(summary = "设置默认提供商", description = "设置系统默认的AI服务提供商")
+    @SaCheckPermission("ai:provider:edit")
+    @PostMapping("/setDefault")
+    public R<Void> setDefault(@Parameter(description = "提供商名称") @RequestParam String name) {
+        try {
+            providerManager.setDefaultProvider(name);
+            log.info("设置默认提供商: {}", name);
+            return R.ok();
+        } catch (Exception e) {
+            log.error("设置默认提供商失败: {}", name, e);
+            return R.fail("设置默认提供商失败: " + e.getMessage());
+        }
+    }
+
+    /**
+     * 获取系统统计信息
+     */
+    @Operation(summary = "系统统计", description = "获取系统级别的AI使用统计信息")
+    @SaCheckPermission("ai:provider:query")
+    @GetMapping("/stats/system")
+    public R<Map<String, Object>> getSystemStats() {
+        try {
+            Map<String, Object> stats = monitorService.getSystemStats();
+            return R.ok(stats);
+        } catch (Exception e) {
+            log.error("获取系统统计失败", e);
+            return R.fail("获取系统统计失败: " + e.getMessage());
+        }
+    }
+
+    /**
+     * 获取各Provider统计信息
+     */
+    @Operation(summary = "Provider统计", description = "获取所有Provider的使用统计信息")
+    @SaCheckPermission("ai:provider:query")
+    @GetMapping("/stats/providers")
+    public R<List<Map<String, Object>>> getProviderStats() {
+        try {
+            List<Map<String, Object>> stats = monitorService.getAllProviderStats();
+            return R.ok(stats);
+        } catch (Exception e) {
+            log.error("获取Provider统计失败", e);
+            return R.fail("获取Provider统计失败: " + e.getMessage());
+        }
+    }
+
+    /**
+     * 重置统计信息
+     */
+    @Operation(summary = "重置统计", description = "重置所有提供商的统计信息")
+    @SaCheckPermission("ai:provider:edit")
+    @PostMapping("/stats/reset")
+    public R<Void> resetStats() {
+        try {
+            monitorService.resetStats();
+            providerManager.resetAllStatistics();
+            log.info("重置统计信息成功");
+            return R.ok();
+        } catch (Exception e) {
+            log.error("重置统计失败", e);
+            return R.fail("重置统计失败: " + e.getMessage());
+        }
+    }
+}
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/controller/admin/AdminAiRatingRecordController.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/controller/admin/AdminAiRatingRecordController.java
new file mode 100644
index 0000000..c180d53
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/controller/admin/AdminAiRatingRecordController.java
@@ -0,0 +1,102 @@
+package org.dromara.ai.controller.admin;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.ai.domain.bo.AiRatingRecordBo;
+import org.dromara.ai.domain.vo.AiRatingRecordVo;
+import org.dromara.ai.service.AiRatingRecordService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * AI评价记录管理
+ *
+ * @author pengles
+ */
+@Tag(name = "管理端-AI评价记录管理", description = "AI评价记录管理接口")
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/ai/rating/record")
+public class AdminAiRatingRecordController extends BaseController {
+
+    private final AiRatingRecordService aiRatingRecordService;
+
+    /**
+     * 查询AI评价记录列表
+     */
+    @Operation(summary = "查询AI评价记录列表", description = "分页查询AI评价记录列表，支持多条件搜索")
+    @SaCheckPermission("ai:rating:record:list")
+    @GetMapping("/list")
+    public TableDataInfo<AiRatingRecordVo> list(@Parameter(description = "评价记录查询条件") AiRatingRecordBo bo,
+                                                 @Parameter(description = "分页参数") PageQuery pageQuery) {
+        return aiRatingRecordService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出AI评价记录列表
+     */
+    @Operation(summary = "导出AI评价记录列表", description = "导出AI评价记录到Excel")
+    @SaCheckPermission("ai:rating:record:export")
+    @Log(title = "AI评价记录", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(@Parameter(description = "评价记录查询条件") AiRatingRecordBo bo,
+                       @Parameter(description = "响应对象") HttpServletResponse response) {
+        List<AiRatingRecordVo> list = aiRatingRecordService.queryList(bo);
+        ExcelUtil.exportExcel(list, "AI评价记录", AiRatingRecordVo.class, response);
+    }
+
+    /**
+     * 获取AI评价记录详细信息
+     */
+    @Operation(summary = "获取AI评价记录详情", description = "根据记录ID获取详细信息")
+    @SaCheckPermission("ai:rating:record:query")
+    @GetMapping("/{id}")
+    public R<AiRatingRecordVo> getInfo(@Parameter(description = "记录ID", required = true)
+                                        @NotNull(message = "主键不能为空")
+                                        @PathVariable Long id) {
+        return R.ok(aiRatingRecordService.queryById(id));
+    }
+
+    /**
+     * 批量删除AI评价记录
+     */
+    @Operation(summary = "批量删除AI评价记录", description = "根据ID数组批量删除AI评价记录")
+    @SaCheckPermission("ai:rating:record:remove")
+    @Log(title = "AI评价记录", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@Parameter(description = "记录ID数组", required = true)
+                           @NotNull(message = "主键不能为空")
+                           @PathVariable Long[] ids) {
+        return toAjax(aiRatingRecordService.deleteWithValidByIds(Arrays.asList(ids), true));
+    }
+
+    /**
+     * 获取平均评分
+     */
+    @Operation(summary = "获取平均评分", description = "获取指定Provider的平均评分")
+    @SaCheckPermission("ai:rating:record:query")
+    @GetMapping("/average/{providerName}")
+    public R<Map<String, Object>> getAverageRating(@Parameter(description = "Provider名称", required = true)
+                                                     @PathVariable String providerName) {
+        Double averageRating = aiRatingRecordService.getAverageRating(providerName);
+        return R.ok(Map.of("providerName", providerName, "averageRating", averageRating));
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/controller/admin/AdminAiSensitiveWordController.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/controller/admin/AdminAiSensitiveWordController.java
new file mode 100644
index 0000000..a1f6488
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/controller/admin/AdminAiSensitiveWordController.java
@@ -0,0 +1,128 @@
+package org.dromara.ai.controller.admin;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.ai.domain.bo.AiSensitiveWordBo;
+import org.dromara.ai.domain.vo.AiSensitiveWordVo;
+import org.dromara.ai.service.AiSensitiveWordService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * AI敏感词管理
+ *
+ * @author pengles
+ */
+@Tag(name = "管理端-AI敏感词管理", description = "AI敏感词管理接口")
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/ai/sensitive/word")
+public class AdminAiSensitiveWordController extends BaseController {
+
+    private final AiSensitiveWordService aiSensitiveWordService;
+
+    /**
+     * 查询AI敏感词列表
+     */
+    @Operation(summary = "查询AI敏感词列表", description = "分页查询AI敏感词列表，支持多条件搜索")
+    @SaCheckPermission("ai:sensitive:word:list")
+    @GetMapping("/list")
+    public TableDataInfo<AiSensitiveWordVo> list(@Parameter(description = "敏感词查询条件") AiSensitiveWordBo bo,
+                                                  @Parameter(description = "分页参数") PageQuery pageQuery) {
+        return aiSensitiveWordService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出AI敏感词列表
+     */
+    @Operation(summary = "导出AI敏感词列表", description = "导出AI敏感词到Excel")
+    @SaCheckPermission("ai:sensitive:word:export")
+    @Log(title = "AI敏感词", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(@Parameter(description = "敏感词查询条件") AiSensitiveWordBo bo,
+                       @Parameter(description = "响应对象") HttpServletResponse response) {
+        List<AiSensitiveWordVo> list = aiSensitiveWordService.queryList(bo);
+        ExcelUtil.exportExcel(list, "AI敏感词", AiSensitiveWordVo.class, response);
+    }
+
+    /**
+     * 获取AI敏感词详细信息
+     */
+    @Operation(summary = "获取AI敏感词详情", description = "根据ID获取详细信息")
+    @SaCheckPermission("ai:sensitive:word:query")
+    @GetMapping("/{id}")
+    public R<AiSensitiveWordVo> getInfo(@Parameter(description = "敏感词ID", required = true)
+                                         @NotNull(message = "主键不能为空")
+                                         @PathVariable Long id) {
+        return R.ok(aiSensitiveWordService.queryById(id));
+    }
+
+    /**
+     * 新增AI敏感词
+     */
+    @Operation(summary = "新增AI敏感词", description = "新增AI敏感词")
+    @SaCheckPermission("ai:sensitive:word:add")
+    @Log(title = "AI敏感词", businessType = BusinessType.INSERT)
+    @PostMapping
+    public R<Void> add(@Valid @RequestBody AiSensitiveWordBo bo) {
+        return toAjax(aiSensitiveWordService.insertByBo(bo));
+    }
+
+    /**
+     * 修改AI敏感词
+     */
+    @Operation(summary = "修改AI敏感词", description = "修改AI敏感词")
+    @SaCheckPermission("ai:sensitive:word:edit")
+    @Log(title = "AI敏感词", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public R<Void> edit(@Valid @RequestBody AiSensitiveWordBo bo) {
+        return toAjax(aiSensitiveWordService.updateByBo(bo));
+    }
+
+    /**
+     * 批量删除AI敏感词
+     */
+    @Operation(summary = "批量删除AI敏感词", description = "根据ID数组批量删除AI敏感词")
+    @SaCheckPermission("ai:sensitive:word:remove")
+    @Log(title = "AI敏感词", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@Parameter(description = "敏感词ID数组", required = true)
+                           @NotNull(message = "主键不能为空")
+                           @PathVariable Long[] ids) {
+        return toAjax(aiSensitiveWordService.deleteWithValidByIds(Arrays.asList(ids), true));
+    }
+
+    /**
+     * 启用/禁用敏感词
+     */
+    @Operation(summary = "启用/禁用敏感词", description = "启用或禁用敏感词")
+    @SaCheckPermission("ai:sensitive:word:edit")
+    @Log(title = "AI敏感词", businessType = BusinessType.UPDATE)
+    @PutMapping("/changeEnabled")
+    public R<Void> changeEnabled(@Parameter(description = "敏感词ID", required = true)
+                                  @NotNull(message = "敏感词ID不能为空")
+                                  @RequestParam Long id,
+                                  @Parameter(description = "启用状态(0=禁用 1=启用)", required = true)
+                                  @NotNull(message = "启用状态不能为空")
+                                  @RequestParam Integer enabled) {
+        return toAjax(aiSensitiveWordService.changeEnabled(id, enabled));
+    }
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/controller/admin/AdminAiUsageStatsController.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/controller/admin/AdminAiUsageStatsController.java
new file mode 100644
index 0000000..5c8a2c2
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/controller/admin/AdminAiUsageStatsController.java
@@ -0,0 +1,129 @@
+package org.dromara.ai.controller.admin;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.ai.domain.bo.AiUsageStatsBo;
+import org.dromara.ai.domain.vo.AiUsageStatsVo;
+import org.dromara.ai.service.AiUsageStatsService;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * AI使用统计管理
+ *
+ * @author pengles
+ */
+@Tag(name = "管理端-AI使用统计管理", description = "AI使用统计管理接口")
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/ai/usage/stats")
+public class AdminAiUsageStatsController extends BaseController {
+
+    private final AiUsageStatsService aiUsageStatsService;
+
+    /**
+     * 查询AI使用统计列表
+     */
+    @Operation(summary = "查询AI使用统计列表", description = "分页查询AI使用统计列表，支持多条件搜索")
+    @SaCheckPermission("ai:usage:stats:list")
+    @GetMapping("/list")
+    public TableDataInfo<AiUsageStatsVo> list(@Parameter(description = "使用统计查询条件") AiUsageStatsBo bo,
+                                               @Parameter(description = "分页参数") PageQuery pageQuery) {
+        return aiUsageStatsService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出AI使用统计列表
+     */
+    @Operation(summary = "导出AI使用统计列表", description = "导出AI使用统计到Excel")
+    @SaCheckPermission("ai:usage:stats:export")
+    @Log(title = "AI使用统计", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(@Parameter(description = "使用统计查询条件") AiUsageStatsBo bo,
+                       @Parameter(description = "响应对象") HttpServletResponse response) {
+        List<AiUsageStatsVo> list = aiUsageStatsService.queryList(bo);
+        ExcelUtil.exportExcel(list, "AI使用统计", AiUsageStatsVo.class, response);
+    }
+
+    /**
+     * 获取AI使用统计详细信息
+     */
+    @Operation(summary = "获取AI使用统计详情", description = "根据统计ID获取详细信息")
+    @SaCheckPermission("ai:usage:stats:query")
+    @GetMapping("/{id}")
+    public R<AiUsageStatsVo> getInfo(@Parameter(description = "统计ID", required = true)
+                                      @NotNull(message = "主键不能为空")
+                                      @PathVariable Long id) {
+        return R.ok(aiUsageStatsService.queryById(id));
+    }
+
+    /**
+     * 获取汇总统计
+     */
+    @Operation(summary = "获取汇总统计", description = "获取指定时间范围内的汇总统计数据")
+    @SaCheckPermission("ai:usage:stats:query")
+    @GetMapping("/summary")
+    public R<Map<String, Object>> getSummary(
+            @Parameter(description = "开始日期") @DateTimeFormat(pattern = "yyyy-MM-dd") @RequestParam(required = false) Date startDate,
+            @Parameter(description = "结束日期") @DateTimeFormat(pattern = "yyyy-MM-dd") @RequestParam(required = false) Date endDate) {
+        return R.ok(aiUsageStatsService.getSummaryStats(startDate, endDate));
+    }
+
+    /**
+     * 获取用户统计
+     */
+    @Operation(summary = "获取用户统计", description = "获取指定用户的统计数据")
+    @SaCheckPermission("ai:usage:stats:query")
+    @GetMapping("/user/{userId}")
+    public R<Map<String, Object>> getUserStats(
+            @Parameter(description = "用户ID", required = true) @PathVariable @NotNull Long userId,
+            @Parameter(description = "开始日期") @DateTimeFormat(pattern = "yyyy-MM-dd") @RequestParam(required = false) Date startDate,
+            @Parameter(description = "结束日期") @DateTimeFormat(pattern = "yyyy-MM-dd") @RequestParam(required = false) Date endDate) {
+        return R.ok(aiUsageStatsService.getUserStats(userId, startDate, endDate));
+    }
+
+    /**
+     * 获取Provider统计
+     */
+    @Operation(summary = "获取Provider统计", description = "获取指定Provider的统计数据")
+    @SaCheckPermission("ai:usage:stats:query")
+    @GetMapping("/provider/{providerName}")
+    public R<Map<String, Object>> getProviderStats(
+            @Parameter(description = "Provider名称", required = true) @PathVariable @NotNull String providerName,
+            @Parameter(description = "开始日期") @DateTimeFormat(pattern = "yyyy-MM-dd") @RequestParam(required = false) Date startDate,
+            @Parameter(description = "结束日期") @DateTimeFormat(pattern = "yyyy-MM-dd") @RequestParam(required = false) Date endDate) {
+        return R.ok(aiUsageStatsService.getProviderStats(providerName, startDate, endDate));
+    }
+
+    /**
+     * 获取趋势数据
+     */
+    @Operation(summary = "获取趋势数据", description = "获取指定时间范围内的趋势数据（支持按日/周/月分组）")
+    @SaCheckPermission("ai:usage:stats:query")
+    @GetMapping("/trend")
+    public R<List<Map<String, Object>>> getTrend(
+            @Parameter(description = "开始日期") @DateTimeFormat(pattern = "yyyy-MM-dd") @RequestParam(required = false) Date startDate,
+            @Parameter(description = "结束日期") @DateTimeFormat(pattern = "yyyy-MM-dd") @RequestParam(required = false) Date endDate,
+            @Parameter(description = "分组方式（day/week/month）") @RequestParam(defaultValue = "day") String groupBy) {
+        return R.ok(aiUsageStatsService.getTrendData(startDate, endDate, groupBy));
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/controller/admin/AdminAiUserQuotaController.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/controller/admin/AdminAiUserQuotaController.java
new file mode 100644
index 0000000..435cb01
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/controller/admin/AdminAiUserQuotaController.java
@@ -0,0 +1,139 @@
+package org.dromara.ai.controller.admin;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.ai.domain.bo.AiUserQuotaBo;
+import org.dromara.ai.domain.vo.AiUserQuotaVo;
+import org.dromara.ai.service.AiUserQuotaService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * AI用户配额管理
+ *
+ * @author pengles
+ */
+@Tag(name = "管理端-AI用户配额管理", description = "AI用户配额管理接口")
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/ai/user/quota")
+public class AdminAiUserQuotaController extends BaseController {
+
+    private final AiUserQuotaService aiUserQuotaService;
+
+    /**
+     * 查询AI用户配额列表
+     */
+    @Operation(summary = "查询AI用户配额列表", description = "分页查询AI用户配额列表，支持多条件搜索")
+    @SaCheckPermission("ai:user:quota:list")
+    @GetMapping("/list")
+    public TableDataInfo<AiUserQuotaVo> list(@Parameter(description = "配额查询条件") AiUserQuotaBo bo,
+                                              @Parameter(description = "分页参数") PageQuery pageQuery) {
+        return aiUserQuotaService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出AI用户配额列表
+     */
+    @Operation(summary = "导出AI用户配额列表", description = "导出AI用户配额到Excel")
+    @SaCheckPermission("ai:user:quota:export")
+    @Log(title = "AI用户配额", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(@Parameter(description = "配额查询条件") AiUserQuotaBo bo,
+                       @Parameter(description = "响应对象") HttpServletResponse response) {
+        List<AiUserQuotaVo> list = aiUserQuotaService.queryList(bo);
+        ExcelUtil.exportExcel(list, "AI用户配额", AiUserQuotaVo.class, response);
+    }
+
+    /**
+     * 获取AI用户配额详细信息
+     */
+    @Operation(summary = "获取AI用户配额详情", description = "根据配额ID获取详细信息")
+    @SaCheckPermission("ai:user:quota:query")
+    @GetMapping("/{id}")
+    public R<AiUserQuotaVo> getInfo(@Parameter(description = "配额ID", required = true)
+                                     @NotNull(message = "主键不能为空")
+                                     @PathVariable Long id) {
+        return R.ok(aiUserQuotaService.queryById(id));
+    }
+
+    /**
+     * 根据用户ID获取配额信息
+     */
+    @Operation(summary = "根据用户ID获取配额信息", description = "根据用户ID获取配额信息")
+    @SaCheckPermission("ai:user:quota:query")
+    @GetMapping("/user/{userId}")
+    public R<AiUserQuotaVo> getByUserId(@Parameter(description = "用户ID", required = true)
+                                         @NotNull(message = "用户ID不能为空")
+                                         @PathVariable Long userId) {
+        return R.ok(aiUserQuotaService.queryByUserId(userId));
+    }
+
+    /**
+     * 新增AI用户配额
+     */
+    @Operation(summary = "新增AI用户配额", description = "新增AI用户配额")
+    @SaCheckPermission("ai:user:quota:add")
+    @Log(title = "AI用户配额", businessType = BusinessType.INSERT)
+    @PostMapping
+    public R<Void> add(@Valid @RequestBody AiUserQuotaBo bo) {
+        return toAjax(aiUserQuotaService.insertByBo(bo));
+    }
+
+    /**
+     * 修改AI用户配额
+     */
+    @Operation(summary = "修改AI用户配额", description = "修改AI用户配额")
+    @SaCheckPermission("ai:user:quota:edit")
+    @Log(title = "AI用户配额", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public R<Void> edit(@Valid @RequestBody AiUserQuotaBo bo) {
+        return toAjax(aiUserQuotaService.updateByBo(bo));
+    }
+
+    /**
+     * 批量删除AI用户配额
+     */
+    @Operation(summary = "批量删除AI用户配额", description = "根据ID数组批量删除AI用户配额")
+    @SaCheckPermission("ai:user:quota:remove")
+    @Log(title = "AI用户配额", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@Parameter(description = "配额ID数组", required = true)
+                           @NotNull(message = "主键不能为空")
+                           @PathVariable Long[] ids) {
+        return toAjax(aiUserQuotaService.deleteWithValidByIds(Arrays.asList(ids), true));
+    }
+
+    /**
+     * 重置用户配额
+     */
+    @Operation(summary = "重置用户配额", description = "重置用户的日配额或月配额")
+    @SaCheckPermission("ai:user:quota:edit")
+    @Log(title = "AI用户配额", businessType = BusinessType.UPDATE)
+    @PostMapping("/reset/{userId}")
+    public R<Void> resetQuota(@Parameter(description = "用户ID", required = true)
+                               @NotNull(message = "用户ID不能为空")
+                               @PathVariable Long userId,
+                               @Parameter(description = "重置类型(DAILY/MONTHLY)", required = true)
+                               @RequestParam String resetType) {
+        return toAjax(aiUserQuotaService.resetQuota(userId, resetType));
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/controller/admin/AdminSysModelController.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/controller/admin/AdminSysModelController.java
new file mode 100644
index 0000000..92336b2
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/controller/admin/AdminSysModelController.java
@@ -0,0 +1,87 @@
+package org.dromara.ai.controller.admin;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.dromara.ai.domain.dto.AiModelInfo;
+import org.dromara.ai.service.AiModelService;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.web.core.BaseController;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * 系统模型管理
+ *
+ * @author pengles
+ */
+@Tag(name = "管理端-系统模型管理", description = "系统模型管理接口")
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/system/model")
+public class AdminSysModelController extends BaseController {
+
+    private final AiModelService aiModelService;
+
+    /**
+     * 获取模型列表（用于前端下拉选择）
+     */
+    @Operation(summary = "获取模型列表", description = "获取所有可用模型列表，用于前端下拉选择")
+    @GetMapping("/modelList")
+    public R<List<Map<String, Object>>> modelList() {
+        List<AiModelInfo> models = aiModelService.getAllModels();
+        List<Map<String, Object>> data = models.stream()
+            .filter(m -> Boolean.TRUE.equals(m.getAvailable()))
+            .filter(m -> m.getStatus() == null || m.getStatus() == AiModelInfo.ModelStatus.AVAILABLE)
+            .map(this::toFrontendModel)
+            .collect(Collectors.toList());
+        return R.ok(data);
+    }
+
+    /**
+     * 根据分类获取模型列表
+     */
+    @Operation(summary = "根据分类获取模型列表", description = "根据类型或Provider分类获取模型列表")
+    @GetMapping("/list")
+    public R<List<Map<String, Object>>> listByCategory(
+            @Parameter(description = "分类（类型或Provider）") @RequestParam(required = false) String category) {
+        List<AiModelInfo> models = aiModelService.getAllModels();
+        List<Map<String, Object>> data = models.stream()
+            .filter(m -> {
+                if (category == null || category.isBlank()) return true;
+                boolean byType = m.getType() != null && category.equalsIgnoreCase(m.getType().getCode());
+                boolean byProvider = m.getProvider() != null && category.equalsIgnoreCase(m.getProvider());
+                return byType || byProvider;
+            })
+            .map(this::toFrontendModel)
+            .collect(Collectors.toList());
+        return R.ok(data);
+    }
+
+    /**
+     * 转换为前端模型格式
+     */
+    private Map<String, Object> toFrontendModel(AiModelInfo m) {
+        Map<String, Object> map = new LinkedHashMap<>();
+        map.put("modelName", m.getId());
+        map.put("modelDescribe", Optional.ofNullable(m.getDisplayName()).orElse(Optional.ofNullable(m.getName()).orElse(m.getId())));
+        List<String> caps = Optional.ofNullable(m.getCapabilities()).orElse(List.of())
+            .stream().map(AiModelInfo.ModelCapability::getCode).collect(Collectors.toList());
+        map.put("modelCapability", caps);
+        List<Map<String, String>> abilities = Optional.ofNullable(m.getCapabilities()).orElse(List.of())
+            .stream().map(c -> {
+                Map<String, String> a = new HashMap<>();
+                a.put("name", c.getCode());
+                a.put("description", c.getName());
+                return a;
+            }).collect(Collectors.toList());
+        map.put("modelAbilities", abilities);
+        return map;
+    }
+}
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/controller/app/AiAssistantController.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/controller/app/AiAssistantController.java
new file mode 100644
index 0000000..066d89c
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/controller/app/AiAssistantController.java
@@ -0,0 +1,75 @@
+package org.dromara.ai.controller.app;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.ai.domain.dto.AiChatResponse;
+import org.dromara.ai.service.AiCodingAssistantService;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+/**
+ * AI代码助手控制器
+ * 提供代码分析和项目脚手架生成功能
+ *
+ * @author pengles
+ */
+@Slf4j
+@RestController
+@RequestMapping("/ai/assistant")
+@RequiredArgsConstructor
+public class AiAssistantController {
+
+    private final AiCodingAssistantService assistantService;
+
+    /**
+     * AI代码分析
+     *
+     * @param code   代码内容
+     * @param model  模型名称（可选）
+     * @param userId 用户ID（可选）
+     * @param params 额外参数（可选）
+     * @return 分析结果
+     */
+    @PostMapping("/analyze")
+    @Log(title = "AI代码分析", businessType = BusinessType.OTHER)
+    public R<AiChatResponse> analyze(@RequestParam String code,
+                                     @RequestParam(required = false) String model,
+                                     @RequestParam(required = false) String userId,
+                                     @RequestBody(required = false) Map<String, Object> params) {
+        try {
+            AiChatResponse resp = assistantService.analyzeCode(code, model, params, userId);
+            return R.ok(resp);
+        } catch (Exception e) {
+            log.error("AI代码分析失败", e);
+            return R.fail("AI代码分析失败: " + e.getMessage());
+        }
+    }
+
+    /**
+     * AI项目脚手架生成
+     *
+     * @param appType 应用类型（如SpringBoot、Vue等）
+     * @param model   模型名称（可选）
+     * @param userId  用户ID（可选）
+     * @param options 选项参数（可选）
+     * @return 生成结果
+     */
+    @PostMapping("/scaffold")
+    @Log(title = "AI脚手架生成", businessType = BusinessType.OTHER)
+    public R<AiChatResponse> scaffold(@RequestParam String appType,
+                                      @RequestParam(required = false) String model,
+                                      @RequestParam(required = false) String userId,
+                                      @RequestBody(required = false) Map<String, Object> options) {
+        try {
+            AiChatResponse resp = assistantService.generateScaffold(appType, options, model, userId);
+            return R.ok(resp);
+        } catch (Exception e) {
+            log.error("AI脚手架生成失败", e);
+            return R.fail("AI脚手架生成失败: " + e.getMessage());
+        }
+    }
+}
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/controller/app/AiChatController.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/controller/app/AiChatController.java
new file mode 100644
index 0000000..83ca288
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/controller/app/AiChatController.java
@@ -0,0 +1,284 @@
+package org.dromara.ai.controller.app;
+
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.ai.domain.dto.AiChatRequest;
+import org.dromara.ai.domain.dto.AiChatResponse;
+import org.dromara.ai.service.AiChatService;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.web.core.BaseController;
+import org.springframework.http.MediaType;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * AI聊天控制器
+ * 提供AI聊天相关的REST API接口
+ *
+ * @author pengles
+ */
+@Slf4j
+@RestController
+@RequestMapping("/ai/chat")
+@RequiredArgsConstructor
+public class AiChatController extends BaseController {
+
+    private final AiChatService aiChatService;
+    private final org.dromara.ai.service.AiChatHistoryService chatHistoryService;
+
+    /**
+     * 同步聊天对话
+     *
+     * @param request 聊天请求
+     * @return 聊天响应
+     */
+    @PostMapping("/sync")
+    @Log(title = "AI聊天", businessType = BusinessType.OTHER)
+    public R<AiChatResponse> chat(@Validated @RequestBody AiChatRequest request) {
+        log.info("接收到AI聊天请求 - 用户: {}, 模型: {}", request.getUserId(), request.getModel());
+
+        try {
+            AiChatResponse response = aiChatService.chat(request);
+            return R.ok(response);
+        } catch (Exception e) {
+            log.error("AI聊天失败", e);
+            return R.fail("AI聊天失败: " + e.getMessage());
+        }
+    }
+
+    /**
+     * 异步聊天对话
+     *
+     * @param request 聊天请求
+     * @return 异步聊天响应
+     */
+    @PostMapping("/async")
+    @Log(title = "AI异步聊天", businessType = BusinessType.OTHER)
+    public R<CompletableFuture<AiChatResponse>> chatAsync(@Validated @RequestBody AiChatRequest request) {
+        log.info("接收到AI异步聊天请求 - 用户: {}, 模型: {}", request.getUserId(), request.getModel());
+
+        try {
+            CompletableFuture<AiChatResponse> future = aiChatService.chatAsync(request);
+            return R.ok(future);
+        } catch (Exception e) {
+            log.error("AI异步聊天启动失败", e);
+            return R.fail("AI异步聊天启动失败: " + e.getMessage());
+        }
+    }
+
+    /**
+     * 流式聊天对话 (SSE)
+     *
+     * @param request 聊天请求
+     * @return SSE流
+     */
+    @PostMapping(value = "/stream", produces = MediaType.TEXT_EVENT_STREAM_VALUE)
+    @Log(title = "AI流式聊天", businessType = BusinessType.OTHER)
+    public SseEmitter chatStream(@Validated @RequestBody AiChatRequest request) {
+        log.info("接收到AI流式聊天请求 - 用户: {}, 模型: {}", request.getUserId(), request.getModel());
+
+        SseEmitter emitter = new SseEmitter(TimeUnit.MINUTES.toMillis(10)); // 10分钟超时
+
+        try {
+            aiChatService.chatStream(request, new AiChatService.StreamCallback() {
+                @Override
+                public void onChunk(String chunk) {
+                    try {
+                        emitter.send(SseEmitter.event()
+                                .name("chunk")
+                                .data(chunk));
+                    } catch (IOException e) {
+                        log.error("发送SSE数据块失败", e);
+                        emitter.completeWithError(e);
+                    }
+                }
+
+                @Override
+                public void onComplete(AiChatResponse response) {
+                    try {
+                        emitter.send(SseEmitter.event()
+                                .name("complete")
+                                .data(response));
+                        emitter.complete();
+                    } catch (IOException e) {
+                        log.error("发送SSE完成事件失败", e);
+                        emitter.completeWithError(e);
+                    }
+                }
+
+                @Override
+                public void onError(Throwable error) {
+                    log.error("AI流式聊天失败", error);
+                    try {
+                        emitter.send(SseEmitter.event()
+                                .name("error")
+                                .data("AI流式聊天失败: " + error.getMessage()));
+                    } catch (IOException e) {
+                        log.error("发送SSE错误事件失败", e);
+                    }
+                    emitter.completeWithError(error);
+                }
+            });
+
+        } catch (Exception e) {
+            log.error("AI流式聊天启动失败", e);
+            emitter.completeWithError(e);
+        }
+
+        return emitter;
+    }
+
+    /**
+     * 流式聊天对话 (WebSocket风格的分块响应)
+     *
+     * @param request  聊天请求
+     * @param response HTTP响应
+     */
+    @PostMapping("/stream-chunks")
+    @Log(title = "AI流式聊天分块", businessType = BusinessType.OTHER)
+    public void chatStreamChunks(@Validated @RequestBody AiChatRequest request,
+                                 HttpServletResponse response) {
+        log.info("接收到AI流式聊天分块请求 - 用户: {}, 模型: {}", request.getUserId(), request.getModel());
+
+        response.setContentType("text/plain; charset=utf-8");
+        response.setHeader("Cache-Control", "no-cache");
+        response.setHeader("Connection", "keep-alive");
+
+        try {
+            aiChatService.chatStream(request, new AiChatService.StreamCallback() {
+                @Override
+                public void onChunk(String chunk) {
+                    try {
+                        response.getWriter().write(chunk);
+                        response.getWriter().flush();
+                    } catch (IOException e) {
+                        log.error("写入响应块失败", e);
+                    }
+                }
+
+                @Override
+                public void onComplete(AiChatResponse chatResponse) {
+                    try {
+                        response.getWriter().write("\n[DONE]\n");
+                        response.getWriter().flush();
+                        response.getWriter().close();
+                    } catch (IOException e) {
+                        log.error("完成响应写入失败", e);
+                    }
+                }
+
+                @Override
+                public void onError(Throwable error) {
+                    try {
+                        response.getWriter().write("\n[ERROR]: " + error.getMessage() + "\n");
+                        response.getWriter().flush();
+                        response.getWriter().close();
+                    } catch (IOException e) {
+                        log.error("写入错误响应失败", e);
+                    }
+                }
+            });
+
+        } catch (Exception e) {
+            log.error("AI流式聊天分块启动失败", e);
+            try {
+                response.getWriter().write("\n[ERROR]: " + e.getMessage() + "\n");
+                response.getWriter().flush();
+                response.getWriter().close();
+            } catch (IOException ioException) {
+                log.error("写入启动错误响应失败", ioException);
+            }
+        }
+    }
+
+    /**
+     * 批量聊天对话
+     *
+     * @param requests 聊天请求列表
+     * @return 批量聊天响应
+     */
+    @PostMapping("/batch")
+    @Log(title = "AI批量聊天", businessType = BusinessType.OTHER)
+    public R<List<AiChatResponse>> chatBatch(@Validated @RequestBody List<AiChatRequest> requests) {
+        log.info("接收到AI批量聊天请求 - 请求数量: {}", requests.size());
+
+        try {
+            List<CompletableFuture<AiChatResponse>> futures = aiChatService.chatBatch(requests);
+            List<AiChatResponse> responses = aiChatService.waitForBatchCompletion(futures);
+            return R.ok(responses);
+        } catch (Exception e) {
+            log.error("AI批量聊天失败", e);
+            return R.fail("AI批量聊天失败: " + e.getMessage());
+        }
+    }
+
+    /**
+     * 获取聊天历史
+     *
+     * @param sessionId 会话ID
+     * @param limit     限制数量
+     * @return 聊天历史
+     */
+    @GetMapping("/history/{sessionId}")
+    public R<List<AiChatRequest.AiMessage>> getChatHistory(
+            @PathVariable String sessionId,
+            @RequestParam(defaultValue = "50") Integer limit) {
+        log.info("获取聊天历史 - 会话: {}, 限制: {}", sessionId, limit);
+
+        try {
+            List<AiChatRequest.AiMessage> history = chatHistoryService.getHistory(sessionId, limit);
+            return R.ok(history);
+        } catch (Exception e) {
+            log.error("获取聊天历史失败", e);
+            return R.fail("获取聊天历史失败: " + e.getMessage());
+        }
+    }
+
+    /**
+     * 清除聊天历史
+     *
+     * @param sessionId 会话ID
+     * @return 操作结果
+     */
+    @DeleteMapping("/history/{sessionId}")
+    @Log(title = "清除聊天历史", businessType = BusinessType.DELETE)
+    public R<Void> clearChatHistory(@PathVariable String sessionId) {
+        log.info("清除聊天历史 - 会话: {}", sessionId);
+
+        try {
+            chatHistoryService.clearHistory(sessionId);
+            return R.ok();
+        } catch (Exception e) {
+            log.error("清除聊天历史失败", e);
+            return R.fail("清除聊天历史失败: " + e.getMessage());
+        }
+    }
+
+    /**
+     * 获取会话统计信息
+     *
+     * @param sessionId 会话ID
+     * @return 统计信息
+     */
+    @GetMapping("/stats/{sessionId}")
+    public R<org.dromara.ai.service.AiChatHistoryService.SessionStats> getSessionStats(@PathVariable String sessionId) {
+        log.info("获取会话统计 - 会话: {}", sessionId);
+
+        try {
+            org.dromara.ai.service.AiChatHistoryService.SessionStats stats = chatHistoryService.getSessionStats(sessionId);
+            return R.ok(stats);
+        } catch (Exception e) {
+            log.error("获取会话统计失败", e);
+            return R.fail("获取会话统计失败: " + e.getMessage());
+        }
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/controller/app/AiImageController.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/controller/app/AiImageController.java
new file mode 100644
index 0000000..7554834
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/controller/app/AiImageController.java
@@ -0,0 +1,207 @@
+package org.dromara.ai.controller.app;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Pattern;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import okhttp3.*;
+import org.dromara.common.core.domain.R;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.nio.charset.StandardCharsets;
+import java.util.Map;
+
+/**
+ * AI图像控制器
+ * 提供DALL·E-3图像生成、编辑和变体功能
+ *
+ * @author pengles
+ */
+@Slf4j
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping
+public class AiImageController {
+
+    @Value("${ruoyi.ai.external-ai.openai.base-url:https://api.openai.com}")
+    private String openaiBaseUrl;
+    @Value("${ruoyi.ai.external-ai.openai.api-key:}")
+    private String openaiApiKey;
+
+    private final OkHttpClient client = new OkHttpClient();
+
+    /**
+     * DALL·E-3 图像生成
+     *
+     * @param prompt 提示词
+     * @param size   分辨率 (512x512 或 1024x1024)
+     * @return 生成结果
+     */
+    @Operation(summary = "DALL·E-3 生成", description = "通过OpenAI DALL·E-3模型生成图像")
+    @PostMapping("/dall3")
+    public R<Map<String, Object>> dalle3(
+            @Parameter(description = "提示词") @RequestParam @NotBlank String prompt,
+            @Parameter(description = "分辨率") @RequestParam @Pattern(regexp = "^(512x512|1024x1024)$") String size) {
+        try {
+            log.info("DALL·E-3图像生成请求 - 提示词长度: {}, 分辨率: {}", prompt.length(), size);
+            
+            if (openaiApiKey == null || openaiApiKey.isBlank()) {
+                log.warn("OpenAI API Key未配置");
+                return R.fail("OpenAI API Key未配置");
+            }
+            
+            String url = normalize(openaiBaseUrl) + "/v1/images/generations";
+            String body = "{\"model\":\"dall-e-3\",\"prompt\":\"" + prompt.replace("\"", "\\\"") + "\",\"size\":\"" + size + "\"}";
+            Request.Builder b = new Request.Builder().url(url)
+                    .post(RequestBody.create(MediaType.parse("application/json"), body.getBytes(StandardCharsets.UTF_8)))
+                    .header("Authorization", "Bearer " + openaiApiKey);
+            try (Response resp = client.newCall(b.build()).execute()) {
+                if (!resp.isSuccessful()) {
+                    String errorBody = resp.body() != null ? resp.body().string() : "";
+                    log.error("DALL·E-3 API调用失败: {} - {}", resp.code(), errorBody);
+                    return R.fail("OpenAI调用失败: HTTP " + resp.code());
+                }
+                String respBody = resp.body() != null ? resp.body().string() : "{}";
+                log.info("DALL·E-3图像生成成功");
+                return R.ok(Map.of("raw", respBody));
+            }
+        } catch (Exception e) {
+            log.error("DALL·E-3图像生成失败", e);
+            return R.fail("OpenAI调用失败: " + e.getMessage());
+        }
+    }
+
+    /**
+     * DALL·E-3 图像编辑
+     *
+     * @param prompt 提示词
+     * @param size   分辨率 (512x512 或 1024x1024)
+     * @param image  原图文件
+     * @param mask   遮罩文件（可选）
+     * @return 编辑结果
+     */
+    @Operation(summary = "DALL·E-3 编辑", description = "上传原图与遮罩进行图像编辑")
+    @PostMapping("/dall3/edit")
+    public R<Map<String, Object>> dalle3Edit(
+            @Parameter(description = "提示词") @RequestParam @NotBlank String prompt,
+            @Parameter(description = "分辨率") @RequestParam @Pattern(regexp = "^(512x512|1024x1024)$") String size,
+            @Parameter(description = "原图") @RequestParam("image") MultipartFile image,
+            @Parameter(description = "遮罩") @RequestParam(value = "mask", required = false) MultipartFile mask) {
+        try {
+            log.info("DALL·E-3图像编辑请求 - 提示词长度: {}, 分辨率: {}, 图片: {}", 
+                    prompt.length(), size, image.getOriginalFilename());
+            
+            if (openaiApiKey == null || openaiApiKey.isBlank()) {
+                log.warn("OpenAI API Key未配置");
+                return R.fail("OpenAI API Key未配置");
+            }
+            
+            String url = normalize(openaiBaseUrl) + "/v1/images/edits";
+            MultipartBody.Builder mb = new MultipartBody.Builder().setType(MultipartBody.FORM)
+                    .addFormDataPart("model", "dall-e-3")
+                    .addFormDataPart("prompt", prompt)
+                    .addFormDataPart("size", size)
+                    .addFormDataPart("image", image.getOriginalFilename(), 
+                            RequestBody.create(MediaType.parse("application/octet-stream"), toBytes(image)));
+            if (mask != null && !mask.isEmpty()) {
+                mb.addFormDataPart("mask", mask.getOriginalFilename(), 
+                        RequestBody.create(MediaType.parse("application/octet-stream"), toBytes(mask)));
+            }
+            Request.Builder b = new Request.Builder().url(url)
+                    .post(mb.build())
+                    .header("Authorization", "Bearer " + openaiApiKey);
+            try (Response resp = client.newCall(b.build()).execute()) {
+                if (!resp.isSuccessful()) {
+                    String errorBody = resp.body() != null ? resp.body().string() : "";
+                    log.error("DALL·E-3编辑API调用失败: {} - {}", resp.code(), errorBody);
+                    return R.fail("OpenAI调用失败: HTTP " + resp.code());
+                }
+                String respBody = resp.body() != null ? resp.body().string() : "{}";
+                log.info("DALL·E-3图像编辑成功");
+                return R.ok(Map.of("raw", respBody));
+            }
+        } catch (Exception e) {
+            log.error("DALL·E-3图像编辑失败", e);
+            return R.fail("OpenAI调用失败: " + e.getMessage());
+        }
+    }
+
+    /**
+     * DALL·E-3 图像变体生成
+     *
+     * @param size  分辨率 (512x512 或 1024x1024)
+     * @param image 原图文件
+     * @return 变体生成结果
+     */
+    @Operation(summary = "DALL·E-3 变体", description = "上传原图生成图像变体")
+    @PostMapping("/dall3/variations")
+    public R<Map<String, Object>> dalle3Variations(
+            @Parameter(description = "分辨率") @RequestParam @Pattern(regexp = "^(512x512|1024x1024)$") String size,
+            @Parameter(description = "原图") @RequestParam("image") MultipartFile image) {
+        try {
+            log.info("DALL·E-3图像变体生成请求 - 分辨率: {}, 图片: {}", size, image.getOriginalFilename());
+            
+            if (openaiApiKey == null || openaiApiKey.isBlank()) {
+                log.warn("OpenAI API Key未配置");
+                return R.fail("OpenAI API Key未配置");
+            }
+            
+            String url = normalize(openaiBaseUrl) + "/v1/images/variations";
+            MultipartBody.Builder mb = new MultipartBody.Builder().setType(MultipartBody.FORM)
+                    .addFormDataPart("model", "dall-e-3")
+                    .addFormDataPart("size", size)
+                    .addFormDataPart("image", image.getOriginalFilename(), 
+                            RequestBody.create(MediaType.parse("application/octet-stream"), toBytes(image)));
+            Request.Builder b = new Request.Builder().url(url)
+                    .post(mb.build())
+                    .header("Authorization", "Bearer " + openaiApiKey);
+            try (Response resp = client.newCall(b.build()).execute()) {
+                if (!resp.isSuccessful()) {
+                    String errorBody = resp.body() != null ? resp.body().string() : "";
+                    log.error("DALL·E-3变体API调用失败: {} - {}", resp.code(), errorBody);
+                    return R.fail("OpenAI调用失败: HTTP " + resp.code());
+                }
+                String respBody = resp.body() != null ? resp.body().string() : "{}";
+                log.info("DALL·E-3图像变体生成成功");
+                return R.ok(Map.of("raw", respBody));
+            }
+        } catch (Exception e) {
+            log.error("DALL·E-3图像变体生成失败", e);
+            return R.fail("OpenAI调用失败: " + e.getMessage());
+        }
+    }
+
+    /**
+     * URL标准化（去除尾部斜杠）
+     */
+    private String normalize(String base) {
+        if (base == null || base.isBlank()) {
+            return "";
+        }
+        if (base.endsWith("/")) {
+            return base.substring(0, base.length() - 1);
+        }
+        return base;
+    }
+
+    /**
+     * 将MultipartFile转换为字节数组
+     */
+    private byte[] toBytes(MultipartFile f) {
+        try {
+            return f.getBytes();
+        } catch (Exception e) {
+            log.error("转换文件为字节数组失败: {}", f.getOriginalFilename(), e);
+            return new byte[0];
+        }
+    }
+}
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/controller/app/AiPaintingController.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/controller/app/AiPaintingController.java
new file mode 100644
index 0000000..b88fb30
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/controller/app/AiPaintingController.java
@@ -0,0 +1,117 @@
+package org.dromara.ai.controller.app;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.ai.painting.PaintingEngineType;
+import org.dromara.ai.painting.PaintingTask;
+import org.dromara.ai.service.AiPaintingService;
+import org.dromara.common.core.domain.R;
+import org.springframework.http.MediaType;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
+
+import java.util.Map;
+
+/**
+ * AI绘画控制器
+ * 提供统一的AI绘画任务管理和状态查询接口
+ *
+ * @author pengles
+ */
+@Slf4j
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/ai/painting")
+public class AiPaintingController {
+    
+    private final AiPaintingService paintingService;
+
+    /**
+     * 创建绘画任务
+     *
+     * @param body 请求体，包含engine（引擎类型）、prompt（提示词）、params（参数）
+     * @return 任务ID
+     */
+    @Operation(summary = "创建绘画任务", description = "创建一个新的AI绘画任务，支持多种绘画引擎")
+    @PostMapping("/task")
+    public R<Map<String, Object>> createTask(@RequestBody Map<String, Object> body) {
+        try {
+            String engine = String.valueOf(body.getOrDefault("engine", "DALL_E_3"));
+            String prompt = String.valueOf(body.getOrDefault("prompt", ""));
+            Map<String, Object> params = (Map<String, Object>) body.getOrDefault("params", Map.of());
+            
+            log.info("创建绘画任务 - 引擎: {}, 提示词长度: {}", engine, prompt.length());
+            
+            PaintingEngineType type = PaintingEngineType.valueOf(engine);
+            String taskId = paintingService.createTask(type, prompt, params);
+            
+            log.info("绘画任务创建成功 - 任务ID: {}", taskId);
+            return R.ok(Map.of("taskId", taskId));
+        } catch (IllegalArgumentException e) {
+            log.error("创建绘画任务失败 - 无效的引擎类型", e);
+            return R.fail("无效的引擎类型: " + e.getMessage());
+        } catch (Exception e) {
+            log.error("创建绘画任务失败", e);
+            return R.fail("创建任务失败: " + e.getMessage());
+        }
+    }
+
+    /**
+     * 查询任务状态
+     *
+     * @param taskId 任务ID
+     * @return 任务状态信息
+     */
+    @Operation(summary = "任务状态", description = "查询指定绘画任务的当前状态")
+    @GetMapping("/status/{taskId}")
+    public R<PaintingTask> status(
+            @Parameter(description = "任务ID", required = true)
+            @PathVariable("taskId") String taskId) {
+        try {
+            log.debug("查询绘画任务状态 - 任务ID: {}", taskId);
+            PaintingTask task = paintingService.getTask(taskId);
+            if (task == null) {
+                log.warn("绘画任务不存在 - 任务ID: {}", taskId);
+                return R.fail("TASK_NOT_FOUND");
+            }
+            return R.ok(task);
+        } catch (Exception e) {
+            log.error("查询绘画任务状态失败 - 任务ID: {}", taskId, e);
+            return R.fail("查询任务状态失败: " + e.getMessage());
+        }
+    }
+
+    /**
+     * 任务进度流（SSE）
+     *
+     * @param taskId 任务ID
+     * @return SSE事件流
+     */
+    @Operation(summary = "进度流", description = "通过SSE实时获取绘画任务的进度更新")
+    @GetMapping(value = "/stream/{taskId}", produces = MediaType.TEXT_EVENT_STREAM_VALUE)
+    public SseEmitter stream(
+            @Parameter(description = "任务ID", required = true)
+            @PathVariable("taskId") String taskId) {
+        try {
+            log.info("创建绘画任务进度流 - 任务ID: {}", taskId);
+            SseEmitter emitter = new SseEmitter(0L);
+            paintingService.addEmitter(taskId, emitter);
+            return emitter;
+        } catch (Exception e) {
+            log.error("创建绘画任务进度流失败 - 任务ID: {}", taskId, e);
+            SseEmitter emitter = new SseEmitter(0L);
+            try {
+                emitter.send(SseEmitter.event().name("error").data("创建进度流失败: " + e.getMessage()));
+                emitter.completeWithError(e);
+            } catch (Exception ex) {
+                log.error("发送错误事件失败", ex);
+            }
+            return emitter;
+        }
+    }
+}
+
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/controller/app/AppAiPaintingFavoriteController.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/controller/app/AppAiPaintingFavoriteController.java
new file mode 100644
index 0000000..4a15332
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/controller/app/AppAiPaintingFavoriteController.java
@@ -0,0 +1,82 @@
+package org.dromara.ai.controller.app;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.ai.domain.bo.AiPaintingFavoriteBo;
+import org.dromara.ai.domain.vo.AiPaintingFavoriteVo;
+import org.dromara.ai.service.AiPaintingFavoriteService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 用户端AI绘画作品收藏
+ *
+ * @author pengles
+ */
+@Tag(name = "用户端-AI绘画作品收藏", description = "用户端AI绘画作品收藏接口")
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/app/ai/painting/favorite")
+public class AppAiPaintingFavoriteController extends BaseController {
+
+    private final AiPaintingFavoriteService aiPaintingFavoriteService;
+
+    /**
+     * 查询当前用户的收藏列表
+     */
+    @Operation(summary = "查询当前用户的收藏列表", description = "查询当前登录用户的绘画作品收藏列表")
+    @GetMapping("/list")
+    public R<List<AiPaintingFavoriteVo>> getMyFavorites() {
+        Long userId = LoginHelper.getUserId();
+        List<AiPaintingFavoriteVo> list = aiPaintingFavoriteService.queryByUserId(userId);
+        return R.ok(list);
+    }
+
+    /**
+     * 收藏绘画作品
+     */
+    @Operation(summary = "收藏绘画作品", description = "收藏指定的绘画作品")
+    @PostMapping
+    public R<Void> addFavorite(@Valid @RequestBody AiPaintingFavoriteBo bo) {
+        // 自动设置用户ID
+        Long userId = LoginHelper.getUserId();
+        bo.setUserId(userId);
+        return toAjax(aiPaintingFavoriteService.insertByBo(bo));
+    }
+
+    /**
+     * 取消收藏
+     */
+    @Operation(summary = "取消收藏", description = "取消收藏指定的绘画作品")
+    @DeleteMapping("/{paintingRecordId}")
+    public R<Void> cancelFavorite(@Parameter(description = "绘画记录ID", required = true)
+                                   @NotNull(message = "绘画记录ID不能为空")
+                                   @PathVariable Long paintingRecordId) {
+        Long userId = LoginHelper.getUserId();
+        return toAjax(aiPaintingFavoriteService.cancelFavorite(userId, paintingRecordId));
+    }
+
+    /**
+     * 检查是否已收藏
+     */
+    @Operation(summary = "检查是否已收藏", description = "检查当前用户是否已收藏指定的绘画作品")
+    @GetMapping("/check/{paintingRecordId}")
+    public R<Boolean> checkFavorite(@Parameter(description = "绘画记录ID", required = true)
+                                     @NotNull(message = "绘画记录ID不能为空")
+                                     @PathVariable Long paintingRecordId) {
+        Long userId = LoginHelper.getUserId();
+        Boolean favorited = aiPaintingFavoriteService.isFavorited(userId, paintingRecordId);
+        return R.ok(favorited);
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/controller/app/AppAiPaintingRecordController.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/controller/app/AppAiPaintingRecordController.java
new file mode 100644
index 0000000..16ffa9e
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/controller/app/AppAiPaintingRecordController.java
@@ -0,0 +1,91 @@
+package org.dromara.ai.controller.app;
+
+import cn.dev33.satoken.annotation.SaIgnore;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.ai.domain.vo.AiPaintingRecordVo;
+import org.dromara.ai.service.AiPaintingRecordService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+/**
+ * 用户端AI绘画记录
+ *
+ * @author pengles
+ */
+@Tag(name = "用户端-AI绘画记录", description = "用户端AI绘画记录接口")
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/app/ai/painting/record")
+public class AppAiPaintingRecordController extends BaseController {
+
+    private final AiPaintingRecordService aiPaintingRecordService;
+
+    /**
+     * 生成分享码
+     */
+    @Operation(summary = "生成分享码", description = "为指定的绘画作品生成分享码")
+    @PostMapping("/{id}/share")
+    public R<Map<String, String>> generateShareCode(@Parameter(description = "记录ID", required = true)
+                                                     @NotNull(message = "记录ID不能为空")
+                                                     @PathVariable Long id) {
+        // 验证记录所有权
+        AiPaintingRecordVo record = aiPaintingRecordService.queryById(id);
+        if (record == null) {
+            return R.fail("绘画记录不存在");
+        }
+        Long userId = LoginHelper.getUserId();
+        if (!userId.equals(record.getUserId())) {
+            return R.fail("无权操作该记录");
+        }
+        String shareCode = aiPaintingRecordService.generateShareCode(id);
+        return R.ok(Map.of("shareCode", shareCode));
+    }
+
+    /**
+     * 取消分享
+     */
+    @Operation(summary = "取消分享", description = "取消指定绘画作品的分享")
+    @DeleteMapping("/{id}/share")
+    public R<Void> cancelShare(@Parameter(description = "记录ID", required = true)
+                                @NotNull(message = "记录ID不能为空")
+                                @PathVariable Long id) {
+        // 验证记录所有权
+        AiPaintingRecordVo record = aiPaintingRecordService.queryById(id);
+        if (record == null) {
+            return R.fail("绘画记录不存在");
+        }
+        Long userId = LoginHelper.getUserId();
+        if (!userId.equals(record.getUserId())) {
+            return R.fail("无权操作该记录");
+        }
+        return toAjax(aiPaintingRecordService.cancelShare(id));
+    }
+
+    /**
+     * 根据分享码查看作品（无需登录）
+     */
+    @Operation(summary = "根据分享码查看作品", description = "根据分享码查看公开分享的绘画作品，无需登录")
+    @SaIgnore
+    @GetMapping("/share/{shareCode}")
+    public R<AiPaintingRecordVo> getByShareCode(@Parameter(description = "分享码", required = true)
+                                                  @NotBlank(message = "分享码不能为空")
+                                                  @PathVariable String shareCode) {
+        AiPaintingRecordVo record = aiPaintingRecordService.queryByShareCode(shareCode);
+        if (record == null) {
+            return R.fail("分享码无效或作品已取消分享");
+        }
+        return R.ok(record);
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/controller/app/AppAiPaintingTemplateController.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/controller/app/AppAiPaintingTemplateController.java
new file mode 100644
index 0000000..842a07b
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/controller/app/AppAiPaintingTemplateController.java
@@ -0,0 +1,106 @@
+package org.dromara.ai.controller.app;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.ai.domain.bo.AiPaintingTemplateBo;
+import org.dromara.ai.domain.vo.AiPaintingTemplateVo;
+import org.dromara.ai.service.AiPaintingTemplateService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 用户端AI绘画参数模板
+ *
+ * @author pengles
+ */
+@Tag(name = "用户端-AI绘画参数模板", description = "用户端AI绘画参数模板接口")
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/app/ai/painting/template")
+public class AppAiPaintingTemplateController extends BaseController {
+
+    private final AiPaintingTemplateService aiPaintingTemplateService;
+
+    /**
+     * 查询可用的模板列表
+     */
+    @Operation(summary = "查询可用的模板列表", description = "根据引擎类型查询可用的模板列表（公开模板 + 用户私有模板）")
+    @GetMapping("/list/{engineType}")
+    public R<List<AiPaintingTemplateVo>> getAvailableTemplates(@Parameter(description = "引擎类型", required = true)
+                                                                 @PathVariable String engineType) {
+        Long userId = null;
+        try {
+            userId = LoginHelper.getUserId();
+        } catch (Exception e) {
+            // 未登录用户只能看到公开模板
+        }
+        List<AiPaintingTemplateVo> list = aiPaintingTemplateService.queryAvailableTemplates(engineType, userId);
+        return R.ok(list);
+    }
+
+    /**
+     * 获取模板详情
+     */
+    @Operation(summary = "获取模板详情", description = "根据模板ID获取详细信息")
+    @GetMapping("/{id}")
+    public R<AiPaintingTemplateVo> getInfo(@Parameter(description = "模板ID", required = true)
+                                            @PathVariable Long id) {
+        return R.ok(aiPaintingTemplateService.queryById(id));
+    }
+
+    /**
+     * 新增用户私有模板
+     */
+    @Operation(summary = "新增用户私有模板", description = "新增用户私有绘画参数模板")
+    @PostMapping
+    public R<Void> add(@Valid @RequestBody AiPaintingTemplateBo bo) {
+        // 自动设置用户ID
+        Long userId = LoginHelper.getUserId();
+        bo.setUserId(userId);
+        bo.setIsPublic(0); // 用户创建的模板默认为私有
+        return toAjax(aiPaintingTemplateService.insertByBo(bo));
+    }
+
+    /**
+     * 修改用户私有模板
+     */
+    @Operation(summary = "修改用户私有模板", description = "修改用户私有绘画参数模板（只能修改自己的模板）")
+    @PutMapping
+    public R<Void> edit(@Valid @RequestBody AiPaintingTemplateBo bo) {
+        // 验证模板所有权
+        Long userId = LoginHelper.getUserId();
+        AiPaintingTemplateVo existing = aiPaintingTemplateService.queryById(bo.getId());
+        if (existing == null || !userId.equals(existing.getUserId())) {
+            return R.fail("无权修改该模板");
+        }
+        bo.setUserId(userId); // 确保用户ID不变
+        return toAjax(aiPaintingTemplateService.updateByBo(bo));
+    }
+
+    /**
+     * 删除用户私有模板
+     */
+    @Operation(summary = "删除用户私有模板", description = "删除用户私有绘画参数模板（只能删除自己的模板）")
+    @DeleteMapping("/{id}")
+    public R<Void> remove(@Parameter(description = "模板ID", required = true)
+                           @PathVariable Long id) {
+        // 验证模板所有权
+        Long userId = LoginHelper.getUserId();
+        AiPaintingTemplateVo existing = aiPaintingTemplateService.queryById(id);
+        if (existing == null || !userId.equals(existing.getUserId())) {
+            return R.fail("无权删除该模板");
+        }
+        return toAjax(aiPaintingTemplateService.deleteWithValidByIds(Arrays.asList(id), true));
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/controller/app/AppAiRatingRecordController.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/controller/app/AppAiRatingRecordController.java
new file mode 100644
index 0000000..4a320ec
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/controller/app/AppAiRatingRecordController.java
@@ -0,0 +1,60 @@
+package org.dromara.ai.controller.app;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.ai.domain.bo.AiRatingRecordBo;
+import org.dromara.ai.domain.vo.AiRatingRecordVo;
+import org.dromara.ai.service.AiRatingRecordService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * AI评价记录（用户端）
+ *
+ * @author pengles
+ */
+@Tag(name = "用户端-AI评价记录", description = "AI评价记录接口")
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/app/ai/rating")
+public class AppAiRatingRecordController extends BaseController {
+
+    private final AiRatingRecordService aiRatingRecordService;
+
+    /**
+     * 提交评价
+     */
+    @Operation(summary = "提交评价", description = "用户对AI回复进行评价")
+    @Log(title = "AI评价", businessType = BusinessType.OTHER)
+    @PostMapping("/submit")
+    public R<Void> submitRating(@Valid @RequestBody AiRatingRecordBo bo) {
+        // 设置当前用户ID
+        Long userId = LoginHelper.getUserId();
+        bo.setUserId(userId);
+        return toAjax(aiRatingRecordService.insertByBo(bo));
+    }
+
+    /**
+     * 查询评价记录（根据消息ID）
+     */
+    @Operation(summary = "查询评价记录", description = "根据消息ID查询当前用户的评价记录")
+    @GetMapping("/{messageId}")
+    public R<AiRatingRecordVo> getRating(@Parameter(description = "消息ID", required = true)
+                                          @NotNull(message = "消息ID不能为空")
+                                          @PathVariable String messageId) {
+        Long userId = LoginHelper.getUserId();
+        AiRatingRecordVo vo = aiRatingRecordService.queryByMessageId(messageId, userId);
+        return R.ok(vo);
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/controller/app/AppAiUserQuotaController.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/controller/app/AppAiUserQuotaController.java
new file mode 100644
index 0000000..c27adb3
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/controller/app/AppAiUserQuotaController.java
@@ -0,0 +1,41 @@
+package org.dromara.ai.controller.app;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.ai.domain.vo.AiUserQuotaVo;
+import org.dromara.ai.service.AiUserQuotaService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 用户端AI用户配额
+ *
+ * @author pengles
+ */
+@Tag(name = "用户端-AI用户配额", description = "用户端AI用户配额接口")
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/app/ai/user/quota")
+public class AppAiUserQuotaController {
+
+    private final AiUserQuotaService aiUserQuotaService;
+
+    /**
+     * 查询当前用户的配额信息
+     */
+    @Operation(summary = "查询当前用户的配额信息", description = "查询当前登录用户的配额信息")
+    @GetMapping
+    public R<AiUserQuotaVo> getMyQuota() {
+        Long userId = LoginHelper.getUserId();
+        AiUserQuotaVo vo = aiUserQuotaService.queryByUserId(userId);
+        return R.ok(vo);
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/controller/app/CozeController.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/controller/app/CozeController.java
new file mode 100644
index 0000000..f7f4a4c
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/controller/app/CozeController.java
@@ -0,0 +1,66 @@
+package org.dromara.ai.controller.app;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.ai.platform.CozeService;
+import org.springframework.http.MediaType;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
+
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Coze平台控制器
+ * 提供Coze平台的Bot对话接口
+ *
+ * @author pengles
+ */
+@Slf4j
+@Validated
+@RestController
+@RequestMapping("/ai/coze")
+@RequiredArgsConstructor
+public class CozeController {
+    
+    private final CozeService cozeService;
+
+    /**
+     * Coze流式Bot对话
+     *
+     * @param body 请求体，包含botId（Bot ID）和input（输入内容）
+     * @return SSE事件流
+     */
+    @PostMapping(value = "/stream", produces = MediaType.TEXT_EVENT_STREAM_VALUE)
+    @Operation(summary = "Coze流式Bot对话", description = "通过SSE与Coze平台的Bot进行流式对话")
+    public SseEmitter stream(@RequestBody Map<String, Object> body) {
+        String botId = String.valueOf(body.getOrDefault("botId", ""));
+        String input = String.valueOf(body.getOrDefault("input", ""));
+        
+        log.info("Coze流式Bot对话请求 - Bot ID: {}, 输入长度: {}", botId, input.length());
+        
+        SseEmitter emitter = new SseEmitter(TimeUnit.MINUTES.toMillis(2));
+        try {
+            String raw = cozeService.stream(botId, input);
+            emitter.send(raw);
+            emitter.send("[DONE]");
+            emitter.complete();
+            log.debug("Coze流式Bot对话完成 - Bot ID: {}", botId);
+        } catch (Exception e) {
+            log.error("Coze流式Bot对话失败 - Bot ID: {}", botId, e);
+            try {
+                emitter.send(SseEmitter.event().name("error").data("ERROR: " + e.getMessage()));
+            } catch (Exception ignored) {
+                log.debug("发送错误事件失败", ignored);
+            }
+            emitter.completeWithError(e);
+        }
+        return emitter;
+    }
+}
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/controller/app/DifyController.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/controller/app/DifyController.java
new file mode 100644
index 0000000..95c405a
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/controller/app/DifyController.java
@@ -0,0 +1,72 @@
+package org.dromara.ai.controller.app;
+
+import io.swagger.v3.oas.annotations.Operation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.ai.platform.DifyClientService;
+import org.dromara.common.core.domain.R;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+/**
+ * DIFY平台控制器
+ * 提供DIFY平台的应用管理接口
+ *
+ * @author pengles
+ */
+@Slf4j
+@Validated
+@RestController
+@RequestMapping("/ai/dify")
+@RequiredArgsConstructor
+public class DifyController {
+    
+    private final DifyClientService difyService;
+
+    /**
+     * 获取应用列表
+     *
+     * @return 应用列表
+     */
+    @GetMapping("/apps")
+    @Operation(summary = "列表应用", description = "获取DIFY平台的所有应用列表")
+    public R<Map<String, Object>> apps() {
+        try {
+            log.debug("获取DIFY应用列表");
+            String resp = difyService.get("/api/apps");
+            return R.ok(Map.of("raw", resp));
+        } catch (Exception e) {
+            log.error("获取DIFY应用列表失败", e);
+            return R.fail("DIFY调用失败: " + e.getMessage());
+        }
+    }
+
+    /**
+     * 创建或更新应用
+     *
+     * @param body 应用信息
+     * @return 创建结果
+     */
+    @PostMapping("/apps")
+    @Operation(summary = "创建应用", description = "在DIFY平台创建或更新应用")
+    public R<Map<String, Object>> create(@RequestBody Map<String, Object> body) {
+        try {
+            log.info("创建DIFY应用");
+            String resp = difyService.post("/api/apps", toJson(body));
+            log.info("DIFY应用创建成功");
+            return R.ok(Map.of("raw", resp));
+        } catch (Exception e) {
+            log.error("创建DIFY应用失败", e);
+            return R.fail("DIFY调用失败: " + e.getMessage());
+        }
+    }
+
+    /**
+     * 将Map转换为JSON字符串
+     */
+    private String toJson(Map<String, Object> m) {
+        return org.dromara.common.json.utils.JsonUtils.toJsonString(m);
+    }
+}
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/controller/app/FastGptController.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/controller/app/FastGptController.java
new file mode 100644
index 0000000..5a85d52
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/controller/app/FastGptController.java
@@ -0,0 +1,95 @@
+package org.dromara.ai.controller.app;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.ai.platform.FastGptService;
+import org.dromara.common.core.domain.R;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+/**
+ * FastGPT平台控制器
+ * 提供FastGPT平台的知识库检索、工作流编排和上下文管理接口
+ *
+ * @author pengles
+ */
+@Slf4j
+@Validated
+@RestController
+@RequestMapping("/ai/fastgpt")
+@RequiredArgsConstructor
+public class FastGptController {
+    
+    private final FastGptService fastGptService;
+
+    /**
+     * 知识库检索
+     *
+     * @param body 检索参数
+     * @return 检索结果
+     */
+    @PostMapping("/knowledge/search")
+    @Operation(summary = "知识库检索", description = "在FastGPT平台的知识库中进行检索")
+    public R<Map<String, Object>> search(@RequestBody Map<String, Object> body) {
+        try {
+            log.debug("FastGPT知识库检索请求");
+            String resp = fastGptService.post("/api/knowledge/search", toJson(body));
+            return R.ok(Map.of("raw", resp));
+        } catch (Exception e) {
+            log.error("FastGPT知识库检索失败", e);
+            return R.fail("FastGPT调用失败: " + e.getMessage());
+        }
+    }
+
+    /**
+     * 工作流编排
+     *
+     * @param body 工作流参数
+     * @return 执行结果
+     */
+    @PostMapping("/workflow/run")
+    @Operation(summary = "工作流编排", description = "运行FastGPT平台的工作流")
+    public R<Map<String, Object>> workflow(@RequestBody Map<String, Object> body) {
+        try {
+            log.info("FastGPT工作流执行请求");
+            String resp = fastGptService.post("/api/workflow/run", toJson(body));
+            log.info("FastGPT工作流执行成功");
+            return R.ok(Map.of("raw", resp));
+        } catch (Exception e) {
+            log.error("FastGPT工作流执行失败", e);
+            return R.fail("FastGPT调用失败: " + e.getMessage());
+        }
+    }
+
+    /**
+     * 获取上下文
+     *
+     * @param sessionId 会话ID
+     * @return 上下文信息
+     */
+    @GetMapping("/context/{sessionId}")
+    @Operation(summary = "上下文管理", description = "获取指定会话的上下文信息")
+    public R<Map<String, Object>> context(
+            @Parameter(description = "会话ID", required = true)
+            @PathVariable String sessionId) {
+        try {
+            log.debug("获取FastGPT上下文 - 会话ID: {}", sessionId);
+            String resp = fastGptService.get("/api/context/" + sessionId);
+            return R.ok(Map.of("raw", resp));
+        } catch (Exception e) {
+            log.error("获取FastGPT上下文失败 - 会话ID: {}", sessionId, e);
+            return R.fail("FastGPT调用失败: " + e.getMessage());
+        }
+    }
+
+    /**
+     * 将Map转换为JSON字符串
+     */
+    private String toJson(Map<String, Object> m) {
+        return org.dromara.common.json.utils.JsonUtils.toJsonString(m);
+    }
+}
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/controller/app/McpController.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/controller/app/McpController.java
new file mode 100644
index 0000000..9aef44e
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/controller/app/McpController.java
@@ -0,0 +1,82 @@
+package org.dromara.ai.controller.app;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import jakarta.validation.constraints.NotBlank;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.ai.mcp.McpIntegrationService;
+import org.dromara.ai.mcp.McpTool;
+import org.dromara.ai.mcp.McpToolRegistry;
+import org.dromara.common.core.domain.R;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+/**
+ * MCP工具控制器
+ * 提供MCP（Model Context Protocol）工具的查询和调用接口
+ *
+ * @author pengles
+ */
+@Slf4j
+@Validated
+@RestController
+@RequestMapping("/ai/mcp")
+@RequiredArgsConstructor
+public class McpController {
+    
+    private final McpToolRegistry registry;
+    private final McpIntegrationService mcpIntegrationService;
+
+    /**
+     * 获取所有已注册的MCP工具列表
+     *
+     * @return 工具列表
+     */
+    @GetMapping("/tools")
+    @Operation(summary = "获取工具列表", description = "返回所有已注册的MCP工具及其信息")
+    public R<Map<String, McpTool>> tools() {
+        try {
+            Map<String, McpTool> allTools = registry.all();
+            log.debug("获取MCP工具列表，共{}个工具", allTools.size());
+            return R.ok(allTools);
+        } catch (Exception e) {
+            log.error("获取MCP工具列表失败", e);
+            return R.fail("获取工具列表失败: " + e.getMessage());
+        }
+    }
+
+    /**
+     * 调用指定的MCP工具
+     *
+     * @param name  工具名称
+     * @param input 工具输入参数
+     * @return 工具执行结果
+     */
+    @PostMapping("/invoke/{name}")
+    @Operation(summary = "调用工具", description = "执行指定的MCP工具并返回结果")
+    public R<Map<String, Object>> invoke(
+            @Parameter(description = "工具名称", required = true)
+            @PathVariable @NotBlank String name,
+            @Parameter(description = "工具输入参数")
+            @RequestBody(required = false) Map<String, Object> input) {
+        try {
+            log.info("调用MCP工具: {}, 输入参数: {}", name, input != null ? input.keySet() : "无");
+            
+            Map<String, Object> result = mcpIntegrationService.invokeTool(name, input != null ? input : Map.of());
+            
+            if (result.containsKey("error")) {
+                log.warn("MCP工具调用失败: {}, 错误: {}", name, result.get("error"));
+                return R.fail("工具调用失败: " + result.get("error"));
+            }
+            
+            log.debug("MCP工具调用成功: {}", name);
+            return R.ok(result);
+        } catch (Exception e) {
+            log.error("调用MCP工具失败: {}", name, e);
+            return R.fail("工具调用失败: " + e.getMessage());
+        }
+    }
+}
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/controller/app/MultimodalController.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/controller/app/MultimodalController.java
new file mode 100644
index 0000000..e0bc08d
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/controller/app/MultimodalController.java
@@ -0,0 +1,168 @@
+package org.dromara.ai.controller.app;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.tika.Tika;
+import org.dromara.common.core.domain.R;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.nio.charset.StandardCharsets;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * 多模态控制器
+ * 提供文件解析、OCR识别、图像识别、图生文等功能
+ *
+ * @author pengles
+ */
+@Slf4j
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/multimodal")
+public class MultimodalController {
+
+    @Value("${ruoyi.ai.ocr.base-url:}")
+    private String ocrBaseUrl;
+
+    @Value("${ruoyi.ai.external-ai.openai.api-key:}")
+    private String openaiApiKey;
+
+    @Value("${ruoyi.ai.external-ai.openai.base-url:https://api.openai.com}")
+    private String openaiBaseUrl;
+
+    @Operation(summary = "文件解析")
+    @PostMapping(value = "/extract", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    public R<Map<String, Object>> extract(
+            @Parameter(description = "文件") @RequestParam("file") @NotNull MultipartFile file) {
+        try {
+            Tika tika = new Tika();
+            String text = tika.parseToString(file.getInputStream());
+            String summary = summarize(text);
+            return R.ok(Map.of("text", text, "summary", summary));
+        } catch (Exception e) {
+            log.error("文件解析失败", e);
+            return R.fail("解析失败: " + e.getMessage());
+        }
+    }
+
+    @Operation(summary = "OCR识别")
+    @PostMapping(value = "/ocr", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    public ResponseEntity<byte[]> ocr(
+            @Parameter(description = "图片") @RequestParam("file") @NotNull MultipartFile file) {
+        try {
+            if (ocrBaseUrl == null || ocrBaseUrl.isBlank()) {
+                String msg = "{\"code\":500,\"msg\":\"OCR未配置\",\"data\":null}";
+                return ResponseEntity.status(500).contentType(MediaType.APPLICATION_JSON)
+                        .body(msg.getBytes(StandardCharsets.UTF_8));
+            }
+            // TODO: 实现OCR服务调用
+            String msg = "{\"code\":200,\"msg\":\"OK\",\"data\":{\"text\":\"\"}}";
+            return ResponseEntity.ok().contentType(MediaType.APPLICATION_JSON)
+                    .body(msg.getBytes(StandardCharsets.UTF_8));
+        } catch (Exception e) {
+            log.error("OCR识别失败", e);
+            String msg = "{\"code\":500,\"msg\":\"" + e.getMessage().replace("\"", "\\\"") + "\",\"data\":null}";
+            return ResponseEntity.status(500).contentType(MediaType.APPLICATION_JSON)
+                    .body(msg.getBytes(StandardCharsets.UTF_8));
+        }
+    }
+
+    @Operation(summary = "文本分析")
+    @PostMapping("/analyze/text")
+    public R<Map<String, Object>> analyzeText(
+            @Parameter(description = "文本") @RequestParam("text") String text) {
+        try {
+            String t = text == null ? "" : text.trim();
+            String summary = summarize(t);
+            List<String> keywords = Arrays.stream(t.split("\\s+"))
+                    .filter(s -> s.length() > 3)
+                    .limit(10)
+                    .collect(Collectors.toList());
+            String title = t.length() > 16 ? t.substring(0, 16) : t;
+            return R.ok(Map.of("title", title, "summary", summary, "keywords", keywords));
+        } catch (Exception e) {
+            log.error("文本分析失败", e);
+            return R.fail("文本分析失败: " + e.getMessage());
+        }
+    }
+
+    @Operation(summary = "图像识别", description = "使用AI模型识别图像内容，返回标签和描述")
+    @PostMapping(value = "/analyze/image", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    public R<Map<String, Object>> analyzeImage(
+            @Parameter(description = "图片") @RequestParam("file") @NotNull MultipartFile file,
+            @Parameter(description = "模型名称") @RequestParam(required = false) String model) {
+        try {
+            // 检查是否配置了OpenAI API Key
+            if (openaiApiKey == null || openaiApiKey.isBlank()) {
+                return R.ok(Map.of("labels", List.of(), "description", "",
+                        "msg", "VISION_PROVIDER_NOT_CONFIGURED",
+                        "error", "OpenAI API Key未配置"));
+            }
+
+            // 由于当前 AiMessage.content 是 String 类型，Vision API 的多模态支持需要在 Provider 层面实现
+            // 这里提供一个占位实现，提示用户使用支持 Vision 的模型
+            // 实际使用时，需要在 OpenAiProvider 中扩展支持多模态消息格式
+            
+            log.warn("图像识别功能需要 Vision API 支持，当前实现为占位，请使用支持 Vision 的模型（如 gpt-4-vision-preview）");
+            
+            return R.ok(Map.of("labels", List.of(), "description", "",
+                    "msg", "VISION_API_NOT_FULLY_IMPLEMENTED",
+                    "hint", "此功能需要 Vision API 支持。当前 AiMessage 接口限制，建议直接使用 OpenAI Vision API 或扩展 Provider 接口"));
+        } catch (Exception e) {
+            log.error("图像识别失败", e);
+            return R.ok(Map.of("labels", List.of(), "description", "",
+                    "msg", "VISION_ANALYSIS_ERROR",
+                    "error", e.getMessage()));
+        }
+    }
+
+    @Operation(summary = "图生文", description = "使用AI模型为图片生成描述文本")
+    @PostMapping(value = "/caption", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    public R<Map<String, Object>> caption(
+            @Parameter(description = "图片") @RequestParam("file") @NotNull MultipartFile file,
+            @Parameter(description = "模型名称") @RequestParam(required = false) String model) {
+        try {
+            // 检查是否配置了OpenAI API Key
+            if (openaiApiKey == null || openaiApiKey.isBlank()) {
+                return R.ok(Map.of("text", "", "msg", "CAPTION_PROVIDER_NOT_CONFIGURED",
+                        "error", "OpenAI API Key未配置"));
+            }
+
+            // 由于当前 AiMessage.content 是 String 类型，Vision API 的多模态支持需要在 Provider 层面实现
+            // 这里提供一个占位实现，提示用户使用支持 Vision 的模型
+            
+            log.warn("图生文功能需要 Vision API 支持，当前实现为占位，请使用支持 Vision 的模型（如 gpt-4-vision-preview）");
+            
+            return R.ok(Map.of("text", "", "msg", "CAPTION_API_NOT_FULLY_IMPLEMENTED",
+                    "hint", "此功能需要 Vision API 支持。当前 AiMessage 接口限制，建议直接使用 OpenAI Vision API 或扩展 Provider 接口"));
+        } catch (Exception e) {
+            log.error("图生文失败", e);
+            return R.ok(Map.of("text", "", "msg", "CAPTION_GENERATION_ERROR",
+                    "error", e.getMessage()));
+        }
+    }
+
+
+    /**
+     * 文本摘要
+     */
+    private String summarize(String text) {
+        if (text == null) return "";
+        String s = text.trim().replaceAll("\\s+", " ");
+        if (s.length() <= 200) return s;
+        return s.substring(0, 200);
+    }
+}
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/controller/app/PptController.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/controller/app/PptController.java
new file mode 100644
index 0000000..019f598
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/controller/app/PptController.java
@@ -0,0 +1,133 @@
+package org.dromara.ai.controller.app;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import jakarta.validation.constraints.NotBlank;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.xslf.usermodel.XMLSlideShow;
+import org.apache.poi.xslf.usermodel.XSLFSlide;
+import org.dromara.common.core.domain.R;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.awt.*;
+import java.awt.image.BufferedImage;
+import java.io.ByteArrayOutputStream;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Base64;
+import java.util.List;
+
+/**
+ * PPT控制器
+ * 提供智能PPT生成和导出功能
+ *
+ * @author pengles
+ */
+@Slf4j
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/ppt")
+public class PptController {
+
+    /**
+     * 生成PPTX文件
+     *
+     * @param content 文本内容（按换行符分割为多页）
+     * @param theme   主题（可选，暂未实现）
+     * @return PPTX文件字节流
+     */
+    @Operation(summary = "生成PPTX", description = "根据文本内容生成PowerPoint演示文稿，每行内容作为一页")
+    @PostMapping("/generate")
+    public ResponseEntity<byte[]> generate(
+            @Parameter(description = "文本内容") @RequestParam @NotBlank String content,
+            @Parameter(description = "主题") @RequestParam(required = false) String theme) {
+        try {
+            log.info("开始生成PPTX，内容长度: {}", content.length());
+            XMLSlideShow ppt = new XMLSlideShow();
+            try {
+                String[] parts = content.split("\\n+");
+                if (parts.length == 0) parts = new String[]{content};
+                for (String p : parts) {
+                    XSLFSlide slide = ppt.createSlide();
+                    slide.createTextBox().setText(p);
+                }
+                ByteArrayOutputStream bos = new ByteArrayOutputStream();
+                ppt.write(bos);
+                byte[] bytes = bos.toByteArray();
+                log.info("PPTX生成成功，文件大小: {} bytes，共{}页", bytes.length, parts.length);
+                return ResponseEntity.ok()
+                        .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=\"generated.pptx\"")
+                        .contentType(MediaType.APPLICATION_OCTET_STREAM)
+                        .body(bytes);
+            } finally {
+                ppt.close();
+            }
+        } catch (Exception e) {
+            log.error("PPTX生成失败", e);
+            String msg = "{\"code\":500,\"msg\":\"" + e.getMessage().replace("\"", "\\\"") + "\",\"data\":null}";
+            return ResponseEntity.status(500)
+                    .contentType(MediaType.APPLICATION_JSON)
+                    .body(msg.getBytes(StandardCharsets.UTF_8));
+        }
+    }
+
+    /**
+     * 导出PNG图片序列
+     *
+     * @param content 文本内容
+     * @param width   图片宽度（可选）
+     * @param height  图片高度（可选）
+     * @return Base64编码的PNG图片列表
+     */
+    @Operation(summary = "导出PNG序列", description = "将PPT内容导出为PNG图片序列，每页一张图片，返回Base64编码")
+    @PostMapping("/export/pngs")
+    public R<List<String>> exportPngs(
+            @Parameter(description = "文本内容") @RequestParam @NotBlank String content,
+            @Parameter(description = "宽度") @RequestParam(required = false) Integer width,
+            @Parameter(description = "高度") @RequestParam(required = false) Integer height) {
+        try {
+            log.info("开始导出PNG序列，内容长度: {}, 尺寸: {}x{}", content.length(), width, height);
+            XMLSlideShow ppt = new XMLSlideShow();
+            try {
+                String[] parts = content.split("\\n+");
+                if (parts.length == 0) parts = new String[]{content};
+                for (String p : parts) {
+                    XSLFSlide slide = ppt.createSlide();
+                    slide.createTextBox().setText(p);
+                }
+                Dimension pgsize = ppt.getPageSize();
+                int w = width != null ? width : pgsize.width;
+                int h = height != null ? height : pgsize.height;
+                List<String> imgs = new ArrayList<>();
+                for (XSLFSlide slide : ppt.getSlides()) {
+                    BufferedImage img = new BufferedImage(w, h, BufferedImage.TYPE_INT_ARGB);
+                    Graphics2D graphics = img.createGraphics();
+                    graphics.setPaint(Color.WHITE);
+                    graphics.fillRect(0, 0, w, h);
+                    slide.draw(graphics);
+                    graphics.dispose();
+                    ByteArrayOutputStream bos = new ByteArrayOutputStream();
+                    javax.imageio.ImageIO.write(img, "png", bos);
+                    String b64 = Base64.getEncoder().encodeToString(bos.toByteArray());
+                    imgs.add("data:image/png;base64," + b64);
+                }
+                log.info("PNG序列导出成功，共{}张图片", imgs.size());
+                return R.ok(imgs);
+            } finally {
+                ppt.close();
+            }
+        } catch (Exception e) {
+            log.error("PNG序列导出失败", e);
+            return R.fail("导出失败: " + e.getMessage());
+        }
+    }
+}
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/controller/app/QueueMetricsController.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/controller/app/QueueMetricsController.java
new file mode 100644
index 0000000..e92295e
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/controller/app/QueueMetricsController.java
@@ -0,0 +1,45 @@
+package org.dromara.ai.controller.app;
+
+import io.swagger.v3.oas.annotations.Operation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.ai.queue.TaskQueueService;
+import org.dromara.common.core.domain.R;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+/**
+ * 队列指标控制器
+ * 提供任务队列的监控指标查询接口
+ *
+ * @author pengles
+ */
+@Slf4j
+@RestController
+@RequestMapping("/ai/queue")
+@RequiredArgsConstructor
+public class QueueMetricsController {
+    
+    private final TaskQueueService queueService;
+
+    /**
+     * 获取队列指标
+     *
+     * @return 队列指标信息
+     */
+    @GetMapping("/metrics")
+    @Operation(summary = "队列指标", description = "获取任务队列的实时监控指标，包括队列深度、处理速率等")
+    public R<Map<String, Object>> metrics() {
+        try {
+            Map<String, Object> metrics = queueService.metrics();
+            log.debug("获取队列指标成功");
+            return R.ok(metrics);
+        } catch (Exception e) {
+            log.error("获取队列指标失败", e);
+            return R.fail("获取队列指标失败: " + e.getMessage());
+        }
+    }
+}
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/controller/app/SimpleAiController.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/controller/app/SimpleAiController.java
new file mode 100644
index 0000000..8f171f3
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/controller/app/SimpleAiController.java
@@ -0,0 +1,113 @@
+package org.dromara.ai.controller.app;
+
+import lombok.RequiredArgsConstructor;
+import org.dromara.ai.provider.AiProviderManager;
+import org.dromara.ai.service.SimpleAiService;
+import org.dromara.common.core.domain.R;
+import org.dromara.knowledge.domain.vo.KnowledgeSearchResultVo;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 简化的AI控制器
+ * 提供基于知识库的AI问答功能
+ *
+ * @author pengles
+ */
+@RestController
+@RequestMapping("/ai")
+@RequiredArgsConstructor
+public class SimpleAiController {
+
+    private final SimpleAiService simpleAiService;
+    private final AiProviderManager aiProviderManager;
+
+    /**
+     * 基于知识库的问答
+     *
+     * @param knowledgeId 知识库ID
+     * @param question    用户问题
+     * @param limit       返回结果数量限制
+     * @return AI回答
+     */
+    @PostMapping("/ask")
+    public R<String> ask(@RequestParam String knowledgeId,
+                         @RequestParam String question,
+                         @RequestParam(required = false, defaultValue = "5") Integer limit) {
+        String answer = simpleAiService.askWithKnowledge(knowledgeId, question, limit);
+        return R.ok(answer);
+    }
+
+    /**
+     * 向量相似度搜索
+     *
+     * @param knowledgeId 知识库ID
+     * @param queryText   查询文本
+     * @param modelName   模型名称
+     * @param topK        返回前K个结果
+     * @param threshold   相似度阈值
+     * @return 搜索结果
+     */
+    @PostMapping("/search")
+    public R<List<KnowledgeSearchResultVo>> vectorSearch(
+            @RequestParam String knowledgeId,
+            @RequestParam String queryText,
+            @RequestParam(required = false, defaultValue = "default") String modelName,
+            @RequestParam(required = false, defaultValue = "5") Integer topK,
+            @RequestParam(required = false, defaultValue = "0.7") Double threshold) {
+
+        List<KnowledgeSearchResultVo> results = simpleAiService.vectorSearch(
+                knowledgeId, queryText, modelName, topK, threshold
+        );
+        return R.ok(results);
+    }
+
+    /**
+     * 获取知识库统计信息
+     *
+     * @param knowledgeId 知识库ID
+     * @return 统计信息
+     */
+    @GetMapping("/stats/{knowledgeId}")
+    public R<Map<String, Object>> getKnowledgeStats(@PathVariable String knowledgeId) {
+        Map<String, Object> stats = simpleAiService.getKnowledgeStats(knowledgeId);
+        return R.ok(stats);
+    }
+
+    /**
+     * 检查模型是否可用
+     *
+     * @param modelName 模型名称
+     * @return 是否可用
+     */
+    @GetMapping("/model/check/{modelName}")
+    public R<Boolean> checkModel(@PathVariable String modelName) {
+        boolean available = simpleAiService.isModelAvailable(modelName);
+        return R.ok(available);
+    }
+
+    /**
+     * 获取可用的模型列表
+     *
+     * @return 模型列表
+     */
+    @GetMapping("/models")
+    public R<List<String>> getAvailableModels() {
+        List<String> models = simpleAiService.getAvailableModels();
+        return R.ok(models);
+    }
+
+    /**
+     * AI服务健康检查
+     *
+     * @return 健康状态与Provider统计
+     */
+    @GetMapping("/health")
+    public R<Map<String, Object>> health() {
+        Map<String, Object> stats = aiProviderManager.getAllStatistics();
+        stats.put("status", "UP");
+        return R.ok(stats);
+    }
+}
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/domain/AiChatRecord.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/domain/AiChatRecord.java
new file mode 100644
index 0000000..16d6091
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/domain/AiChatRecord.java
@@ -0,0 +1,92 @@
+package org.dromara.ai.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * AI聊天记录对象 ai_chat_record
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode
+@TableName("ai_chat_record")
+public class AiChatRecord implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @TableId
+    private Long id;
+
+    /**
+     * 会话ID
+     */
+    private String sessionId;
+
+    /**
+     * 用户ID
+     */
+    private Long userId;
+
+    /**
+     * Provider名称
+     */
+    private String providerName;
+
+    /**
+     * 模型名称
+     */
+    private String modelName;
+
+    /**
+     * 消息类型(USER/ASSISTANT)
+     */
+    private String messageType;
+
+    /**
+     * 消息内容
+     */
+    private String content;
+
+    /**
+     * 使用的Token数
+     */
+    private Integer tokensUsed;
+
+    /**
+     * 成本
+     */
+    private BigDecimal cost;
+
+    /**
+     * 响应时间(毫秒)
+     */
+    private Integer responseTime;
+
+    /**
+     * 是否流式响应(0否 1是)
+     */
+    private Integer isStream;
+
+    /**
+     * 错误信息
+     */
+    private String errorMessage;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+}
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/domain/AiPaintingFavorite.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/domain/AiPaintingFavorite.java
new file mode 100644
index 0000000..c08956f
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/domain/AiPaintingFavorite.java
@@ -0,0 +1,56 @@
+package org.dromara.ai.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * AI绘画作品收藏对象 ai_painting_favorite
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode
+@TableName("ai_painting_favorite")
+public class AiPaintingFavorite implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @TableId
+    private Long id;
+
+    /**
+     * 用户ID
+     */
+    private Long userId;
+
+    /**
+     * 绘画记录ID
+     */
+    private Long paintingRecordId;
+
+    /**
+     * 任务ID
+     */
+    private String taskId;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 收藏时间
+     */
+    private Date createTime;
+
+}
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/domain/AiPaintingRecord.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/domain/AiPaintingRecord.java
new file mode 100644
index 0000000..2afa68a
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/domain/AiPaintingRecord.java
@@ -0,0 +1,96 @@
+package org.dromara.ai.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * AI绘画历史记录对象 ai_painting_record
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode
+@TableName("ai_painting_record")
+public class AiPaintingRecord implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @TableId
+    private Long id;
+
+    /**
+     * 任务ID
+     */
+    private String taskId;
+
+    /**
+     * 用户ID
+     */
+    private Long userId;
+
+    /**
+     * 绘画引擎类型(DALL_E_3/MIDJOURNEY/STABLE_DIFFUSION)
+     */
+    private String engineType;
+
+    /**
+     * 提示词
+     */
+    private String prompt;
+
+    /**
+     * 绘画参数(JSON字符串)
+     */
+    private String params;
+
+    /**
+     * 状态(PENDING/RUNNING/SUCCESS/FAILED)
+     */
+    private String status;
+
+    /**
+     * 进度(0-100)
+     */
+    private Integer progress;
+
+    /**
+     * 生成的图片URL列表(JSON字符串)
+     */
+    private String images;
+
+    /**
+     * 错误消息
+     */
+    private String message;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     * 分享码（用于分享作品）
+     */
+    private String shareCode;
+
+    /**
+     * 是否公开分享(0否 1是)
+     */
+    private Integer isPublic;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/domain/AiPaintingTemplate.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/domain/AiPaintingTemplate.java
new file mode 100644
index 0000000..ae7f60e
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/domain/AiPaintingTemplate.java
@@ -0,0 +1,92 @@
+package org.dromara.ai.domain;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * AI绘画参数模板对象 ai_painting_template
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode
+@TableName("ai_painting_template")
+public class AiPaintingTemplate implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @TableId
+    private Long id;
+
+    /**
+     * 模板名称
+     */
+    private String templateName;
+
+    /**
+     * 用户ID(为空表示系统模板)
+     */
+    private Long userId;
+
+    /**
+     * 绘画引擎类型(DALL_E_3/MIDJOURNEY/STABLE_DIFFUSION)
+     */
+    private String engineType;
+
+    /**
+     * 绘画参数(JSON字符串)
+     */
+    private String params;
+
+    /**
+     * 模板描述
+     */
+    private String description;
+
+    /**
+     * 是否公开(0=私有 1=公开)
+     */
+    private Integer isPublic;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+    /**
+     * 创建者
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private String createBy;
+
+    /**
+     * 更新者
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private String updateBy;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/domain/AiProviderConfig.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/domain/AiProviderConfig.java
new file mode 100644
index 0000000..ac58098
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/domain/AiProviderConfig.java
@@ -0,0 +1,137 @@
+package org.dromara.ai.domain;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * AI Provider配置对象 ai_provider_config
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode
+@TableName("ai_provider_config")
+public class AiProviderConfig implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @TableId
+    private Long id;
+
+    /**
+     * Provider名称
+     */
+    private String providerName;
+
+    /**
+     * Provider类型
+     */
+    private String providerType;
+
+    /**
+     * 是否启用(0=禁用 1=启用)
+     */
+    private Integer enabled;
+
+    /**
+     * 优先级(数字越小优先级越高)
+     */
+    private Integer priority;
+
+    /**
+     * 权重(用于负载均衡)
+     */
+    private Integer weight;
+
+    /**
+     * 最大并发数
+     */
+    private Integer maxConcurrency;
+
+    /**
+     * 超时时间(秒)
+     */
+    private Integer timeoutSeconds;
+
+    /**
+     * 最大重试次数
+     */
+    private Integer maxRetries;
+
+    /**
+     * 熔断器配置(JSON字符串)
+     */
+    private String circuitBreakerConfig;
+
+    /**
+     * 限流配置(JSON字符串)
+     */
+    private String rateLimitConfig;
+
+    /**
+     * API配置(JSON字符串)
+     */
+    private String apiConfig;
+
+    /**
+     * 模型配置(JSON字符串)
+     */
+    private String modelConfig;
+
+    /**
+     * 扩展配置(JSON字符串)
+     */
+    private String extensionConfig;
+
+    /**
+     * 健康检查URL
+     */
+    private String healthCheckUrl;
+
+    /**
+     * 健康检查间隔(秒)
+     */
+    private Integer healthCheckInterval;
+
+    /**
+     * 创建者
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 更新者
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private String updateBy;
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+}
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/domain/AiProviderConfigHistory.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/domain/AiProviderConfigHistory.java
new file mode 100644
index 0000000..ce1f11b
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/domain/AiProviderConfigHistory.java
@@ -0,0 +1,66 @@
+package org.dromara.ai.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * AI Provider配置历史对象 ai_provider_config_history
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode
+@TableName("ai_provider_config_history")
+public class AiProviderConfigHistory implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @TableId
+    private Long id;
+
+    /**
+     * 配置ID
+     */
+    private Long configId;
+
+    /**
+     * Provider名称
+     */
+    private String providerName;
+
+    /**
+     * 配置数据(JSON字符串)
+     */
+    private String configData;
+
+    /**
+     * 操作类型(CREATE/UPDATE/DELETE)
+     */
+    private String operationType;
+
+    /**
+     * 操作时间
+     */
+    private Date operationTime;
+
+    /**
+     * 操作者
+     */
+    private String operationBy;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/domain/AiRatingRecord.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/domain/AiRatingRecord.java
new file mode 100644
index 0000000..53fd53e
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/domain/AiRatingRecord.java
@@ -0,0 +1,71 @@
+package org.dromara.ai.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * AI评价记录对象 ai_rating_record
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode
+@TableName("ai_rating_record")
+public class AiRatingRecord implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @TableId
+    private Long id;
+
+    /**
+     * 消息ID
+     */
+    private String messageId;
+
+    /**
+     * 用户ID
+     */
+    private Long userId;
+
+    /**
+     * Provider名称
+     */
+    private String providerName;
+
+    /**
+     * 评分(1-5)
+     */
+    private Integer rating;
+
+    /**
+     * 反馈内容
+     */
+    private String feedback;
+
+    /**
+     * 评价维度
+     */
+    private String dimension;
+
+    /**
+     * 是否匿名(0否 1是)
+     */
+    private Integer anonymous;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+}
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/domain/AiSensitiveWord.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/domain/AiSensitiveWord.java
new file mode 100644
index 0000000..18f0c43
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/domain/AiSensitiveWord.java
@@ -0,0 +1,82 @@
+package org.dromara.ai.domain;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * AI敏感词对象 ai_sensitive_word
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode
+@TableName("ai_sensitive_word")
+public class AiSensitiveWord implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @TableId
+    private Long id;
+
+    /**
+     * 敏感词
+     */
+    private String word;
+
+    /**
+     * 词类型(PROFANITY/HATE_SPEECH/VIOLENCE/SEXUAL_CONTENT/ILLEGAL_ACTIVITY/PERSONAL_INFO/SPAM/MALICIOUS_CODE/POLITICAL_SENSITIVE/COMMERCIAL_AD)
+     */
+    private String wordType;
+
+    /**
+     * 是否启用(0=禁用 1=启用)
+     */
+    private Integer enabled;
+
+    /**
+     * 优先级(数字越大优先级越高)
+     */
+    private Integer priority;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+    /**
+     * 创建者
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private String createBy;
+
+    /**
+     * 更新者
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private String updateBy;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/domain/AiUsageStats.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/domain/AiUsageStats.java
new file mode 100644
index 0000000..5f8bcca
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/domain/AiUsageStats.java
@@ -0,0 +1,92 @@
+package org.dromara.ai.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * AI使用统计对象 ai_usage_stats
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode
+@TableName("ai_usage_stats")
+public class AiUsageStats implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @TableId
+    private Long id;
+
+    /**
+     * 用户ID
+     */
+    private Long userId;
+
+    /**
+     * Provider名称
+     */
+    private String providerName;
+
+    /**
+     * 模型名称
+     */
+    private String modelName;
+
+    /**
+     * 统计日期
+     */
+    private Date statDate;
+
+    /**
+     * 请求次数
+     */
+    private Integer requestCount;
+
+    /**
+     * 成功次数
+     */
+    private Integer successCount;
+
+    /**
+     * 错误次数
+     */
+    private Integer errorCount;
+
+    /**
+     * 总Token数
+     */
+    private Long totalTokens;
+
+    /**
+     * 总成本
+     */
+    private BigDecimal totalCost;
+
+    /**
+     * 平均响应时间(毫秒)
+     */
+    private Integer avgResponseTime;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+}
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/domain/AiUserQuota.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/domain/AiUserQuota.java
new file mode 100644
index 0000000..7f949a6
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/domain/AiUserQuota.java
@@ -0,0 +1,107 @@
+package org.dromara.ai.domain;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * AI用户配额对象 ai_user_quota
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode
+@TableName("ai_user_quota")
+public class AiUserQuota implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @TableId
+    private Long id;
+
+    /**
+     * 用户ID
+     */
+    private Long userId;
+
+    /**
+     * 权限级别(GUEST/BASIC/PREMIUM/VIP/ADMIN)
+     */
+    private String permissionLevel;
+
+    /**
+     * 每日配额限制(0表示无限制)
+     */
+    private Long dailyQuota;
+
+    /**
+     * 每月配额限制(0表示无限制)
+     */
+    private Long monthlyQuota;
+
+    /**
+     * 每日已使用配额
+     */
+    private Long dailyUsed;
+
+    /**
+     * 每月已使用配额
+     */
+    private Long monthlyUsed;
+
+    /**
+     * 上次重置日配额时间
+     */
+    private Date lastResetDaily;
+
+    /**
+     * 上次重置月配额时间
+     */
+    private Date lastResetMonthly;
+
+    /**
+     * 自定义限制(JSON字符串)
+     */
+    private String customLimits;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+    /**
+     * 创建者
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private String createBy;
+
+    /**
+     * 更新者
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private String updateBy;
+
+}
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/domain/bo/AiChatRecordBo.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/domain/bo/AiChatRecordBo.java
new file mode 100644
index 0000000..28becb4
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/domain/bo/AiChatRecordBo.java
@@ -0,0 +1,96 @@
+package org.dromara.ai.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.ai.domain.AiChatRecord;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * AI聊天记录业务对象 ai_chat_record
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode
+@AutoMapper(target = AiChatRecord.class, reverseConvertGenerate = false)
+public class AiChatRecordBo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    private Long id;
+
+    /**
+     * 会话ID
+     */
+    private String sessionId;
+
+    /**
+     * 用户ID
+     */
+    private Long userId;
+
+    /**
+     * Provider名称
+     */
+    private String providerName;
+
+    /**
+     * 模型名称
+     */
+    private String modelName;
+
+    /**
+     * 消息类型(USER/ASSISTANT)
+     */
+    private String messageType;
+
+    /**
+     * 消息内容（用于搜索）
+     */
+    private String content;
+
+    /**
+     * 使用的Token数
+     */
+    private Integer tokensUsed;
+
+    /**
+     * 成本
+     */
+    private BigDecimal cost;
+
+    /**
+     * 响应时间(毫秒)
+     */
+    private Integer responseTime;
+
+    /**
+     * 是否流式响应(0否 1是)
+     */
+    private Integer isStream;
+
+    /**
+     * 错误信息
+     */
+    private String errorMessage;
+
+    /**
+     * 创建时间（开始）
+     */
+    private Date createTimeStart;
+
+    /**
+     * 创建时间（结束）
+     */
+    private Date createTimeEnd;
+
+}
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/domain/bo/AiPaintingFavoriteBo.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/domain/bo/AiPaintingFavoriteBo.java
new file mode 100644
index 0000000..f94deb0
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/domain/bo/AiPaintingFavoriteBo.java
@@ -0,0 +1,60 @@
+package org.dromara.ai.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.ai.domain.AiPaintingFavorite;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * AI绘画作品收藏业务对象 ai_painting_favorite
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode
+@AutoMapper(target = AiPaintingFavorite.class, reverseConvertGenerate = false)
+public class AiPaintingFavoriteBo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    private Long id;
+
+    /**
+     * 用户ID
+     */
+    private Long userId;
+
+    /**
+     * 绘画记录ID
+     */
+    private Long paintingRecordId;
+
+    /**
+     * 任务ID
+     */
+    private String taskId;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 收藏时间开始
+     */
+    private Date createTimeStart;
+
+    /**
+     * 收藏时间结束
+     */
+    private Date createTimeEnd;
+
+}
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/domain/bo/AiPaintingRecordBo.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/domain/bo/AiPaintingRecordBo.java
new file mode 100644
index 0000000..3e9745f
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/domain/bo/AiPaintingRecordBo.java
@@ -0,0 +1,95 @@
+package org.dromara.ai.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.ai.domain.AiPaintingRecord;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * AI绘画历史记录业务对象 ai_painting_record
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode
+@AutoMapper(target = AiPaintingRecord.class, reverseConvertGenerate = false)
+public class AiPaintingRecordBo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    private Long id;
+
+    /**
+     * 任务ID
+     */
+    private String taskId;
+
+    /**
+     * 用户ID
+     */
+    private Long userId;
+
+    /**
+     * 绘画引擎类型(DALL_E_3/MIDJOURNEY/STABLE_DIFFUSION)
+     */
+    private String engineType;
+
+    /**
+     * 提示词
+     */
+    private String prompt;
+
+    /**
+     * 绘画参数(JSON字符串)
+     */
+    private String params;
+
+    /**
+     * 状态(PENDING/RUNNING/SUCCESS/FAILED)
+     */
+    private String status;
+
+    /**
+     * 进度(0-100)
+     */
+    private Integer progress;
+
+    /**
+     * 生成的图片URL列表(JSON字符串)
+     */
+    private String images;
+
+    /**
+     * 错误消息
+     */
+    private String message;
+
+    /**
+     * 创建时间开始
+     */
+    private Date createTimeStart;
+
+    /**
+     * 创建时间结束
+     */
+    private Date createTimeEnd;
+
+    /**
+     * 分享码（用于分享作品）
+     */
+    private String shareCode;
+
+    /**
+     * 是否公开分享(0否 1是)
+     */
+    private Integer isPublic;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/domain/bo/AiPaintingTemplateBo.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/domain/bo/AiPaintingTemplateBo.java
new file mode 100644
index 0000000..3a9e7a6
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/domain/bo/AiPaintingTemplateBo.java
@@ -0,0 +1,78 @@
+package org.dromara.ai.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.ai.domain.AiPaintingTemplate;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * AI绘画参数模板业务对象 ai_painting_template
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode
+@AutoMapper(target = AiPaintingTemplate.class, reverseConvertGenerate = false)
+public class AiPaintingTemplateBo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    private Long id;
+
+    /**
+     * 模板名称
+     */
+    @NotBlank(message = "模板名称不能为空")
+    private String templateName;
+
+    /**
+     * 用户ID(为空表示系统模板)
+     */
+    private Long userId;
+
+    /**
+     * 绘画引擎类型(DALL_E_3/MIDJOURNEY/STABLE_DIFFUSION)
+     */
+    @NotBlank(message = "引擎类型不能为空")
+    private String engineType;
+
+    /**
+     * 绘画参数(JSON字符串)
+     */
+    private String params;
+
+    /**
+     * 模板描述
+     */
+    private String description;
+
+    /**
+     * 是否公开(0=私有 1=公开)
+     */
+    private Integer isPublic;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    /**
+     * 创建时间开始
+     */
+    private Date createTimeStart;
+
+    /**
+     * 创建时间结束
+     */
+    private Date createTimeEnd;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/domain/bo/AiProviderConfigBo.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/domain/bo/AiProviderConfigBo.java
new file mode 100644
index 0000000..890d70e
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/domain/bo/AiProviderConfigBo.java
@@ -0,0 +1,123 @@
+package org.dromara.ai.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.ai.domain.AiProviderConfig;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * AI Provider配置业务对象 ai_provider_config
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode
+@AutoMapper(target = AiProviderConfig.class, reverseConvertGenerate = false)
+public class AiProviderConfigBo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    private Long id;
+
+    /**
+     * Provider名称
+     */
+    @NotBlank(message = "Provider名称不能为空")
+    private String providerName;
+
+    /**
+     * Provider类型
+     */
+    @NotBlank(message = "Provider类型不能为空")
+    private String providerType;
+
+    /**
+     * 是否启用(0=禁用 1=启用)
+     */
+    private Integer enabled;
+
+    /**
+     * 优先级(数字越小优先级越高)
+     */
+    private Integer priority;
+
+    /**
+     * 权重(用于负载均衡)
+     */
+    private Integer weight;
+
+    /**
+     * 最大并发数
+     */
+    private Integer maxConcurrency;
+
+    /**
+     * 超时时间(秒)
+     */
+    private Integer timeoutSeconds;
+
+    /**
+     * 最大重试次数
+     */
+    private Integer maxRetries;
+
+    /**
+     * 熔断器配置(JSON字符串)
+     */
+    private String circuitBreakerConfig;
+
+    /**
+     * 限流配置(JSON字符串)
+     */
+    private String rateLimitConfig;
+
+    /**
+     * API配置(JSON字符串)
+     */
+    private String apiConfig;
+
+    /**
+     * 模型配置(JSON字符串)
+     */
+    private String modelConfig;
+
+    /**
+     * 扩展配置(JSON字符串)
+     */
+    private String extensionConfig;
+
+    /**
+     * 健康检查URL
+     */
+    private String healthCheckUrl;
+
+    /**
+     * 健康检查间隔(秒)
+     */
+    private Integer healthCheckInterval;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 创建时间开始（用于查询）
+     */
+    private Date createTimeStart;
+
+    /**
+     * 创建时间结束（用于查询）
+     */
+    private Date createTimeEnd;
+
+}
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/domain/bo/AiProviderConfigHistoryBo.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/domain/bo/AiProviderConfigHistoryBo.java
new file mode 100644
index 0000000..6ef0e4e
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/domain/bo/AiProviderConfigHistoryBo.java
@@ -0,0 +1,75 @@
+package org.dromara.ai.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.ai.domain.AiProviderConfigHistory;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * AI Provider配置历史业务对象 ai_provider_config_history
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode
+@AutoMapper(target = AiProviderConfigHistory.class, reverseConvertGenerate = false)
+public class AiProviderConfigHistoryBo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    private Long id;
+
+    /**
+     * 配置ID
+     */
+    private Long configId;
+
+    /**
+     * Provider名称
+     */
+    private String providerName;
+
+    /**
+     * 配置数据(JSON字符串)
+     */
+    private String configData;
+
+    /**
+     * 操作类型(CREATE/UPDATE/DELETE)
+     */
+    private String operationType;
+
+    /**
+     * 操作时间
+     */
+    private Date operationTime;
+
+    /**
+     * 操作时间开始
+     */
+    private Date operationTimeStart;
+
+    /**
+     * 操作时间结束
+     */
+    private Date operationTimeEnd;
+
+    /**
+     * 操作者
+     */
+    private String operationBy;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/domain/bo/AiRatingRecordBo.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/domain/bo/AiRatingRecordBo.java
new file mode 100644
index 0000000..523f00d
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/domain/bo/AiRatingRecordBo.java
@@ -0,0 +1,75 @@
+package org.dromara.ai.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.ai.domain.AiRatingRecord;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * AI评价记录业务对象 ai_rating_record
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode
+@AutoMapper(target = AiRatingRecord.class, reverseConvertGenerate = false)
+public class AiRatingRecordBo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    private Long id;
+
+    /**
+     * 消息ID
+     */
+    private String messageId;
+
+    /**
+     * 用户ID
+     */
+    private Long userId;
+
+    /**
+     * Provider名称
+     */
+    private String providerName;
+
+    /**
+     * 评分(1-5)
+     */
+    private Integer rating;
+
+    /**
+     * 反馈内容
+     */
+    private String feedback;
+
+    /**
+     * 评价维度
+     */
+    private String dimension;
+
+    /**
+     * 是否匿名(0否 1是)
+     */
+    private Integer anonymous;
+
+    /**
+     * 创建时间开始（用于查询）
+     */
+    private Date createTimeStart;
+
+    /**
+     * 创建时间结束（用于查询）
+     */
+    private Date createTimeEnd;
+
+}
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/domain/bo/AiSensitiveWordBo.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/domain/bo/AiSensitiveWordBo.java
new file mode 100644
index 0000000..f43dd4d
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/domain/bo/AiSensitiveWordBo.java
@@ -0,0 +1,68 @@
+package org.dromara.ai.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.ai.domain.AiSensitiveWord;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * AI敏感词业务对象 ai_sensitive_word
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode
+@AutoMapper(target = AiSensitiveWord.class, reverseConvertGenerate = false)
+public class AiSensitiveWordBo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    private Long id;
+
+    /**
+     * 敏感词
+     */
+    @NotBlank(message = "敏感词不能为空")
+    private String word;
+
+    /**
+     * 词类型(PROFANITY/HATE_SPEECH/VIOLENCE/SEXUAL_CONTENT/ILLEGAL_ACTIVITY/PERSONAL_INFO/SPAM/MALICIOUS_CODE/POLITICAL_SENSITIVE/COMMERCIAL_AD)
+     */
+    @NotBlank(message = "词类型不能为空")
+    private String wordType;
+
+    /**
+     * 是否启用(0=禁用 1=启用)
+     */
+    private Integer enabled;
+
+    /**
+     * 优先级(数字越大优先级越高)
+     */
+    private Integer priority;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 创建时间开始
+     */
+    private Date createTimeStart;
+
+    /**
+     * 创建时间结束
+     */
+    private Date createTimeEnd;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/domain/bo/AiUsageStatsBo.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/domain/bo/AiUsageStatsBo.java
new file mode 100644
index 0000000..5fd5872
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/domain/bo/AiUsageStatsBo.java
@@ -0,0 +1,86 @@
+package org.dromara.ai.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.ai.domain.AiUsageStats;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * AI使用统计业务对象 ai_usage_stats
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode
+@AutoMapper(target = AiUsageStats.class, reverseConvertGenerate = false)
+public class AiUsageStatsBo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    private Long id;
+
+    /**
+     * 用户ID
+     */
+    private Long userId;
+
+    /**
+     * Provider名称
+     */
+    private String providerName;
+
+    /**
+     * 模型名称
+     */
+    private String modelName;
+
+    /**
+     * 统计日期（开始）
+     */
+    private Date statDateStart;
+
+    /**
+     * 统计日期（结束）
+     */
+    private Date statDateEnd;
+
+    /**
+     * 请求次数
+     */
+    private Integer requestCount;
+
+    /**
+     * 成功次数
+     */
+    private Integer successCount;
+
+    /**
+     * 错误次数
+     */
+    private Integer errorCount;
+
+    /**
+     * 总Token数
+     */
+    private Long totalTokens;
+
+    /**
+     * 总成本
+     */
+    private BigDecimal totalCost;
+
+    /**
+     * 平均响应时间(毫秒)
+     */
+    private Integer avgResponseTime;
+
+}
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/domain/bo/AiUserQuotaBo.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/domain/bo/AiUserQuotaBo.java
new file mode 100644
index 0000000..12e4d46
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/domain/bo/AiUserQuotaBo.java
@@ -0,0 +1,90 @@
+package org.dromara.ai.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.ai.domain.AiUserQuota;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * AI用户配额业务对象 ai_user_quota
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode
+@AutoMapper(target = AiUserQuota.class, reverseConvertGenerate = false)
+public class AiUserQuotaBo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    private Long id;
+
+    /**
+     * 用户ID
+     */
+    private Long userId;
+
+    /**
+     * 权限级别(GUEST/BASIC/PREMIUM/VIP/ADMIN)
+     */
+    private String permissionLevel;
+
+    /**
+     * 每日配额限制(0表示无限制)
+     */
+    private Long dailyQuota;
+
+    /**
+     * 每月配额限制(0表示无限制)
+     */
+    private Long monthlyQuota;
+
+    /**
+     * 每日已使用配额
+     */
+    private Long dailyUsed;
+
+    /**
+     * 每月已使用配额
+     */
+    private Long monthlyUsed;
+
+    /**
+     * 上次重置日配额时间
+     */
+    private Date lastResetDaily;
+
+    /**
+     * 上次重置月配额时间
+     */
+    private Date lastResetMonthly;
+
+    /**
+     * 自定义限制(JSON字符串)
+     */
+    private String customLimits;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 创建时间开始
+     */
+    private Date createTimeStart;
+
+    /**
+     * 创建时间结束
+     */
+    private Date createTimeEnd;
+
+}
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/domain/dto/AiChatRequest.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/domain/dto/AiChatRequest.java
new file mode 100644
index 0000000..b4f7cc4
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/domain/dto/AiChatRequest.java
@@ -0,0 +1,165 @@
+package org.dromara.ai.domain.dto;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * AI聊天请求DTO
+ *
+ * @author pengles
+ */
+@Data
+@Accessors(chain = true)
+public class AiChatRequest implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 模型名称
+     */
+    private String model;
+
+    /**
+     * 对话消息列表
+     */
+    private List<AiMessage> messages;
+
+    /**
+     * 温度参数 (0.0-2.0)
+     */
+    private Double temperature;
+
+    /**
+     * 最大生成token数
+     */
+    private Integer maxTokens;
+
+    /**
+     * Top-p参数 (0.0-1.0)
+     */
+    private Double topP;
+
+    /**
+     * 频率惩罚 (-2.0-2.0)
+     */
+    private Double frequencyPenalty;
+
+    /**
+     * 存在惩罚 (-2.0-2.0)
+     */
+    private Double presencePenalty;
+
+    /**
+     * 停止词列表
+     */
+    private List<String> stop;
+
+    /**
+     * 是否流式输出
+     */
+    private Boolean stream;
+
+    /**
+     * 用户ID
+     */
+    private String userId;
+
+    /**
+     * 会话ID
+     */
+    private String sessionId;
+
+    /**
+     * 知识库ID
+     */
+    private String knowledgeId;
+
+    /**
+     * 是否启用知识库检索
+     */
+    private Boolean enableKnowledge;
+
+    /**
+     * 知识库检索数量
+     */
+    private Integer knowledgeLimit;
+
+    /**
+     * 知识库检索阈值
+     */
+    private Double knowledgeThreshold;
+
+    /**
+     * 扩展参数
+     */
+    private Map<String, Object> extra;
+
+    private Boolean enableTools;
+    private java.util.List<String> requestedTools;
+    private Map<String, Object> toolContext;
+
+    /**
+     * AI消息
+     */
+    @Data
+    @Accessors(chain = true)
+    public static class AiMessage implements Serializable {
+
+        private static final long serialVersionUID = 1L;
+
+        /**
+         * 消息角色
+         */
+        private String role;
+
+        /**
+         * 消息内容
+         */
+        private String content;
+
+        /**
+         * 消息名称
+         */
+        private String name;
+
+        /**
+         * 函数调用信息
+         */
+        private Object functionCall;
+
+        /**
+         * 工具调用信息
+         */
+        private List<Object> toolCalls;
+
+        /**
+         * 工具调用ID
+         */
+        private String toolCallId;
+    }
+
+    /**
+     * 消息角色枚举
+     */
+    public enum MessageRole {
+        SYSTEM("system"),
+        USER("user"),
+        ASSISTANT("assistant"),
+        FUNCTION("function"),
+        TOOL("tool");
+
+        private final String value;
+
+        MessageRole(String value) {
+            this.value = value;
+        }
+
+        public String getValue() {
+            return value;
+        }
+    }
+}
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/domain/dto/AiChatResponse.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/domain/dto/AiChatResponse.java
new file mode 100644
index 0000000..6b896ce
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/domain/dto/AiChatResponse.java
@@ -0,0 +1,222 @@
+package org.dromara.ai.domain.dto;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * AI聊天响应DTO
+ *
+ * @author pengles
+ */
+@Data
+@Accessors(chain = true)
+public class AiChatResponse implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 响应ID
+     */
+    private String id;
+
+    /**
+     * 对象类型
+     */
+    private String object;
+
+    /**
+     * 创建时间
+     */
+    private Long created;
+
+    /**
+     * 模型名称
+     */
+    private String model;
+
+    /**
+     * 选择列表
+     */
+    private List<Choice> choices;
+
+    /**
+     * 使用情况
+     */
+    private Usage usage;
+
+    /**
+     * 系统指纹
+     */
+    private String systemFingerprint;
+
+    /**
+     * 提供商名称
+     */
+    private String provider;
+
+    /**
+     * 响应时间（毫秒）
+     */
+    private Long responseTime;
+
+    /**
+     * 是否成功
+     */
+    private Boolean success;
+
+    /**
+     * 错误信息
+     */
+    private String error;
+
+    /**
+     * 错误代码
+     */
+    private String errorCode;
+
+    /**
+     * 知识库检索结果
+     */
+    private List<KnowledgeResult> knowledgeResults;
+
+    /**
+     * 扩展信息
+     */
+    private Map<String, Object> extra;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 选择项
+     */
+    @Data
+    @Accessors(chain = true)
+    public static class Choice implements Serializable {
+
+        private static final long serialVersionUID = 1L;
+
+        /**
+         * 索引
+         */
+        private Integer index;
+
+        /**
+         * 消息
+         */
+        private AiChatRequest.AiMessage message;
+
+        /**
+         * 增量消息（流式）
+         */
+        private AiChatRequest.AiMessage delta;
+
+        /**
+         * 结束原因
+         */
+        private String finishReason;
+
+        /**
+         * 日志概率
+         */
+        private Object logprobs;
+    }
+
+    /**
+     * 使用情况
+     */
+    @Data
+    @Accessors(chain = true)
+    public static class Usage implements Serializable {
+
+        private static final long serialVersionUID = 1L;
+
+        /**
+         * 提示token数
+         */
+        private Integer promptTokens;
+
+        /**
+         * 完成token数
+         */
+        private Integer completionTokens;
+
+        /**
+         * 总token数
+         */
+        private Integer totalTokens;
+
+        /**
+         * 提示token详情
+         */
+        private Object promptTokensDetails;
+
+        /**
+         * 完成token详情
+         */
+        private Object completionTokensDetails;
+    }
+
+    /**
+     * 知识库检索结果
+     */
+    @Data
+    @Accessors(chain = true)
+    public static class KnowledgeResult implements Serializable {
+
+        private static final long serialVersionUID = 1L;
+
+        /**
+         * 文档ID
+         */
+        private String documentId;
+
+        /**
+         * 文档标题
+         */
+        private String title;
+
+        /**
+         * 文档内容
+         */
+        private String content;
+
+        /**
+         * 相似度分数
+         */
+        private Double score;
+
+        /**
+         * 元数据
+         */
+        private Map<String, Object> metadata;
+    }
+
+    /**
+     * 结束原因枚举
+     */
+    public enum FinishReason {
+        STOP("stop"),
+        LENGTH("length"),
+        FUNCTION_CALL("function_call"),
+        TOOL_CALLS("tool_calls"),
+        CONTENT_FILTER("content_filter");
+
+        private final String value;
+
+        FinishReason(String value) {
+            this.value = value;
+        }
+
+        public String getValue() {
+            return value;
+        }
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/domain/dto/AiModelInfo.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/domain/dto/AiModelInfo.java
new file mode 100644
index 0000000..5ecced7
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/domain/dto/AiModelInfo.java
@@ -0,0 +1,394 @@
+package org.dromara.ai.domain.dto;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * AI模型信息DTO
+ *
+ * @author pengles
+ */
+@Data
+@Accessors(chain = true)
+public class AiModelInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 模型ID
+     */
+    private String id;
+
+    /**
+     * 模型名称
+     */
+    private String name;
+
+    /**
+     * 模型显示名称
+     */
+    private String displayName;
+
+    /**
+     * 模型描述
+     */
+    private String description;
+
+    /**
+     * 模型版本
+     */
+    private String version;
+
+    /**
+     * 提供商类型
+     */
+    private String provider;
+
+    /**
+     * 模型类型
+     */
+    private ModelType type;
+
+    /**
+     * 模型能力
+     */
+    private List<ModelCapability> capabilities;
+
+    /**
+     * 最大上下文长度
+     */
+    private Integer maxContextLength;
+
+    /**
+     * 最大输出长度
+     */
+    private Integer maxOutputLength;
+
+    /**
+     * 输入价格（每1K token）
+     */
+    private Double inputPrice;
+
+    /**
+     * 输出价格（每1K token）
+     */
+    private Double outputPrice;
+
+    /**
+     * 是否支持流式输出
+     */
+    private Boolean supportStream;
+
+    /**
+     * 是否支持函数调用
+     */
+    private Boolean supportFunction;
+
+    /**
+     * 是否支持工具调用
+     */
+    private Boolean supportTool;
+
+    /**
+     * 是否支持视觉
+     */
+    private Boolean supportVision;
+
+    /**
+     * 是否支持图像生成
+     */
+    private Boolean supportImageGeneration;
+
+    /**
+     * 是否支持语音
+     */
+    private Boolean supportAudio;
+
+    /**
+     * 是否可用
+     */
+    private Boolean available;
+
+    /**
+     * 模型状态
+     */
+    private ModelStatus status;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime created;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updated;
+
+    /**
+     * 模型参数
+     */
+    private ModelParameters parameters;
+
+    /**
+     * 扩展信息
+     */
+    private Map<String, Object> extra;
+
+    /**
+     * 模型类型枚举
+     */
+    public enum ModelType {
+        /**
+         * 文本生成
+         */
+        TEXT_GENERATION("text_generation", "文本生成"),
+
+        /**
+         * 聊天对话
+         */
+        CHAT("chat", "聊天对话"),
+
+        /**
+         * 代码生成
+         */
+        CODE_GENERATION("code_generation", "代码生成"),
+
+        /**
+         * 图像生成
+         */
+        IMAGE_GENERATION("image_generation", "图像生成"),
+
+        /**
+         * 语音合成
+         */
+        TEXT_TO_SPEECH("text_to_speech", "语音合成"),
+
+        /**
+         * 语音识别
+         */
+        SPEECH_TO_TEXT("speech_to_text", "语音识别"),
+
+        /**
+         * 嵌入向量
+         */
+        EMBEDDING("embedding", "嵌入向量"),
+
+        /**
+         * 多模态
+         */
+        MULTIMODAL("multimodal", "多模态");
+
+        private final String code;
+        private final String name;
+
+        ModelType(String code, String name) {
+            this.code = code;
+            this.name = name;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getName() {
+            return name;
+        }
+    }
+
+    /**
+     * 模型能力枚举
+     */
+    public enum ModelCapability {
+        /**
+         * 文本理解
+         */
+        TEXT_UNDERSTANDING("text_understanding", "文本理解"),
+
+        /**
+         * 文本生成
+         */
+        TEXT_GENERATION("text_generation", "文本生成"),
+
+        /**
+         * 对话聊天
+         */
+        CONVERSATION("conversation", "对话聊天"),
+
+        /**
+         * 代码理解
+         */
+        CODE_UNDERSTANDING("code_understanding", "代码理解"),
+
+        /**
+         * 代码生成
+         */
+        CODE_GENERATION("code_generation", "代码生成"),
+
+        /**
+         * 函数调用
+         */
+        FUNCTION_CALLING("function_calling", "函数调用"),
+
+        /**
+         * 工具使用
+         */
+        TOOL_USE("tool_use", "工具使用"),
+
+        /**
+         * 图像理解
+         */
+        IMAGE_UNDERSTANDING("image_understanding", "图像理解"),
+
+        /**
+         * 图像生成
+         */
+        IMAGE_GENERATION("image_generation", "图像生成"),
+
+        /**
+         * 语音识别
+         */
+        SPEECH_RECOGNITION("speech_recognition", "语音识别"),
+
+        /**
+         * 语音合成
+         */
+        SPEECH_SYNTHESIS("speech_synthesis", "语音合成"),
+
+        /**
+         * 文档分析
+         */
+        DOCUMENT_ANALYSIS("document_analysis", "文档分析"),
+
+        /**
+         * 知识问答
+         */
+        KNOWLEDGE_QA("knowledge_qa", "知识问答");
+
+        private final String code;
+        private final String name;
+
+        ModelCapability(String code, String name) {
+            this.code = code;
+            this.name = name;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getName() {
+            return name;
+        }
+    }
+
+    /**
+     * 模型状态枚举
+     */
+    public enum ModelStatus {
+        /**
+         * 可用
+         */
+        AVAILABLE("available", "可用"),
+
+        /**
+         * 不可用
+         */
+        UNAVAILABLE("unavailable", "不可用"),
+
+        /**
+         * 维护中
+         */
+        MAINTENANCE("maintenance", "维护中"),
+
+        /**
+         * 已弃用
+         */
+        DEPRECATED("deprecated", "已弃用");
+
+        private final String code;
+        private final String name;
+
+        ModelStatus(String code, String name) {
+            this.code = code;
+            this.name = name;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public String getName() {
+            return name;
+        }
+    }
+
+    /**
+     * 模型参数
+     */
+    @Data
+    @Accessors(chain = true)
+    public static class ModelParameters implements Serializable {
+
+        private static final long serialVersionUID = 1L;
+
+        /**
+         * 默认温度
+         */
+        private Double defaultTemperature;
+
+        /**
+         * 最小温度
+         */
+        private Double minTemperature;
+
+        /**
+         * 最大温度
+         */
+        private Double maxTemperature;
+
+        /**
+         * 默认Top-p
+         */
+        private Double defaultTopP;
+
+        /**
+         * 最小Top-p
+         */
+        private Double minTopP;
+
+        /**
+         * 最大Top-p
+         */
+        private Double maxTopP;
+
+        /**
+         * 默认最大token数
+         */
+        private Integer defaultMaxTokens;
+
+        /**
+         * 最小最大token数
+         */
+        private Integer minMaxTokens;
+
+        /**
+         * 最大最大token数
+         */
+        private Integer maxMaxTokens;
+
+        /**
+         * 支持的停止词数量
+         */
+        private Integer maxStopSequences;
+
+        /**
+         * 其他参数
+         */
+        private Map<String, Object> others;
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/domain/enums/AiProviderType.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/domain/enums/AiProviderType.java
new file mode 100644
index 0000000..0c8b582
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/domain/enums/AiProviderType.java
@@ -0,0 +1,125 @@
+package org.dromara.ai.domain.enums;
+
+/**
+ * AI服务提供商类型枚举
+ *
+ * @author pengles
+ */
+public enum AiProviderType {
+
+    /**
+     * OpenAI
+     */
+    OPENAI("openai", "OpenAI", "OpenAI官方API服务"),
+
+    /**
+     * Azure OpenAI
+     */
+    AZURE_OPENAI("azure_openai", "Azure OpenAI", "微软Azure OpenAI服务"),
+
+    /**
+     * 百度文心一言
+     */
+    BAIDU_WENXIN("baidu_wenxin", "百度文心一言", "百度文心一言大模型"),
+
+    /**
+     * 阿里通义千问
+     */
+    ALIBABA_TONGYI("alibaba_tongyi", "阿里通义千问", "阿里巴巴通义千问大模型"),
+
+    /**
+     * 腾讯混元
+     */
+    TENCENT_HUNYUAN("tencent_hunyuan", "腾讯混元", "腾讯混元大模型"),
+
+    /**
+     * 讯飞星火
+     */
+    IFLYTEK_SPARK("iflytek_spark", "讯飞星火", "科大讯飞星火认知大模型"),
+
+    /**
+     * 智谱AI
+     */
+    ZHIPU_AI("zhipu_ai", "智谱AI", "智谱AI大模型"),
+
+    /**
+     * 月之暗面Kimi
+     */
+    MOONSHOT_KIMI("moonshot_kimi", "月之暗面Kimi", "月之暗面Kimi大模型"),
+
+    /**
+     * 字节豆包
+     */
+    BYTEDANCE_DOUBAO("bytedance_doubao", "字节豆包", "字节跳动豆包大模型"),
+
+    /**
+     * 自定义提供商
+     */
+    CUSTOM("custom", "自定义", "自定义AI服务提供商"),
+    FASTGPT("fastgpt", "FastGPT", "FastGPT平台"),
+    COZE("coze", "Coze", "Coze平台"),
+    DIFY("dify", "Dify", "Dify平台");
+
+    /**
+     * 提供商代码
+     */
+    private final String code;
+
+    /**
+     * 提供商名称
+     */
+    private final String name;
+
+    /**
+     * 提供商描述
+     */
+    private final String description;
+
+    AiProviderType(String code, String name, String description) {
+        this.code = code;
+        this.name = name;
+        this.description = description;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    /**
+     * 根据代码获取提供商类型
+     *
+     * @param code 提供商代码
+     * @return 提供商类型
+     */
+    public static AiProviderType fromCode(String code) {
+        for (AiProviderType type : values()) {
+            if (type.getCode().equals(code)) {
+                return type;
+            }
+        }
+        return CUSTOM;
+    }
+
+    /**
+     * 根据名称获取提供商类型
+     *
+     * @param name 提供商名称
+     * @return 提供商类型
+     */
+    public static AiProviderType fromName(String name) {
+        for (AiProviderType type : values()) {
+            if (type.getName().equals(name)) {
+                return type;
+            }
+        }
+        return CUSTOM;
+    }
+}
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/domain/vo/AiChatRecordVo.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/domain/vo/AiChatRecordVo.java
new file mode 100644
index 0000000..b25cc4d
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/domain/vo/AiChatRecordVo.java
@@ -0,0 +1,94 @@
+package org.dromara.ai.domain.vo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.ai.domain.AiChatRecord;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * AI聊天记录视图对象 ai_chat_record
+ *
+ * @author pengles
+ */
+@Data
+@AutoMapper(target = AiChatRecord.class)
+public class AiChatRecordVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    private Long id;
+
+    /**
+     * 会话ID
+     */
+    private String sessionId;
+
+    /**
+     * 用户ID
+     */
+    private Long userId;
+
+    /**
+     * Provider名称
+     */
+    private String providerName;
+
+    /**
+     * 模型名称
+     */
+    private String modelName;
+
+    /**
+     * 消息类型(USER/ASSISTANT)
+     */
+    private String messageType;
+
+    /**
+     * 消息内容
+     */
+    private String content;
+
+    /**
+     * 使用的Token数
+     */
+    private Integer tokensUsed;
+
+    /**
+     * 成本
+     */
+    private BigDecimal cost;
+
+    /**
+     * 响应时间(毫秒)
+     */
+    private Integer responseTime;
+
+    /**
+     * 是否流式响应(0否 1是)
+     */
+    private Integer isStream;
+
+    /**
+     * 是否流式响应(显示用)
+     */
+    private String isStreamStr;
+
+    /**
+     * 错误信息
+     */
+    private String errorMessage;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+}
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/domain/vo/AiPaintingFavoriteVo.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/domain/vo/AiPaintingFavoriteVo.java
new file mode 100644
index 0000000..68f1592
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/domain/vo/AiPaintingFavoriteVo.java
@@ -0,0 +1,60 @@
+package org.dromara.ai.domain.vo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.ai.domain.AiPaintingFavorite;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * AI绘画作品收藏视图对象 ai_painting_favorite
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode
+@AutoMapper(target = AiPaintingFavorite.class)
+public class AiPaintingFavoriteVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    private Long id;
+
+    /**
+     * 用户ID
+     */
+    private Long userId;
+
+    /**
+     * 绘画记录ID
+     */
+    private Long paintingRecordId;
+
+    /**
+     * 任务ID
+     */
+    private String taskId;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 收藏时间
+     */
+    private Date createTime;
+
+    /**
+     * 绘画记录信息（关联查询）
+     */
+    private AiPaintingRecordVo paintingRecord;
+
+}
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/domain/vo/AiPaintingRecordVo.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/domain/vo/AiPaintingRecordVo.java
new file mode 100644
index 0000000..70568ba
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/domain/vo/AiPaintingRecordVo.java
@@ -0,0 +1,110 @@
+package org.dromara.ai.domain.vo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.ai.domain.AiPaintingRecord;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * AI绘画历史记录视图对象 ai_painting_record
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode
+@AutoMapper(target = AiPaintingRecord.class)
+public class AiPaintingRecordVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    private Long id;
+
+    /**
+     * 任务ID
+     */
+    private String taskId;
+
+    /**
+     * 用户ID
+     */
+    private Long userId;
+
+    /**
+     * 绘画引擎类型(DALL_E_3/MIDJOURNEY/STABLE_DIFFUSION)
+     */
+    private String engineType;
+
+    /**
+     * 绘画引擎类型（字符串显示）
+     */
+    private String engineTypeStr;
+
+    /**
+     * 提示词
+     */
+    private String prompt;
+
+    /**
+     * 绘画参数(JSON字符串)
+     */
+    private String params;
+
+    /**
+     * 状态(PENDING/RUNNING/SUCCESS/FAILED)
+     */
+    private String status;
+
+    /**
+     * 状态（字符串显示）
+     */
+    private String statusStr;
+
+    /**
+     * 进度(0-100)
+     */
+    private Integer progress;
+
+    /**
+     * 生成的图片URL列表(JSON字符串)
+     */
+    private String images;
+
+    /**
+     * 错误消息
+     */
+    private String message;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     * 分享码（用于分享作品）
+     */
+    private String shareCode;
+
+    /**
+     * 是否公开分享(0否 1是)
+     */
+    private Integer isPublic;
+
+    /**
+     * 是否公开分享（字符串显示）
+     */
+    private String isPublicStr;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/domain/vo/AiPaintingTemplateVo.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/domain/vo/AiPaintingTemplateVo.java
new file mode 100644
index 0000000..95bde71
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/domain/vo/AiPaintingTemplateVo.java
@@ -0,0 +1,95 @@
+package org.dromara.ai.domain.vo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.ai.domain.AiPaintingTemplate;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * AI绘画参数模板视图对象 ai_painting_template
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode
+@AutoMapper(target = AiPaintingTemplate.class)
+public class AiPaintingTemplateVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    private Long id;
+
+    /**
+     * 模板名称
+     */
+    private String templateName;
+
+    /**
+     * 用户ID(为空表示系统模板)
+     */
+    private Long userId;
+
+    /**
+     * 绘画引擎类型(DALL_E_3/MIDJOURNEY/STABLE_DIFFUSION)
+     */
+    private String engineType;
+
+    /**
+     * 绘画引擎类型（字符串显示）
+     */
+    private String engineTypeStr;
+
+    /**
+     * 绘画参数(JSON字符串)
+     */
+    private String params;
+
+    /**
+     * 模板描述
+     */
+    private String description;
+
+    /**
+     * 是否公开(0=私有 1=公开)
+     */
+    private Integer isPublic;
+
+    /**
+     * 是否公开（字符串显示）
+     */
+    private String isPublicStr;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     * 创建者
+     */
+    private String createBy;
+
+    /**
+     * 更新者
+     */
+    private String updateBy;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/domain/vo/AiProviderConfigHistoryVo.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/domain/vo/AiProviderConfigHistoryVo.java
new file mode 100644
index 0000000..5008f13
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/domain/vo/AiProviderConfigHistoryVo.java
@@ -0,0 +1,70 @@
+package org.dromara.ai.domain.vo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.ai.domain.AiProviderConfigHistory;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * AI Provider配置历史视图对象 ai_provider_config_history
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode
+@AutoMapper(target = AiProviderConfigHistory.class)
+public class AiProviderConfigHistoryVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    private Long id;
+
+    /**
+     * 配置ID
+     */
+    private Long configId;
+
+    /**
+     * Provider名称
+     */
+    private String providerName;
+
+    /**
+     * 配置数据(JSON字符串)
+     */
+    private String configData;
+
+    /**
+     * 操作类型(CREATE/UPDATE/DELETE)
+     */
+    private String operationType;
+
+    /**
+     * 操作类型（字符串显示）
+     */
+    private String operationTypeStr;
+
+    /**
+     * 操作时间
+     */
+    private Date operationTime;
+
+    /**
+     * 操作者
+     */
+    private String operationBy;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/domain/vo/AiProviderConfigVo.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/domain/vo/AiProviderConfigVo.java
new file mode 100644
index 0000000..7411165
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/domain/vo/AiProviderConfigVo.java
@@ -0,0 +1,135 @@
+package org.dromara.ai.domain.vo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.ai.domain.AiProviderConfig;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * AI Provider配置视图对象 ai_provider_config
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode
+@AutoMapper(target = AiProviderConfig.class)
+public class AiProviderConfigVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    private Long id;
+
+    /**
+     * Provider名称
+     */
+    private String providerName;
+
+    /**
+     * Provider类型
+     */
+    private String providerType;
+
+    /**
+     * 是否启用(0=禁用 1=启用)
+     */
+    private Integer enabled;
+
+    /**
+     * 是否启用（字符串显示）
+     */
+    private String enabledStr;
+
+    /**
+     * 优先级(数字越小优先级越高)
+     */
+    private Integer priority;
+
+    /**
+     * 权重(用于负载均衡)
+     */
+    private Integer weight;
+
+    /**
+     * 最大并发数
+     */
+    private Integer maxConcurrency;
+
+    /**
+     * 超时时间(秒)
+     */
+    private Integer timeoutSeconds;
+
+    /**
+     * 最大重试次数
+     */
+    private Integer maxRetries;
+
+    /**
+     * 熔断器配置(JSON字符串)
+     */
+    private String circuitBreakerConfig;
+
+    /**
+     * 限流配置(JSON字符串)
+     */
+    private String rateLimitConfig;
+
+    /**
+     * API配置(JSON字符串)
+     */
+    private String apiConfig;
+
+    /**
+     * 模型配置(JSON字符串)
+     */
+    private String modelConfig;
+
+    /**
+     * 扩展配置(JSON字符串)
+     */
+    private String extensionConfig;
+
+    /**
+     * 健康检查URL
+     */
+    private String healthCheckUrl;
+
+    /**
+     * 健康检查间隔(秒)
+     */
+    private Integer healthCheckInterval;
+
+    /**
+     * 创建者
+     */
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新者
+     */
+    private String updateBy;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+}
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/domain/vo/AiRatingRecordVo.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/domain/vo/AiRatingRecordVo.java
new file mode 100644
index 0000000..e1f8eeb
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/domain/vo/AiRatingRecordVo.java
@@ -0,0 +1,75 @@
+package org.dromara.ai.domain.vo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.ai.domain.AiRatingRecord;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * AI评价记录视图对象 ai_rating_record
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode
+@AutoMapper(target = AiRatingRecord.class)
+public class AiRatingRecordVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    private Long id;
+
+    /**
+     * 消息ID
+     */
+    private String messageId;
+
+    /**
+     * 用户ID
+     */
+    private Long userId;
+
+    /**
+     * Provider名称
+     */
+    private String providerName;
+
+    /**
+     * 评分(1-5)
+     */
+    private Integer rating;
+
+    /**
+     * 反馈内容
+     */
+    private String feedback;
+
+    /**
+     * 评价维度
+     */
+    private String dimension;
+
+    /**
+     * 是否匿名(0否 1是)
+     */
+    private Integer anonymous;
+
+    /**
+     * 是否匿名（字符串显示）
+     */
+    private String anonymousStr;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+}
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/domain/vo/AiSensitiveWordVo.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/domain/vo/AiSensitiveWordVo.java
new file mode 100644
index 0000000..a0a2281
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/domain/vo/AiSensitiveWordVo.java
@@ -0,0 +1,85 @@
+package org.dromara.ai.domain.vo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.ai.domain.AiSensitiveWord;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * AI敏感词视图对象 ai_sensitive_word
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode
+@AutoMapper(target = AiSensitiveWord.class)
+public class AiSensitiveWordVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    private Long id;
+
+    /**
+     * 敏感词
+     */
+    private String word;
+
+    /**
+     * 词类型(PROFANITY/HATE_SPEECH/VIOLENCE/SEXUAL_CONTENT/ILLEGAL_ACTIVITY/PERSONAL_INFO/SPAM/MALICIOUS_CODE/POLITICAL_SENSITIVE/COMMERCIAL_AD)
+     */
+    private String wordType;
+
+    /**
+     * 词类型（字符串显示）
+     */
+    private String wordTypeStr;
+
+    /**
+     * 是否启用(0=禁用 1=启用)
+     */
+    private Integer enabled;
+
+    /**
+     * 是否启用（字符串显示）
+     */
+    private String enabledStr;
+
+    /**
+     * 优先级(数字越大优先级越高)
+     */
+    private Integer priority;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     * 创建者
+     */
+    private String createBy;
+
+    /**
+     * 更新者
+     */
+    private String updateBy;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/domain/vo/AiUsageStatsVo.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/domain/vo/AiUsageStatsVo.java
new file mode 100644
index 0000000..0e56120
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/domain/vo/AiUsageStatsVo.java
@@ -0,0 +1,94 @@
+package org.dromara.ai.domain.vo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.ai.domain.AiUsageStats;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * AI使用统计视图对象 ai_usage_stats
+ *
+ * @author pengles
+ */
+@Data
+@AutoMapper(target = AiUsageStats.class)
+public class AiUsageStatsVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    private Long id;
+
+    /**
+     * 用户ID
+     */
+    private Long userId;
+
+    /**
+     * Provider名称
+     */
+    private String providerName;
+
+    /**
+     * 模型名称
+     */
+    private String modelName;
+
+    /**
+     * 统计日期
+     */
+    private Date statDate;
+
+    /**
+     * 请求次数
+     */
+    private Integer requestCount;
+
+    /**
+     * 成功次数
+     */
+    private Integer successCount;
+
+    /**
+     * 错误次数
+     */
+    private Integer errorCount;
+
+    /**
+     * 总Token数
+     */
+    private Long totalTokens;
+
+    /**
+     * 总成本
+     */
+    private BigDecimal totalCost;
+
+    /**
+     * 平均响应时间(毫秒)
+     */
+    private Integer avgResponseTime;
+
+    /**
+     * 成功率（计算字段）
+     */
+    private Double successRate;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+}
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/domain/vo/AiUserQuotaVo.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/domain/vo/AiUserQuotaVo.java
new file mode 100644
index 0000000..bb41db7
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/domain/vo/AiUserQuotaVo.java
@@ -0,0 +1,115 @@
+package org.dromara.ai.domain.vo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.ai.domain.AiUserQuota;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * AI用户配额视图对象 ai_user_quota
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode
+@AutoMapper(target = AiUserQuota.class)
+public class AiUserQuotaVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    private Long id;
+
+    /**
+     * 用户ID
+     */
+    private Long userId;
+
+    /**
+     * 权限级别(GUEST/BASIC/PREMIUM/VIP/ADMIN)
+     */
+    private String permissionLevel;
+
+    /**
+     * 权限级别（字符串显示）
+     */
+    private String permissionLevelStr;
+
+    /**
+     * 每日配额限制(0表示无限制)
+     */
+    private Long dailyQuota;
+
+    /**
+     * 每月配额限制(0表示无限制)
+     */
+    private Long monthlyQuota;
+
+    /**
+     * 每日已使用配额
+     */
+    private Long dailyUsed;
+
+    /**
+     * 每月已使用配额
+     */
+    private Long monthlyUsed;
+
+    /**
+     * 每日剩余配额
+     */
+    private Long dailyRemaining;
+
+    /**
+     * 每月剩余配额
+     */
+    private Long monthlyRemaining;
+
+    /**
+     * 上次重置日配额时间
+     */
+    private Date lastResetDaily;
+
+    /**
+     * 上次重置月配额时间
+     */
+    private Date lastResetMonthly;
+
+    /**
+     * 自定义限制(JSON字符串)
+     */
+    private String customLimits;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     * 创建者
+     */
+    private String createBy;
+
+    /**
+     * 更新者
+     */
+    private String updateBy;
+
+}
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/error/AiErrorHandler.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/error/AiErrorHandler.java
new file mode 100644
index 0000000..9665b8e
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/error/AiErrorHandler.java
@@ -0,0 +1,836 @@
+package org.dromara.ai.error;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.ai.domain.dto.AiChatRequest;
+import org.dromara.ai.domain.dto.AiChatResponse;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Function;
+
+/**
+ * AI错误处理和故障恢复服务
+ * 提供统一的错误处理、重试机制和故障恢复功能
+ *
+ * @author pengles
+ */
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class AiErrorHandler {
+
+    private final ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(2);
+
+    // 错误统计
+    private final Map<String, ErrorStatistics> errorStats = new ConcurrentHashMap<>();
+
+    // 熔断器状态
+    private final Map<String, CircuitBreakerState> circuitBreakers = new ConcurrentHashMap<>();
+
+    // 重试配置
+    private final Map<String, RetryConfig> retryConfigs = new ConcurrentHashMap<>();
+
+    /**
+     * 错误类型枚举
+     */
+    public enum ErrorType {
+        NETWORK_ERROR,          // 网络错误
+        TIMEOUT_ERROR,          // 超时错误
+        RATE_LIMIT_ERROR,       // 速率限制错误
+        QUOTA_EXCEEDED_ERROR,   // 配额超限错误
+        AUTHENTICATION_ERROR,   // 认证错误
+        AUTHORIZATION_ERROR,    // 授权错误
+        VALIDATION_ERROR,       // 验证错误
+        SERVICE_UNAVAILABLE,    // 服务不可用
+        INTERNAL_ERROR,         // 内部错误
+        UNKNOWN_ERROR           // 未知错误
+    }
+
+    /**
+     * 错误严重级别
+     */
+    public enum ErrorSeverity {
+        LOW,        // 低级别
+        MEDIUM,     // 中级别
+        HIGH,       // 高级别
+        CRITICAL    // 严重级别
+    }
+
+    /**
+     * 熔断器状态
+     */
+    public enum CircuitBreakerStatus {
+        CLOSED,     // 关闭状态（正常）
+        OPEN,       // 开启状态（熔断）
+        HALF_OPEN   // 半开状态（试探）
+    }
+
+    /**
+     * 错误信息类
+     */
+    public static class AiError {
+        private String id;
+        private ErrorType type;
+        private ErrorSeverity severity;
+        private String message;
+        private String details;
+        private String provider;
+        private String model;
+        private String userId;
+        private LocalDateTime occurTime;
+        private Map<String, Object> context;
+        private Throwable cause;
+
+        // Getters and Setters
+        public String getId() {
+            return id;
+        }
+
+        public AiError setId(String id) {
+            this.id = id;
+            return this;
+        }
+
+        public ErrorType getType() {
+            return type;
+        }
+
+        public AiError setType(ErrorType type) {
+            this.type = type;
+            return this;
+        }
+
+        public ErrorSeverity getSeverity() {
+            return severity;
+        }
+
+        public AiError setSeverity(ErrorSeverity severity) {
+            this.severity = severity;
+            return this;
+        }
+
+        public String getMessage() {
+            return message;
+        }
+
+        public AiError setMessage(String message) {
+            this.message = message;
+            return this;
+        }
+
+        public String getDetails() {
+            return details;
+        }
+
+        public AiError setDetails(String details) {
+            this.details = details;
+            return this;
+        }
+
+        public String getProvider() {
+            return provider;
+        }
+
+        public AiError setProvider(String provider) {
+            this.provider = provider;
+            return this;
+        }
+
+        public String getModel() {
+            return model;
+        }
+
+        public AiError setModel(String model) {
+            this.model = model;
+            return this;
+        }
+
+        public String getUserId() {
+            return userId;
+        }
+
+        public AiError setUserId(String userId) {
+            this.userId = userId;
+            return this;
+        }
+
+        public LocalDateTime getOccurTime() {
+            return occurTime;
+        }
+
+        public AiError setOccurTime(LocalDateTime occurTime) {
+            this.occurTime = occurTime;
+            return this;
+        }
+
+        public Map<String, Object> getContext() {
+            return context;
+        }
+
+        public AiError setContext(Map<String, Object> context) {
+            this.context = context;
+            return this;
+        }
+
+        public Throwable getCause() {
+            return cause;
+        }
+
+        public AiError setCause(Throwable cause) {
+            this.cause = cause;
+            return this;
+        }
+    }
+
+    /**
+     * 错误统计类
+     */
+    public static class ErrorStatistics {
+        private String key;
+        private long totalErrors;
+        private long networkErrors;
+        private long timeoutErrors;
+        private long rateLimitErrors;
+        private long quotaErrors;
+        private long authErrors;
+        private long validationErrors;
+        private long serviceUnavailableErrors;
+        private long internalErrors;
+        private long unknownErrors;
+        private LocalDateTime lastErrorTime;
+        private LocalDateTime firstErrorTime;
+        private double errorRate;
+
+        public ErrorStatistics(String key) {
+            this.key = key;
+            this.firstErrorTime = LocalDateTime.now();
+        }
+
+        public void incrementError(ErrorType type) {
+            totalErrors++;
+            lastErrorTime = LocalDateTime.now();
+
+            switch (type) {
+                case NETWORK_ERROR -> networkErrors++;
+                case TIMEOUT_ERROR -> timeoutErrors++;
+                case RATE_LIMIT_ERROR -> rateLimitErrors++;
+                case QUOTA_EXCEEDED_ERROR -> quotaErrors++;
+                case AUTHENTICATION_ERROR, AUTHORIZATION_ERROR -> authErrors++;
+                case VALIDATION_ERROR -> validationErrors++;
+                case SERVICE_UNAVAILABLE -> serviceUnavailableErrors++;
+                case INTERNAL_ERROR -> internalErrors++;
+                default -> unknownErrors++;
+            }
+        }
+
+        // Getters
+        public String getKey() {
+            return key;
+        }
+
+        public long getTotalErrors() {
+            return totalErrors;
+        }
+
+        public long getNetworkErrors() {
+            return networkErrors;
+        }
+
+        public long getTimeoutErrors() {
+            return timeoutErrors;
+        }
+
+        public long getRateLimitErrors() {
+            return rateLimitErrors;
+        }
+
+        public long getQuotaErrors() {
+            return quotaErrors;
+        }
+
+        public long getAuthErrors() {
+            return authErrors;
+        }
+
+        public long getValidationErrors() {
+            return validationErrors;
+        }
+
+        public long getServiceUnavailableErrors() {
+            return serviceUnavailableErrors;
+        }
+
+        public long getInternalErrors() {
+            return internalErrors;
+        }
+
+        public long getUnknownErrors() {
+            return unknownErrors;
+        }
+
+        public LocalDateTime getLastErrorTime() {
+            return lastErrorTime;
+        }
+
+        public LocalDateTime getFirstErrorTime() {
+            return firstErrorTime;
+        }
+
+        public double getErrorRate() {
+            return errorRate;
+        }
+
+        public void setErrorRate(double errorRate) {
+            this.errorRate = errorRate;
+        }
+    }
+
+    /**
+     * 熔断器状态类
+     */
+    public static class CircuitBreakerState {
+        private String key;
+        private CircuitBreakerStatus status;
+        private long failureCount;
+        private long successCount;
+        private LocalDateTime lastFailureTime;
+        private LocalDateTime lastSuccessTime;
+        private LocalDateTime nextRetryTime;
+        private int failureThreshold;
+        private int successThreshold;
+        private long timeoutMs;
+
+        public CircuitBreakerState(String key) {
+            this.key = key;
+            this.status = CircuitBreakerStatus.CLOSED;
+            this.failureThreshold = 5;
+            this.successThreshold = 3;
+            this.timeoutMs = 60000; // 1分钟
+        }
+
+        public void recordSuccess() {
+            successCount++;
+            lastSuccessTime = LocalDateTime.now();
+
+            if (status == CircuitBreakerStatus.HALF_OPEN && successCount >= successThreshold) {
+                status = CircuitBreakerStatus.CLOSED;
+                failureCount = 0;
+                successCount = 0;
+            }
+        }
+
+        public void recordFailure() {
+            failureCount++;
+            lastFailureTime = LocalDateTime.now();
+
+            if (status == CircuitBreakerStatus.CLOSED && failureCount >= failureThreshold) {
+                status = CircuitBreakerStatus.OPEN;
+                nextRetryTime = LocalDateTime.now().plusNanos(timeoutMs * 1_000_000);
+            } else if (status == CircuitBreakerStatus.HALF_OPEN) {
+                status = CircuitBreakerStatus.OPEN;
+                nextRetryTime = LocalDateTime.now().plusNanos(timeoutMs * 1_000_000);
+                successCount = 0;
+            }
+        }
+
+        public boolean canExecute() {
+            if (status == CircuitBreakerStatus.CLOSED) {
+                return true;
+            } else if (status == CircuitBreakerStatus.OPEN) {
+                if (LocalDateTime.now().isAfter(nextRetryTime)) {
+                    status = CircuitBreakerStatus.HALF_OPEN;
+                    return true;
+                }
+                return false;
+            } else { // HALF_OPEN
+                return true;
+            }
+        }
+
+        // Getters
+        public String getKey() {
+            return key;
+        }
+
+        public CircuitBreakerStatus getStatus() {
+            return status;
+        }
+
+        public long getFailureCount() {
+            return failureCount;
+        }
+
+        public long getSuccessCount() {
+            return successCount;
+        }
+
+        public LocalDateTime getLastFailureTime() {
+            return lastFailureTime;
+        }
+
+        public LocalDateTime getLastSuccessTime() {
+            return lastSuccessTime;
+        }
+
+        public LocalDateTime getNextRetryTime() {
+            return nextRetryTime;
+        }
+    }
+
+    /**
+     * 重试配置类
+     */
+    public static class RetryConfig {
+        private int maxAttempts;
+        private long initialDelayMs;
+        private long maxDelayMs;
+        private double backoffMultiplier;
+        private boolean exponentialBackoff;
+
+        public RetryConfig() {
+            this.maxAttempts = 3;
+            this.initialDelayMs = 1000;
+            this.maxDelayMs = 30000;
+            this.backoffMultiplier = 2.0;
+            this.exponentialBackoff = true;
+        }
+
+        // Getters and Setters
+        public int getMaxAttempts() {
+            return maxAttempts;
+        }
+
+        public RetryConfig setMaxAttempts(int maxAttempts) {
+            this.maxAttempts = maxAttempts;
+            return this;
+        }
+
+        public long getInitialDelayMs() {
+            return initialDelayMs;
+        }
+
+        public RetryConfig setInitialDelayMs(long initialDelayMs) {
+            this.initialDelayMs = initialDelayMs;
+            return this;
+        }
+
+        public long getMaxDelayMs() {
+            return maxDelayMs;
+        }
+
+        public RetryConfig setMaxDelayMs(long maxDelayMs) {
+            this.maxDelayMs = maxDelayMs;
+            return this;
+        }
+
+        public double getBackoffMultiplier() {
+            return backoffMultiplier;
+        }
+
+        public RetryConfig setBackoffMultiplier(double backoffMultiplier) {
+            this.backoffMultiplier = backoffMultiplier;
+            return this;
+        }
+
+        public boolean isExponentialBackoff() {
+            return exponentialBackoff;
+        }
+
+        public RetryConfig setExponentialBackoff(boolean exponentialBackoff) {
+            this.exponentialBackoff = exponentialBackoff;
+            return this;
+        }
+    }
+
+    /**
+     * 执行带错误处理的操作
+     *
+     * @param key       操作标识
+     * @param operation 操作函数
+     * @param request   请求对象
+     * @return 响应结果
+     */
+    public AiChatResponse executeWithErrorHandling(String key,
+                                                   Function<AiChatRequest, AiChatResponse> operation,
+                                                   AiChatRequest request) {
+        CircuitBreakerState circuitBreaker = getOrCreateCircuitBreaker(key);
+
+        // 检查熔断器状态
+        if (!circuitBreaker.canExecute()) {
+            AiError error = new AiError()
+                    .setType(ErrorType.SERVICE_UNAVAILABLE)
+                    .setSeverity(ErrorSeverity.HIGH)
+                    .setMessage("服务熔断中，暂时不可用")
+                    .setProvider(key)
+                    .setUserId(request.getUserId())
+                    .setOccurTime(LocalDateTime.now());
+
+            recordError(key, error);
+            return createErrorResponse(error, request);
+        }
+
+        RetryConfig retryConfig = getOrCreateRetryConfig(key);
+
+        for (int attempt = 1; attempt <= retryConfig.getMaxAttempts(); attempt++) {
+            try {
+                AiChatResponse response = operation.apply(request);
+
+                if (response.getSuccess() != null && response.getSuccess()) {
+                    circuitBreaker.recordSuccess();
+                    return response;
+                } else {
+                    // 业务错误
+                    AiError error = createErrorFromResponse(response, request);
+                    recordError(key, error);
+
+                    if (attempt == retryConfig.getMaxAttempts() || !isRetryableError(error.getType())) {
+                        circuitBreaker.recordFailure();
+                        return response;
+                    }
+                }
+
+            } catch (Exception e) {
+                AiError error = createErrorFromException(e, key, request);
+                recordError(key, error);
+
+                if (attempt == retryConfig.getMaxAttempts() || !isRetryableError(error.getType())) {
+                    circuitBreaker.recordFailure();
+                    return createErrorResponse(error, request);
+                }
+
+                // 等待重试
+                if (attempt < retryConfig.getMaxAttempts()) {
+                    try {
+                        long delay = calculateRetryDelay(retryConfig, attempt);
+                        Thread.sleep(delay);
+                    } catch (InterruptedException ie) {
+                        Thread.currentThread().interrupt();
+                        break;
+                    }
+                }
+            }
+        }
+
+        // 所有重试都失败
+        AiError error = new AiError()
+                .setType(ErrorType.INTERNAL_ERROR)
+                .setSeverity(ErrorSeverity.HIGH)
+                .setMessage("所有重试尝试都失败")
+                .setProvider(key)
+                .setUserId(request.getUserId())
+                .setOccurTime(LocalDateTime.now());
+
+        circuitBreaker.recordFailure();
+        return createErrorResponse(error, request);
+    }
+
+    /**
+     * 记录错误
+     *
+     * @param key   错误标识
+     * @param error 错误信息
+     */
+    public void recordError(String key, AiError error) {
+        ErrorStatistics stats = errorStats.computeIfAbsent(key, ErrorStatistics::new);
+        stats.incrementError(error.getType());
+
+        log.error("AI错误记录 - Key: {}, Type: {}, Severity: {}, Message: {}",
+                key, error.getType(), error.getSeverity(), error.getMessage());
+
+        // 根据错误严重级别进行不同处理
+        switch (error.getSeverity()) {
+            case CRITICAL -> handleCriticalError(error);
+            case HIGH -> handleHighSeverityError(error);
+            case MEDIUM -> handleMediumSeverityError(error);
+            case LOW -> handleLowSeverityError(error);
+        }
+    }
+
+    /**
+     * 获取错误统计
+     *
+     * @param key 统计标识
+     * @return 错误统计
+     */
+    public ErrorStatistics getErrorStatistics(String key) {
+        return errorStats.get(key);
+    }
+
+    /**
+     * 获取所有错误统计
+     *
+     * @return 错误统计映射
+     */
+    public Map<String, ErrorStatistics> getAllErrorStatistics() {
+        return new ConcurrentHashMap<>(errorStats);
+    }
+
+    /**
+     * 获取熔断器状态
+     *
+     * @param key 熔断器标识
+     * @return 熔断器状态
+     */
+    public CircuitBreakerState getCircuitBreakerState(String key) {
+        return circuitBreakers.get(key);
+    }
+
+    /**
+     * 重置熔断器
+     *
+     * @param key 熔断器标识
+     */
+    public void resetCircuitBreaker(String key) {
+        CircuitBreakerState state = circuitBreakers.get(key);
+        if (state != null) {
+            state.status = CircuitBreakerStatus.CLOSED;
+            state.failureCount = 0;
+            state.successCount = 0;
+            log.info("熔断器已重置: {}", key);
+        }
+    }
+
+    /**
+     * 设置重试配置
+     *
+     * @param key    配置标识
+     * @param config 重试配置
+     */
+    public void setRetryConfig(String key, RetryConfig config) {
+        retryConfigs.put(key, config);
+    }
+
+    /**
+     * 清理错误统计
+     */
+    public void clearErrorStatistics() {
+        errorStats.clear();
+        log.info("错误统计已清理");
+    }
+
+    /**
+     * 获取或创建熔断器
+     */
+    private CircuitBreakerState getOrCreateCircuitBreaker(String key) {
+        return circuitBreakers.computeIfAbsent(key, CircuitBreakerState::new);
+    }
+
+    /**
+     * 获取或创建重试配置
+     */
+    private RetryConfig getOrCreateRetryConfig(String key) {
+        return retryConfigs.computeIfAbsent(key, k -> new RetryConfig());
+    }
+
+    /**
+     * 判断是否为可重试错误
+     */
+    private boolean isRetryableError(ErrorType errorType) {
+        return switch (errorType) {
+            case NETWORK_ERROR, TIMEOUT_ERROR, SERVICE_UNAVAILABLE, RATE_LIMIT_ERROR -> true;
+            case AUTHENTICATION_ERROR, AUTHORIZATION_ERROR, VALIDATION_ERROR, QUOTA_EXCEEDED_ERROR -> false;
+            default -> true;
+        };
+    }
+
+    /**
+     * 计算重试延迟
+     */
+    private long calculateRetryDelay(RetryConfig config, int attempt) {
+        if (!config.isExponentialBackoff()) {
+            return config.getInitialDelayMs();
+        }
+
+        long delay = (long) (config.getInitialDelayMs() * Math.pow(config.getBackoffMultiplier(), attempt - 1));
+        return Math.min(delay, config.getMaxDelayMs());
+    }
+
+    /**
+     * 从异常创建错误对象
+     */
+    private AiError createErrorFromException(Exception e, String provider, AiChatRequest request) {
+        ErrorType type = classifyException(e);
+        ErrorSeverity severity = determineSeverity(type);
+
+        return new AiError()
+                .setId(java.util.UUID.randomUUID().toString())
+                .setType(type)
+                .setSeverity(severity)
+                .setMessage(e.getMessage())
+                .setDetails(getStackTrace(e))
+                .setProvider(provider)
+                .setModel(request.getModel())
+                .setUserId(request.getUserId())
+                .setOccurTime(LocalDateTime.now())
+                .setCause(e);
+    }
+
+    /**
+     * 从响应创建错误对象
+     */
+    private AiError createErrorFromResponse(AiChatResponse response, AiChatRequest request) {
+        ErrorType type = classifyResponseError(response);
+        ErrorSeverity severity = determineSeverity(type);
+
+        return new AiError()
+                .setId(java.util.UUID.randomUUID().toString())
+                .setType(type)
+                .setSeverity(severity)
+                .setMessage(response.getError())
+                .setDetails(response.getErrorCode())
+                .setProvider(response.getProvider())
+                .setModel(response.getModel())
+                .setUserId(request.getUserId())
+                .setOccurTime(LocalDateTime.now());
+    }
+
+    /**
+     * 分类异常类型
+     */
+    private ErrorType classifyException(Exception e) {
+        String message = e.getMessage();
+        if (message == null) {
+            return ErrorType.UNKNOWN_ERROR;
+        }
+
+        message = message.toLowerCase();
+
+        if (message.contains("timeout") || message.contains("timed out")) {
+            return ErrorType.TIMEOUT_ERROR;
+        } else if (message.contains("network") || message.contains("connection")) {
+            return ErrorType.NETWORK_ERROR;
+        } else if (message.contains("rate limit") || message.contains("too many requests")) {
+            return ErrorType.RATE_LIMIT_ERROR;
+        } else if (message.contains("quota") || message.contains("limit exceeded")) {
+            return ErrorType.QUOTA_EXCEEDED_ERROR;
+        } else if (message.contains("unauthorized") || message.contains("authentication")) {
+            return ErrorType.AUTHENTICATION_ERROR;
+        } else if (message.contains("forbidden") || message.contains("access denied")) {
+            return ErrorType.AUTHORIZATION_ERROR;
+        } else if (message.contains("validation") || message.contains("invalid")) {
+            return ErrorType.VALIDATION_ERROR;
+        } else if (message.contains("service unavailable") || message.contains("server error")) {
+            return ErrorType.SERVICE_UNAVAILABLE;
+        } else {
+            return ErrorType.INTERNAL_ERROR;
+        }
+    }
+
+    /**
+     * 分类响应错误类型
+     */
+    private ErrorType classifyResponseError(AiChatResponse response) {
+        String errorCode = response.getErrorCode();
+        String errorMessage = response.getError();
+
+        if (errorCode != null) {
+            return switch (errorCode.toUpperCase()) {
+                case "TIMEOUT", "TIMEOUT_ERROR" -> ErrorType.TIMEOUT_ERROR;
+                case "RATE_LIMIT", "RATE_LIMIT_ERROR" -> ErrorType.RATE_LIMIT_ERROR;
+                case "QUOTA_EXCEEDED" -> ErrorType.QUOTA_EXCEEDED_ERROR;
+                case "AUTH_ERROR", "AUTHENTICATION_ERROR" -> ErrorType.AUTHENTICATION_ERROR;
+                case "AUTHORIZATION_ERROR" -> ErrorType.AUTHORIZATION_ERROR;
+                case "VALIDATION_ERROR" -> ErrorType.VALIDATION_ERROR;
+                case "SERVICE_UNAVAILABLE" -> ErrorType.SERVICE_UNAVAILABLE;
+                case "NETWORK_ERROR" -> ErrorType.NETWORK_ERROR;
+                default -> ErrorType.INTERNAL_ERROR;
+            };
+        }
+
+        if (errorMessage != null) {
+            return classifyException(new RuntimeException(errorMessage));
+        }
+
+        return ErrorType.UNKNOWN_ERROR;
+    }
+
+    /**
+     * 确定错误严重级别
+     */
+    private ErrorSeverity determineSeverity(ErrorType errorType) {
+        return switch (errorType) {
+            case AUTHENTICATION_ERROR, AUTHORIZATION_ERROR -> ErrorSeverity.CRITICAL;
+            case SERVICE_UNAVAILABLE, QUOTA_EXCEEDED_ERROR -> ErrorSeverity.HIGH;
+            case NETWORK_ERROR, TIMEOUT_ERROR, RATE_LIMIT_ERROR -> ErrorSeverity.MEDIUM;
+            case VALIDATION_ERROR -> ErrorSeverity.LOW;
+            default -> ErrorSeverity.MEDIUM;
+        };
+    }
+
+    /**
+     * 创建错误响应
+     */
+    private AiChatResponse createErrorResponse(AiError error, AiChatRequest request) {
+        return new AiChatResponse()
+                .setSuccess(false)
+                .setError(error.getMessage())
+                .setErrorCode(error.getType().name())
+                .setModel(request.getModel())
+                .setProvider(error.getProvider())
+                .setCreateTime(LocalDateTime.now());
+    }
+
+    /**
+     * 获取异常堆栈信息
+     */
+    private String getStackTrace(Exception e) {
+        java.io.StringWriter sw = new java.io.StringWriter();
+        java.io.PrintWriter pw = new java.io.PrintWriter(sw);
+        e.printStackTrace(pw);
+        return sw.toString();
+    }
+
+    /**
+     * 处理严重错误
+     */
+    private void handleCriticalError(AiError error) {
+        log.error("严重错误发生: {}", error.getMessage());
+        // 可以发送告警、通知等
+    }
+
+    /**
+     * 处理高级别错误
+     */
+    private void handleHighSeverityError(AiError error) {
+        log.warn("高级别错误发生: {}", error.getMessage());
+        // 可以记录到特殊日志、发送通知等
+    }
+
+    /**
+     * 处理中级别错误
+     */
+    private void handleMediumSeverityError(AiError error) {
+        log.warn("中级别错误发生: {}", error.getMessage());
+    }
+
+    /**
+     * 处理低级别错误
+     */
+    private void handleLowSeverityError(AiError error) {
+        log.debug("低级别错误发生: {}", error.getMessage());
+    }
+
+    /**
+     * 销毁资源
+     */
+    public void destroy() {
+        if (scheduler != null && !scheduler.isShutdown()) {
+            scheduler.shutdown();
+            try {
+                if (!scheduler.awaitTermination(5, TimeUnit.SECONDS)) {
+                    scheduler.shutdownNow();
+                }
+            } catch (InterruptedException e) {
+                scheduler.shutdownNow();
+                Thread.currentThread().interrupt();
+            }
+        }
+        log.info("AI错误处理器已销毁");
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/mapper/AiChatRecordMapper.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/mapper/AiChatRecordMapper.java
new file mode 100644
index 0000000..445bf3c
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/mapper/AiChatRecordMapper.java
@@ -0,0 +1,16 @@
+package org.dromara.ai.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.ai.domain.AiChatRecord;
+import org.dromara.ai.domain.vo.AiChatRecordVo;
+
+/**
+ * AI聊天记录Mapper接口
+ *
+ * @author pengles
+ */
+@Mapper
+public interface AiChatRecordMapper extends BaseMapperPlus<AiChatRecord, AiChatRecordVo> {
+
+}
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/mapper/AiPaintingFavoriteMapper.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/mapper/AiPaintingFavoriteMapper.java
new file mode 100644
index 0000000..bec1c72
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/mapper/AiPaintingFavoriteMapper.java
@@ -0,0 +1,16 @@
+package org.dromara.ai.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.dromara.ai.domain.AiPaintingFavorite;
+import org.dromara.ai.domain.vo.AiPaintingFavoriteVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * AI绘画作品收藏Mapper接口
+ *
+ * @author pengles
+ */
+@Mapper
+public interface AiPaintingFavoriteMapper extends BaseMapperPlus<AiPaintingFavorite, AiPaintingFavoriteVo> {
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/mapper/AiPaintingRecordMapper.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/mapper/AiPaintingRecordMapper.java
new file mode 100644
index 0000000..0d88a83
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/mapper/AiPaintingRecordMapper.java
@@ -0,0 +1,16 @@
+package org.dromara.ai.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.dromara.ai.domain.AiPaintingRecord;
+import org.dromara.ai.domain.vo.AiPaintingRecordVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * AI绘画历史记录Mapper接口
+ *
+ * @author pengles
+ */
+@Mapper
+public interface AiPaintingRecordMapper extends BaseMapperPlus<AiPaintingRecord, AiPaintingRecordVo> {
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/mapper/AiPaintingTemplateMapper.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/mapper/AiPaintingTemplateMapper.java
new file mode 100644
index 0000000..66475ca
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/mapper/AiPaintingTemplateMapper.java
@@ -0,0 +1,16 @@
+package org.dromara.ai.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.dromara.ai.domain.AiPaintingTemplate;
+import org.dromara.ai.domain.vo.AiPaintingTemplateVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * AI绘画参数模板Mapper接口
+ *
+ * @author pengles
+ */
+@Mapper
+public interface AiPaintingTemplateMapper extends BaseMapperPlus<AiPaintingTemplate, AiPaintingTemplateVo> {
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/mapper/AiProviderConfigHistoryMapper.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/mapper/AiProviderConfigHistoryMapper.java
new file mode 100644
index 0000000..ffcd4c8
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/mapper/AiProviderConfigHistoryMapper.java
@@ -0,0 +1,16 @@
+package org.dromara.ai.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.dromara.ai.domain.AiProviderConfigHistory;
+import org.dromara.ai.domain.vo.AiProviderConfigHistoryVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * AI Provider配置历史Mapper接口
+ *
+ * @author pengles
+ */
+@Mapper
+public interface AiProviderConfigHistoryMapper extends BaseMapperPlus<AiProviderConfigHistory, AiProviderConfigHistoryVo> {
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/mapper/AiProviderConfigMapper.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/mapper/AiProviderConfigMapper.java
new file mode 100644
index 0000000..e1a3881
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/mapper/AiProviderConfigMapper.java
@@ -0,0 +1,16 @@
+package org.dromara.ai.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.dromara.ai.domain.AiProviderConfig;
+import org.dromara.ai.domain.vo.AiProviderConfigVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * AI Provider配置Mapper接口
+ *
+ * @author pengles
+ */
+@Mapper
+public interface AiProviderConfigMapper extends BaseMapperPlus<AiProviderConfig, AiProviderConfigVo> {
+
+}
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/mapper/AiRatingRecordMapper.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/mapper/AiRatingRecordMapper.java
new file mode 100644
index 0000000..28243c6
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/mapper/AiRatingRecordMapper.java
@@ -0,0 +1,16 @@
+package org.dromara.ai.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.dromara.ai.domain.AiRatingRecord;
+import org.dromara.ai.domain.vo.AiRatingRecordVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * AI评价记录Mapper接口
+ *
+ * @author pengles
+ */
+@Mapper
+public interface AiRatingRecordMapper extends BaseMapperPlus<AiRatingRecord, AiRatingRecordVo> {
+
+}
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/mapper/AiSensitiveWordMapper.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/mapper/AiSensitiveWordMapper.java
new file mode 100644
index 0000000..8ddb3b2
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/mapper/AiSensitiveWordMapper.java
@@ -0,0 +1,16 @@
+package org.dromara.ai.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.dromara.ai.domain.AiSensitiveWord;
+import org.dromara.ai.domain.vo.AiSensitiveWordVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * AI敏感词Mapper接口
+ *
+ * @author pengles
+ */
+@Mapper
+public interface AiSensitiveWordMapper extends BaseMapperPlus<AiSensitiveWord, AiSensitiveWordVo> {
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/mapper/AiUsageStatsMapper.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/mapper/AiUsageStatsMapper.java
new file mode 100644
index 0000000..e0633dd
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/mapper/AiUsageStatsMapper.java
@@ -0,0 +1,16 @@
+package org.dromara.ai.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.ai.domain.AiUsageStats;
+import org.dromara.ai.domain.vo.AiUsageStatsVo;
+
+/**
+ * AI使用统计Mapper接口
+ *
+ * @author pengles
+ */
+@Mapper
+public interface AiUsageStatsMapper extends BaseMapperPlus<AiUsageStats, AiUsageStatsVo> {
+
+}
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/mapper/AiUserQuotaMapper.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/mapper/AiUserQuotaMapper.java
new file mode 100644
index 0000000..88ffd76
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/mapper/AiUserQuotaMapper.java
@@ -0,0 +1,16 @@
+package org.dromara.ai.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.dromara.ai.domain.AiUserQuota;
+import org.dromara.ai.domain.vo.AiUserQuotaVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * AI用户配额Mapper接口
+ *
+ * @author pengles
+ */
+@Mapper
+public interface AiUserQuotaMapper extends BaseMapperPlus<AiUserQuota, AiUserQuotaVo> {
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/mcp/McpIntegrationService.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/mcp/McpIntegrationService.java
new file mode 100644
index 0000000..d7e1a98
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/mcp/McpIntegrationService.java
@@ -0,0 +1,96 @@
+package org.dromara.ai.mcp;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.ai.domain.dto.AiChatRequest;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * MCP集成服务
+ * 提供MCP工具与AI聊天请求的集成功能
+ *
+ * @author pengles
+ */
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class McpIntegrationService {
+    
+    private final McpToolRegistry registry;
+
+    /**
+     * 增强消息，添加可用工具信息
+     *
+     * @param request 聊天请求
+     */
+    public void enrichMessages(AiChatRequest request) {
+        if (!Boolean.TRUE.equals(request.getEnableTools())) {
+            return;
+        }
+        
+        try {
+            List<String> names = request.getRequestedTools() != null 
+                    ? request.getRequestedTools() 
+                    : new ArrayList<>(registry.all().keySet());
+            
+            if (names.isEmpty()) {
+                log.debug("未找到可用的MCP工具");
+                return;
+            }
+            
+            StringBuilder sb = new StringBuilder();
+            sb.append("可用工具: ").append(String.join(",", names));
+            AiChatRequest.AiMessage sys = new AiChatRequest.AiMessage()
+                    .setRole("system")
+                    .setContent(sb.toString());
+            
+            List<AiChatRequest.AiMessage> msgs = new ArrayList<>();
+            msgs.add(sys);
+            if (request.getMessages() != null) {
+                msgs.addAll(request.getMessages());
+            }
+            request.setMessages(msgs);
+            
+            log.debug("MCP工具消息增强完成 - 工具数量: {}", names.size());
+        } catch (Exception e) {
+            log.error("MCP工具消息增强失败", e);
+            // 增强失败不影响主流程，只记录日志
+        }
+    }
+
+    /**
+     * 调用MCP工具
+     *
+     * @param name  工具名称
+     * @param input 工具输入参数
+     * @return 工具执行结果
+     */
+    public Map<String, Object> invokeTool(String name, Map<String, Object> input) {
+        try {
+            log.debug("调用MCP工具: {}, 输入参数: {}", name, input != null ? input.keySet() : "无");
+            
+            McpTool tool = registry.get(name);
+            if (tool == null) {
+                log.warn("MCP工具不存在: {}", name);
+                return Map.of("error", "tool_not_found", "toolName", name);
+            }
+            
+            Map<String, Object> result = tool.invoke(input != null ? input : Map.of());
+            
+            if (result != null && result.containsKey("error")) {
+                log.warn("MCP工具调用失败: {}, 错误: {}", name, result.get("error"));
+            } else {
+                log.debug("MCP工具调用成功: {}", name);
+            }
+            
+            return result;
+        } catch (Exception e) {
+            log.error("MCP工具调用异常: {}", name, e);
+            return Map.of("error", "tool_invocation_error", "message", e.getMessage(), "toolName", name);
+        }
+    }
+}
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/mcp/McpTool.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/mcp/McpTool.java
new file mode 100644
index 0000000..c1a35e2
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/mcp/McpTool.java
@@ -0,0 +1,19 @@
+package org.dromara.ai.mcp;
+
+import java.util.Map;
+
+/**
+ * MCP工具接口
+ * 定义MCP工具的标准接口规范
+ *
+ * @author pengles
+ */
+public interface McpTool {
+    String name();
+
+    String description();
+
+    Map<String, Object> schema();
+
+    Map<String, Object> invoke(Map<String, Object> input);
+}
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/mcp/McpToolRegistry.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/mcp/McpToolRegistry.java
new file mode 100644
index 0000000..2936602
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/mcp/McpToolRegistry.java
@@ -0,0 +1,60 @@
+package org.dromara.ai.mcp;
+
+import org.springframework.stereotype.Component;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Supplier;
+
+/**
+ * MCP工具注册表
+ * 管理所有MCP工具的注册、版本控制和动态加载
+ *
+ * @author pengles
+ */
+@Component
+public class McpToolRegistry {
+    private final Map<String, McpTool> tools = new ConcurrentHashMap<>();
+    private final Map<String, String> versions = new ConcurrentHashMap<>();
+    private final Map<String, Supplier<McpTool>> factories = new ConcurrentHashMap<>();
+
+    public void register(McpTool tool) {
+        tools.put(tool.name(), tool);
+        versions.put(tool.name(), "1.0.0");
+    }
+
+    public McpTool get(String name) {
+        return tools.get(name);
+    }
+
+    public Map<String, McpTool> all() {
+        return new HashMap<>(tools);
+    }
+
+    public void unregister(String name) {
+        tools.remove(name);
+        versions.remove(name);
+        factories.remove(name);
+    }
+
+    public void registerFactory(String name, String version, Supplier<McpTool> factory) {
+        factories.put(name, factory);
+        versions.put(name, version);
+        tools.put(name, factory.get());
+    }
+
+    public void reload(String name) {
+        Supplier<McpTool> f = factories.get(name);
+        if (f != null) {
+            tools.put(name, f.get());
+        }
+    }
+
+    public Map<String, Object> metadata(String name) {
+        McpTool t = tools.get(name);
+        String v = versions.get(name);
+        if (t == null) return Map.of();
+        return Map.of("name", t.name(), "version", v);
+    }
+}
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/mcp/tools/AlgorithmComputeTool.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/mcp/tools/AlgorithmComputeTool.java
new file mode 100644
index 0000000..445f95a
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/mcp/tools/AlgorithmComputeTool.java
@@ -0,0 +1,34 @@
+package org.dromara.ai.mcp.tools;
+
+import org.dromara.ai.mcp.McpTool;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class AlgorithmComputeTool implements McpTool {
+    @Override
+    public String name() {
+        return "algorithm_compute";
+    }
+
+    @Override
+    public String description() {
+        return "执行简单算法计算";
+    }
+
+    @Override
+    public Map<String, Object> schema() {
+        Map<String, Object> s = new HashMap<>();
+        s.put("type", "object");
+        s.put("properties", Map.of("n", Map.of("type", "integer")));
+        return s;
+    }
+
+    @Override
+    public Map<String, Object> invoke(Map<String, Object> input) {
+        int n = Integer.parseInt(String.valueOf(input.getOrDefault("n", 10)));
+        long sum = 0;
+        for (int i = 1; i <= n; i++) sum += i;
+        return Map.of("sum", sum);
+    }
+}
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/mcp/tools/ApiCallTool.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/mcp/tools/ApiCallTool.java
new file mode 100644
index 0000000..b1a388f
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/mcp/tools/ApiCallTool.java
@@ -0,0 +1,43 @@
+package org.dromara.ai.mcp.tools;
+
+import org.dromara.ai.mcp.McpTool;
+
+import java.net.URI;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.util.HashMap;
+import java.util.Map;
+
+public class ApiCallTool implements McpTool {
+    @Override
+    public String name() {
+        return "api_call";
+    }
+
+    @Override
+    public String description() {
+        return "调用HTTP API";
+    }
+
+    @Override
+    public Map<String, Object> schema() {
+        Map<String, Object> s = new HashMap<>();
+        s.put("type", "object");
+        s.put("properties", Map.of("url", Map.of("type", "string")));
+        return s;
+    }
+
+    @Override
+    public Map<String, Object> invoke(Map<String, Object> input) {
+        try {
+            String url = String.valueOf(input.get("url"));
+            HttpClient client = HttpClient.newHttpClient();
+            HttpRequest req = HttpRequest.newBuilder(URI.create(url)).GET().build();
+            HttpResponse<String> resp = client.send(req, HttpResponse.BodyHandlers.ofString());
+            return Map.of("status", resp.statusCode(), "body", resp.body());
+        } catch (Exception e) {
+            return Map.of("error", e.getMessage());
+        }
+    }
+}
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/mcp/tools/DataTransformTool.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/mcp/tools/DataTransformTool.java
new file mode 100644
index 0000000..5ea7723
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/mcp/tools/DataTransformTool.java
@@ -0,0 +1,33 @@
+package org.dromara.ai.mcp.tools;
+
+import org.dromara.ai.mcp.McpTool;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class DataTransformTool implements McpTool {
+    @Override
+    public String name() {
+        return "data_transform";
+    }
+
+    @Override
+    public String description() {
+        return "数据格式转换";
+    }
+
+    @Override
+    public Map<String, Object> schema() {
+        Map<String, Object> s = new HashMap<>();
+        s.put("type", "object");
+        s.put("properties", Map.of("items", Map.of("type", "array")));
+        return s;
+    }
+
+    @Override
+    public Map<String, Object> invoke(Map<String, Object> input) {
+        Object items = input.get("items");
+        return Map.of("count", items instanceof List ? ((List<?>) items).size() : 0);
+    }
+}
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/mcp/tools/FileParseTool.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/mcp/tools/FileParseTool.java
new file mode 100644
index 0000000..f2d16da
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/mcp/tools/FileParseTool.java
@@ -0,0 +1,39 @@
+package org.dromara.ai.mcp.tools;
+
+import org.apache.tika.Tika;
+import org.dromara.ai.mcp.McpTool;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class FileParseTool implements McpTool {
+    @Override
+    public String name() {
+        return "file_parse";
+    }
+
+    @Override
+    public String description() {
+        return "解析文件内容";
+    }
+
+    @Override
+    public Map<String, Object> schema() {
+        Map<String, Object> s = new HashMap<>();
+        s.put("type", "object");
+        s.put("properties", Map.of("path", Map.of("type", "string")));
+        return s;
+    }
+
+    @Override
+    public Map<String, Object> invoke(Map<String, Object> input) {
+        try {
+            String path = String.valueOf(input.get("path"));
+            Tika tika = new Tika();
+            String text = tika.parseToString(new java.io.File(path));
+            return Map.of("text", text);
+        } catch (Exception e) {
+            return Map.of("error", e.getMessage());
+        }
+    }
+}
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/mcp/tools/HttpFetchTool.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/mcp/tools/HttpFetchTool.java
new file mode 100644
index 0000000..2782888
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/mcp/tools/HttpFetchTool.java
@@ -0,0 +1,43 @@
+package org.dromara.ai.mcp.tools;
+
+import org.dromara.ai.mcp.McpTool;
+
+import java.net.URI;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.util.HashMap;
+import java.util.Map;
+
+public class HttpFetchTool implements McpTool {
+    @Override
+    public String name() {
+        return "http_fetch";
+    }
+
+    @Override
+    public String description() {
+        return "HTTP抓取";
+    }
+
+    @Override
+    public Map<String, Object> schema() {
+        Map<String, Object> s = new HashMap<>();
+        s.put("type", "object");
+        s.put("properties", Map.of("url", Map.of("type", "string")));
+        return s;
+    }
+
+    @Override
+    public Map<String, Object> invoke(Map<String, Object> input) {
+        try {
+            String url = String.valueOf(input.get("url"));
+            HttpClient client = HttpClient.newHttpClient();
+            HttpRequest req = HttpRequest.newBuilder(URI.create(url)).GET().build();
+            HttpResponse<String> resp = client.send(req, HttpResponse.BodyHandlers.ofString());
+            return Map.of("status", resp.statusCode(), "body", resp.body());
+        } catch (Exception e) {
+            return Map.of("error", e.getMessage());
+        }
+    }
+}
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/mcp/tools/ProjectScaffoldTool.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/mcp/tools/ProjectScaffoldTool.java
new file mode 100644
index 0000000..4cccea8
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/mcp/tools/ProjectScaffoldTool.java
@@ -0,0 +1,34 @@
+package org.dromara.ai.mcp.tools;
+
+import org.dromara.ai.mcp.McpTool;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class ProjectScaffoldTool implements McpTool {
+    @Override
+    public String name() {
+        return "project_scaffold";
+    }
+
+    @Override
+    public String description() {
+        return "生成项目脚手架方案";
+    }
+
+    @Override
+    public Map<String, Object> schema() {
+        Map<String, Object> s = new HashMap<>();
+        s.put("type", "object");
+        s.put("properties", Map.of("type", Map.of("type", "string")));
+        return s;
+    }
+
+    @Override
+    public Map<String, Object> invoke(Map<String, Object> input) {
+        String type = String.valueOf(input.getOrDefault("type", "webapp"));
+        Map<String, Object> out = new HashMap<>();
+        out.put("plan", "生成 " + type + " 脚手架，包含依赖、目录结构与初始化命令");
+        return out;
+    }
+}
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/model/ApiResult.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/model/ApiResult.java
new file mode 100644
index 0000000..1102e28
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/model/ApiResult.java
@@ -0,0 +1,60 @@
+package org.dromara.ai.model;
+
+public class ApiResult<T> {
+    private boolean success;
+    private String message;
+    private String code;
+    private T data;
+
+    public static <T> ApiResult<T> ok(T data) {
+        ApiResult<T> r = new ApiResult<>();
+        r.success = true;
+        r.data = data;
+        return r;
+    }
+
+    public static <T> ApiResult<T> fail(String code, String message) {
+        ApiResult<T> r = new ApiResult<>();
+        r.success = false;
+        r.code = code;
+        r.message = message;
+        return r;
+    }
+
+    public boolean isSuccess() {
+        return success;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public T getData() {
+        return data;
+    }
+
+    public ApiResult<T> setSuccess(boolean success) {
+        this.success = success;
+        return this;
+    }
+
+    public ApiResult<T> setMessage(String message) {
+        this.message = message;
+        return this;
+    }
+
+    public ApiResult<T> setCode(String code) {
+        this.code = code;
+        return this;
+    }
+
+    public ApiResult<T> setData(T data) {
+        this.data = data;
+        return this;
+    }
+}
+
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/monitor/AiMonitorService.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/monitor/AiMonitorService.java
new file mode 100644
index 0000000..fa05788
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/monitor/AiMonitorService.java
@@ -0,0 +1,433 @@
+package org.dromara.ai.monitor;
+
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.ai.provider.AiProvider;
+import org.dromara.ai.provider.AiProviderManager;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.stream.Collectors;
+
+/**
+ * AI服务监控服务
+ * 提供性能监控、使用统计和健康检查功能
+ *
+ * @author pengles
+ * @since 2024-01-01
+ */
+@Slf4j
+@Service
+public class AiMonitorService {
+
+    @Autowired
+    private AiProviderManager providerManager;
+
+    // 监控数据存储
+    private final Map<String, ProviderMetrics> providerMetrics = new ConcurrentHashMap<>();
+    private final Map<String, ModelMetrics> modelMetrics = new ConcurrentHashMap<>();
+    private final Map<String, UserMetrics> userMetrics = new ConcurrentHashMap<>();
+    private final SystemMetrics systemMetrics = new SystemMetrics("1.0.0", "production");
+
+    /**
+     * 记录请求开始
+     *
+     * @param providerName Provider名称
+     * @param modelName    模型名称
+     * @param userId       用户ID
+     * @return 请求ID
+     */
+    public String recordRequestStart(String providerName, String modelName, String userId) {
+        String requestId = UUID.randomUUID().toString();
+        long startTime = System.currentTimeMillis();
+
+        // 记录Provider指标
+        ProviderMetrics pMetrics = providerMetrics.computeIfAbsent(providerName, k -> new ProviderMetrics(k, "AI_PROVIDER"));
+        pMetrics.incrementTotalRequests();
+        pMetrics.addActiveRequest(requestId, startTime);
+
+        // 记录模型指标
+        String modelKey = providerName + ":" + modelName;
+        ModelMetrics mMetrics = modelMetrics.computeIfAbsent(modelKey, k -> new ModelMetrics(modelName, modelName, providerName, "TEXT_GENERATION"));
+        mMetrics.incrementTotalRequests();
+        mMetrics.addActiveRequest(requestId, startTime);
+
+        // 记录用户指标
+        if (userId != null) {
+            UserMetrics uMetrics = userMetrics.computeIfAbsent(userId, k -> {
+                try {
+                    return new UserMetrics(Long.parseLong(k), k, "REGULAR");
+                } catch (NumberFormatException e) {
+                    // 如果userId不是数字，使用hashCode作为ID
+                    return new UserMetrics((long) k.hashCode(), k, "REGULAR");
+                }
+            });
+            uMetrics.incrementTotalRequests();
+            uMetrics.addActiveRequest(requestId, startTime);
+        }
+
+        // 记录系统指标
+        systemMetrics.incrementTotalRequests();
+        systemMetrics.addActiveRequest(requestId, startTime);
+
+        log.debug("记录请求开始: requestId={}, provider={}, model={}, user={}",
+                requestId, providerName, modelName, userId);
+
+        return requestId;
+    }
+
+    /**
+     * 记录请求完成
+     *
+     * @param requestId    请求ID
+     * @param providerName Provider名称
+     * @param modelName    模型名称
+     * @param userId       用户ID
+     * @param success      是否成功
+     * @param inputTokens  输入token数
+     * @param outputTokens 输出token数
+     * @param errorCode    错误码
+     */
+    public void recordRequestEnd(String requestId, String providerName, String modelName,
+                                 String userId, boolean success, int inputTokens, int outputTokens, String errorCode) {
+        long endTime = System.currentTimeMillis();
+
+        // 记录Provider指标
+        ProviderMetrics pMetrics = providerMetrics.get(providerName);
+        if (pMetrics != null) {
+            Long startTime = pMetrics.removeActiveRequest(requestId);
+            if (startTime != null) {
+                long responseTime = endTime - startTime;
+                pMetrics.addResponseTime(responseTime);
+                if (success) {
+                    pMetrics.incrementSuccessRequests();
+                } else {
+                    pMetrics.incrementFailedRequests();
+                    pMetrics.incrementErrorCount(errorCode);
+                }
+                pMetrics.addTokenUsage(inputTokens, outputTokens);
+            }
+        }
+
+        // 记录模型指标
+        String modelKey = providerName + ":" + modelName;
+        ModelMetrics mMetrics = modelMetrics.get(modelKey);
+        if (mMetrics != null) {
+            Long startTime = mMetrics.removeActiveRequest(requestId);
+            if (startTime != null) {
+                long responseTime = endTime - startTime;
+                mMetrics.addResponseTime(responseTime);
+                if (success) {
+                    mMetrics.incrementSuccessRequests();
+                } else {
+                    mMetrics.incrementFailedRequests();
+                    mMetrics.incrementErrorCount(errorCode);
+                }
+                mMetrics.addTokenUsage(inputTokens, outputTokens);
+            }
+        }
+
+        // 记录用户指标
+        if (userId != null) {
+            UserMetrics uMetrics = userMetrics.get(userId);
+            if (uMetrics != null) {
+                Long startTime = uMetrics.removeActiveRequest(requestId);
+                if (startTime != null) {
+                    long responseTime = endTime - startTime;
+                    uMetrics.addResponseTime(responseTime);
+                    if (success) {
+                        uMetrics.incrementSuccessRequests();
+                    } else {
+                        uMetrics.incrementFailedRequests();
+                    }
+                    uMetrics.addTokenUsage(inputTokens, outputTokens);
+                }
+            }
+        }
+
+        // 记录系统指标
+        Long startTime = systemMetrics.removeActiveRequest(requestId);
+        if (startTime != null) {
+            long responseTime = endTime - startTime;
+            systemMetrics.addResponseTime(responseTime);
+            if (success) {
+                systemMetrics.incrementSuccessRequests();
+            } else {
+                systemMetrics.incrementFailedRequests();
+                systemMetrics.incrementErrorCount(errorCode);
+            }
+            systemMetrics.addTokenUsage(inputTokens, outputTokens);
+        }
+
+        log.debug("记录请求完成: requestId={}, provider={}, model={}, user={}, success={}, responseTime={}ms",
+                requestId, providerName, modelName, userId, success, endTime - (startTime != null ? startTime : endTime));
+    }
+
+    /**
+     * 获取Provider统计信息
+     *
+     * @param providerName Provider名称
+     * @return 统计信息
+     */
+    public Map<String, Object> getProviderStats(String providerName) {
+        ProviderMetrics metrics = providerMetrics.get(providerName);
+        if (metrics == null) {
+            return new HashMap<>();
+        }
+
+        Map<String, Object> stats = new HashMap<>();
+        stats.put("providerName", providerName);
+        stats.put("totalRequests", metrics.getTotalRequests());
+        stats.put("successRequests", metrics.getSuccessRequests());
+        stats.put("failedRequests", metrics.getFailedRequests());
+        stats.put("activeRequests", metrics.getActiveRequestCount());
+        stats.put("successRate", metrics.getSuccessRate());
+        stats.put("avgResponseTime", metrics.getAvgResponseTime());
+        stats.put("minResponseTime", metrics.getMinResponseTime());
+        stats.put("maxResponseTime", metrics.getMaxResponseTime());
+        stats.put("totalInputTokens", metrics.getTotalInputTokens());
+        stats.put("totalOutputTokens", metrics.getTotalOutputTokens());
+        stats.put("errorCounts", metrics.getErrorCounts());
+        stats.put("lastUpdateTime", metrics.getLastUpdateTime());
+
+        return stats;
+    }
+
+    /**
+     * 获取模型统计信息
+     *
+     * @param providerName Provider名称
+     * @param modelName    模型名称
+     * @return 统计信息
+     */
+    public Map<String, Object> getModelStats(String providerName, String modelName) {
+        String modelKey = providerName + ":" + modelName;
+        ModelMetrics metrics = modelMetrics.get(modelKey);
+        if (metrics == null) {
+            return new HashMap<>();
+        }
+
+        Map<String, Object> stats = new HashMap<>();
+        stats.put("providerName", providerName);
+        stats.put("modelName", modelName);
+        stats.put("totalRequests", metrics.getTotalRequests());
+        stats.put("successRequests", metrics.getSuccessRequests());
+        stats.put("failedRequests", metrics.getFailedRequests());
+        stats.put("activeRequests", metrics.getActiveRequestCount());
+        stats.put("successRate", metrics.getSuccessRate());
+        stats.put("avgResponseTime", metrics.getAvgResponseTime());
+        stats.put("minResponseTime", metrics.getMinResponseTime());
+        stats.put("maxResponseTime", metrics.getMaxResponseTime());
+        stats.put("totalInputTokens", metrics.getTotalInputTokens());
+        stats.put("totalOutputTokens", metrics.getTotalOutputTokens());
+        stats.put("errorCounts", metrics.getErrorCounts());
+        stats.put("lastUpdateTime", metrics.getLastUpdateTime());
+
+        return stats;
+    }
+
+    /**
+     * 获取用户统计信息
+     *
+     * @param userId 用户ID
+     * @return 统计信息
+     */
+    public Map<String, Object> getUserStats(String userId) {
+        UserMetrics metrics = userMetrics.get(userId);
+        if (metrics == null) {
+            return new HashMap<>();
+        }
+
+        Map<String, Object> stats = new HashMap<>();
+        stats.put("userId", userId);
+        stats.put("totalRequests", metrics.getTotalRequests());
+        stats.put("successRequests", metrics.getSuccessRequests());
+        stats.put("failedRequests", metrics.getFailedRequests());
+        stats.put("activeRequests", metrics.getActiveRequestCount());
+        stats.put("successRate", metrics.getSuccessRate());
+        stats.put("avgResponseTime", metrics.getAvgResponseTime());
+        stats.put("totalInputTokens", metrics.getTotalInputTokens());
+        stats.put("totalOutputTokens", metrics.getTotalOutputTokens());
+        stats.put("lastUpdateTime", metrics.getLastUpdateTime());
+
+        return stats;
+    }
+
+    /**
+     * 获取系统统计信息
+     *
+     * @return 统计信息
+     */
+    public Map<String, Object> getSystemStats() {
+        Map<String, Object> stats = new HashMap<>();
+        stats.put("totalRequests", systemMetrics.getTotalRequests());
+        stats.put("successRequests", systemMetrics.getSuccessRequests());
+        stats.put("failedRequests", systemMetrics.getFailedRequests());
+        stats.put("activeRequests", systemMetrics.getActiveRequestCount());
+        stats.put("successRate", systemMetrics.getSuccessRate());
+        stats.put("avgResponseTime", systemMetrics.getAvgResponseTime());
+        stats.put("minResponseTime", systemMetrics.getMinResponseTime());
+        stats.put("maxResponseTime", systemMetrics.getMaxResponseTime());
+        stats.put("totalInputTokens", systemMetrics.getTotalInputTokens());
+        stats.put("totalOutputTokens", systemMetrics.getTotalOutputTokens());
+        stats.put("errorCounts", systemMetrics.getErrorCounts());
+        stats.put("providerCount", providerMetrics.size());
+        stats.put("modelCount", modelMetrics.size());
+        stats.put("userCount", userMetrics.size());
+        stats.put("lastUpdateTime", systemMetrics.getLastUpdateTime());
+
+        return stats;
+    }
+
+    /**
+     * 获取所有Provider统计信息
+     *
+     * @return Provider统计列表
+     */
+    public List<Map<String, Object>> getAllProviderStats() {
+        return providerMetrics.keySet().stream()
+                .map(this::getProviderStats)
+                .collect(Collectors.toList());
+    }
+
+    /**
+     * 获取热门模型排行
+     *
+     * @param limit 限制数量
+     * @return 模型排行列表
+     */
+    public List<Map<String, Object>> getPopularModels(int limit) {
+        return modelMetrics.entrySet().stream()
+                .sorted((e1, e2) -> Long.compare(e2.getValue().getTotalRequests(), e1.getValue().getTotalRequests()))
+                .limit(limit)
+                .map(entry -> {
+                    String[] parts = entry.getKey().split(":", 2);
+                    Map<String, Object> model = new HashMap<>();
+                    model.put("providerName", parts[0]);
+                    model.put("modelName", parts.length > 1 ? parts[1] : "");
+                    model.put("totalRequests", entry.getValue().getTotalRequests());
+                    model.put("successRate", entry.getValue().getSuccessRate());
+                    model.put("avgResponseTime", entry.getValue().getAvgResponseTime());
+                    return model;
+                })
+                .collect(Collectors.toList());
+    }
+
+    /**
+     * 获取活跃用户排行
+     *
+     * @param limit 限制数量
+     * @return 用户排行列表
+     */
+    public List<Map<String, Object>> getActiveUsers(int limit) {
+        return userMetrics.entrySet().stream()
+                .sorted((e1, e2) -> Long.compare(e2.getValue().getTotalRequests(), e1.getValue().getTotalRequests()))
+                .limit(limit)
+                .map(entry -> {
+                    Map<String, Object> user = new HashMap<>();
+                    user.put("userId", entry.getKey());
+                    user.put("totalRequests", entry.getValue().getTotalRequests());
+                    user.put("successRate", entry.getValue().getSuccessRate());
+                    user.put("totalTokens", entry.getValue().getTotalInputTokens() + entry.getValue().getTotalOutputTokens());
+                    return user;
+                })
+                .collect(Collectors.toList());
+    }
+
+    /**
+     * 健康检查
+     *
+     * @return 健康状态
+     */
+    public Map<String, Object> healthCheck() {
+        Map<String, Object> health = new HashMap<>();
+
+        // 检查Provider健康状态
+        List<Map<String, Object>> providerHealth = new ArrayList<>();
+        for (AiProvider provider : providerManager.getAllProviders()) {
+            Map<String, Object> providerStatus = new HashMap<>();
+            providerStatus.put("name", provider.getProviderName());
+            providerStatus.put("available", provider.isAvailable());
+            providerStatus.put("version", provider.getVersion());
+
+            ProviderMetrics metrics = providerMetrics.get(provider.getProviderName());
+            if (metrics != null) {
+                providerStatus.put("successRate", metrics.getSuccessRate());
+                providerStatus.put("avgResponseTime", metrics.getAvgResponseTime());
+                providerStatus.put("activeRequests", metrics.getActiveRequestCount());
+            }
+
+            providerHealth.add(providerStatus);
+        }
+
+        health.put("providers", providerHealth);
+        health.put("systemStats", getSystemStats());
+        health.put("timestamp", LocalDateTime.now());
+
+        // 计算整体健康分数
+        double healthScore = calculateHealthScore();
+        health.put("healthScore", healthScore);
+        health.put("status", healthScore >= 0.8 ? "HEALTHY" : healthScore >= 0.5 ? "WARNING" : "CRITICAL");
+
+        return health;
+    }
+
+    /**
+     * 计算健康分数
+     *
+     * @return 健康分数 (0.0-1.0)
+     */
+    private double calculateHealthScore() {
+        if (systemMetrics.getTotalRequests() == 0) {
+            return 1.0; // 没有请求时认为是健康的
+        }
+
+        double successRate = systemMetrics.getSuccessRate();
+        double responseTimeScore = Math.max(0, 1.0 - systemMetrics.getAvgResponseTime() / 10000.0); // 10秒为基准
+
+        return (successRate * 0.7 + responseTimeScore * 0.3);
+    }
+
+    /**
+     * 重置统计数据
+     */
+    public void resetStats() {
+        providerMetrics.clear();
+        modelMetrics.clear();
+        userMetrics.clear();
+        systemMetrics.reset();
+        log.info("AI监控统计数据已重置");
+    }
+
+    /**
+     * 定时清理过期数据
+     */
+    @Scheduled(fixedRate = 3600000) // 每小时执行一次
+    public void cleanupExpiredData() {
+        long expireTime = System.currentTimeMillis() - 24 * 60 * 60 * 1000; // 24小时前
+
+        // 清理过期的活跃请求
+        providerMetrics.values().forEach(metrics -> metrics.cleanupExpiredRequests(expireTime));
+        modelMetrics.values().forEach(metrics -> metrics.cleanupExpiredRequests(expireTime));
+        userMetrics.values().forEach(metrics -> metrics.cleanupExpiredRequests(expireTime));
+        systemMetrics.cleanupExpiredRequests(expireTime);
+
+        log.debug("清理过期监控数据完成");
+    }
+
+    /**
+     * 定时输出监控报告
+     */
+    @Scheduled(fixedRate = 300000) // 每5分钟执行一次
+    public void logMonitorReport() {
+        Map<String, Object> systemStats = getSystemStats();
+        log.info("AI服务监控报告: 总请求={}, 成功率={}, 平均响应时间={}ms, 活跃请求={}",
+                systemStats.get("totalRequests"),
+                systemStats.get("successRate"),
+                systemStats.get("avgResponseTime"),
+                systemStats.get("activeRequests"));
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/monitor/BaseMetrics.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/monitor/BaseMetrics.java
new file mode 100644
index 0000000..5188095
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/monitor/BaseMetrics.java
@@ -0,0 +1,252 @@
+package org.dromara.ai.monitor;
+
+import java.time.LocalDateTime;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.atomic.LongAdder;
+
+/**
+ * 基础监控指标类
+ *
+ * @author pengles
+ * @since 2024-01-01
+ */
+public abstract class BaseMetrics {
+
+    protected final AtomicLong totalRequests = new AtomicLong(0);
+    protected final AtomicLong successRequests = new AtomicLong(0);
+    protected final AtomicLong failedRequests = new AtomicLong(0);
+    protected final LongAdder totalResponseTime = new LongAdder();
+    protected final AtomicLong minResponseTime = new AtomicLong(Long.MAX_VALUE);
+    protected final AtomicLong maxResponseTime = new AtomicLong(0);
+    protected final AtomicLong totalInputTokens = new AtomicLong(0);
+    protected final AtomicLong totalOutputTokens = new AtomicLong(0);
+    protected final Map<String, AtomicLong> errorCounts = new ConcurrentHashMap<>();
+    protected final Map<String, Long> activeRequests = new ConcurrentHashMap<>();
+    protected volatile LocalDateTime lastUpdateTime = LocalDateTime.now();
+
+    /**
+     * 增加总请求数
+     */
+    public void incrementTotalRequests() {
+        totalRequests.incrementAndGet();
+        updateLastUpdateTime();
+    }
+
+    /**
+     * 增加成功请求数
+     */
+    public void incrementSuccessRequests() {
+        successRequests.incrementAndGet();
+        updateLastUpdateTime();
+    }
+
+    /**
+     * 增加失败请求数
+     */
+    public void incrementFailedRequests() {
+        failedRequests.incrementAndGet();
+        updateLastUpdateTime();
+    }
+
+    /**
+     * 添加响应时间
+     *
+     * @param responseTime 响应时间(毫秒)
+     */
+    public void addResponseTime(long responseTime) {
+        totalResponseTime.add(responseTime);
+
+        // 更新最小响应时间
+        long currentMin = minResponseTime.get();
+        while (responseTime < currentMin && !minResponseTime.compareAndSet(currentMin, responseTime)) {
+            currentMin = minResponseTime.get();
+        }
+
+        // 更新最大响应时间
+        long currentMax = maxResponseTime.get();
+        while (responseTime > currentMax && !maxResponseTime.compareAndSet(currentMax, responseTime)) {
+            currentMax = maxResponseTime.get();
+        }
+
+        updateLastUpdateTime();
+    }
+
+    /**
+     * 添加Token使用量
+     *
+     * @param inputTokens  输入Token数
+     * @param outputTokens 输出Token数
+     */
+    public void addTokenUsage(int inputTokens, int outputTokens) {
+        totalInputTokens.addAndGet(inputTokens);
+        totalOutputTokens.addAndGet(outputTokens);
+        updateLastUpdateTime();
+    }
+
+    /**
+     * 增加错误计数
+     *
+     * @param errorCode 错误码
+     */
+    public void incrementErrorCount(String errorCode) {
+        if (errorCode != null && !errorCode.isEmpty()) {
+            errorCounts.computeIfAbsent(errorCode, k -> new AtomicLong(0)).incrementAndGet();
+            updateLastUpdateTime();
+        }
+    }
+
+    /**
+     * 添加活跃请求
+     *
+     * @param requestId 请求ID
+     * @param startTime 开始时间
+     */
+    public void addActiveRequest(String requestId, long startTime) {
+        activeRequests.put(requestId, startTime);
+        updateLastUpdateTime();
+    }
+
+    /**
+     * 移除活跃请求
+     *
+     * @param requestId 请求ID
+     * @return 开始时间
+     */
+    public Long removeActiveRequest(String requestId) {
+        Long startTime = activeRequests.remove(requestId);
+        if (startTime != null) {
+            updateLastUpdateTime();
+        }
+        return startTime;
+    }
+
+    /**
+     * 清理过期的活跃请求
+     *
+     * @param expireTime 过期时间
+     */
+    public void cleanupExpiredRequests(long expireTime) {
+        activeRequests.entrySet().removeIf(entry -> entry.getValue() < expireTime);
+    }
+
+    /**
+     * 获取总请求数
+     */
+    public long getTotalRequests() {
+        return totalRequests.get();
+    }
+
+    /**
+     * 获取成功请求数
+     */
+    public long getSuccessRequests() {
+        return successRequests.get();
+    }
+
+    /**
+     * 获取失败请求数
+     */
+    public long getFailedRequests() {
+        return failedRequests.get();
+    }
+
+    /**
+     * 获取活跃请求数
+     */
+    public int getActiveRequestCount() {
+        return activeRequests.size();
+    }
+
+    /**
+     * 获取成功率
+     */
+    public double getSuccessRate() {
+        long total = totalRequests.get();
+        if (total == 0) {
+            return 0.0;
+        }
+        return (double) successRequests.get() / total;
+    }
+
+    /**
+     * 获取平均响应时间
+     */
+    public double getAvgResponseTime() {
+        long completedRequests = successRequests.get() + failedRequests.get();
+        if (completedRequests == 0) {
+            return 0.0;
+        }
+        return (double) totalResponseTime.sum() / completedRequests;
+    }
+
+    /**
+     * 获取最小响应时间
+     */
+    public long getMinResponseTime() {
+        long min = minResponseTime.get();
+        return min == Long.MAX_VALUE ? 0 : min;
+    }
+
+    /**
+     * 获取最大响应时间
+     */
+    public long getMaxResponseTime() {
+        return maxResponseTime.get();
+    }
+
+    /**
+     * 获取总输入Token数
+     */
+    public long getTotalInputTokens() {
+        return totalInputTokens.get();
+    }
+
+    /**
+     * 获取总输出Token数
+     */
+    public long getTotalOutputTokens() {
+        return totalOutputTokens.get();
+    }
+
+    /**
+     * 获取错误计数
+     */
+    public Map<String, Long> getErrorCounts() {
+        Map<String, Long> result = new ConcurrentHashMap<>();
+        errorCounts.forEach((key, value) -> result.put(key, value.get()));
+        return result;
+    }
+
+    /**
+     * 获取最后更新时间
+     */
+    public LocalDateTime getLastUpdateTime() {
+        return lastUpdateTime;
+    }
+
+    /**
+     * 重置指标
+     */
+    public void reset() {
+        totalRequests.set(0);
+        successRequests.set(0);
+        failedRequests.set(0);
+        totalResponseTime.reset();
+        minResponseTime.set(Long.MAX_VALUE);
+        maxResponseTime.set(0);
+        totalInputTokens.set(0);
+        totalOutputTokens.set(0);
+        errorCounts.clear();
+        activeRequests.clear();
+        updateLastUpdateTime();
+    }
+
+    /**
+     * 更新最后更新时间
+     */
+    private void updateLastUpdateTime() {
+        lastUpdateTime = LocalDateTime.now();
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/monitor/ModelMetrics.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/monitor/ModelMetrics.java
new file mode 100644
index 0000000..f66e371
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/monitor/ModelMetrics.java
@@ -0,0 +1,323 @@
+package org.dromara.ai.monitor;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.time.LocalDateTime;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.atomic.LongAdder;
+
+/**
+ * AI Model监控指标
+ * 继承基础监控指标，添加Model特有的监控数据
+ *
+ * @author pengles
+ * @date 2024-01-01
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ModelMetrics extends BaseMetrics {
+
+    /**
+     * 模型ID
+     */
+    private String modelId;
+
+    /**
+     * 模型名称
+     */
+    private String modelName;
+
+    /**
+     * Provider名称
+     */
+    private String providerName;
+
+    /**
+     * 模型类型
+     */
+    private String modelType;
+
+    /**
+     * 总成本（分）
+     */
+    private LongAdder totalCost = new LongAdder();
+
+    /**
+     * 输入成本（分）
+     */
+    private LongAdder inputCost = new LongAdder();
+
+    /**
+     * 输出成本（分）
+     */
+    private LongAdder outputCost = new LongAdder();
+
+    /**
+     * 平均质量评分
+     */
+    private double avgQualityScore = 0.0;
+
+    /**
+     * 质量评分总和
+     */
+    private LongAdder totalQualityScore = new LongAdder();
+
+    /**
+     * 质量评分次数
+     */
+    private AtomicLong qualityScoreCount = new AtomicLong(0);
+
+    /**
+     * 上下文长度使用统计
+     */
+    private LongAdder totalContextLength = new LongAdder();
+
+    /**
+     * 最大上下文长度
+     */
+    private AtomicLong maxContextLength = new AtomicLong(0);
+
+    /**
+     * 流式请求数
+     */
+    private AtomicLong streamRequests = new AtomicLong(0);
+
+    /**
+     * 函数调用请求数
+     */
+    private AtomicLong functionCallRequests = new AtomicLong(0);
+
+    /**
+     * 工具调用请求数
+     */
+    private AtomicLong toolCallRequests = new AtomicLong(0);
+
+    /**
+     * 视觉处理请求数
+     */
+    private AtomicLong visionRequests = new AtomicLong(0);
+
+    /**
+     * 图像生成请求数
+     */
+    private AtomicLong imageGenerationRequests = new AtomicLong(0);
+
+    /**
+     * 音频处理请求数
+     */
+    private AtomicLong audioRequests = new AtomicLong(0);
+
+    /**
+     * 最后使用时间
+     */
+    private LocalDateTime lastUsedTime;
+
+    /**
+     * 模型热度（使用频率）
+     */
+    private double popularity = 0.0;
+
+    public ModelMetrics(String modelId, String modelName, String providerName, String modelType) {
+        this.modelId = modelId;
+        this.modelName = modelName;
+        this.providerName = providerName;
+        this.modelType = modelType;
+        this.lastUsedTime = LocalDateTime.now();
+    }
+
+    /**
+     * 记录成本
+     *
+     * @param inputTokens  输入Token数
+     * @param outputTokens 输出Token数
+     * @param inputPrice   输入价格（每千Token）
+     * @param outputPrice  输出价格（每千Token）
+     */
+    public void recordCost(int inputTokens, int outputTokens, double inputPrice, double outputPrice) {
+        long inputCostValue = Math.round(inputTokens * inputPrice / 1000.0 * 100); // 转换为分
+        long outputCostValue = Math.round(outputTokens * outputPrice / 1000.0 * 100); // 转换为分
+
+        inputCost.add(inputCostValue);
+        outputCost.add(outputCostValue);
+        totalCost.add(inputCostValue + outputCostValue);
+
+        lastUpdateTime = LocalDateTime.now();
+    }
+
+    /**
+     * 记录质量评分
+     *
+     * @param score 质量评分 (0-100)
+     */
+    public void recordQualityScore(double score) {
+        if (score >= 0 && score <= 100) {
+            totalQualityScore.add(Math.round(score * 100)); // 保留两位小数精度
+            qualityScoreCount.incrementAndGet();
+            updateAvgQualityScore();
+            lastUpdateTime = LocalDateTime.now();
+        }
+    }
+
+    /**
+     * 记录上下文长度
+     *
+     * @param contextLength 上下文长度
+     */
+    public void recordContextLength(int contextLength) {
+        totalContextLength.add(contextLength);
+
+        // 更新最大上下文长度
+        long currentMax = maxContextLength.get();
+        while (contextLength > currentMax && !maxContextLength.compareAndSet(currentMax, contextLength)) {
+            currentMax = maxContextLength.get();
+        }
+
+        lastUpdateTime = LocalDateTime.now();
+    }
+
+    /**
+     * 记录流式请求
+     */
+    public void recordStreamRequest() {
+        streamRequests.incrementAndGet();
+        recordUsage();
+    }
+
+    /**
+     * 记录函数调用请求
+     */
+    public void recordFunctionCallRequest() {
+        functionCallRequests.incrementAndGet();
+        recordUsage();
+    }
+
+    /**
+     * 记录工具调用请求
+     */
+    public void recordToolCallRequest() {
+        toolCallRequests.incrementAndGet();
+        recordUsage();
+    }
+
+    /**
+     * 记录视觉处理请求
+     */
+    public void recordVisionRequest() {
+        visionRequests.incrementAndGet();
+        recordUsage();
+    }
+
+    /**
+     * 记录图像生成请求
+     */
+    public void recordImageGenerationRequest() {
+        imageGenerationRequests.incrementAndGet();
+        recordUsage();
+    }
+
+    /**
+     * 记录音频处理请求
+     */
+    public void recordAudioRequest() {
+        audioRequests.incrementAndGet();
+        recordUsage();
+    }
+
+    /**
+     * 记录模型使用
+     */
+    public void recordUsage() {
+        incrementTotalRequests();
+        lastUsedTime = LocalDateTime.now();
+        updatePopularity();
+    }
+
+    /**
+     * 更新平均质量评分
+     */
+    private void updateAvgQualityScore() {
+        long count = qualityScoreCount.get();
+        if (count > 0) {
+            avgQualityScore = totalQualityScore.doubleValue() / (count * 100.0);
+        }
+    }
+
+    /**
+     * 更新模型热度
+     */
+    private void updatePopularity() {
+        // 基于最近使用时间和总请求数计算热度
+        long totalReqs = getTotalRequests();
+        if (totalReqs > 0) {
+            // 简单的热度计算：总请求数的对数值
+            popularity = Math.log10(totalReqs + 1) * 10;
+        }
+    }
+
+    /**
+     * 获取平均成本（分/千Token）
+     */
+    public double getAvgCostPerKToken() {
+        long totalTokens = getTotalInputTokens() + getTotalOutputTokens();
+        if (totalTokens > 0) {
+            return totalCost.doubleValue() / (totalTokens / 1000.0);
+        }
+        return 0.0;
+    }
+
+    /**
+     * 获取平均上下文长度
+     */
+    public double getAvgContextLength() {
+        long totalReqs = getTotalRequests();
+        if (totalReqs > 0) {
+            return totalContextLength.doubleValue() / totalReqs;
+        }
+        return 0.0;
+    }
+
+    /**
+     * 获取流式请求比例
+     */
+    public double getStreamRequestRatio() {
+        long totalReqs = getTotalRequests();
+        if (totalReqs > 0) {
+            return (double) streamRequests.get() / totalReqs * 100;
+        }
+        return 0.0;
+    }
+
+    /**
+     * 获取功能使用统计
+     */
+    public String getFeatureUsageStats() {
+        return String.format("Stream: %d, Function: %d, Tool: %d, Vision: %d, Image: %d, Audio: %d",
+                streamRequests.get(), functionCallRequests.get(), toolCallRequests.get(),
+                visionRequests.get(), imageGenerationRequests.get(), audioRequests.get());
+    }
+
+    /**
+     * 重置指标
+     */
+    @Override
+    public void reset() {
+        super.reset();
+        totalCost.reset();
+        inputCost.reset();
+        outputCost.reset();
+        totalQualityScore.reset();
+        qualityScoreCount.set(0);
+        totalContextLength.reset();
+        maxContextLength.set(0);
+        streamRequests.set(0);
+        functionCallRequests.set(0);
+        toolCallRequests.set(0);
+        visionRequests.set(0);
+        imageGenerationRequests.set(0);
+        audioRequests.set(0);
+        avgQualityScore = 0.0;
+        popularity = 0.0;
+        lastUsedTime = LocalDateTime.now();
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/monitor/ProviderMetrics.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/monitor/ProviderMetrics.java
new file mode 100644
index 0000000..1339d9c
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/monitor/ProviderMetrics.java
@@ -0,0 +1,211 @@
+package org.dromara.ai.monitor;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.time.LocalDateTime;
+import java.util.concurrent.atomic.AtomicLong;
+
+/**
+ * AI Provider监控指标
+ * 继承基础监控指标，添加Provider特有的监控数据
+ *
+ * @author pengles
+ * @date 2024-01-01
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ProviderMetrics extends BaseMetrics {
+
+    /**
+     * Provider名称
+     */
+    private String providerName;
+
+    /**
+     * Provider类型
+     */
+    private String providerType;
+
+    /**
+     * 连接超时次数
+     */
+    private AtomicLong timeoutCount = new AtomicLong(0);
+
+    /**
+     * 限流次数
+     */
+    private AtomicLong rateLimitCount = new AtomicLong(0);
+
+    /**
+     * 配额超限次数
+     */
+    private AtomicLong quotaExceededCount = new AtomicLong(0);
+
+    /**
+     * 服务不可用次数
+     */
+    private AtomicLong serviceUnavailableCount = new AtomicLong(0);
+
+    /**
+     * 最后成功请求时间
+     */
+    private LocalDateTime lastSuccessTime;
+
+    /**
+     * 最后失败请求时间
+     */
+    private LocalDateTime lastFailureTime;
+
+    /**
+     * 连续失败次数
+     */
+    private AtomicLong consecutiveFailures = new AtomicLong(0);
+
+    /**
+     * Provider可用性状态
+     */
+    private boolean available = true;
+
+    /**
+     * 健康检查最后执行时间
+     */
+    private LocalDateTime lastHealthCheckTime;
+
+    /**
+     * 健康检查状态
+     */
+    private boolean healthCheckPassed = true;
+
+    public ProviderMetrics(String providerName, String providerType) {
+        this.providerName = providerName;
+        this.providerType = providerType;
+        this.lastSuccessTime = LocalDateTime.now();
+        this.lastHealthCheckTime = LocalDateTime.now();
+    }
+
+    /**
+     * 增加超时次数
+     */
+    public void incrementTimeout() {
+        timeoutCount.incrementAndGet();
+        incrementFailedRequests();
+        updateFailureInfo();
+    }
+
+    /**
+     * 增加限流次数
+     */
+    public void incrementRateLimit() {
+        rateLimitCount.incrementAndGet();
+        incrementFailedRequests();
+        updateFailureInfo();
+    }
+
+    /**
+     * 增加配额超限次数
+     */
+    public void incrementQuotaExceeded() {
+        quotaExceededCount.incrementAndGet();
+        incrementFailedRequests();
+        updateFailureInfo();
+    }
+
+    /**
+     * 增加服务不可用次数
+     */
+    public void incrementServiceUnavailable() {
+        serviceUnavailableCount.incrementAndGet();
+        incrementFailedRequests();
+        updateFailureInfo();
+    }
+
+    /**
+     * 记录成功请求
+     */
+    public void recordSuccess() {
+        incrementSuccessRequests();
+        lastSuccessTime = LocalDateTime.now();
+        consecutiveFailures.set(0);
+        updateAvailability();
+    }
+
+    /**
+     * 记录失败请求
+     */
+    public void recordFailure() {
+        incrementFailedRequests();
+        updateFailureInfo();
+    }
+
+    /**
+     * 更新失败信息
+     */
+    private void updateFailureInfo() {
+        lastFailureTime = LocalDateTime.now();
+        consecutiveFailures.incrementAndGet();
+        updateAvailability();
+    }
+
+    /**
+     * 更新可用性状态
+     */
+    private void updateAvailability() {
+        // 连续失败超过10次则标记为不可用
+        if (consecutiveFailures.get() >= 10) {
+            available = false;
+        } else if (consecutiveFailures.get() == 0) {
+            available = true;
+        }
+    }
+
+    /**
+     * 更新健康检查状态
+     */
+    public void updateHealthCheck(boolean passed) {
+        this.healthCheckPassed = passed;
+        this.lastHealthCheckTime = LocalDateTime.now();
+        if (!passed) {
+            available = false;
+        }
+    }
+
+    /**
+     * 获取Provider健康分数 (0-100)
+     */
+    public double getHealthScore() {
+        if (!available || !healthCheckPassed) {
+            return 0.0;
+        }
+
+        double successRate = getSuccessRate();
+        double timeoutRate = getTotalRequests() > 0 ?
+                (double) timeoutCount.get() / getTotalRequests() * 100 : 0;
+        double rateLimitRate = getTotalRequests() > 0 ?
+                (double) rateLimitCount.get() / getTotalRequests() * 100 : 0;
+
+        // 综合计算健康分数
+        double score = successRate;
+        score -= timeoutRate * 0.5; // 超时影响权重0.5
+        score -= rateLimitRate * 0.3; // 限流影响权重0.3
+
+        return Math.max(0, Math.min(100, score));
+    }
+
+    /**
+     * 重置指标
+     */
+    @Override
+    public void reset() {
+        super.reset();
+        timeoutCount.set(0);
+        rateLimitCount.set(0);
+        quotaExceededCount.set(0);
+        serviceUnavailableCount.set(0);
+        consecutiveFailures.set(0);
+        available = true;
+        healthCheckPassed = true;
+        lastSuccessTime = LocalDateTime.now();
+        lastHealthCheckTime = LocalDateTime.now();
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/monitor/SystemMetrics.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/monitor/SystemMetrics.java
new file mode 100644
index 0000000..239ffab
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/monitor/SystemMetrics.java
@@ -0,0 +1,477 @@
+package org.dromara.ai.monitor;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.time.LocalDateTime;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.atomic.LongAdder;
+
+/**
+ * 系统级AI监控指标
+ * 继承基础监控指标，添加系统级特有的监控数据
+ *
+ * @author pengles
+ * @date 2024-01-01
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class SystemMetrics extends BaseMetrics {
+
+    /**
+     * 系统启动时间
+     */
+    private LocalDateTime systemStartTime;
+
+    /**
+     * 总用户数
+     */
+    private AtomicLong totalUsers = new AtomicLong(0);
+
+    /**
+     * 活跃用户数（24小时内）
+     */
+    private AtomicLong activeUsers = new AtomicLong(0);
+
+    /**
+     * 在线用户数
+     */
+    private AtomicLong onlineUsers = new AtomicLong(0);
+
+    /**
+     * 总Provider数
+     */
+    private AtomicLong totalProviders = new AtomicLong(0);
+
+    /**
+     * 可用Provider数
+     */
+    private AtomicLong availableProviders = new AtomicLong(0);
+
+    /**
+     * 总模型数
+     */
+    private AtomicLong totalModels = new AtomicLong(0);
+
+    /**
+     * 可用模型数
+     */
+    private AtomicLong availableModels = new AtomicLong(0);
+
+    /**
+     * 系统总收入（分）
+     */
+    private LongAdder totalRevenue = new LongAdder();
+
+    /**
+     * 系统总成本（分）
+     */
+    private LongAdder totalCost = new LongAdder();
+
+    /**
+     * 系统利润（分）
+     */
+    private LongAdder totalProfit = new LongAdder();
+
+    /**
+     * 峰值并发请求数
+     */
+    private AtomicLong peakConcurrentRequests = new AtomicLong(0);
+
+    /**
+     * 峰值并发用户数
+     */
+    private AtomicLong peakConcurrentUsers = new AtomicLong(0);
+
+    /**
+     * 系统负载（0-100）
+     */
+    private volatile double systemLoad = 0.0;
+
+    /**
+     * 内存使用率（0-100）
+     */
+    private volatile double memoryUsage = 0.0;
+
+    /**
+     * CPU使用率（0-100）
+     */
+    private volatile double cpuUsage = 0.0;
+
+    /**
+     * 磁盘使用率（0-100）
+     */
+    private volatile double diskUsage = 0.0;
+
+    /**
+     * 网络带宽使用（MB/s）
+     */
+    private volatile double networkBandwidth = 0.0;
+
+    /**
+     * 数据库连接池使用率（0-100）
+     */
+    private volatile double dbConnectionUsage = 0.0;
+
+    /**
+     * Redis连接池使用率（0-100）
+     */
+    private volatile double redisConnectionUsage = 0.0;
+
+    /**
+     * 按小时统计的请求数
+     */
+    private Map<Integer, AtomicLong> hourlyRequests = new ConcurrentHashMap<>();
+
+    /**
+     * 按天统计的请求数
+     */
+    private Map<String, AtomicLong> dailyRequests = new ConcurrentHashMap<>();
+
+    /**
+     * 系统健康状态
+     */
+    private String healthStatus = "HEALTHY";
+
+    /**
+     * 系统警告数
+     */
+    private AtomicLong warningCount = new AtomicLong(0);
+
+    /**
+     * 系统错误数
+     */
+    private AtomicLong systemErrorCount = new AtomicLong(0);
+
+    /**
+     * 最后健康检查时间
+     */
+    private LocalDateTime lastHealthCheckTime;
+
+    /**
+     * 系统版本
+     */
+    private String systemVersion;
+
+    /**
+     * 部署环境
+     */
+    private String environment;
+
+    public SystemMetrics(String systemVersion, String environment) {
+        this.systemVersion = systemVersion;
+        this.environment = environment;
+        this.systemStartTime = LocalDateTime.now();
+        this.lastHealthCheckTime = LocalDateTime.now();
+
+        // 初始化24小时统计
+        for (int i = 0; i < 24; i++) {
+            hourlyRequests.put(i, new AtomicLong(0));
+        }
+    }
+
+    /**
+     * 记录用户活动
+     *
+     * @param userId    用户ID
+     * @param isNewUser 是否新用户
+     */
+    public void recordUserActivity(Long userId, boolean isNewUser) {
+        if (isNewUser) {
+            totalUsers.incrementAndGet();
+        }
+        // 这里可以添加更复杂的活跃用户统计逻辑
+        lastUpdateTime = LocalDateTime.now();
+    }
+
+    /**
+     * 更新在线用户数
+     *
+     * @param count 当前在线用户数
+     */
+    public void updateOnlineUsers(long count) {
+        onlineUsers.set(count);
+
+        // 更新峰值并发用户数
+        long currentPeak = peakConcurrentUsers.get();
+        while (count > currentPeak && !peakConcurrentUsers.compareAndSet(currentPeak, count)) {
+            currentPeak = peakConcurrentUsers.get();
+        }
+
+        lastUpdateTime = LocalDateTime.now();
+    }
+
+    /**
+     * 更新Provider统计
+     *
+     * @param total     总Provider数
+     * @param available 可用Provider数
+     */
+    public void updateProviderStats(long total, long available) {
+        totalProviders.set(total);
+        availableProviders.set(available);
+        lastUpdateTime = LocalDateTime.now();
+    }
+
+    /**
+     * 更新模型统计
+     *
+     * @param total     总模型数
+     * @param available 可用模型数
+     */
+    public void updateModelStats(long total, long available) {
+        totalModels.set(total);
+        availableModels.set(available);
+        lastUpdateTime = LocalDateTime.now();
+    }
+
+    /**
+     * 记录收入
+     *
+     * @param revenue 收入金额（分）
+     */
+    public void recordRevenue(long revenue) {
+        totalRevenue.add(revenue);
+        updateProfit();
+        lastUpdateTime = LocalDateTime.now();
+    }
+
+    /**
+     * 记录成本
+     *
+     * @param cost 成本金额（分）
+     */
+    public void recordCost(long cost) {
+        totalCost.add(cost);
+        updateProfit();
+        lastUpdateTime = LocalDateTime.now();
+    }
+
+    /**
+     * 更新系统资源使用情况
+     *
+     * @param cpuUsage         CPU使用率
+     * @param memoryUsage      内存使用率
+     * @param diskUsage        磁盘使用率
+     * @param networkBandwidth 网络带宽
+     */
+    public void updateSystemResources(double cpuUsage, double memoryUsage,
+                                      double diskUsage, double networkBandwidth) {
+        this.cpuUsage = cpuUsage;
+        this.memoryUsage = memoryUsage;
+        this.diskUsage = diskUsage;
+        this.networkBandwidth = networkBandwidth;
+
+        // 计算系统负载
+        this.systemLoad = (cpuUsage + memoryUsage + diskUsage) / 3.0;
+
+        updateHealthStatus();
+        lastUpdateTime = LocalDateTime.now();
+    }
+
+    /**
+     * 更新数据库连接使用情况
+     *
+     * @param dbUsage    数据库连接使用率
+     * @param redisUsage Redis连接使用率
+     */
+    public void updateConnectionUsage(double dbUsage, double redisUsage) {
+        this.dbConnectionUsage = dbUsage;
+        this.redisConnectionUsage = redisUsage;
+        updateHealthStatus();
+        lastUpdateTime = LocalDateTime.now();
+    }
+
+    /**
+     * 记录请求（按时间统计）
+     */
+    @Override
+    public void incrementTotalRequests() {
+        super.incrementTotalRequests();
+
+        // 记录当前小时的请求数
+        int currentHour = LocalDateTime.now().getHour();
+        hourlyRequests.get(currentHour).incrementAndGet();
+
+        // 记录当天的请求数
+        String today = LocalDateTime.now().toLocalDate().toString();
+        dailyRequests.computeIfAbsent(today, k -> new AtomicLong(0)).incrementAndGet();
+
+        // 更新峰值并发请求数
+        int activeCount = getActiveRequestCount();
+        long currentPeak = peakConcurrentRequests.get();
+        while (activeCount > currentPeak && !peakConcurrentRequests.compareAndSet(currentPeak, activeCount)) {
+            currentPeak = peakConcurrentRequests.get();
+        }
+    }
+
+    /**
+     * 记录系统警告
+     *
+     * @param warningMessage 警告信息
+     */
+    public void recordWarning(String warningMessage) {
+        warningCount.incrementAndGet();
+        incrementErrorCount("WARNING: " + warningMessage);
+        updateHealthStatus();
+        lastUpdateTime = LocalDateTime.now();
+    }
+
+    /**
+     * 记录系统错误
+     *
+     * @param errorMessage 错误信息
+     */
+    public void recordSystemError(String errorMessage) {
+        systemErrorCount.incrementAndGet();
+        incrementErrorCount("ERROR: " + errorMessage);
+        updateHealthStatus();
+        lastUpdateTime = LocalDateTime.now();
+    }
+
+    /**
+     * 更新健康状态
+     */
+    private void updateHealthStatus() {
+        // 基于各种指标计算健康状态
+        if (systemLoad > 90 || memoryUsage > 90 || diskUsage > 95 ||
+                dbConnectionUsage > 90 || redisConnectionUsage > 90) {
+            healthStatus = "CRITICAL";
+        } else if (systemLoad > 70 || memoryUsage > 70 || diskUsage > 80 ||
+                dbConnectionUsage > 70 || redisConnectionUsage > 70) {
+            healthStatus = "WARNING";
+        } else if (availableProviders.get() == 0 || availableModels.get() == 0) {
+            healthStatus = "DEGRADED";
+        } else {
+            healthStatus = "HEALTHY";
+        }
+
+        lastHealthCheckTime = LocalDateTime.now();
+    }
+
+    /**
+     * 更新利润
+     */
+    private void updateProfit() {
+        long profit = totalRevenue.longValue() - totalCost.longValue();
+        totalProfit.reset();
+        totalProfit.add(profit);
+    }
+
+    /**
+     * 获取系统运行时间（小时）
+     */
+    public long getSystemUptimeHours() {
+        return java.time.Duration.between(systemStartTime, LocalDateTime.now()).toHours();
+    }
+
+    /**
+     * 获取Provider可用率
+     */
+    public double getProviderAvailabilityRate() {
+        long total = totalProviders.get();
+        if (total > 0) {
+            return (double) availableProviders.get() / total * 100;
+        }
+        return 0.0;
+    }
+
+    /**
+     * 获取模型可用率
+     */
+    public double getModelAvailabilityRate() {
+        long total = totalModels.get();
+        if (total > 0) {
+            return (double) availableModels.get() / total * 100;
+        }
+        return 0.0;
+    }
+
+    /**
+     * 获取利润率
+     */
+    public double getProfitMargin() {
+        long revenue = totalRevenue.longValue();
+        if (revenue > 0) {
+            return (double) totalProfit.longValue() / revenue * 100;
+        }
+        return 0.0;
+    }
+
+    /**
+     * 获取系统健康评分 (0-100)
+     */
+    public double getSystemHealthScore() {
+        double resourceScore = 100 - systemLoad;
+        double availabilityScore = (getProviderAvailabilityRate() + getModelAvailabilityRate()) / 2;
+        double errorScore = Math.max(0, 100 - systemErrorCount.get());
+
+        return (resourceScore + availabilityScore + errorScore) / 3.0;
+    }
+
+    /**
+     * 获取今日请求数
+     */
+    public long getTodayRequests() {
+        String today = LocalDateTime.now().toLocalDate().toString();
+        return dailyRequests.getOrDefault(today, new AtomicLong(0)).get();
+    }
+
+    /**
+     * 获取当前小时请求数
+     */
+    public long getCurrentHourRequests() {
+        int currentHour = LocalDateTime.now().getHour();
+        return hourlyRequests.get(currentHour).get();
+    }
+
+    /**
+     * 获取系统摘要
+     */
+    public String getSystemSummary() {
+        return String.format(
+                "System: %s [%s], Status: %s, Users: %d/%d, Providers: %d/%d, Models: %d/%d, Load: %.1f%%, Health: %.1f",
+                systemVersion, environment, healthStatus,
+                onlineUsers.get(), totalUsers.get(),
+                availableProviders.get(), totalProviders.get(),
+                availableModels.get(), totalModels.get(),
+                systemLoad, getSystemHealthScore()
+        );
+    }
+
+    /**
+     * 重置指标
+     */
+    @Override
+    public void reset() {
+        super.reset();
+        totalUsers.set(0);
+        activeUsers.set(0);
+        onlineUsers.set(0);
+        totalProviders.set(0);
+        availableProviders.set(0);
+        totalModels.set(0);
+        availableModels.set(0);
+        totalRevenue.reset();
+        totalCost.reset();
+        totalProfit.reset();
+        peakConcurrentRequests.set(0);
+        peakConcurrentUsers.set(0);
+        warningCount.set(0);
+        systemErrorCount.set(0);
+        hourlyRequests.values().forEach(counter -> counter.set(0));
+        dailyRequests.clear();
+        systemLoad = 0.0;
+        memoryUsage = 0.0;
+        cpuUsage = 0.0;
+        diskUsage = 0.0;
+        networkBandwidth = 0.0;
+        dbConnectionUsage = 0.0;
+        redisConnectionUsage = 0.0;
+        healthStatus = "HEALTHY";
+        systemStartTime = LocalDateTime.now();
+        lastHealthCheckTime = LocalDateTime.now();
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/monitor/UserMetrics.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/monitor/UserMetrics.java
new file mode 100644
index 0000000..9bc5ee0
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/monitor/UserMetrics.java
@@ -0,0 +1,374 @@
+package org.dromara.ai.monitor;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.time.LocalDateTime;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.atomic.LongAdder;
+
+/**
+ * 用户AI使用监控指标
+ * 继承基础监控指标，添加用户特有的监控数据
+ *
+ * @author pengles
+ * @date 2024-01-01
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class UserMetrics extends BaseMetrics {
+
+    /**
+     * 用户ID
+     */
+    private Long userId;
+
+    /**
+     * 用户名
+     */
+    private String username;
+
+    /**
+     * 用户类型
+     */
+    private String userType;
+
+    /**
+     * 总消费金额（分）
+     */
+    private LongAdder totalSpent = new LongAdder();
+
+    /**
+     * 配额限制（分）
+     */
+    private long quotaLimit = 0;
+
+    /**
+     * 已使用配额（分）
+     */
+    private LongAdder usedQuota = new LongAdder();
+
+    /**
+     * 按模型分组的使用统计
+     */
+    private Map<String, AtomicLong> modelUsage = new ConcurrentHashMap<>();
+
+    /**
+     * 按Provider分组的使用统计
+     */
+    private Map<String, AtomicLong> providerUsage = new ConcurrentHashMap<>();
+
+    /**
+     * 会话数量
+     */
+    private AtomicLong sessionCount = new AtomicLong(0);
+
+    /**
+     * 平均会话长度（消息数）
+     */
+    private double avgSessionLength = 0.0;
+
+    /**
+     * 总会话长度
+     */
+    private LongAdder totalSessionLength = new LongAdder();
+
+    /**
+     * 最长会话长度
+     */
+    private AtomicLong maxSessionLength = new AtomicLong(0);
+
+    /**
+     * 首次使用时间
+     */
+    private LocalDateTime firstUsedTime;
+
+    /**
+     * 最后使用时间
+     */
+    private LocalDateTime lastUsedTime;
+
+    /**
+     * 最后登录时间
+     */
+    private LocalDateTime lastLoginTime;
+
+    /**
+     * 活跃天数
+     */
+    private AtomicLong activeDays = new AtomicLong(0);
+
+    /**
+     * 用户等级
+     */
+    private String userLevel = "BASIC";
+
+    /**
+     * 用户状态
+     */
+    private String status = "ACTIVE";
+
+    /**
+     * 违规次数
+     */
+    private AtomicLong violationCount = new AtomicLong(0);
+
+    /**
+     * 最后违规时间
+     */
+    private LocalDateTime lastViolationTime;
+
+    public UserMetrics(Long userId, String username, String userType) {
+        this.userId = userId;
+        this.username = username;
+        this.userType = userType;
+        this.firstUsedTime = LocalDateTime.now();
+        this.lastUsedTime = LocalDateTime.now();
+        this.lastLoginTime = LocalDateTime.now();
+    }
+
+    /**
+     * 记录消费
+     *
+     * @param amount 消费金额（分）
+     */
+    public void recordSpending(long amount) {
+        totalSpent.add(amount);
+        usedQuota.add(amount);
+        lastUpdateTime = LocalDateTime.now();
+    }
+
+    /**
+     * 记录模型使用
+     *
+     * @param modelId 模型ID
+     */
+    public void recordModelUsage(String modelId) {
+        if (modelId != null && !modelId.isEmpty()) {
+            modelUsage.computeIfAbsent(modelId, k -> new AtomicLong(0)).incrementAndGet();
+            recordUsage();
+        }
+    }
+
+    /**
+     * 记录Provider使用
+     *
+     * @param providerName Provider名称
+     */
+    public void recordProviderUsage(String providerName) {
+        if (providerName != null && !providerName.isEmpty()) {
+            providerUsage.computeIfAbsent(providerName, k -> new AtomicLong(0)).incrementAndGet();
+        }
+    }
+
+    /**
+     * 开始新会话
+     */
+    public void startNewSession() {
+        sessionCount.incrementAndGet();
+        recordUsage();
+    }
+
+    /**
+     * 结束会话
+     *
+     * @param messageCount 会话中的消息数量
+     */
+    public void endSession(int messageCount) {
+        totalSessionLength.add(messageCount);
+
+        // 更新最长会话长度
+        long currentMax = maxSessionLength.get();
+        while (messageCount > currentMax && !maxSessionLength.compareAndSet(currentMax, messageCount)) {
+            currentMax = maxSessionLength.get();
+        }
+
+        updateAvgSessionLength();
+        lastUpdateTime = LocalDateTime.now();
+    }
+
+    /**
+     * 记录用户使用
+     */
+    public void recordUsage() {
+        incrementTotalRequests();
+        lastUsedTime = LocalDateTime.now();
+        updateUserLevel();
+    }
+
+    /**
+     * 记录登录
+     */
+    public void recordLogin() {
+        lastLoginTime = LocalDateTime.now();
+        // 简单的活跃天数计算逻辑
+        activeDays.incrementAndGet();
+    }
+
+    /**
+     * 记录违规
+     *
+     * @param violationType 违规类型
+     */
+    public void recordViolation(String violationType) {
+        violationCount.incrementAndGet();
+        lastViolationTime = LocalDateTime.now();
+        incrementErrorCount(violationType);
+
+        // 根据违规次数更新用户状态
+        if (violationCount.get() >= 10) {
+            status = "SUSPENDED";
+        } else if (violationCount.get() >= 5) {
+            status = "WARNING";
+        }
+
+        lastUpdateTime = LocalDateTime.now();
+    }
+
+    /**
+     * 设置配额限制
+     *
+     * @param quotaLimit 配额限制（分）
+     */
+    public void setQuotaLimit(long quotaLimit) {
+        this.quotaLimit = quotaLimit;
+    }
+
+    /**
+     * 重置配额使用
+     */
+    public void resetQuota() {
+        usedQuota.reset();
+        lastUpdateTime = LocalDateTime.now();
+    }
+
+    /**
+     * 检查是否超出配额
+     */
+    public boolean isQuotaExceeded() {
+        return quotaLimit > 0 && usedQuota.longValue() >= quotaLimit;
+    }
+
+    /**
+     * 获取剩余配额
+     */
+    public long getRemainingQuota() {
+        if (quotaLimit <= 0) {
+            return Long.MAX_VALUE; // 无限制
+        }
+        return Math.max(0, quotaLimit - usedQuota.longValue());
+    }
+
+    /**
+     * 获取配额使用率
+     */
+    public double getQuotaUsageRate() {
+        if (quotaLimit <= 0) {
+            return 0.0;
+        }
+        return (double) usedQuota.longValue() / quotaLimit * 100;
+    }
+
+    /**
+     * 获取最常用的模型
+     */
+    public String getMostUsedModel() {
+        return modelUsage.entrySet().stream()
+                .max(Map.Entry.comparingByValue((a, b) -> Long.compare(a.get(), b.get())))
+                .map(Map.Entry::getKey)
+                .orElse(null);
+    }
+
+    /**
+     * 获取最常用的Provider
+     */
+    public String getMostUsedProvider() {
+        return providerUsage.entrySet().stream()
+                .max(Map.Entry.comparingByValue((a, b) -> Long.compare(a.get(), b.get())))
+                .map(Map.Entry::getKey)
+                .orElse(null);
+    }
+
+    /**
+     * 获取用户活跃度评分 (0-100)
+     */
+    public double getActivityScore() {
+        long totalReqs = getTotalRequests();
+        long days = activeDays.get();
+        long sessions = sessionCount.get();
+
+        if (totalReqs == 0) {
+            return 0.0;
+        }
+
+        // 基于请求数、活跃天数和会话数计算活跃度
+        double requestScore = Math.min(50, Math.log10(totalReqs + 1) * 10);
+        double dayScore = Math.min(30, days * 2);
+        double sessionScore = Math.min(20, sessions * 0.5);
+
+        return requestScore + dayScore + sessionScore;
+    }
+
+    /**
+     * 更新平均会话长度
+     */
+    private void updateAvgSessionLength() {
+        long sessions = sessionCount.get();
+        if (sessions > 0) {
+            avgSessionLength = totalSessionLength.doubleValue() / sessions;
+        }
+    }
+
+    /**
+     * 更新用户等级
+     */
+    private void updateUserLevel() {
+        long totalReqs = getTotalRequests();
+        long spent = totalSpent.longValue();
+
+        if (totalReqs >= 10000 || spent >= 100000) { // 1000元
+            userLevel = "PREMIUM";
+        } else if (totalReqs >= 1000 || spent >= 10000) { // 100元
+            userLevel = "ADVANCED";
+        } else if (totalReqs >= 100 || spent >= 1000) { // 10元
+            userLevel = "INTERMEDIATE";
+        } else {
+            userLevel = "BASIC";
+        }
+    }
+
+    /**
+     * 获取用户统计摘要
+     */
+    public String getUserSummary() {
+        return String.format("User: %s, Level: %s, Requests: %d, Sessions: %d, Spent: %.2f, Status: %s",
+                username, userLevel, getTotalRequests(), sessionCount.get(),
+                totalSpent.doubleValue() / 100.0, status);
+    }
+
+    /**
+     * 重置指标
+     */
+    @Override
+    public void reset() {
+        super.reset();
+        totalSpent.reset();
+        usedQuota.reset();
+        modelUsage.clear();
+        providerUsage.clear();
+        sessionCount.set(0);
+        totalSessionLength.reset();
+        maxSessionLength.set(0);
+        activeDays.set(0);
+        violationCount.set(0);
+        avgSessionLength = 0.0;
+        userLevel = "BASIC";
+        status = "ACTIVE";
+        firstUsedTime = LocalDateTime.now();
+        lastUsedTime = LocalDateTime.now();
+        lastLoginTime = LocalDateTime.now();
+        lastViolationTime = null;
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/orchestration/AiOrchestrationEngine.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/orchestration/AiOrchestrationEngine.java
new file mode 100644
index 0000000..8937071
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/orchestration/AiOrchestrationEngine.java
@@ -0,0 +1,347 @@
+package org.dromara.ai.orchestration;
+
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.ai.domain.dto.AiChatRequest;
+import org.dromara.ai.domain.dto.AiChatResponse;
+import org.dromara.ai.provider.AiProvider;
+import org.dromara.ai.provider.AiProviderManager;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.stream.Collectors;
+
+/**
+ * AI编排引擎
+ * 实现多Provider结果合并和智能路由
+ *
+ * @author pengles
+ * @since 2024-01-01
+ */
+@Slf4j
+@Service
+public class AiOrchestrationEngine {
+
+    @Autowired
+    private AiProviderManager providerManager;
+
+    private final ExecutorService executorService = Executors.newFixedThreadPool(10);
+
+    /**
+     * 路由策略枚举
+     */
+    public enum RoutingStrategy {
+        FASTEST,        // 最快响应
+        BEST_QUALITY,   // 最佳质量
+        LOAD_BALANCE,   // 负载均衡
+        COST_OPTIMAL,   // 成本最优
+        FAILOVER        // 故障转移
+    }
+
+    /**
+     * 合并策略枚举
+     */
+    public enum MergeStrategy {
+        FIRST_SUCCESS,  // 第一个成功
+        BEST_RESULT,    // 最佳结果
+        CONSENSUS,      // 共识结果
+        WEIGHTED_MERGE  // 权重合并
+    }
+
+    /**
+     * 智能路由聊天请求
+     *
+     * @param request  聊天请求
+     * @param strategy 路由策略
+     * @return 聊天响应
+     */
+    public AiChatResponse routeChat(AiChatRequest request, RoutingStrategy strategy) {
+        log.debug("智能路由聊天请求，策略: {}", strategy);
+
+        try {
+            AiProvider selectedProvider = selectProvider(request, strategy);
+            if (selectedProvider == null) {
+                return createErrorResponse("没有可用的AI Provider");
+            }
+
+            log.info("选择Provider: {} 处理请求", selectedProvider.getProviderName());
+            return selectedProvider.chat(request);
+
+        } catch (Exception e) {
+            log.error("智能路由失败", e);
+            return createErrorResponse("路由处理失败: " + e.getMessage());
+        }
+    }
+
+    /**
+     * 多Provider并行处理并合并结果
+     *
+     * @param request       聊天请求
+     * @param providerNames Provider名称列表
+     * @param mergeStrategy 合并策略
+     * @return 合并后的聊天响应
+     */
+    public AiChatResponse mergeChat(AiChatRequest request, List<String> providerNames, MergeStrategy mergeStrategy) {
+        log.debug("多Provider并行处理，合并策略: {}", mergeStrategy);
+
+        if (providerNames == null || providerNames.isEmpty()) {
+            return createErrorResponse("Provider列表为空");
+        }
+
+        try {
+            // 并行调用多个Provider
+            List<CompletableFuture<AiChatResponse>> futures = providerNames.stream()
+                    .map(name -> providerManager.getProvider(name))
+                    .filter(Objects::nonNull)
+                    .filter(AiProvider::isAvailable)
+                    .map(provider -> CompletableFuture.supplyAsync(() -> {
+                        try {
+                            log.debug("Provider {} 开始处理请求", provider.getProviderName());
+                            return provider.chat(request);
+                        } catch (Exception e) {
+                            log.warn("Provider {} 处理失败: {}", provider.getProviderName(), e.getMessage());
+                            return createErrorResponse("Provider处理失败: " + e.getMessage());
+                        }
+                    }, executorService))
+                    .collect(Collectors.toList());
+
+            if (futures.isEmpty()) {
+                return createErrorResponse("没有可用的Provider");
+            }
+
+            // 等待所有结果
+            List<AiChatResponse> responses = futures.stream()
+                    .map(CompletableFuture::join)
+                    .collect(Collectors.toList());
+
+            // 根据策略合并结果
+            return mergeResponses(responses, mergeStrategy);
+
+        } catch (Exception e) {
+            log.error("多Provider处理失败", e);
+            return createErrorResponse("合并处理失败: " + e.getMessage());
+        }
+    }
+
+    /**
+     * 故障转移处理
+     *
+     * @param request       聊天请求
+     * @param providerNames Provider优先级列表
+     * @return 聊天响应
+     */
+    public AiChatResponse failoverChat(AiChatRequest request, List<String> providerNames) {
+        log.debug("故障转移处理，Provider优先级: {}", providerNames);
+
+        for (String providerName : providerNames) {
+            AiProvider provider = providerManager.getProvider(providerName);
+            if (provider == null || !provider.isAvailable()) {
+                log.warn("Provider {} 不可用，尝试下一个", providerName);
+                continue;
+            }
+
+            try {
+                log.info("使用Provider {} 处理请求", providerName);
+                AiChatResponse response = provider.chat(request);
+                if (response.getSuccess()) {
+                    return response;
+                }
+                log.warn("Provider {} 处理失败，尝试下一个", providerName);
+            } catch (Exception e) {
+                log.warn("Provider {} 异常，尝试下一个: {}", providerName, e.getMessage());
+            }
+        }
+
+        return createErrorResponse("所有Provider都不可用");
+    }
+
+    /**
+     * 选择最优Provider
+     *
+     * @param request  聊天请求
+     * @param strategy 路由策略
+     * @return 选中的Provider
+     */
+    private AiProvider selectProvider(AiChatRequest request, RoutingStrategy strategy) {
+        List<AiProvider> availableProviders = providerManager.getAvailableProviders();
+
+        if (availableProviders.isEmpty()) {
+            return null;
+        }
+
+        switch (strategy) {
+            case FASTEST:
+                return selectFastestProvider(availableProviders);
+            case BEST_QUALITY:
+                return selectBestQualityProvider(availableProviders, request.getModel());
+            case LOAD_BALANCE:
+                return selectLoadBalancedProvider(availableProviders);
+            case COST_OPTIMAL:
+                return selectCostOptimalProvider(availableProviders, request.getModel());
+            case FAILOVER:
+            default:
+                return availableProviders.get(0);
+        }
+    }
+
+    /**
+     * 选择最快的Provider
+     */
+    private AiProvider selectFastestProvider(List<AiProvider> providers) {
+        return providers.stream()
+                .min(Comparator.comparing(provider -> {
+                    Map<String, Object> stats = provider.getStatistics();
+                    return (Double) stats.getOrDefault("avgResponseTime", Double.MAX_VALUE);
+                }))
+                .orElse(providers.get(0));
+    }
+
+    /**
+     * 选择最佳质量Provider
+     */
+    private AiProvider selectBestQualityProvider(List<AiProvider> providers, String modelName) {
+        return providers.stream()
+                .filter(provider -> provider.getSupportedModels().contains(modelName))
+                .max(Comparator.comparing(provider -> {
+                    Map<String, Object> stats = provider.getStatistics();
+                    return (Double) stats.getOrDefault("successRate", 0.0);
+                }))
+                .orElse(providers.get(0));
+    }
+
+    /**
+     * 选择负载均衡Provider
+     */
+    private AiProvider selectLoadBalancedProvider(List<AiProvider> providers) {
+        return providers.stream()
+                .min(Comparator.comparing(provider -> {
+                    Map<String, Object> stats = provider.getStatistics();
+                    return (Long) stats.getOrDefault("totalRequests", 0L);
+                }))
+                .orElse(providers.get(0));
+    }
+
+    /**
+     * 选择成本最优Provider
+     */
+    private AiProvider selectCostOptimalProvider(List<AiProvider> providers, String modelName) {
+        return providers.stream()
+                .filter(provider -> provider.getSupportedModels().contains(modelName))
+                .min(Comparator.comparing(provider -> {
+                    try {
+                        Double price = provider.getModelInfo(modelName).getInputPrice();
+                        return price != null ? price : Double.MAX_VALUE;
+                    } catch (Exception e) {
+                        return Double.MAX_VALUE;
+                    }
+                }))
+                .orElse(providers.get(0));
+    }
+
+    /**
+     * 合并多个响应
+     *
+     * @param responses 响应列表
+     * @param strategy  合并策略
+     * @return 合并后的响应
+     */
+    private AiChatResponse mergeResponses(List<AiChatResponse> responses, MergeStrategy strategy) {
+        List<AiChatResponse> successResponses = responses.stream()
+                .filter(response -> response.getSuccess() != null && response.getSuccess())
+                .collect(Collectors.toList());
+
+        if (successResponses.isEmpty()) {
+            return responses.get(0); // 返回第一个错误响应
+        }
+
+        switch (strategy) {
+            case FIRST_SUCCESS:
+                return successResponses.get(0);
+            case BEST_RESULT:
+                return selectBestResponse(successResponses);
+            case CONSENSUS:
+                return createConsensusResponse(successResponses);
+            case WEIGHTED_MERGE:
+                return createWeightedMergeResponse(successResponses);
+            default:
+                return successResponses.get(0);
+        }
+    }
+
+    /**
+     * 选择最佳响应
+     */
+    private AiChatResponse selectBestResponse(List<AiChatResponse> responses) {
+        return responses.stream()
+                .max(Comparator.comparing(response -> {
+                    // 根据响应长度和质量评分
+                    String content = response.getChoices().get(0).getMessage().getContent();
+                    return content != null ? content.length() : 0;
+                }))
+                .orElse(responses.get(0));
+    }
+
+    /**
+     * 创建共识响应
+     */
+    private AiChatResponse createConsensusResponse(List<AiChatResponse> responses) {
+        // 简单实现：选择最常见的响应
+        Map<String, Long> contentCount = responses.stream()
+                .map(response -> response.getChoices().get(0).getMessage().getContent())
+                .collect(Collectors.groupingBy(content -> content, Collectors.counting()));
+
+        String consensusContent = contentCount.entrySet().stream()
+                .max(Map.Entry.comparingByValue())
+                .map(Map.Entry::getKey)
+                .orElse("");
+
+        AiChatResponse consensusResponse = responses.get(0);
+        consensusResponse.getChoices().get(0).getMessage().setContent(consensusContent);
+        return consensusResponse;
+    }
+
+    /**
+     * 创建权重合并响应
+     */
+    private AiChatResponse createWeightedMergeResponse(List<AiChatResponse> responses) {
+        // 简单实现：合并所有响应内容
+        StringBuilder mergedContent = new StringBuilder();
+        for (int i = 0; i < responses.size(); i++) {
+            String content = responses.get(i).getChoices().get(0).getMessage().getContent();
+            mergedContent.append("Provider ").append(i + 1).append(": ").append(content).append("\n\n");
+        }
+
+        AiChatResponse mergedResponse = responses.get(0);
+        mergedResponse.getChoices().get(0).getMessage().setContent(mergedContent.toString().trim());
+        return mergedResponse;
+    }
+
+    /**
+     * 创建错误响应
+     *
+     * @param errorMessage 错误信息
+     * @return 错误响应
+     */
+    private AiChatResponse createErrorResponse(String errorMessage) {
+        AiChatResponse response = new AiChatResponse();
+        response.setSuccess(false);
+        response.setError(errorMessage);
+        response.setResponseTime(System.currentTimeMillis());
+        return response;
+    }
+
+    /**
+     * 销毁资源
+     */
+    public void destroy() {
+        if (executorService != null && !executorService.isShutdown()) {
+            executorService.shutdown();
+        }
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/painting/PaintingEngineType.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/painting/PaintingEngineType.java
new file mode 100644
index 0000000..970935e
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/painting/PaintingEngineType.java
@@ -0,0 +1,8 @@
+package org.dromara.ai.painting;
+
+public enum PaintingEngineType {
+    DALL_E_3,
+    MIDJOURNEY,
+    STABLE_DIFFUSION
+}
+
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/painting/PaintingProvider.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/painting/PaintingProvider.java
new file mode 100644
index 0000000..8e1a07f
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/painting/PaintingProvider.java
@@ -0,0 +1,13 @@
+package org.dromara.ai.painting;
+
+import java.util.List;
+import java.util.Map;
+
+public interface PaintingProvider {
+    String name();
+
+    void submit(PaintingTask task);
+
+    List<String> create(String prompt, Map<String, Object> params) throws Exception;
+}
+
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/painting/PaintingStatus.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/painting/PaintingStatus.java
new file mode 100644
index 0000000..89d932f
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/painting/PaintingStatus.java
@@ -0,0 +1,9 @@
+package org.dromara.ai.painting;
+
+public enum PaintingStatus {
+    PENDING,
+    RUNNING,
+    SUCCESS,
+    FAILED
+}
+
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/painting/PaintingTask.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/painting/PaintingTask.java
new file mode 100644
index 0000000..eb4856c
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/painting/PaintingTask.java
@@ -0,0 +1,23 @@
+package org.dromara.ai.painting;
+
+import lombok.Data;
+
+import java.time.Instant;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+@Data
+public class PaintingTask {
+    private String id;
+    private PaintingEngineType engine;
+    private String prompt;
+    private Map<String, Object> params;
+    private PaintingStatus status;
+    private int progress;
+    private List<String> images = new ArrayList<>();
+    private String message;
+    private Instant createdAt = Instant.now();
+    private Instant updatedAt = Instant.now();
+}
+
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/painting/provider/DallE3Provider.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/painting/provider/DallE3Provider.java
new file mode 100644
index 0000000..4eef6c5
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/painting/provider/DallE3Provider.java
@@ -0,0 +1,52 @@
+package org.dromara.ai.painting.provider;
+
+import okhttp3.*;
+import org.dromara.ai.painting.PaintingProvider;
+import org.dromara.ai.painting.PaintingTask;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+@Component
+public class DallE3Provider implements PaintingProvider {
+    @Value("${ruoyi.ai.external-ai.openai.base-url:https://api.openai.com}")
+    private String openaiBaseUrl;
+    @Value("${ruoyi.ai.external-ai.openai.api-key:}")
+    private String openaiApiKey;
+    private final OkHttpClient client = new OkHttpClient();
+
+    @Override
+    public String name() {
+        return "dall-e-3";
+    }
+
+    @Override
+    public void submit(PaintingTask task) {
+    }
+
+    @Override
+    public List<String> create(String prompt, Map<String, Object> params) throws Exception {
+        String size = String.valueOf(params.getOrDefault("size", "1024x1024"));
+        String url = normalize(openaiBaseUrl) + "/v1/images/generations";
+        String body = "{\"model\":\"dall-e-3\",\"prompt\":\"" + prompt.replace("\"", "\\\"") + "\",\"size\":\"" + size + "\"}";
+        Request.Builder b = new Request.Builder().url(url)
+                .post(RequestBody.create(MediaType.parse("application/json"), body.getBytes(StandardCharsets.UTF_8)))
+                .header("Authorization", "Bearer " + openaiApiKey);
+        try (Response resp = client.newCall(b.build()).execute()) {
+            String respBody = resp.body() != null ? resp.body().string() : "{}";
+            List<String> images = new ArrayList<>();
+            images.add(respBody);
+            return images;
+        }
+    }
+
+    private String normalize(String base) {
+        if (base.endsWith("/")) return base.substring(0, base.length() - 1);
+        return base;
+    }
+}
+
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/painting/provider/MidJourneyProvider.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/painting/provider/MidJourneyProvider.java
new file mode 100644
index 0000000..b326699
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/painting/provider/MidJourneyProvider.java
@@ -0,0 +1,56 @@
+package org.dromara.ai.painting.provider;
+
+import okhttp3.*;
+import org.dromara.ai.painting.PaintingProvider;
+import org.dromara.ai.painting.PaintingTask;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+@Component
+public class MidJourneyProvider implements PaintingProvider {
+    @Value("${ruoyi.ai.external-ai.midjourney.base-url:}")
+    private String baseUrl;
+    @Value("${ruoyi.ai.external-ai.midjourney.token:}")
+    private String token;
+    private final OkHttpClient client = new OkHttpClient();
+
+    @Override
+    public String name() {
+        return "midjourney";
+    }
+
+    @Override
+    public void submit(PaintingTask task) {
+    }
+
+    @Override
+    public List<String> create(String prompt, Map<String, Object> params) throws Exception {
+        if (baseUrl == null || baseUrl.isBlank()) {
+            List<String> images = new ArrayList<>();
+            images.add("{\"code\":500,\"msg\":\"MIDJOURNEY_NOT_CONFIGURED\"}");
+            return images;
+        }
+        String url = normalize(baseUrl) + "/mj/submit";
+        String body = "{\"prompt\":\"" + prompt.replace("\"", "\\\"") + "\"}";
+        Request.Builder b = new Request.Builder().url(url)
+                .post(RequestBody.create(MediaType.parse("application/json"), body.getBytes(StandardCharsets.UTF_8)))
+                .header("Authorization", "Bearer " + token);
+        try (Response resp = client.newCall(b.build()).execute()) {
+            String respBody = resp.body() != null ? resp.body().string() : "{}";
+            List<String> images = new ArrayList<>();
+            images.add(respBody);
+            return images;
+        }
+    }
+
+    private String normalize(String base) {
+        if (base.endsWith("/")) return base.substring(0, base.length() - 1);
+        return base;
+    }
+}
+
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/painting/provider/StableDiffusionProvider.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/painting/provider/StableDiffusionProvider.java
new file mode 100644
index 0000000..0e25452
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/painting/provider/StableDiffusionProvider.java
@@ -0,0 +1,53 @@
+package org.dromara.ai.painting.provider;
+
+import okhttp3.*;
+import org.dromara.ai.painting.PaintingProvider;
+import org.dromara.ai.painting.PaintingTask;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+@Component
+public class StableDiffusionProvider implements PaintingProvider {
+    @Value("${ruoyi.ai.external-ai.sd.base-url:}")
+    private String baseUrl;
+    private final OkHttpClient client = new OkHttpClient();
+
+    @Override
+    public String name() {
+        return "stable-diffusion";
+    }
+
+    @Override
+    public void submit(PaintingTask task) {
+    }
+
+    @Override
+    public List<String> create(String prompt, Map<String, Object> params) throws Exception {
+        if (baseUrl == null || baseUrl.isBlank()) {
+            List<String> images = new ArrayList<>();
+            images.add("{\"code\":500,\"msg\":\"SD_NOT_CONFIGURED\"}");
+            return images;
+        }
+        String url = normalize(baseUrl) + "/sdapi/v1/txt2img";
+        String body = "{\"prompt\":\"" + prompt.replace("\"", "\\\"") + "\"}";
+        Request.Builder b = new Request.Builder().url(url)
+                .post(RequestBody.create(MediaType.parse("application/json"), body.getBytes(StandardCharsets.UTF_8)));
+        try (Response resp = client.newCall(b.build()).execute()) {
+            String respBody = resp.body() != null ? resp.body().string() : "{}";
+            List<String> images = new ArrayList<>();
+            images.add(respBody);
+            return images;
+        }
+    }
+
+    private String normalize(String base) {
+        if (base.endsWith("/")) return base.substring(0, base.length() - 1);
+        return base;
+    }
+}
+
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/platform/CozeService.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/platform/CozeService.java
new file mode 100644
index 0000000..33029a4
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/platform/CozeService.java
@@ -0,0 +1,33 @@
+package org.dromara.ai.platform;
+
+import lombok.RequiredArgsConstructor;
+import okhttp3.*;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+
+@Service
+@RequiredArgsConstructor
+public class CozeService {
+    @Value("${ruoyi.ai.platform.coze.base-url:}")
+    private String baseUrl;
+    @Value("${ruoyi.ai.platform.coze.token:}")
+    private String token;
+    private final OkHttpClient client = new OkHttpClient();
+
+    public String stream(String botId, String input) throws Exception {
+        String url = normalize(baseUrl) + "/api/bot/" + botId + "/chat";
+        String body = "{\"input\":\"" + input.replace("\"", "\\\"") + "\"}";
+        Request.Builder b = new Request.Builder().url(url)
+                .post(RequestBody.create(MediaType.parse("application/json"), body))
+                .header("Authorization", "Bearer " + token);
+        try (Response resp = client.newCall(b.build()).execute()) {
+            return resp.body() != null ? resp.body().string() : "{}";
+        }
+    }
+
+    private String normalize(String base) {
+        if (base == null) return "";
+        if (base.endsWith("/")) return base.substring(0, base.length() - 1);
+        return base;
+    }
+}
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/platform/DifyClientService.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/platform/DifyClientService.java
new file mode 100644
index 0000000..e83e6b5
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/platform/DifyClientService.java
@@ -0,0 +1,62 @@
+package org.dromara.ai.platform;
+
+import lombok.RequiredArgsConstructor;
+import okhttp3.*;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+
+@Service
+@RequiredArgsConstructor
+public class DifyClientService {
+    @Value("${ruoyi.ai.platform.dify.base-url:}")
+    private String baseUrl;
+    @Value("${ruoyi.ai.platform.dify.token:}")
+    private String token;
+    private final OkHttpClient client = new OkHttpClient();
+
+    public String get(String path) throws Exception {
+        String url = normalize(baseUrl) + path;
+        Request.Builder b = new Request.Builder().url(url)
+                .get()
+                .header("Authorization", "Bearer " + token);
+        try (Response resp = client.newCall(b.build()).execute()) {
+            return resp.body() != null ? resp.body().string() : "{}";
+        }
+    }
+
+    public String post(String path, String json) throws Exception {
+        String url = normalize(baseUrl) + path;
+        Request.Builder b = new Request.Builder().url(url)
+                .post(RequestBody.create(MediaType.parse("application/json"), json))
+                .header("Authorization", "Bearer " + token);
+        try (Response resp = client.newCall(b.build()).execute()) {
+            return resp.body() != null ? resp.body().string() : "{}";
+        }
+    }
+
+    public String put(String path, String json) throws Exception {
+        String url = normalize(baseUrl) + path;
+        Request.Builder b = new Request.Builder().url(url)
+                .put(RequestBody.create(MediaType.parse("application/json"), json))
+                .header("Authorization", "Bearer " + token);
+        try (Response resp = client.newCall(b.build()).execute()) {
+            return resp.body() != null ? resp.body().string() : "{}";
+        }
+    }
+
+    public String delete(String path) throws Exception {
+        String url = normalize(baseUrl) + path;
+        Request.Builder b = new Request.Builder().url(url)
+                .delete()
+                .header("Authorization", "Bearer " + token);
+        try (Response resp = client.newCall(b.build()).execute()) {
+            return resp.body() != null ? resp.body().string() : "{}";
+        }
+    }
+
+    private String normalize(String base) {
+        if (base == null) return "";
+        if (base.endsWith("/")) return base.substring(0, base.length() - 1);
+        return base;
+    }
+}
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/platform/FastGptService.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/platform/FastGptService.java
new file mode 100644
index 0000000..29958bd
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/platform/FastGptService.java
@@ -0,0 +1,42 @@
+package org.dromara.ai.platform;
+
+import lombok.RequiredArgsConstructor;
+import okhttp3.*;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+
+@Service
+@RequiredArgsConstructor
+public class FastGptService {
+    @Value("${ruoyi.ai.platform.fastgpt.base-url:}")
+    private String baseUrl;
+    @Value("${ruoyi.ai.platform.fastgpt.token:}")
+    private String token;
+    private final OkHttpClient client = new OkHttpClient();
+
+    public String post(String path, String json) throws Exception {
+        String url = normalize(baseUrl) + path;
+        Request.Builder b = new Request.Builder().url(url)
+                .post(RequestBody.create(MediaType.parse("application/json"), json))
+                .header("Authorization", "Bearer " + token);
+        try (Response resp = client.newCall(b.build()).execute()) {
+            return resp.body() != null ? resp.body().string() : "{}";
+        }
+    }
+
+    public String get(String path) throws Exception {
+        String url = normalize(baseUrl) + path;
+        Request.Builder b = new Request.Builder().url(url)
+                .get()
+                .header("Authorization", "Bearer " + token);
+        try (Response resp = client.newCall(b.build()).execute()) {
+            return resp.body() != null ? resp.body().string() : "{}";
+        }
+    }
+
+    private String normalize(String base) {
+        if (base == null) return "";
+        if (base.endsWith("/")) return base.substring(0, base.length() - 1);
+        return base;
+    }
+}
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/provider/AbstractAiProvider.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/provider/AbstractAiProvider.java
new file mode 100644
index 0000000..34a2c79
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/provider/AbstractAiProvider.java
@@ -0,0 +1,367 @@
+package org.dromara.ai.provider;
+
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.ai.domain.dto.AiChatRequest;
+import org.dromara.ai.domain.dto.AiChatResponse;
+import org.dromara.ai.domain.dto.AiModelInfo;
+
+import java.time.LocalDateTime;
+import java.util.Map;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicLong;
+
+/**
+ * AI服务提供商抽象基类
+ * 提供通用功能实现和统计信息管理
+ *
+ * @author pengles
+ */
+@Slf4j
+public abstract class AbstractAiProvider implements AiProvider {
+
+    /**
+     * 提供商配置
+     */
+    protected Map<String, Object> configuration = new ConcurrentHashMap<>();
+
+    /**
+     * 是否已初始化
+     */
+    protected final AtomicBoolean initialized = new AtomicBoolean(false);
+
+    /**
+     * 是否可用
+     */
+    protected final AtomicBoolean available = new AtomicBoolean(false);
+
+    /**
+     * 统计信息
+     */
+    protected final Statistics statistics = new Statistics();
+
+    /**
+     * 初始化时间
+     */
+    protected LocalDateTime initTime;
+
+    @Override
+    public void initialize(Map<String, Object> config) {
+        try {
+            log.info("初始化AI提供商: {}", getProviderName());
+
+            if (config != null) {
+                this.configuration.putAll(config);
+            }
+
+            // 执行具体的初始化逻辑
+            doInitialize();
+
+            this.initialized.set(true);
+            this.available.set(true);
+            this.initTime = LocalDateTime.now();
+
+            log.info("AI提供商初始化成功: {}", getProviderName());
+
+        } catch (Exception e) {
+            log.error("AI提供商初始化失败: {}", getProviderName(), e);
+            this.initialized.set(false);
+            this.available.set(false);
+            throw new RuntimeException("AI提供商初始化失败: " + e.getMessage(), e);
+        }
+    }
+
+    @Override
+    public void destroy() {
+        try {
+            log.info("销毁AI提供商: {}", getProviderName());
+
+            // 执行具体的销毁逻辑
+            doDestroy();
+
+            this.initialized.set(false);
+            this.available.set(false);
+
+            log.info("AI提供商销毁成功: {}", getProviderName());
+
+        } catch (Exception e) {
+            log.error("AI提供商销毁失败: {}", getProviderName(), e);
+        }
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return initialized.get() && available.get();
+    }
+
+    @Override
+    public AiChatResponse chat(AiChatRequest request) {
+        checkAvailable();
+
+        long startTime = System.currentTimeMillis();
+        statistics.incrementRequestCount();
+
+        try {
+            AiChatResponse response = doChat(request);
+
+            long responseTime = System.currentTimeMillis() - startTime;
+            response.setResponseTime(responseTime);
+            response.setProvider(getProviderName());
+            response.setSuccess(true);
+            response.setCreateTime(LocalDateTime.now());
+
+            statistics.incrementSuccessCount();
+            statistics.addResponseTime(responseTime);
+
+            if (response.getUsage() != null) {
+                statistics.addTokenUsage(
+                        response.getUsage().getPromptTokens(),
+                        response.getUsage().getCompletionTokens()
+                );
+            }
+
+            return response;
+
+        } catch (Exception e) {
+            long responseTime = System.currentTimeMillis() - startTime;
+            statistics.incrementErrorCount();
+            statistics.addResponseTime(responseTime);
+
+            log.error("AI聊天请求失败: {}", getProviderName(), e);
+
+            return new AiChatResponse()
+                    .setSuccess(false)
+                    .setError(e.getMessage())
+                    .setErrorCode("CHAT_ERROR")
+                    .setProvider(getProviderName())
+                    .setResponseTime(responseTime)
+                    .setCreateTime(LocalDateTime.now());
+        }
+    }
+
+    @Override
+    public CompletableFuture<AiChatResponse> chatAsync(AiChatRequest request) {
+        return CompletableFuture.supplyAsync(() -> chat(request));
+    }
+
+    @Override
+    public void chatStream(AiChatRequest request, StreamCallback callback) {
+        checkAvailable();
+
+        long startTime = System.currentTimeMillis();
+        statistics.incrementRequestCount();
+
+        try {
+            doChatStream(request, new StreamCallback() {
+                @Override
+                public void onChunk(String chunk) {
+                    callback.onChunk(chunk);
+                }
+
+                @Override
+                public void onComplete(AiChatResponse response) {
+                    long responseTime = System.currentTimeMillis() - startTime;
+                    response.setResponseTime(responseTime);
+                    response.setProvider(getProviderName());
+                    response.setSuccess(true);
+                    response.setCreateTime(LocalDateTime.now());
+
+                    statistics.incrementSuccessCount();
+                    statistics.addResponseTime(responseTime);
+
+                    if (response.getUsage() != null) {
+                        statistics.addTokenUsage(
+                                response.getUsage().getPromptTokens(),
+                                response.getUsage().getCompletionTokens()
+                        );
+                    }
+
+                    callback.onComplete(response);
+                }
+
+                @Override
+                public void onError(Throwable error) {
+                    long responseTime = System.currentTimeMillis() - startTime;
+                    statistics.incrementErrorCount();
+                    statistics.addResponseTime(responseTime);
+
+                    log.error("AI流式聊天请求失败: {}", getProviderName(), error);
+                    callback.onError(error);
+                }
+            });
+
+        } catch (Exception e) {
+            long responseTime = System.currentTimeMillis() - startTime;
+            statistics.incrementErrorCount();
+            statistics.addResponseTime(responseTime);
+
+            log.error("AI流式聊天请求失败: {}", getProviderName(), e);
+            callback.onError(e);
+        }
+    }
+
+    @Override
+    public boolean isModelSupported(String modelName) {
+        return getSupportedModels().stream()
+                .anyMatch(model -> model.getId().equals(modelName) || model.getName().equals(modelName));
+    }
+
+    @Override
+    public AiModelInfo getModelInfo(String modelName) {
+        return getSupportedModels().stream()
+                .filter(model -> model.getId().equals(modelName) || model.getName().equals(modelName))
+                .findFirst()
+                .orElse(null);
+    }
+
+    @Override
+    public Map<String, Object> getConfiguration() {
+        return new ConcurrentHashMap<>(configuration);
+    }
+
+    @Override
+    public void updateConfiguration(Map<String, Object> config) {
+        if (config != null) {
+            this.configuration.putAll(config);
+            // 触发配置更新
+            onConfigurationUpdated();
+        }
+    }
+
+    @Override
+    public Map<String, Object> getStatistics() {
+        Map<String, Object> stats = new ConcurrentHashMap<>();
+        stats.put("providerName", getProviderName());
+        stats.put("providerType", getProviderType().getCode());
+        stats.put("version", getVersion());
+        stats.put("available", isAvailable());
+        stats.put("initialized", initialized.get());
+        stats.put("initTime", initTime);
+        stats.put("requestCount", statistics.getRequestCount());
+        stats.put("successCount", statistics.getSuccessCount());
+        stats.put("errorCount", statistics.getErrorCount());
+        stats.put("averageResponseTime", statistics.getAverageResponseTime());
+        stats.put("totalPromptTokens", statistics.getTotalPromptTokens());
+        stats.put("totalCompletionTokens", statistics.getTotalCompletionTokens());
+        stats.put("totalTokens", statistics.getTotalTokens());
+        return stats;
+    }
+
+    @Override
+    public void resetStatistics() {
+        statistics.reset();
+        log.info("重置AI提供商统计信息: {}", getProviderName());
+    }
+
+    /**
+     * 检查提供商是否可用
+     */
+    protected void checkAvailable() {
+        if (!isAvailable()) {
+            throw new IllegalStateException("AI提供商不可用: " + getProviderName());
+        }
+    }
+
+    /**
+     * 执行具体的初始化逻辑
+     */
+    protected abstract void doInitialize();
+
+    /**
+     * 执行具体的销毁逻辑
+     */
+    protected abstract void doDestroy();
+
+    /**
+     * 执行具体的聊天逻辑
+     */
+    protected abstract AiChatResponse doChat(AiChatRequest request);
+
+    /**
+     * 执行具体的流式聊天逻辑
+     */
+    protected abstract void doChatStream(AiChatRequest request, StreamCallback callback);
+
+    /**
+     * 配置更新回调
+     */
+    protected void onConfigurationUpdated() {
+        // 子类可以重写此方法来处理配置更新
+    }
+
+    /**
+     * 统计信息类
+     */
+    protected static class Statistics {
+        private final AtomicLong requestCount = new AtomicLong(0);
+        private final AtomicLong successCount = new AtomicLong(0);
+        private final AtomicLong errorCount = new AtomicLong(0);
+        private final AtomicLong totalResponseTime = new AtomicLong(0);
+        private final AtomicLong totalPromptTokens = new AtomicLong(0);
+        private final AtomicLong totalCompletionTokens = new AtomicLong(0);
+
+        public void incrementRequestCount() {
+            requestCount.incrementAndGet();
+        }
+
+        public void incrementSuccessCount() {
+            successCount.incrementAndGet();
+        }
+
+        public void incrementErrorCount() {
+            errorCount.incrementAndGet();
+        }
+
+        public void addResponseTime(long responseTime) {
+            totalResponseTime.addAndGet(responseTime);
+        }
+
+        public void addTokenUsage(Integer promptTokens, Integer completionTokens) {
+            if (promptTokens != null) {
+                totalPromptTokens.addAndGet(promptTokens);
+            }
+            if (completionTokens != null) {
+                totalCompletionTokens.addAndGet(completionTokens);
+            }
+        }
+
+        public long getRequestCount() {
+            return requestCount.get();
+        }
+
+        public long getSuccessCount() {
+            return successCount.get();
+        }
+
+        public long getErrorCount() {
+            return errorCount.get();
+        }
+
+        public double getAverageResponseTime() {
+            long requests = requestCount.get();
+            return requests > 0 ? (double) totalResponseTime.get() / requests : 0.0;
+        }
+
+        public long getTotalPromptTokens() {
+            return totalPromptTokens.get();
+        }
+
+        public long getTotalCompletionTokens() {
+            return totalCompletionTokens.get();
+        }
+
+        public long getTotalTokens() {
+            return totalPromptTokens.get() + totalCompletionTokens.get();
+        }
+
+        public void reset() {
+            requestCount.set(0);
+            successCount.set(0);
+            errorCount.set(0);
+            totalResponseTime.set(0);
+            totalPromptTokens.set(0);
+            totalCompletionTokens.set(0);
+        }
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/provider/AiProvider.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/provider/AiProvider.java
new file mode 100644
index 0000000..82f479f
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/provider/AiProvider.java
@@ -0,0 +1,158 @@
+package org.dromara.ai.provider;
+
+import org.dromara.ai.domain.dto.AiChatRequest;
+import org.dromara.ai.domain.dto.AiChatResponse;
+import org.dromara.ai.domain.dto.AiModelInfo;
+import org.dromara.ai.domain.enums.AiProviderType;
+
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.CompletableFuture;
+
+/**
+ * AI服务提供商接口
+ * 定义统一的AI服务接口规范，支持多种AI服务提供商
+ *
+ * @author pengles
+ */
+public interface AiProvider {
+
+    /**
+     * 获取提供商类型
+     *
+     * @return 提供商类型
+     */
+    AiProviderType getProviderType();
+
+    /**
+     * 获取提供商名称
+     *
+     * @return 提供商名称
+     */
+    String getProviderName();
+
+    /**
+     * 获取提供商版本
+     *
+     * @return 版本信息
+     */
+    String getVersion();
+
+    /**
+     * 检查提供商是否可用
+     *
+     * @return 是否可用
+     */
+    boolean isAvailable();
+
+    /**
+     * 初始化提供商
+     *
+     * @param config 配置参数
+     */
+    void initialize(Map<String, Object> config);
+
+    /**
+     * 销毁提供商资源
+     */
+    void destroy();
+
+    /**
+     * 同步聊天对话
+     *
+     * @param request 聊天请求
+     * @return 聊天响应
+     */
+    AiChatResponse chat(AiChatRequest request);
+
+    /**
+     * 异步聊天对话
+     *
+     * @param request 聊天请求
+     * @return 异步聊天响应
+     */
+    CompletableFuture<AiChatResponse> chatAsync(AiChatRequest request);
+
+    /**
+     * 流式聊天对话
+     *
+     * @param request  聊天请求
+     * @param callback 流式回调
+     */
+    void chatStream(AiChatRequest request, StreamCallback callback);
+
+    /**
+     * 获取支持的模型列表
+     *
+     * @return 模型列表
+     */
+    List<AiModelInfo> getSupportedModels();
+
+    /**
+     * 检查模型是否支持
+     *
+     * @param modelName 模型名称
+     * @return 是否支持
+     */
+    boolean isModelSupported(String modelName);
+
+    /**
+     * 获取模型信息
+     *
+     * @param modelName 模型名称
+     * @return 模型信息
+     */
+    AiModelInfo getModelInfo(String modelName);
+
+    /**
+     * 获取提供商配置
+     *
+     * @return 配置信息
+     */
+    Map<String, Object> getConfiguration();
+
+    /**
+     * 更新提供商配置
+     *
+     * @param config 新配置
+     */
+    void updateConfiguration(Map<String, Object> config);
+
+    /**
+     * 获取提供商统计信息
+     *
+     * @return 统计信息
+     */
+    Map<String, Object> getStatistics();
+
+    /**
+     * 重置统计信息
+     */
+    void resetStatistics();
+
+    /**
+     * 流式回调接口
+     */
+    interface StreamCallback {
+        /**
+         * 接收流式数据
+         *
+         * @param chunk 数据块
+         */
+        void onChunk(String chunk);
+
+        /**
+         * 流式完成
+         *
+         * @param response 完整响应
+         */
+        void onComplete(AiChatResponse response);
+
+        /**
+         * 流式错误
+         *
+         * @param error 错误信息
+         */
+        void onError(Throwable error);
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/provider/AiProviderManager.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/provider/AiProviderManager.java
new file mode 100644
index 0000000..b330d8a
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/provider/AiProviderManager.java
@@ -0,0 +1,434 @@
+package org.dromara.ai.provider;
+
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.ai.domain.dto.AiChatRequest;
+import org.dromara.ai.domain.dto.AiChatResponse;
+import org.dromara.ai.domain.dto.AiModelInfo;
+import org.dromara.ai.domain.enums.AiProviderType;
+import org.springframework.stereotype.Component;
+
+import java.util.*;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.stream.Collectors;
+
+/**
+ * AI服务提供商管理器
+ * 负责管理所有AI服务提供商的注册、配置和调度
+ *
+ * @author pengles
+ */
+@Slf4j
+@Component
+public class AiProviderManager {
+
+    /**
+     * 已注册的提供商
+     */
+    private final Map<String, AiProvider> providers = new ConcurrentHashMap<>();
+
+    /**
+     * 提供商类型映射
+     */
+    private final Map<AiProviderType, List<String>> typeMapping = new ConcurrentHashMap<>();
+
+    /**
+     * 模型到提供商的映射
+     */
+    private final Map<String, String> modelMapping = new ConcurrentHashMap<>();
+
+    /**
+     * 默认提供商
+     */
+    private String defaultProvider;
+
+    /**
+     * 轮询索引
+     */
+    private final Map<AiProviderType, Integer> roundRobinIndex = new ConcurrentHashMap<>();
+
+    /**
+     * 降级到期时间：providerName -> timestamp(ms)
+     */
+    private final Map<String, Long> degradeUntil = new ConcurrentHashMap<>();
+
+    /**
+     * 降级阈值配置（可根据需要外部化）
+     */
+    private static final long DEGRADE_DURATION_MS = 60_000;
+    private static final double MAX_ERROR_RATE = 0.3; // 30%
+    private static final double MAX_AVG_RT_MS = 3_000.0; // 3s
+
+    /**
+     * 注册AI服务提供商
+     *
+     * @param provider 提供商实例
+     */
+    public void registerProvider(AiProvider provider) {
+        String providerName = provider.getProviderName();
+
+        log.info("注册AI服务提供商: {}", providerName);
+
+        // 注册提供商
+        providers.put(providerName, provider);
+
+        // 更新类型映射
+        typeMapping.computeIfAbsent(provider.getProviderType(), k -> new ArrayList<>())
+                .add(providerName);
+
+        // 更新模型映射
+        updateModelMapping(provider);
+
+        // 设置默认提供商
+        if (defaultProvider == null) {
+            defaultProvider = providerName;
+        }
+
+        log.info("AI服务提供商注册成功: {}", providerName);
+    }
+
+    /**
+     * 注销AI服务提供商
+     *
+     * @param providerName 提供商名称
+     */
+    public void unregisterProvider(String providerName) {
+        AiProvider provider = providers.remove(providerName);
+        if (provider != null) {
+            log.info("注销AI服务提供商: {}", providerName);
+
+            // 销毁提供商
+            try {
+                provider.destroy();
+            } catch (Exception e) {
+                log.error("销毁AI服务提供商失败: {}", providerName, e);
+            }
+
+            // 更新类型映射
+            typeMapping.get(provider.getProviderType()).remove(providerName);
+
+            // 移除模型映射
+            removeModelMapping(provider);
+
+            // 更新默认提供商
+            if (providerName.equals(defaultProvider)) {
+                defaultProvider = providers.isEmpty() ? null : providers.keySet().iterator().next();
+            }
+
+            log.info("AI服务提供商注销成功: {}", providerName);
+        }
+    }
+
+    /**
+     * 获取AI服务提供商
+     *
+     * @param providerName 提供商名称
+     * @return 提供商实例
+     */
+    public AiProvider getProvider(String providerName) {
+        return providers.get(providerName);
+    }
+
+    /**
+     * 获取默认AI服务提供商
+     *
+     * @return 默认提供商实例
+     */
+    public AiProvider getDefaultProvider() {
+        return defaultProvider != null ? providers.get(defaultProvider) : null;
+    }
+
+    /**
+     * 设置默认AI服务提供商
+     *
+     * @param providerName 提供商名称
+     */
+    public void setDefaultProvider(String providerName) {
+        if (providers.containsKey(providerName)) {
+            this.defaultProvider = providerName;
+            log.info("设置默认AI服务提供商: {}", providerName);
+        } else {
+            throw new IllegalArgumentException("提供商不存在: " + providerName);
+        }
+    }
+
+    /**
+     * 根据模型名称获取提供商
+     *
+     * @param modelName 模型名称
+     * @return 提供商实例
+     */
+    public AiProvider getProviderByModel(String modelName) {
+        String providerName = modelMapping.get(modelName);
+        return providerName != null ? providers.get(providerName) : null;
+    }
+
+    /**
+     * 获取所有已注册的提供商
+     *
+     * @return 提供商列表
+     */
+    public List<AiProvider> getAllProviders() {
+        return new ArrayList<>(providers.values());
+    }
+
+    /**
+     * 获取可用的提供商
+     *
+     * @return 可用提供商列表
+     */
+    public List<AiProvider> getAvailableProviders() {
+        return providers.values().stream()
+                .filter(AiProvider::isAvailable)
+                .collect(Collectors.toList());
+    }
+
+    /**
+     * 根据类型获取提供商
+     *
+     * @param type 提供商类型
+     * @return 提供商列表
+     */
+    public List<AiProvider> getProvidersByType(AiProviderType type) {
+        return typeMapping.getOrDefault(type, Collections.emptyList()).stream()
+                .map(providers::get)
+                .filter(Objects::nonNull)
+                .collect(Collectors.toList());
+    }
+
+    /**
+     * 获取所有支持的模型
+     *
+     * @return 模型列表
+     */
+    public List<AiModelInfo> getAllSupportedModels() {
+        return providers.values().stream()
+                .filter(AiProvider::isAvailable)
+                .flatMap(provider -> provider.getSupportedModels().stream())
+                .collect(Collectors.toList());
+    }
+
+    /**
+     * 检查模型是否支持
+     *
+     * @param modelName 模型名称
+     * @return 是否支持
+     */
+    public boolean isModelSupported(String modelName) {
+        return modelMapping.containsKey(modelName);
+    }
+
+    /**
+     * 获取模型信息
+     *
+     * @param modelName 模型名称
+     * @return 模型信息
+     */
+    public AiModelInfo getModelInfo(String modelName) {
+        AiProvider provider = getProviderByModel(modelName);
+        return provider != null ? provider.getModelInfo(modelName) : null;
+    }
+
+    /**
+     * 聊天对话（自动选择提供商）
+     *
+     * @param request 聊天请求
+     * @return 聊天响应
+     */
+    public AiChatResponse chat(AiChatRequest request) {
+        AiProvider provider = selectProvider(request);
+        if (provider == null) {
+            throw new IllegalStateException("没有可用的AI服务提供商");
+        }
+        return provider.chat(request);
+    }
+
+    /**
+     * 异步聊天对话（自动选择提供商）
+     *
+     * @param request 聊天请求
+     * @return 异步聊天响应
+     */
+    public CompletableFuture<AiChatResponse> chatAsync(AiChatRequest request) {
+        AiProvider provider = selectProvider(request);
+        if (provider == null) {
+            return CompletableFuture.failedFuture(new IllegalStateException("没有可用的AI服务提供商"));
+        }
+        return provider.chatAsync(request);
+    }
+
+    /**
+     * 流式聊天对话（自动选择提供商）
+     *
+     * @param request  聊天请求
+     * @param callback 流式回调
+     */
+    public void chatStream(AiChatRequest request, AiProvider.StreamCallback callback) {
+        AiProvider provider = selectProvider(request);
+        if (provider == null) {
+            callback.onError(new IllegalStateException("没有可用的AI服务提供商"));
+            return;
+        }
+        provider.chatStream(request, callback);
+    }
+
+    /**
+     * 获取所有提供商统计信息
+     *
+     * @return 统计信息
+     */
+    public Map<String, Object> getAllStatistics() {
+        Map<String, Object> allStats = new HashMap<>();
+
+        allStats.put("totalProviders", providers.size());
+        allStats.put("availableProviders", getAvailableProviders().size());
+        allStats.put("defaultProvider", defaultProvider);
+        allStats.put("totalModels", modelMapping.size());
+
+        Map<String, Object> providerStats = new HashMap<>();
+        for (Map.Entry<String, AiProvider> entry : providers.entrySet()) {
+            providerStats.put(entry.getKey(), entry.getValue().getStatistics());
+        }
+        allStats.put("providers", providerStats);
+
+        return allStats;
+    }
+
+    /**
+     * 重置所有提供商统计信息
+     */
+    public void resetAllStatistics() {
+        providers.values().forEach(AiProvider::resetStatistics);
+        log.info("重置所有AI服务提供商统计信息");
+    }
+
+    /**
+     * 选择合适的提供商
+     *
+     * @param request 聊天请求
+     * @return 选中的提供商
+     */
+    private AiProvider selectProvider(AiChatRequest request) {
+        long now = System.currentTimeMillis();
+        // 1. 指定模型优先，且避开降级
+        if (request.getModel() != null) {
+            AiProvider provider = getProviderByModel(request.getModel());
+            if (provider != null && provider.isAvailable() && !isDegraded(provider.getProviderName(), now)) {
+                return provider;
+            }
+        }
+        // 2. 在同类型内按负载/性能选择（若可推断类型）
+        List<AiProvider> avail = getAvailableProviders().stream()
+                .filter(p -> !isDegraded(p.getProviderName(), now))
+                .collect(Collectors.toList());
+        if (avail.isEmpty()) {
+            // fallback: 包含降级的也尝试
+            avail = getAvailableProviders();
+            if (avail.isEmpty()) return null;
+        }
+        // 2.1 过滤掉高错误率或超高平均响应时间的提供商并标记降级
+        List<AiProvider> healthy = new ArrayList<>();
+        for (AiProvider p : avail) {
+            Map<String, Object> stats = p.getStatistics();
+            long req = asLong(stats.get("requestCount"));
+            long err = asLong(stats.get("errorCount"));
+            double avg = asDouble(stats.get("averageResponseTime"));
+            double errorRate = req > 0 ? (double) err / (double) req : 0.0;
+            if (errorRate > MAX_ERROR_RATE || avg > MAX_AVG_RT_MS) {
+                markDegrade(p.getProviderName(), now);
+                continue;
+            }
+            healthy.add(p);
+        }
+        if (healthy.isEmpty()) {
+            healthy = avail;
+        }
+        // 2.2 优先选择平均响应时间更低的提供商
+        healthy.sort(Comparator.comparingDouble(p -> asDouble(p.getStatistics().get("averageResponseTime"))));
+        // 2.3 对平均响应时间相近的提供商进行轮询
+        if (healthy.size() > 1) {
+            double firstAvg = asDouble(healthy.get(0).getStatistics().get("averageResponseTime"));
+            List<AiProvider> near = healthy.stream()
+                    .filter(p -> Math.abs(asDouble(p.getStatistics().get("averageResponseTime")) - firstAvg) < 100.0)
+                    .collect(Collectors.toList());
+            if (!near.isEmpty()) {
+                AiProviderType type = near.get(0).getProviderType();
+                int idx = roundRobinIndex.merge(type, 1, Integer::sum);
+                return near.get(idx % near.size());
+            }
+        }
+        AiProvider chosen = healthy.get(0);
+        if (chosen != null) return chosen;
+        // 3. 默认提供商作为兜底
+        AiProvider def = getDefaultProvider();
+        if (def != null && def.isAvailable() && !isDegraded(def.getProviderName(), now)) return def;
+        // 4. 任何一个可用提供商
+        return getAvailableProviders().stream().findFirst().orElse(null);
+    }
+
+    private boolean isDegraded(String providerName, long now) {
+        Long until = degradeUntil.get(providerName);
+        return until != null && until > now;
+    }
+
+    private void markDegrade(String providerName, long now) {
+        degradeUntil.put(providerName, now + DEGRADE_DURATION_MS);
+        log.warn("提供商降级: {} 有效期 {} ms", providerName, DEGRADE_DURATION_MS);
+    }
+
+    private long asLong(Object o) {
+        if (o instanceof Number) return ((Number) o).longValue();
+        try {
+            return Long.parseLong(String.valueOf(o));
+        } catch (Exception e) {
+            return 0L;
+        }
+    }
+
+    private double asDouble(Object o) {
+        if (o instanceof Number) return ((Number) o).doubleValue();
+        try {
+            return Double.parseDouble(String.valueOf(o));
+        } catch (Exception e) {
+            return 0.0;
+        }
+    }
+
+    /**
+     * 更新模型映射
+     *
+     * @param provider 提供商
+     */
+    private void updateModelMapping(AiProvider provider) {
+        try {
+            List<AiModelInfo> models = provider.getSupportedModels();
+            for (AiModelInfo model : models) {
+                modelMapping.put(model.getId(), provider.getProviderName());
+                if (model.getName() != null && !model.getName().equals(model.getId())) {
+                    modelMapping.put(model.getName(), provider.getProviderName());
+                }
+            }
+        } catch (Exception e) {
+            log.warn("更新模型映射失败: {}", provider.getProviderName(), e);
+        }
+    }
+
+    /**
+     * 移除模型映射
+     *
+     * @param provider 提供商
+     */
+    private void removeModelMapping(AiProvider provider) {
+        try {
+            List<AiModelInfo> models = provider.getSupportedModels();
+            for (AiModelInfo model : models) {
+                modelMapping.remove(model.getId());
+                if (model.getName() != null && !model.getName().equals(model.getId())) {
+                    modelMapping.remove(model.getName());
+                }
+            }
+        } catch (Exception e) {
+            log.warn("移除模型映射失败: {}", provider.getProviderName(), e);
+        }
+    }
+}
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/provider/AzureOpenAiProvider.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/provider/AzureOpenAiProvider.java
new file mode 100644
index 0000000..00146f4
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/provider/AzureOpenAiProvider.java
@@ -0,0 +1,178 @@
+package org.dromara.ai.provider;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import okhttp3.*;
+import org.dromara.ai.domain.dto.AiChatRequest;
+import org.dromara.ai.domain.dto.AiChatResponse;
+import org.dromara.ai.domain.dto.AiModelInfo;
+import org.dromara.ai.domain.enums.AiProviderType;
+
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+
+public class AzureOpenAiProvider extends AbstractAiProvider {
+
+    private OkHttpClient httpClient;
+    private final ObjectMapper objectMapper = new ObjectMapper();
+
+    @Override
+    public AiProviderType getProviderType() {
+        return AiProviderType.AZURE_OPENAI;
+    }
+
+    @Override
+    public String getProviderName() {
+        return "azure-openai";
+    }
+
+    @Override
+    public String getVersion() {
+        return "1.0.0";
+    }
+
+    @Override
+    protected void doInitialize() {
+        String apiKey = (String) configuration.getOrDefault("api-key", "");
+        String endpoint = (String) configuration.getOrDefault("endpoint", "");
+        String deployment = (String) configuration.getOrDefault("deployment-name", "");
+        if (apiKey == null || apiKey.isBlank() || endpoint == null || endpoint.isBlank() || deployment == null || deployment.isBlank()) {
+            throw new IllegalStateException("Azure OpenAI 配置不完整");
+        }
+        Integer timeoutMs = (Integer) configuration.getOrDefault("timeout-ms", 30000);
+        this.httpClient = new OkHttpClient.Builder()
+                .connectTimeout(timeoutMs, TimeUnit.MILLISECONDS)
+                .readTimeout(timeoutMs, TimeUnit.MILLISECONDS)
+                .writeTimeout(timeoutMs, TimeUnit.MILLISECONDS)
+                .build();
+    }
+
+    @Override
+    protected void doDestroy() {
+        this.httpClient = null;
+    }
+
+    @Override
+    protected AiChatResponse doChat(AiChatRequest request) {
+        String apiKey = (String) configuration.get("api-key");
+        String endpoint = (String) configuration.get("endpoint");
+        String deployment = (String) configuration.get("deployment-name");
+        String apiVersion = (String) configuration.getOrDefault("api-version", "2023-12-01-preview");
+
+        String model = Optional.ofNullable(request.getModel())
+                .filter(s -> !s.isBlank())
+                .orElse((String) configuration.getOrDefault("default-model", deployment));
+
+        Map<String, Object> payload = new HashMap<>();
+        payload.put("messages", toOpenAiMessages(request.getMessages()));
+        if (request.getTemperature() != null) payload.put("temperature", request.getTemperature());
+        if (request.getMaxTokens() != null) payload.put("max_tokens", request.getMaxTokens());
+        if (request.getTopP() != null) payload.put("top_p", request.getTopP());
+        if (request.getStop() != null && !request.getStop().isEmpty()) payload.put("stop", request.getStop());
+
+        String url = endpoint + "/openai/deployments/" + deployment + "/chat/completions?api-version=" + apiVersion;
+        Request httpRequest = new Request.Builder()
+                .url(url)
+                .header("api-key", apiKey)
+                .header("Content-Type", "application/json")
+                .post(RequestBody.create(MediaType.parse("application/json"), writeJson(payload)))
+                .build();
+
+        try (Response resp = httpClient.newCall(httpRequest).execute()) {
+            if (!resp.isSuccessful()) {
+                throw new RuntimeException("Azure OpenAI 响应失败: " + resp.code() + " " + resp.message());
+            }
+            String body = Objects.requireNonNull(resp.body()).string();
+            JsonNode root = objectMapper.readTree(body);
+            return toAiChatResponse(root, model);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    protected void doChatStream(AiChatRequest request, StreamCallback callback) {
+        AiChatResponse resp = chat(request);
+        String content = resp.getChoices() != null && !resp.getChoices().isEmpty()
+                ? Optional.ofNullable(resp.getChoices().get(0).getMessage().getContent()).orElse("")
+                : "";
+        int step = Math.max(1, content.length() / 20);
+        for (int i = 0; i < content.length(); i += step) {
+            int end = Math.min(content.length(), i + step);
+            String chunk = content.substring(i, end);
+            if (!chunk.isEmpty()) {
+                callback.onChunk(chunk);
+            }
+        }
+        callback.onComplete(resp);
+    }
+
+    @Override
+    public List<AiModelInfo> getSupportedModels() {
+        List<String> supported = (List<String>) configuration.getOrDefault("supported-models", List.of());
+        String provider = getProviderName();
+        List<AiModelInfo> infos = new ArrayList<>();
+        for (String m : supported) {
+            infos.add(new AiModelInfo()
+                    .setId(m)
+                    .setName(m)
+                    .setDisplayName(m)
+                    .setDescription("Azure OpenAI model " + m)
+                    .setProvider(provider)
+                    .setSupportStream(true)
+                    .setAvailable(true)
+                    .setType(AiModelInfo.ModelType.CHAT)
+            );
+        }
+        return infos;
+    }
+
+    private List<Map<String, Object>> toOpenAiMessages(List<AiChatRequest.AiMessage> messages) {
+        List<Map<String, Object>> list = new ArrayList<>();
+        if (messages == null) return list;
+        for (AiChatRequest.AiMessage msg : messages) {
+            Map<String, Object> item = new HashMap<>();
+            item.put("role", msg.getRole());
+            item.put("content", msg.getContent());
+            list.add(item);
+        }
+        return list;
+    }
+
+    private String writeJson(Object o) {
+        try {
+            return objectMapper.writeValueAsString(o);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private AiChatResponse toAiChatResponse(JsonNode root, String model) {
+        AiChatResponse resp = new AiChatResponse();
+        resp.setSuccess(true);
+        resp.setModel(model);
+        List<AiChatResponse.Choice> choices = new ArrayList<>();
+        JsonNode c = root.path("choices");
+        if (c.isArray()) {
+            for (int i = 0; i < c.size(); i++) {
+                JsonNode ci = c.get(i);
+                AiChatRequest.AiMessage message = new AiChatRequest.AiMessage()
+                        .setRole(Optional.ofNullable(ci.path("message").path("role").asText(null)).orElse("assistant"))
+                        .setContent(ci.path("message").path("content").asText(""));
+                choices.add(new AiChatResponse.Choice()
+                        .setIndex(ci.path("index").isNumber() ? ci.path("index").asInt() : i)
+                        .setMessage(message)
+                        .setFinishReason(ci.path("finish_reason").asText(null)));
+            }
+        }
+        resp.setChoices(choices);
+        JsonNode usage = root.path("usage");
+        if (usage.isObject()) {
+            resp.setUsage(new AiChatResponse.Usage()
+                    .setPromptTokens(usage.path("prompt_tokens").isNumber() ? usage.path("prompt_tokens").asInt() : null)
+                    .setCompletionTokens(usage.path("completion_tokens").isNumber() ? usage.path("completion_tokens").asInt() : null)
+                    .setTotalTokens(usage.path("total_tokens").isNumber() ? usage.path("total_tokens").asInt() : null));
+        }
+        return resp;
+    }
+}
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/provider/CozeProvider.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/provider/CozeProvider.java
new file mode 100644
index 0000000..18e3236
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/provider/CozeProvider.java
@@ -0,0 +1,154 @@
+package org.dromara.ai.provider;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import okhttp3.*;
+import org.dromara.ai.domain.dto.AiChatRequest;
+import org.dromara.ai.domain.dto.AiChatResponse;
+import org.dromara.ai.domain.dto.AiModelInfo;
+import org.dromara.ai.domain.enums.AiProviderType;
+
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+
+public class CozeProvider extends AbstractAiProvider {
+
+    private OkHttpClient httpClient;
+    private final ObjectMapper objectMapper = new ObjectMapper();
+
+    @Override
+    public AiProviderType getProviderType() {
+        return AiProviderType.COZE;
+    }
+
+    @Override
+    public String getProviderName() {
+        return "coze";
+    }
+
+    @Override
+    public String getVersion() {
+        return "1.0.0";
+    }
+
+    @Override
+    protected void doInitialize() {
+        String apiKey = (String) configuration.getOrDefault("api-key", "");
+        String baseUrl = (String) configuration.getOrDefault("base-url", "");
+        String botId = (String) configuration.getOrDefault("default-bot-id", "");
+        if (apiKey == null || apiKey.isBlank() || baseUrl == null || baseUrl.isBlank() || botId.isBlank()) {
+            throw new IllegalStateException("Coze 配置不完整");
+        }
+        Integer timeoutMs = (Integer) configuration.getOrDefault("timeout-ms", 30000);
+        this.httpClient = new OkHttpClient.Builder()
+                .connectTimeout(timeoutMs, TimeUnit.MILLISECONDS)
+                .readTimeout(timeoutMs, TimeUnit.MILLISECONDS)
+                .writeTimeout(timeoutMs, TimeUnit.MILLISECONDS)
+                .build();
+    }
+
+    @Override
+    protected void doDestroy() {
+        this.httpClient = null;
+    }
+
+    @Override
+    protected AiChatResponse doChat(AiChatRequest request) {
+        String apiKey = (String) configuration.get("api-key");
+        String baseUrl = (String) configuration.get("base-url");
+        String botId = (String) configuration.get("default-bot-id");
+
+        Map<String, Object> payload = new HashMap<>();
+        payload.put("bot_id", botId);
+        payload.put("messages", toOpenAiMessages(request.getMessages()));
+
+        Request httpRequest = new Request.Builder()
+                .url(baseUrl + "/conversation/create")
+                .header("Authorization", "Bearer " + apiKey)
+                .header("Content-Type", "application/json")
+                .post(RequestBody.create(MediaType.parse("application/json"), writeJson(payload)))
+                .build();
+
+        try (Response resp = httpClient.newCall(httpRequest).execute()) {
+            if (!resp.isSuccessful()) {
+                throw new RuntimeException("Coze 响应失败: " + resp.code() + " " + resp.message());
+            }
+            String body = Objects.requireNonNull(resp.body()).string();
+            JsonNode root = objectMapper.readTree(body);
+            return toAiChatResponse(root);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    protected void doChatStream(AiChatRequest request, StreamCallback callback) {
+        AiChatResponse resp = chat(request);
+        String content = resp.getChoices() != null && !resp.getChoices().isEmpty()
+                ? Optional.ofNullable(resp.getChoices().get(0).getMessage().getContent()).orElse("")
+                : "";
+        int step = Math.max(1, content.length() / 20);
+        for (int i = 0; i < content.length(); i += step) {
+            int end = Math.min(content.length(), i + step);
+            String chunk = content.substring(i, end);
+            if (!chunk.isEmpty()) {
+                callback.onChunk(chunk);
+            }
+        }
+        callback.onComplete(resp);
+    }
+
+    @Override
+    public List<AiModelInfo> getSupportedModels() {
+        List<String> supported = (List<String>) configuration.getOrDefault("supported-models", List.of("coze"));
+        String provider = getProviderName();
+        List<AiModelInfo> infos = new ArrayList<>();
+        for (String m : supported) {
+            infos.add(new AiModelInfo()
+                    .setId(m)
+                    .setName(m)
+                    .setDisplayName(m)
+                    .setDescription("Coze model " + m)
+                    .setProvider(provider)
+                    .setSupportStream(true)
+                    .setAvailable(true)
+                    .setType(AiModelInfo.ModelType.CHAT)
+            );
+        }
+        return infos;
+    }
+
+    private List<Map<String, Object>> toOpenAiMessages(List<AiChatRequest.AiMessage> messages) {
+        List<Map<String, Object>> list = new ArrayList<>();
+        if (messages == null) return list;
+        for (AiChatRequest.AiMessage msg : messages) {
+            Map<String, Object> item = new HashMap<>();
+            item.put("role", msg.getRole());
+            item.put("content", msg.getContent());
+            list.add(item);
+        }
+        return list;
+    }
+
+    private String writeJson(Object o) {
+        try {
+            return objectMapper.writeValueAsString(o);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private AiChatResponse toAiChatResponse(JsonNode root) {
+        AiChatResponse resp = new AiChatResponse();
+        resp.setSuccess(true);
+        List<AiChatResponse.Choice> choices = new ArrayList<>();
+        String content = root.path("data").path("content").asText("");
+        AiChatRequest.AiMessage message = new AiChatRequest.AiMessage()
+                .setRole("assistant")
+                .setContent(content);
+        choices.add(new AiChatResponse.Choice().setIndex(0).setMessage(message));
+        resp.setChoices(choices);
+        resp.setModel(getProviderName());
+        return resp;
+    }
+}
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/provider/DifyProvider.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/provider/DifyProvider.java
new file mode 100644
index 0000000..0f126f1
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/provider/DifyProvider.java
@@ -0,0 +1,150 @@
+package org.dromara.ai.provider;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import okhttp3.*;
+import org.dromara.ai.domain.dto.AiChatRequest;
+import org.dromara.ai.domain.dto.AiChatResponse;
+import org.dromara.ai.domain.dto.AiModelInfo;
+import org.dromara.ai.domain.enums.AiProviderType;
+
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+
+public class DifyProvider extends AbstractAiProvider {
+
+    private OkHttpClient httpClient;
+    private final ObjectMapper objectMapper = new ObjectMapper();
+
+    @Override
+    public AiProviderType getProviderType() {
+        return AiProviderType.DIFY;
+    }
+
+    @Override
+    public String getProviderName() {
+        return "dify";
+    }
+
+    @Override
+    public String getVersion() {
+        return "1.0.0";
+    }
+
+    @Override
+    protected void doInitialize() {
+        String apiKey = (String) configuration.getOrDefault("api-key", "");
+        String baseUrl = (String) configuration.getOrDefault("base-url", "");
+        String appId = (String) configuration.getOrDefault("default-app-id", "");
+        if (apiKey == null || apiKey.isBlank() || baseUrl == null || baseUrl.isBlank() || appId.isBlank()) {
+            throw new IllegalStateException("Dify 配置不完整");
+        }
+        Integer timeoutMs = (Integer) configuration.getOrDefault("timeout-ms", 30000);
+        this.httpClient = new OkHttpClient.Builder()
+                .connectTimeout(timeoutMs, TimeUnit.MILLISECONDS)
+                .readTimeout(timeoutMs, TimeUnit.MILLISECONDS)
+                .writeTimeout(timeoutMs, TimeUnit.MILLISECONDS)
+                .build();
+    }
+
+    @Override
+    protected void doDestroy() {
+        this.httpClient = null;
+    }
+
+    @Override
+    protected AiChatResponse doChat(AiChatRequest request) {
+        String apiKey = (String) configuration.get("api-key");
+        String baseUrl = (String) configuration.get("base-url");
+        String appId = (String) configuration.get("default-app-id");
+
+        Map<String, Object> payload = new HashMap<>();
+        payload.put("app_id", appId);
+        payload.put("inputs", toInputs(request));
+
+        Request httpRequest = new Request.Builder()
+                .url(baseUrl + "/v1/workflows/run")
+                .header("Authorization", "Bearer " + apiKey)
+                .header("Content-Type", "application/json")
+                .post(RequestBody.create(MediaType.parse("application/json"), writeJson(payload)))
+                .build();
+
+        try (Response resp = httpClient.newCall(httpRequest).execute()) {
+            if (!resp.isSuccessful()) {
+                throw new RuntimeException("Dify 响应失败: " + resp.code() + " " + resp.message());
+            }
+            String body = Objects.requireNonNull(resp.body()).string();
+            JsonNode root = objectMapper.readTree(body);
+            return toAiChatResponse(root);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    protected void doChatStream(AiChatRequest request, StreamCallback callback) {
+        AiChatResponse resp = chat(request);
+        String content = resp.getChoices() != null && !resp.getChoices().isEmpty()
+                ? Optional.ofNullable(resp.getChoices().get(0).getMessage().getContent()).orElse("")
+                : "";
+        int step = Math.max(1, content.length() / 20);
+        for (int i = 0; i < content.length(); i += step) {
+            int end = Math.min(content.length(), i + step);
+            String chunk = content.substring(i, end);
+            if (!chunk.isEmpty()) {
+                callback.onChunk(chunk);
+            }
+        }
+        callback.onComplete(resp);
+    }
+
+    @Override
+    public List<AiModelInfo> getSupportedModels() {
+        List<String> supported = (List<String>) configuration.getOrDefault("supported-models", List.of("dify"));
+        String provider = getProviderName();
+        List<AiModelInfo> infos = new ArrayList<>();
+        for (String m : supported) {
+            infos.add(new AiModelInfo()
+                    .setId(m)
+                    .setName(m)
+                    .setDisplayName(m)
+                    .setDescription("Dify model " + m)
+                    .setProvider(provider)
+                    .setSupportStream(true)
+                    .setAvailable(true)
+                    .setType(AiModelInfo.ModelType.CHAT)
+            );
+        }
+        return infos;
+    }
+
+    private Map<String, Object> toInputs(AiChatRequest request) {
+        Map<String, Object> inputs = new HashMap<>();
+        if (request.getMessages() != null && !request.getMessages().isEmpty()) {
+            inputs.put("query", request.getMessages().get(request.getMessages().size() - 1).getContent());
+        }
+        return inputs;
+    }
+
+    private String writeJson(Object o) {
+        try {
+            return objectMapper.writeValueAsString(o);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private AiChatResponse toAiChatResponse(JsonNode root) {
+        AiChatResponse resp = new AiChatResponse();
+        resp.setSuccess(true);
+        List<AiChatResponse.Choice> choices = new ArrayList<>();
+        String content = root.path("data").path("outputs").path("text").asText("");
+        AiChatRequest.AiMessage message = new AiChatRequest.AiMessage()
+                .setRole("assistant")
+                .setContent(content);
+        choices.add(new AiChatResponse.Choice().setIndex(0).setMessage(message));
+        resp.setChoices(choices);
+        resp.setModel(getProviderName());
+        return resp;
+    }
+}
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/provider/FastGptProvider.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/provider/FastGptProvider.java
new file mode 100644
index 0000000..f50ce99
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/provider/FastGptProvider.java
@@ -0,0 +1,153 @@
+package org.dromara.ai.provider;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import okhttp3.*;
+import org.dromara.ai.domain.dto.AiChatRequest;
+import org.dromara.ai.domain.dto.AiChatResponse;
+import org.dromara.ai.domain.dto.AiModelInfo;
+import org.dromara.ai.domain.enums.AiProviderType;
+
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+
+public class FastGptProvider extends AbstractAiProvider {
+
+    private OkHttpClient httpClient;
+    private final ObjectMapper objectMapper = new ObjectMapper();
+
+    @Override
+    public AiProviderType getProviderType() {
+        return AiProviderType.FASTGPT;
+    }
+
+    @Override
+    public String getProviderName() {
+        return "fastgpt";
+    }
+
+    @Override
+    public String getVersion() {
+        return "1.0.0";
+    }
+
+    @Override
+    protected void doInitialize() {
+        String apiKey = (String) configuration.getOrDefault("api-key", "");
+        String baseUrl = (String) configuration.getOrDefault("base-url", "");
+        if (apiKey == null || apiKey.isBlank() || baseUrl == null || baseUrl.isBlank()) {
+            throw new IllegalStateException("FastGPT 配置不完整");
+        }
+        Integer timeoutMs = (Integer) configuration.getOrDefault("timeout-ms", 30000);
+        this.httpClient = new OkHttpClient.Builder()
+                .connectTimeout(timeoutMs, TimeUnit.MILLISECONDS)
+                .readTimeout(timeoutMs, TimeUnit.MILLISECONDS)
+                .writeTimeout(timeoutMs, TimeUnit.MILLISECONDS)
+                .build();
+    }
+
+    @Override
+    protected void doDestroy() {
+        this.httpClient = null;
+    }
+
+    @Override
+    protected AiChatResponse doChat(AiChatRequest request) {
+        String apiKey = (String) configuration.get("api-key");
+        String baseUrl = (String) configuration.get("base-url");
+        String appId = (String) configuration.getOrDefault("default-app-id", "");
+
+        Map<String, Object> payload = new HashMap<>();
+        payload.put("appId", appId);
+        payload.put("messages", toOpenAiMessages(request.getMessages()));
+
+        Request httpRequest = new Request.Builder()
+                .url(baseUrl + "/api/openapi/chat")
+                .header("Authorization", "Bearer " + apiKey)
+                .header("Content-Type", "application/json")
+                .post(RequestBody.create(MediaType.parse("application/json"), writeJson(payload)))
+                .build();
+
+        try (Response resp = httpClient.newCall(httpRequest).execute()) {
+            if (!resp.isSuccessful()) {
+                throw new RuntimeException("FastGPT 响应失败: " + resp.code() + " " + resp.message());
+            }
+            String body = Objects.requireNonNull(resp.body()).string();
+            JsonNode root = objectMapper.readTree(body);
+            return toAiChatResponse(root);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    protected void doChatStream(AiChatRequest request, StreamCallback callback) {
+        AiChatResponse resp = chat(request);
+        String content = resp.getChoices() != null && !resp.getChoices().isEmpty()
+                ? Optional.ofNullable(resp.getChoices().get(0).getMessage().getContent()).orElse("")
+                : "";
+        int step = Math.max(1, content.length() / 20);
+        for (int i = 0; i < content.length(); i += step) {
+            int end = Math.min(content.length(), i + step);
+            String chunk = content.substring(i, end);
+            if (!chunk.isEmpty()) {
+                callback.onChunk(chunk);
+            }
+        }
+        callback.onComplete(resp);
+    }
+
+    @Override
+    public List<AiModelInfo> getSupportedModels() {
+        List<String> supported = (List<String>) configuration.getOrDefault("supported-models", List.of("fastgpt"));
+        String provider = getProviderName();
+        List<AiModelInfo> infos = new ArrayList<>();
+        for (String m : supported) {
+            infos.add(new AiModelInfo()
+                    .setId(m)
+                    .setName(m)
+                    .setDisplayName(m)
+                    .setDescription("FastGPT model " + m)
+                    .setProvider(provider)
+                    .setSupportStream(true)
+                    .setAvailable(true)
+                    .setType(AiModelInfo.ModelType.CHAT)
+            );
+        }
+        return infos;
+    }
+
+    private List<Map<String, Object>> toOpenAiMessages(List<AiChatRequest.AiMessage> messages) {
+        List<Map<String, Object>> list = new ArrayList<>();
+        if (messages == null) return list;
+        for (AiChatRequest.AiMessage msg : messages) {
+            Map<String, Object> item = new HashMap<>();
+            item.put("role", msg.getRole());
+            item.put("content", msg.getContent());
+            list.add(item);
+        }
+        return list;
+    }
+
+    private String writeJson(Object o) {
+        try {
+            return objectMapper.writeValueAsString(o);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private AiChatResponse toAiChatResponse(JsonNode root) {
+        AiChatResponse resp = new AiChatResponse();
+        resp.setSuccess(true);
+        List<AiChatResponse.Choice> choices = new ArrayList<>();
+        String content = root.path("data").path("text").asText("");
+        AiChatRequest.AiMessage message = new AiChatRequest.AiMessage()
+                .setRole("assistant")
+                .setContent(content);
+        choices.add(new AiChatResponse.Choice().setIndex(0).setMessage(message));
+        resp.setChoices(choices);
+        resp.setModel(getProviderName());
+        return resp;
+    }
+}
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/provider/OpenAiProvider.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/provider/OpenAiProvider.java
new file mode 100644
index 0000000..c18fe9a
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/provider/OpenAiProvider.java
@@ -0,0 +1,242 @@
+package org.dromara.ai.provider;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import lombok.extern.slf4j.Slf4j;
+import okhttp3.*;
+import okhttp3.sse.EventSource;
+import okhttp3.sse.EventSourceListener;
+import okhttp3.sse.EventSources;
+import org.dromara.ai.domain.dto.AiChatRequest;
+import org.dromara.ai.domain.dto.AiChatResponse;
+import org.dromara.ai.domain.dto.AiModelInfo;
+import org.dromara.ai.domain.enums.AiProviderType;
+
+import java.io.IOException;
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * OpenAI 提供商实现
+ */
+@Slf4j
+public class OpenAiProvider extends AbstractAiProvider {
+
+    private OkHttpClient httpClient;
+    private final ObjectMapper objectMapper = new ObjectMapper();
+
+    @Override
+    public AiProviderType getProviderType() {
+        return AiProviderType.OPENAI;
+    }
+
+    @Override
+    public String getProviderName() {
+        return "openai";
+    }
+
+    @Override
+    public String getVersion() {
+        return "1.0.0";
+    }
+
+    @Override
+    protected void doInitialize() {
+        String apiKey = (String) configuration.getOrDefault("api-key", "");
+        if (apiKey == null || apiKey.isBlank()) {
+            throw new IllegalStateException("OpenAI api-key 未配置");
+        }
+        Integer timeoutMs = (Integer) configuration.getOrDefault("timeout-ms", 30000);
+        this.httpClient = new OkHttpClient.Builder()
+                .connectTimeout(timeoutMs, TimeUnit.MILLISECONDS)
+                .readTimeout(timeoutMs, TimeUnit.MILLISECONDS)
+                .writeTimeout(timeoutMs, TimeUnit.MILLISECONDS)
+                .build();
+    }
+
+    @Override
+    protected void doDestroy() {
+        this.httpClient = null;
+    }
+
+    @Override
+    protected AiChatResponse doChat(AiChatRequest request) {
+        String baseUrl = (String) configuration.getOrDefault("base-url", "https://api.openai.com");
+        String apiKey = (String) configuration.get("api-key");
+        String model = Optional.ofNullable(request.getModel())
+                .filter(s -> !s.isBlank())
+                .orElse((String) configuration.getOrDefault("default-model", "gpt-3.5-turbo"));
+
+        Map<String, Object> payload = new HashMap<>();
+        payload.put("model", model);
+        payload.put("messages", toOpenAiMessages(request.getMessages()));
+        if (request.getTemperature() != null) payload.put("temperature", request.getTemperature());
+        if (request.getMaxTokens() != null) payload.put("max_tokens", request.getMaxTokens());
+        if (request.getTopP() != null) payload.put("top_p", request.getTopP());
+        if (request.getStop() != null && !request.getStop().isEmpty()) payload.put("stop", request.getStop());
+
+        Request httpRequest = new Request.Builder()
+                .url(baseUrl + "/v1/chat/completions")
+                .header("Authorization", "Bearer " + apiKey)
+                .header("Content-Type", "application/json")
+                .post(RequestBody.create(MediaType.parse("application/json"),
+                        writeJson(payload)))
+                .build();
+
+        try (Response resp = httpClient.newCall(httpRequest).execute()) {
+            if (!resp.isSuccessful()) {
+                throw new IOException("OpenAI 响应失败: " + resp.code() + " " + resp.message());
+            }
+            String body = Objects.requireNonNull(resp.body()).string();
+            JsonNode root = objectMapper.readTree(body);
+            return toAiChatResponse(root, model);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    protected void doChatStream(AiChatRequest request, StreamCallback callback) {
+        String baseUrl = (String) configuration.getOrDefault("base-url", "https://api.openai.com");
+        String apiKey = (String) configuration.get("api-key");
+        String model = Optional.ofNullable(request.getModel())
+                .filter(s -> !s.isBlank())
+                .orElse((String) configuration.getOrDefault("default-model", "gpt-3.5-turbo"));
+
+        Map<String, Object> payload = new HashMap<>();
+        payload.put("model", model);
+        payload.put("messages", toOpenAiMessages(request.getMessages()));
+        payload.put("stream", true);
+        if (request.getTemperature() != null) payload.put("temperature", request.getTemperature());
+        if (request.getMaxTokens() != null) payload.put("max_tokens", request.getMaxTokens());
+        if (request.getTopP() != null) payload.put("top_p", request.getTopP());
+        if (request.getStop() != null && !request.getStop().isEmpty()) payload.put("stop", request.getStop());
+
+        Request httpRequest = new Request.Builder()
+                .url(baseUrl + "/v1/chat/completions")
+                .header("Authorization", "Bearer " + apiKey)
+                .header("Content-Type", "application/json")
+                .post(RequestBody.create(MediaType.parse("application/json"),
+                        writeJson(payload)))
+                .build();
+
+        StringBuilder contentBuilder = new StringBuilder();
+        EventSourceListener listener = new EventSourceListener() {
+            @Override
+            public void onEvent(EventSource eventSource, String id, String type, String data) {
+                if (data == null) return;
+                if ("[DONE]".equals(data.trim())) {
+                    AiChatResponse finalResp = new AiChatResponse()
+                            .setSuccess(true)
+                            .setModel(model)
+                            .setChoices(List.of(new AiChatResponse.Choice()
+                                    .setIndex(0)
+                                    .setMessage(new AiChatRequest.AiMessage()
+                                            .setRole("assistant")
+                                            .setContent(contentBuilder.toString()))));
+                    callback.onComplete(finalResp);
+                    eventSource.cancel();
+                    return;
+                }
+                try {
+                    JsonNode node = objectMapper.readTree(data);
+                    JsonNode choices = node.path("choices");
+                    if (choices.isArray() && choices.size() > 0) {
+                        JsonNode delta = choices.get(0).path("delta");
+                        String chunk = delta.path("content").asText(null);
+                        if (chunk != null) {
+                            contentBuilder.append(chunk);
+                            callback.onChunk(chunk);
+                        }
+                    }
+                } catch (Exception e) {
+                    callback.onError(e);
+                }
+            }
+
+            @Override
+            public void onFailure(EventSource eventSource, Throwable t, Response response) {
+                if (response != null) {
+                    log.error("OpenAI 流失败: {} {}", response.code(), response.message(), t);
+                } else {
+                    log.error("OpenAI 流失败", t);
+                }
+                callback.onError(t);
+            }
+        };
+
+        EventSources.createFactory(httpClient).newEventSource(httpRequest, listener);
+    }
+
+    @Override
+    public List<AiModelInfo> getSupportedModels() {
+        List<String> supported = (List<String>) configuration.getOrDefault("supported-models", List.of("gpt-3.5-turbo", "gpt-4"));
+        String provider = getProviderName();
+        List<AiModelInfo> infos = new ArrayList<>();
+        for (String m : supported) {
+            infos.add(new AiModelInfo()
+                    .setId(m)
+                    .setName(m)
+                    .setDisplayName(m)
+                    .setDescription("OpenAI model " + m)
+                    .setProvider(provider)
+                    .setSupportStream(true)
+                    .setAvailable(true)
+                    .setType(AiModelInfo.ModelType.CHAT)
+            );
+        }
+        return infos;
+    }
+
+    private List<Map<String, Object>> toOpenAiMessages(List<AiChatRequest.AiMessage> messages) {
+        List<Map<String, Object>> list = new ArrayList<>();
+        if (messages == null) return list;
+        for (AiChatRequest.AiMessage msg : messages) {
+            Map<String, Object> item = new HashMap<>();
+            item.put("role", msg.getRole());
+            item.put("content", msg.getContent());
+            list.add(item);
+        }
+        return list;
+    }
+
+    private String writeJson(Object o) {
+        try {
+            return objectMapper.writeValueAsString(o);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private AiChatResponse toAiChatResponse(JsonNode root, String model) {
+        AiChatResponse resp = new AiChatResponse();
+        resp.setSuccess(true);
+        resp.setModel(model);
+        resp.setId(root.path("id").asText(null));
+        resp.setCreated(root.path("created").isNumber() ? root.path("created").asLong() : null);
+        List<AiChatResponse.Choice> choices = new ArrayList<>();
+        JsonNode c = root.path("choices");
+        if (c.isArray()) {
+            for (int i = 0; i < c.size(); i++) {
+                JsonNode ci = c.get(i);
+                AiChatRequest.AiMessage message = new AiChatRequest.AiMessage()
+                        .setRole(Optional.ofNullable(ci.path("message").path("role").asText(null)).orElse("assistant"))
+                        .setContent(ci.path("message").path("content").asText(""));
+                choices.add(new AiChatResponse.Choice()
+                        .setIndex(ci.path("index").isNumber() ? ci.path("index").asInt() : i)
+                        .setMessage(message)
+                        .setFinishReason(ci.path("finish_reason").asText(null)));
+            }
+        }
+        resp.setChoices(choices);
+        JsonNode usage = root.path("usage");
+        if (usage.isObject()) {
+            resp.setUsage(new AiChatResponse.Usage()
+                    .setPromptTokens(usage.path("prompt_tokens").isNumber() ? usage.path("prompt_tokens").asInt() : null)
+                    .setCompletionTokens(usage.path("completion_tokens").isNumber() ? usage.path("completion_tokens").asInt() : null)
+                    .setTotalTokens(usage.path("total_tokens").isNumber() ? usage.path("total_tokens").asInt() : null));
+        }
+        return resp;
+    }
+}
+
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/provider/QwenProvider.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/provider/QwenProvider.java
new file mode 100644
index 0000000..a51e8ff
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/provider/QwenProvider.java
@@ -0,0 +1,166 @@
+package org.dromara.ai.provider;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import okhttp3.*;
+import org.dromara.ai.domain.dto.AiChatRequest;
+import org.dromara.ai.domain.dto.AiChatResponse;
+import org.dromara.ai.domain.dto.AiModelInfo;
+import org.dromara.ai.domain.enums.AiProviderType;
+
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+
+public class QwenProvider extends AbstractAiProvider {
+
+    private OkHttpClient httpClient;
+    private final ObjectMapper objectMapper = new ObjectMapper();
+
+    @Override
+    public AiProviderType getProviderType() {
+        return AiProviderType.ALIBABA_TONGYI;
+    }
+
+    @Override
+    public String getProviderName() {
+        return "qwen";
+    }
+
+    @Override
+    public String getVersion() {
+        return "1.0.0";
+    }
+
+    @Override
+    protected void doInitialize() {
+        String apiKey = (String) configuration.getOrDefault("api-key", "");
+        String baseUrl = (String) configuration.getOrDefault("base-url", "https://dashscope.aliyuncs.com");
+        if (apiKey == null || apiKey.isBlank() || baseUrl == null || baseUrl.isBlank()) {
+            throw new IllegalStateException("Qwen 配置不完整");
+        }
+        Integer timeoutMs = (Integer) configuration.getOrDefault("timeout-ms", 30000);
+        this.httpClient = new OkHttpClient.Builder()
+                .connectTimeout(timeoutMs, TimeUnit.MILLISECONDS)
+                .readTimeout(timeoutMs, TimeUnit.MILLISECONDS)
+                .writeTimeout(timeoutMs, TimeUnit.MILLISECONDS)
+                .build();
+    }
+
+    @Override
+    protected void doDestroy() {
+        this.httpClient = null;
+    }
+
+    @Override
+    protected AiChatResponse doChat(AiChatRequest request) {
+        String apiKey = (String) configuration.get("api-key");
+        String baseUrl = (String) configuration.getOrDefault("base-url", "https://dashscope.aliyuncs.com");
+        String model = Optional.ofNullable(request.getModel())
+                .filter(s -> !s.isBlank())
+                .orElse((String) configuration.getOrDefault("default-model", "qwen-turbo"));
+
+        Map<String, Object> input = new HashMap<>();
+        input.put("messages", toOpenAiMessages(request.getMessages()));
+        Map<String, Object> payload = new HashMap<>();
+        payload.put("model", model);
+        payload.put("input", input);
+
+        Request httpRequest = new Request.Builder()
+                .url(baseUrl + "/api/v1/services/aigc/text-generation/generation")
+                .header("Authorization", "Bearer " + apiKey)
+                .header("Content-Type", "application/json")
+                .post(RequestBody.create(MediaType.parse("application/json"), writeJson(payload)))
+                .build();
+
+        try (Response resp = httpClient.newCall(httpRequest).execute()) {
+            if (!resp.isSuccessful()) {
+                throw new RuntimeException("Qwen 响应失败: " + resp.code() + " " + resp.message());
+            }
+            String body = Objects.requireNonNull(resp.body()).string();
+            JsonNode root = objectMapper.readTree(body);
+            return toAiChatResponse(root, model);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    protected void doChatStream(AiChatRequest request, StreamCallback callback) {
+        AiChatResponse resp = chat(request);
+        String content = resp.getChoices() != null && !resp.getChoices().isEmpty()
+                ? Optional.ofNullable(resp.getChoices().get(0).getMessage().getContent()).orElse("")
+                : "";
+        int step = Math.max(1, content.length() / 20);
+        for (int i = 0; i < content.length(); i += step) {
+            int end = Math.min(content.length(), i + step);
+            String chunk = content.substring(i, end);
+            if (!chunk.isEmpty()) {
+                callback.onChunk(chunk);
+            }
+        }
+        callback.onComplete(resp);
+    }
+
+    @Override
+    public List<AiModelInfo> getSupportedModels() {
+        List<String> supported = (List<String>) configuration.getOrDefault("supported-models", List.of());
+        String provider = getProviderName();
+        List<AiModelInfo> infos = new ArrayList<>();
+        for (String m : supported) {
+            infos.add(new AiModelInfo()
+                    .setId(m)
+                    .setName(m)
+                    .setDisplayName(m)
+                    .setDescription("Qwen model " + m)
+                    .setProvider(provider)
+                    .setSupportStream(true)
+                    .setAvailable(true)
+                    .setType(AiModelInfo.ModelType.CHAT)
+            );
+        }
+        return infos;
+    }
+
+    private List<Map<String, Object>> toOpenAiMessages(List<AiChatRequest.AiMessage> messages) {
+        List<Map<String, Object>> list = new ArrayList<>();
+        if (messages == null) return list;
+        for (AiChatRequest.AiMessage msg : messages) {
+            Map<String, Object> item = new HashMap<>();
+            item.put("role", msg.getRole());
+            item.put("content", msg.getContent());
+            list.add(item);
+        }
+        return list;
+    }
+
+    private String writeJson(Object o) {
+        try {
+            return objectMapper.writeValueAsString(o);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private AiChatResponse toAiChatResponse(JsonNode root, String model) {
+        AiChatResponse resp = new AiChatResponse();
+        resp.setSuccess(true);
+        resp.setModel(model);
+        List<AiChatResponse.Choice> choices = new ArrayList<>();
+        JsonNode output = root.path("output");
+        if (output.isObject()) {
+            JsonNode choicesNode = output.path("choices");
+            if (choicesNode.isArray() && choicesNode.size() > 0) {
+                JsonNode first = choicesNode.get(0);
+                AiChatRequest.AiMessage message = new AiChatRequest.AiMessage()
+                        .setRole("assistant")
+                        .setContent(first.path("message").path("content").asText(""));
+                choices.add(new AiChatResponse.Choice()
+                        .setIndex(0)
+                        .setMessage(message)
+                        .setFinishReason(first.path("finish_reason").asText(null)));
+            }
+        }
+        resp.setChoices(choices);
+        return resp;
+    }
+}
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/provider/ZhipuAiProvider.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/provider/ZhipuAiProvider.java
new file mode 100644
index 0000000..ff5fac5
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/provider/ZhipuAiProvider.java
@@ -0,0 +1,174 @@
+package org.dromara.ai.provider;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import okhttp3.*;
+import org.dromara.ai.domain.dto.AiChatRequest;
+import org.dromara.ai.domain.dto.AiChatResponse;
+import org.dromara.ai.domain.dto.AiModelInfo;
+import org.dromara.ai.domain.enums.AiProviderType;
+
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+
+public class ZhipuAiProvider extends AbstractAiProvider {
+
+    private OkHttpClient httpClient;
+    private final ObjectMapper objectMapper = new ObjectMapper();
+
+    @Override
+    public AiProviderType getProviderType() {
+        return AiProviderType.ZHIPU_AI;
+    }
+
+    @Override
+    public String getProviderName() {
+        return "zhipu";
+    }
+
+    @Override
+    public String getVersion() {
+        return "1.0.0";
+    }
+
+    @Override
+    protected void doInitialize() {
+        String apiKey = (String) configuration.getOrDefault("api-key", "");
+        String baseUrl = (String) configuration.getOrDefault("base-url", "https://open.bigmodel.cn");
+        if (apiKey == null || apiKey.isBlank() || baseUrl == null || baseUrl.isBlank()) {
+            throw new IllegalStateException("ZhipuAI 配置不完整");
+        }
+        Integer timeoutMs = (Integer) configuration.getOrDefault("timeout-ms", 30000);
+        this.httpClient = new OkHttpClient.Builder()
+                .connectTimeout(timeoutMs, TimeUnit.MILLISECONDS)
+                .readTimeout(timeoutMs, TimeUnit.MILLISECONDS)
+                .writeTimeout(timeoutMs, TimeUnit.MILLISECONDS)
+                .build();
+    }
+
+    @Override
+    protected void doDestroy() {
+        this.httpClient = null;
+    }
+
+    @Override
+    protected AiChatResponse doChat(AiChatRequest request) {
+        String apiKey = (String) configuration.get("api-key");
+        String baseUrl = (String) configuration.getOrDefault("base-url", "https://open.bigmodel.cn");
+        String model = Optional.ofNullable(request.getModel())
+                .filter(s -> !s.isBlank())
+                .orElse((String) configuration.getOrDefault("default-model", "glm-4"));
+
+        Map<String, Object> payload = new HashMap<>();
+        payload.put("model", model);
+        payload.put("messages", toOpenAiMessages(request.getMessages()));
+        if (request.getTemperature() != null) payload.put("temperature", request.getTemperature());
+        if (request.getMaxTokens() != null) payload.put("max_tokens", request.getMaxTokens());
+        if (request.getTopP() != null) payload.put("top_p", request.getTopP());
+        if (request.getStop() != null && !request.getStop().isEmpty()) payload.put("stop", request.getStop());
+
+        Request httpRequest = new Request.Builder()
+                .url(baseUrl + "/api/paas/v4/chat/completions")
+                .header("Authorization", "Bearer " + apiKey)
+                .header("Content-Type", "application/json")
+                .post(RequestBody.create(MediaType.parse("application/json"), writeJson(payload)))
+                .build();
+
+        try (Response resp = httpClient.newCall(httpRequest).execute()) {
+            if (!resp.isSuccessful()) {
+                throw new RuntimeException("ZhipuAI 响应失败: " + resp.code() + " " + resp.message());
+            }
+            String body = Objects.requireNonNull(resp.body()).string();
+            JsonNode root = objectMapper.readTree(body);
+            return toAiChatResponse(root, model);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    protected void doChatStream(AiChatRequest request, StreamCallback callback) {
+        AiChatResponse resp = chat(request);
+        String content = resp.getChoices() != null && !resp.getChoices().isEmpty()
+                ? Optional.ofNullable(resp.getChoices().get(0).getMessage().getContent()).orElse("")
+                : "";
+        int step = Math.max(1, content.length() / 20);
+        for (int i = 0; i < content.length(); i += step) {
+            int end = Math.min(content.length(), i + step);
+            String chunk = content.substring(i, end);
+            if (!chunk.isEmpty()) {
+                callback.onChunk(chunk);
+            }
+        }
+        callback.onComplete(resp);
+    }
+
+    @Override
+    public List<AiModelInfo> getSupportedModels() {
+        List<String> supported = (List<String>) configuration.getOrDefault("supported-models", List.of());
+        String provider = getProviderName();
+        List<AiModelInfo> infos = new ArrayList<>();
+        for (String m : supported) {
+            infos.add(new AiModelInfo()
+                    .setId(m)
+                    .setName(m)
+                    .setDisplayName(m)
+                    .setDescription("ZhipuAI model " + m)
+                    .setProvider(provider)
+                    .setSupportStream(true)
+                    .setAvailable(true)
+                    .setType(AiModelInfo.ModelType.CHAT)
+            );
+        }
+        return infos;
+    }
+
+    private List<Map<String, Object>> toOpenAiMessages(List<AiChatRequest.AiMessage> messages) {
+        List<Map<String, Object>> list = new ArrayList<>();
+        if (messages == null) return list;
+        for (AiChatRequest.AiMessage msg : messages) {
+            Map<String, Object> item = new HashMap<>();
+            item.put("role", msg.getRole());
+            item.put("content", msg.getContent());
+            list.add(item);
+        }
+        return list;
+    }
+
+    private String writeJson(Object o) {
+        try {
+            return objectMapper.writeValueAsString(o);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private AiChatResponse toAiChatResponse(JsonNode root, String model) {
+        AiChatResponse resp = new AiChatResponse();
+        resp.setSuccess(true);
+        resp.setModel(model);
+        List<AiChatResponse.Choice> choices = new ArrayList<>();
+        JsonNode c = root.path("choices");
+        if (c.isArray()) {
+            for (int i = 0; i < c.size(); i++) {
+                JsonNode ci = c.get(i);
+                AiChatRequest.AiMessage message = new AiChatRequest.AiMessage()
+                        .setRole(Optional.ofNullable(ci.path("message").path("role").asText(null)).orElse("assistant"))
+                        .setContent(ci.path("message").path("content").asText(""));
+                choices.add(new AiChatResponse.Choice()
+                        .setIndex(ci.path("index").isNumber() ? ci.path("index").asInt() : i)
+                        .setMessage(message)
+                        .setFinishReason(ci.path("finish_reason").asText(null)));
+            }
+        }
+        resp.setChoices(choices);
+        JsonNode usage = root.path("usage");
+        if (usage.isObject()) {
+            resp.setUsage(new AiChatResponse.Usage()
+                    .setPromptTokens(usage.path("prompt_tokens").isNumber() ? usage.path("prompt_tokens").asInt() : null)
+                    .setCompletionTokens(usage.path("completion_tokens").isNumber() ? usage.path("completion_tokens").asInt() : null)
+                    .setTotalTokens(usage.path("total_tokens").isNumber() ? usage.path("total_tokens").asInt() : null));
+        }
+        return resp;
+    }
+}
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/provider/impl/MockAiProvider.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/provider/impl/MockAiProvider.java
new file mode 100644
index 0000000..62c67b9
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/provider/impl/MockAiProvider.java
@@ -0,0 +1,138 @@
+package org.dromara.ai.provider.impl;
+
+import org.dromara.ai.domain.dto.AiChatRequest;
+import org.dromara.ai.domain.dto.AiChatResponse;
+import org.dromara.ai.domain.dto.AiModelInfo;
+import org.dromara.ai.domain.enums.AiProviderType;
+import org.dromara.ai.provider.AbstractAiProvider;
+import org.dromara.ai.provider.AiProvider;
+import org.springframework.stereotype.Component;
+
+import java.time.Instant;
+import java.util.ArrayList;
+import java.util.List;
+
+@Component
+public class MockAiProvider extends AbstractAiProvider {
+
+    @Override
+    public AiProviderType getProviderType() {
+        return AiProviderType.CUSTOM;
+    }
+
+    @Override
+    public String getProviderName() {
+        return "mock";
+    }
+
+    @Override
+    public String getVersion() {
+        return "1.0.0";
+    }
+
+    @Override
+    protected void doInitialize() {
+    }
+
+    @Override
+    protected void doDestroy() {
+    }
+
+    @Override
+    protected AiChatResponse doChat(AiChatRequest request) {
+        String content = buildReplyContent(request);
+        AiChatRequest.AiMessage message = new AiChatRequest.AiMessage()
+                .setRole("assistant")
+                .setContent(content);
+        AiChatResponse.Choice choice = new AiChatResponse.Choice()
+                .setIndex(0)
+                .setMessage(message)
+                .setFinishReason(AiChatResponse.FinishReason.STOP.getValue());
+        AiChatResponse.Usage usage = new AiChatResponse.Usage()
+                .setPromptTokens(content.length())
+                .setCompletionTokens(content.length())
+                .setTotalTokens(content.length() * 2);
+        return new AiChatResponse()
+                .setId("mock-" + Instant.now().toEpochMilli())
+                .setObject("chat.completion")
+                .setCreated(Instant.now().getEpochSecond())
+                .setModel(request.getModel() != null ? request.getModel() : "mock-gpt")
+                .setChoices(List.of(choice))
+                .setUsage(usage)
+                .setSuccess(true);
+    }
+
+    @Override
+    protected void doChatStream(AiChatRequest request, AiProvider.StreamCallback callback) {
+        String content = buildReplyContent(request);
+        for (int i = 0; i < content.length(); i++) {
+            String c = String.valueOf(content.charAt(i));
+            String chunk = "{\"choices\":[{\"delta\":{\"content\":\"" + escapeJson(c) + "\"}}]}";
+            callback.onChunk(chunk);
+        }
+        AiChatRequest.AiMessage message = new AiChatRequest.AiMessage()
+                .setRole("assistant")
+                .setContent(content);
+        AiChatResponse.Choice choice = new AiChatResponse.Choice()
+                .setIndex(0)
+                .setMessage(message)
+                .setFinishReason(AiChatResponse.FinishReason.STOP.getValue());
+        AiChatResponse response = new AiChatResponse()
+                .setId("mock-" + Instant.now().toEpochMilli())
+                .setObject("chat.completion")
+                .setCreated(Instant.now().getEpochSecond())
+                .setModel(request.getModel() != null ? request.getModel() : "mock-gpt")
+                .setChoices(List.of(choice))
+                .setUsage(new AiChatResponse.Usage()
+                        .setPromptTokens(content.length())
+                        .setCompletionTokens(content.length())
+                        .setTotalTokens(content.length() * 2))
+                .setSuccess(true);
+        callback.onComplete(response);
+    }
+
+    @Override
+    public List<AiModelInfo> getSupportedModels() {
+        List<AiModelInfo> list = new ArrayList<>();
+        AiModelInfo.ModelParameters params1 = new AiModelInfo.ModelParameters()
+                .setDefaultMaxTokens(8192);
+        list.add(new AiModelInfo()
+                .setId("mock-gpt")
+                .setName("mock-gpt")
+                .setProvider(getProviderName())
+                .setDescription("Mock GPT")
+                .setMaxContextLength(8192)
+                .setSupportStream(true)
+                .setStatus(AiModelInfo.ModelStatus.AVAILABLE)
+                .setParameters(params1));
+        AiModelInfo.ModelParameters params2 = new AiModelInfo.ModelParameters()
+                .setDefaultMaxTokens(4096);
+        list.add(new AiModelInfo()
+                .setId("gpt-3.5-turbo")
+                .setName("gpt-3.5-turbo")
+                .setProvider(getProviderName())
+                .setDescription("Mock GPT-3.5")
+                .setMaxContextLength(4096)
+                .setSupportStream(true)
+                .setStatus(AiModelInfo.ModelStatus.AVAILABLE)
+                .setParameters(params2));
+        return list;
+    }
+
+    private String buildReplyContent(AiChatRequest request) {
+        String last = "";
+        if (request.getMessages() != null && !request.getMessages().isEmpty()) {
+            for (AiChatRequest.AiMessage m : request.getMessages()) {
+                if ("user".equals(m.getRole())) {
+                    last = m.getContent();
+                }
+            }
+        }
+        String prefix = "这是AI模拟回复：";
+        return prefix + (last != null ? last : "");
+    }
+
+    private String escapeJson(String s) {
+        return s.replace("\\", "\\\\").replace("\"", "\\\"").replace("\n", "\\n").replace("\r", "\\r");
+    }
+}
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/queue/TaskQueueService.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/queue/TaskQueueService.java
new file mode 100644
index 0000000..1bbb021
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/queue/TaskQueueService.java
@@ -0,0 +1,66 @@
+package org.dromara.ai.queue;
+
+import lombok.Data;
+import org.springframework.stereotype.Service;
+
+import java.time.Instant;
+import java.util.Comparator;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.*;
+
+@Service
+public class TaskQueueService {
+    private final PriorityBlockingQueue<TaskItem> queue = new PriorityBlockingQueue<>(100, Comparator.comparingInt(TaskItem::getPriority).reversed());
+    private final ExecutorService workers = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors());
+    private final Map<String, TaskItem> tasks = new ConcurrentHashMap<>();
+
+    public String submit(String type, int priority, Runnable r) {
+        String id = UUID.randomUUID().toString();
+        TaskItem item = new TaskItem();
+        item.id = id;
+        item.type = type;
+        item.priority = priority;
+        item.createdAt = Instant.now();
+        item.status = "PENDING";
+        tasks.put(id, item);
+        queue.offer(item);
+        workers.submit(() -> {
+            TaskItem t = tasks.get(id);
+            t.status = "RUNNING";
+            try {
+                r.run();
+                t.status = "SUCCESS";
+            } catch (Exception e) {
+                t.status = "FAILED";
+                t.message = e.getMessage();
+            } finally {
+                t.updatedAt = Instant.now();
+            }
+        });
+        return id;
+    }
+
+    public Map<String, Object> metrics() {
+        return Map.of("depth", queue.size(), "active", ((ThreadPoolExecutor) workers).getActiveCount());
+    }
+
+    public TaskItem get(String id) {
+        return tasks.get(id);
+    }
+
+    @Data
+    public static class TaskItem {
+        private String id;
+        private String type;
+        private int priority;
+        private String status;
+        private String message;
+        private Instant createdAt;
+        private Instant updatedAt;
+
+        public int getPriority() {
+            return priority;
+        }
+    }
+}
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/security/AiAccessControlService.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/security/AiAccessControlService.java
new file mode 100644
index 0000000..6dcbc09
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/security/AiAccessControlService.java
@@ -0,0 +1,690 @@
+package org.dromara.ai.security;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+import java.time.temporal.ChronoUnit;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicLong;
+
+/**
+ * AI访问控制服务
+ * 提供用户权限管理、API访问限制和安全控制功能
+ *
+ * @author pengles
+ * @date 2024-01-01
+ */
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class AiAccessControlService {
+
+    /**
+     * 访问控制结果
+     */
+    public static class AccessResult {
+        private boolean allowed;
+        private String reason;
+        private long remainingQuota;
+        private long resetTime;
+        private Map<String, Object> details;
+
+        public AccessResult(boolean allowed, String reason) {
+            this.allowed = allowed;
+            this.reason = reason;
+            this.remainingQuota = 0;
+            this.resetTime = 0;
+            this.details = new HashMap<>();
+        }
+
+        // Getters and Setters
+        public boolean isAllowed() {
+            return allowed;
+        }
+
+        public void setAllowed(boolean allowed) {
+            this.allowed = allowed;
+        }
+
+        public String getReason() {
+            return reason;
+        }
+
+        public void setReason(String reason) {
+            this.reason = reason;
+        }
+
+        public long getRemainingQuota() {
+            return remainingQuota;
+        }
+
+        public void setRemainingQuota(long remainingQuota) {
+            this.remainingQuota = remainingQuota;
+        }
+
+        public long getResetTime() {
+            return resetTime;
+        }
+
+        public void setResetTime(long resetTime) {
+            this.resetTime = resetTime;
+        }
+
+        public Map<String, Object> getDetails() {
+            return details;
+        }
+
+        public void setDetails(Map<String, Object> details) {
+            this.details = details;
+        }
+    }
+
+    /**
+     * 用户权限级别
+     */
+    public enum PermissionLevel {
+        GUEST(1, "访客", 10, 100),
+        BASIC(2, "基础用户", 100, 1000),
+        PREMIUM(3, "高级用户", 1000, 10000),
+        VIP(4, "VIP用户", 5000, 50000),
+        ADMIN(5, "管理员", -1, -1);
+
+        private final int level;
+        private final String description;
+        private final long dailyQuota;
+        private final long monthlyQuota;
+
+        PermissionLevel(int level, String description, long dailyQuota, long monthlyQuota) {
+            this.level = level;
+            this.description = description;
+            this.dailyQuota = dailyQuota;
+            this.monthlyQuota = monthlyQuota;
+        }
+
+        public int getLevel() {
+            return level;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public long getDailyQuota() {
+            return dailyQuota;
+        }
+
+        public long getMonthlyQuota() {
+            return monthlyQuota;
+        }
+    }
+
+    /**
+     * 限流类型
+     */
+    public enum RateLimitType {
+        PER_SECOND,     // 每秒限制
+        PER_MINUTE,     // 每分钟限制
+        PER_HOUR,       // 每小时限制
+        PER_DAY,        // 每天限制
+        PER_MONTH       // 每月限制
+    }
+
+    /**
+     * 用户配额信息
+     */
+    public static class UserQuota {
+        private String userId;
+        private PermissionLevel permissionLevel;
+        private long dailyUsed;
+        private long monthlyUsed;
+        private LocalDateTime lastResetDaily;
+        private LocalDateTime lastResetMonthly;
+        private boolean blocked;
+        private LocalDateTime blockedUntil;
+        private String blockReason;
+        private Map<String, Long> customLimits;
+
+        public UserQuota(String userId, PermissionLevel permissionLevel) {
+            this.userId = userId;
+            this.permissionLevel = permissionLevel;
+            this.dailyUsed = 0;
+            this.monthlyUsed = 0;
+            this.lastResetDaily = LocalDateTime.now();
+            this.lastResetMonthly = LocalDateTime.now();
+            this.blocked = false;
+            this.customLimits = new HashMap<>();
+        }
+
+        // Getters and Setters
+        public String getUserId() {
+            return userId;
+        }
+
+        public void setUserId(String userId) {
+            this.userId = userId;
+        }
+
+        public PermissionLevel getPermissionLevel() {
+            return permissionLevel;
+        }
+
+        public void setPermissionLevel(PermissionLevel permissionLevel) {
+            this.permissionLevel = permissionLevel;
+        }
+
+        public long getDailyUsed() {
+            return dailyUsed;
+        }
+
+        public void setDailyUsed(long dailyUsed) {
+            this.dailyUsed = dailyUsed;
+        }
+
+        public long getMonthlyUsed() {
+            return monthlyUsed;
+        }
+
+        public void setMonthlyUsed(long monthlyUsed) {
+            this.monthlyUsed = monthlyUsed;
+        }
+
+        public LocalDateTime getLastResetDaily() {
+            return lastResetDaily;
+        }
+
+        public void setLastResetDaily(LocalDateTime lastResetDaily) {
+            this.lastResetDaily = lastResetDaily;
+        }
+
+        public LocalDateTime getLastResetMonthly() {
+            return lastResetMonthly;
+        }
+
+        public void setLastResetMonthly(LocalDateTime lastResetMonthly) {
+            this.lastResetMonthly = lastResetMonthly;
+        }
+
+        public boolean isBlocked() {
+            return blocked;
+        }
+
+        public void setBlocked(boolean blocked) {
+            this.blocked = blocked;
+        }
+
+        public LocalDateTime getBlockedUntil() {
+            return blockedUntil;
+        }
+
+        public void setBlockedUntil(LocalDateTime blockedUntil) {
+            this.blockedUntil = blockedUntil;
+        }
+
+        public String getBlockReason() {
+            return blockReason;
+        }
+
+        public void setBlockReason(String blockReason) {
+            this.blockReason = blockReason;
+        }
+
+        public Map<String, Long> getCustomLimits() {
+            return customLimits;
+        }
+
+        public void setCustomLimits(Map<String, Long> customLimits) {
+            this.customLimits = customLimits;
+        }
+    }
+
+    /**
+     * 限流计数器
+     */
+    public static class RateLimitCounter {
+        private final AtomicLong count = new AtomicLong(0);
+        private volatile long windowStart;
+        private final long windowSizeMs;
+
+        public RateLimitCounter(long windowSizeMs) {
+            this.windowSizeMs = windowSizeMs;
+            this.windowStart = System.currentTimeMillis();
+        }
+
+        public boolean tryAcquire(long limit) {
+            long now = System.currentTimeMillis();
+
+            // 检查是否需要重置窗口
+            if (now - windowStart >= windowSizeMs) {
+                synchronized (this) {
+                    if (now - windowStart >= windowSizeMs) {
+                        count.set(0);
+                        windowStart = now;
+                    }
+                }
+            }
+
+            return count.incrementAndGet() <= limit;
+        }
+
+        public long getCurrentCount() {
+            return count.get();
+        }
+
+        public long getRemainingTime() {
+            long now = System.currentTimeMillis();
+            return Math.max(0, windowSizeMs - (now - windowStart));
+        }
+    }
+
+    // 用户配额缓存
+    private final Map<String, UserQuota> userQuotaCache = new ConcurrentHashMap<>();
+
+    // 限流计数器缓存
+    private final Map<String, Map<RateLimitType, RateLimitCounter>> rateLimitCounters = new ConcurrentHashMap<>();
+
+    // IP黑名单
+    private final Set<String> ipBlacklist = ConcurrentHashMap.newKeySet();
+
+    // 用户黑名单
+    private final Set<String> userBlacklist = ConcurrentHashMap.newKeySet();
+
+    // API密钥缓存
+    private final Map<String, String> apiKeyCache = new ConcurrentHashMap<>();
+
+    // 违规计数器
+    private final Map<String, AtomicInteger> violationCounters = new ConcurrentHashMap<>();
+
+    /**
+     * 检查用户访问权限
+     *
+     * @param userId       用户ID
+     * @param operation    操作类型
+     * @param resourceCost 资源消耗
+     * @return 访问控制结果
+     */
+    public AccessResult checkAccess(String userId, String operation, long resourceCost) {
+        try {
+            // 1. 检查用户是否在黑名单中
+            if (userBlacklist.contains(userId)) {
+                return new AccessResult(false, "User is blacklisted");
+            }
+
+            // 2. 获取用户配额信息
+            UserQuota quota = getUserQuota(userId);
+
+            // 3. 检查用户是否被临时封禁
+            if (quota.isBlocked()) {
+                if (quota.getBlockedUntil() != null && LocalDateTime.now().isAfter(quota.getBlockedUntil())) {
+                    // 解除封禁
+                    quota.setBlocked(false);
+                    quota.setBlockedUntil(null);
+                    quota.setBlockReason(null);
+                } else {
+                    return new AccessResult(false, "User is temporarily blocked: " + quota.getBlockReason());
+                }
+            }
+
+            // 4. 重置配额（如果需要）
+            resetQuotaIfNeeded(quota);
+
+            // 5. 检查权限级别
+            if (!hasPermission(quota.getPermissionLevel(), operation)) {
+                return new AccessResult(false, "Insufficient permission level");
+            }
+
+            // 6. 检查配额限制
+            AccessResult quotaResult = checkQuotaLimit(quota, resourceCost);
+            if (!quotaResult.isAllowed()) {
+                return quotaResult;
+            }
+
+            // 7. 检查限流
+            AccessResult rateLimitResult = checkRateLimit(userId, operation);
+            if (!rateLimitResult.isAllowed()) {
+                return rateLimitResult;
+            }
+
+            // 8. 更新使用量
+            updateUsage(quota, resourceCost);
+
+            // 9. 构建成功结果
+            AccessResult result = new AccessResult(true, "Access granted");
+            result.setRemainingQuota(Math.max(0, quota.getPermissionLevel().getDailyQuota() - quota.getDailyUsed()));
+
+            Map<String, Object> details = new HashMap<>();
+            details.put("permissionLevel", quota.getPermissionLevel().name());
+            details.put("dailyUsed", quota.getDailyUsed());
+            details.put("monthlyUsed", quota.getMonthlyUsed());
+            details.put("operation", operation);
+            details.put("resourceCost", resourceCost);
+            result.setDetails(details);
+
+            log.debug("Access granted for user: {}, operation: {}, cost: {}", userId, operation, resourceCost);
+            return result;
+
+        } catch (Exception e) {
+            log.error("Error checking access for user: {}", userId, e);
+            return new AccessResult(false, "Internal error during access check");
+        }
+    }
+
+    /**
+     * 检查IP访问权限
+     *
+     * @param ipAddress IP地址
+     * @return 访问控制结果
+     */
+    public AccessResult checkIpAccess(String ipAddress) {
+        if (ipBlacklist.contains(ipAddress)) {
+            return new AccessResult(false, "IP address is blacklisted");
+        }
+
+        // 检查IP限流
+        String key = "ip:" + ipAddress;
+        Map<RateLimitType, RateLimitCounter> counters = rateLimitCounters.computeIfAbsent(key,
+                k -> new ConcurrentHashMap<>());
+
+        RateLimitCounter perMinuteCounter = counters.computeIfAbsent(RateLimitType.PER_MINUTE,
+                k -> new RateLimitCounter(60 * 1000)); // 1分钟窗口
+
+        if (!perMinuteCounter.tryAcquire(100)) { // 每分钟最多100次请求
+            AccessResult result = new AccessResult(false, "IP rate limit exceeded");
+            result.setResetTime(perMinuteCounter.getRemainingTime());
+            return result;
+        }
+
+        return new AccessResult(true, "IP access granted");
+    }
+
+    /**
+     * 验证API密钥
+     *
+     * @param apiKey API密钥
+     * @return 用户ID，如果验证失败返回null
+     */
+    public String validateApiKey(String apiKey) {
+        if (apiKey == null || apiKey.trim().isEmpty()) {
+            return null;
+        }
+
+        // 从缓存中查找
+        String userId = apiKeyCache.get(apiKey);
+        if (userId != null) {
+            return userId;
+        }
+
+        // 这里应该从数据库中验证API密钥
+        // 为了演示，我们使用简单的格式："user_" + userId
+        if (apiKey.startsWith("ak_")) {
+            userId = apiKey.substring(3);
+            apiKeyCache.put(apiKey, userId);
+            return userId;
+        }
+
+        return null;
+    }
+
+    /**
+     * 记录违规行为
+     *
+     * @param userId        用户ID
+     * @param violationType 违规类型
+     * @param description   违规描述
+     */
+    public void recordViolation(String userId, String violationType, String description) {
+        AtomicInteger counter = violationCounters.computeIfAbsent(userId, k -> new AtomicInteger(0));
+        int violationCount = counter.incrementAndGet();
+
+        log.warn("Violation recorded for user: {}, type: {}, description: {}, total: {}",
+                userId, violationType, description, violationCount);
+
+        // 根据违规次数采取措施
+        if (violationCount >= 10) {
+            blockUser(userId, "Excessive violations", 24); // 封禁24小时
+        } else if (violationCount >= 5) {
+            blockUser(userId, "Multiple violations", 1); // 封禁1小时
+        }
+    }
+
+    /**
+     * 封禁用户
+     *
+     * @param userId 用户ID
+     * @param reason 封禁原因
+     * @param hours  封禁小时数
+     */
+    public void blockUser(String userId, String reason, int hours) {
+        UserQuota quota = getUserQuota(userId);
+        quota.setBlocked(true);
+        quota.setBlockReason(reason);
+        quota.setBlockedUntil(LocalDateTime.now().plusHours(hours));
+
+        log.warn("User blocked: {}, reason: {}, until: {}", userId, reason, quota.getBlockedUntil());
+    }
+
+    /**
+     * 解除用户封禁
+     *
+     * @param userId 用户ID
+     */
+    public void unblockUser(String userId) {
+        UserQuota quota = getUserQuota(userId);
+        quota.setBlocked(false);
+        quota.setBlockedUntil(null);
+        quota.setBlockReason(null);
+
+        // 重置违规计数
+        violationCounters.remove(userId);
+
+        log.info("User unblocked: {}", userId);
+    }
+
+    /**
+     * 添加IP到黑名单
+     *
+     * @param ipAddress IP地址
+     */
+    public void addIpToBlacklist(String ipAddress) {
+        ipBlacklist.add(ipAddress);
+        log.warn("IP added to blacklist: {}", ipAddress);
+    }
+
+    /**
+     * 从黑名单移除IP
+     *
+     * @param ipAddress IP地址
+     */
+    public void removeIpFromBlacklist(String ipAddress) {
+        ipBlacklist.remove(ipAddress);
+        log.info("IP removed from blacklist: {}", ipAddress);
+    }
+
+    /**
+     * 设置用户权限级别
+     *
+     * @param userId 用户ID
+     * @param level  权限级别
+     */
+    public void setUserPermissionLevel(String userId, PermissionLevel level) {
+        UserQuota quota = getUserQuota(userId);
+        quota.setPermissionLevel(level);
+        log.info("User permission level updated: {}, level: {}", userId, level);
+    }
+
+    /**
+     * 获取用户配额信息
+     */
+    private UserQuota getUserQuota(String userId) {
+        return userQuotaCache.computeIfAbsent(userId,
+                k -> new UserQuota(userId, PermissionLevel.BASIC));
+    }
+
+    /**
+     * 重置配额（如果需要）
+     */
+    private void resetQuotaIfNeeded(UserQuota quota) {
+        LocalDateTime now = LocalDateTime.now();
+
+        // 重置日配额
+        if (ChronoUnit.DAYS.between(quota.getLastResetDaily(), now) >= 1) {
+            quota.setDailyUsed(0);
+            quota.setLastResetDaily(now);
+        }
+
+        // 重置月配额
+        if (ChronoUnit.MONTHS.between(quota.getLastResetMonthly(), now) >= 1) {
+            quota.setMonthlyUsed(0);
+            quota.setLastResetMonthly(now);
+        }
+    }
+
+    /**
+     * 检查权限级别
+     */
+    private boolean hasPermission(PermissionLevel userLevel, String operation) {
+        // 管理员拥有所有权限
+        if (userLevel == PermissionLevel.ADMIN) {
+            return true;
+        }
+
+        // 根据操作类型检查权限
+        switch (operation.toLowerCase()) {
+            case "chat":
+                return userLevel.getLevel() >= PermissionLevel.GUEST.getLevel();
+            case "image_generation":
+                return userLevel.getLevel() >= PermissionLevel.BASIC.getLevel();
+            case "advanced_analysis":
+                return userLevel.getLevel() >= PermissionLevel.PREMIUM.getLevel();
+            case "batch_processing":
+                return userLevel.getLevel() >= PermissionLevel.VIP.getLevel();
+            default:
+                return userLevel.getLevel() >= PermissionLevel.BASIC.getLevel();
+        }
+    }
+
+    /**
+     * 检查配额限制
+     */
+    private AccessResult checkQuotaLimit(UserQuota quota, long resourceCost) {
+        PermissionLevel level = quota.getPermissionLevel();
+
+        // 管理员无限制
+        if (level == PermissionLevel.ADMIN) {
+            return new AccessResult(true, "Admin unlimited access");
+        }
+
+        // 检查日配额
+        if (level.getDailyQuota() > 0 && quota.getDailyUsed() + resourceCost > level.getDailyQuota()) {
+            AccessResult result = new AccessResult(false, "Daily quota exceeded");
+            result.setRemainingQuota(Math.max(0, level.getDailyQuota() - quota.getDailyUsed()));
+            return result;
+        }
+
+        // 检查月配额
+        if (level.getMonthlyQuota() > 0 && quota.getMonthlyUsed() + resourceCost > level.getMonthlyQuota()) {
+            AccessResult result = new AccessResult(false, "Monthly quota exceeded");
+            result.setRemainingQuota(Math.max(0, level.getMonthlyQuota() - quota.getMonthlyUsed()));
+            return result;
+        }
+
+        return new AccessResult(true, "Quota check passed");
+    }
+
+    /**
+     * 检查限流
+     */
+    private AccessResult checkRateLimit(String userId, String operation) {
+        String key = "user:" + userId + ":" + operation;
+        Map<RateLimitType, RateLimitCounter> counters = rateLimitCounters.computeIfAbsent(key,
+                k -> new ConcurrentHashMap<>());
+
+        // 每秒限制
+        RateLimitCounter perSecondCounter = counters.computeIfAbsent(RateLimitType.PER_SECOND,
+                k -> new RateLimitCounter(1000)); // 1秒窗口
+
+        if (!perSecondCounter.tryAcquire(5)) { // 每秒最多5次请求
+            AccessResult result = new AccessResult(false, "Rate limit exceeded (per second)");
+            result.setResetTime(perSecondCounter.getRemainingTime());
+            return result;
+        }
+
+        // 每分钟限制
+        RateLimitCounter perMinuteCounter = counters.computeIfAbsent(RateLimitType.PER_MINUTE,
+                k -> new RateLimitCounter(60 * 1000)); // 1分钟窗口
+
+        if (!perMinuteCounter.tryAcquire(100)) { // 每分钟最多100次请求
+            AccessResult result = new AccessResult(false, "Rate limit exceeded (per minute)");
+            result.setResetTime(perMinuteCounter.getRemainingTime());
+            return result;
+        }
+
+        return new AccessResult(true, "Rate limit check passed");
+    }
+
+    /**
+     * 更新使用量
+     */
+    private void updateUsage(UserQuota quota, long resourceCost) {
+        quota.setDailyUsed(quota.getDailyUsed() + resourceCost);
+        quota.setMonthlyUsed(quota.getMonthlyUsed() + resourceCost);
+    }
+
+    /**
+     * 获取访问控制统计信息
+     */
+    public Map<String, Object> getAccessControlStats() {
+        Map<String, Object> stats = new HashMap<>();
+        stats.put("totalUsers", userQuotaCache.size());
+        stats.put("blockedUsers", userQuotaCache.values().stream().mapToLong(q -> q.isBlocked() ? 1 : 0).sum());
+        stats.put("blacklistedIps", ipBlacklist.size());
+        stats.put("blacklistedUsers", userBlacklist.size());
+        stats.put("activeApiKeys", apiKeyCache.size());
+        stats.put("totalViolations", violationCounters.values().stream().mapToInt(AtomicInteger::get).sum());
+
+        // 按权限级别统计用户数
+        Map<String, Long> usersByLevel = new HashMap<>();
+        for (PermissionLevel level : PermissionLevel.values()) {
+            long count = userQuotaCache.values().stream()
+                    .mapToLong(q -> q.getPermissionLevel() == level ? 1 : 0).sum();
+            usersByLevel.put(level.name(), count);
+        }
+        stats.put("usersByPermissionLevel", usersByLevel);
+
+        return stats;
+    }
+
+    /**
+     * 清理过期数据
+     */
+    public void cleanupExpiredData() {
+        LocalDateTime now = LocalDateTime.now();
+
+        // 清理过期的封禁
+        userQuotaCache.values().removeIf(quota -> {
+            if (quota.isBlocked() && quota.getBlockedUntil() != null && now.isAfter(quota.getBlockedUntil())) {
+                quota.setBlocked(false);
+                quota.setBlockedUntil(null);
+                quota.setBlockReason(null);
+            }
+            return false;
+        });
+
+        // 清理过期的限流计数器
+        rateLimitCounters.entrySet().removeIf(entry -> {
+            Map<RateLimitType, RateLimitCounter> counters = entry.getValue();
+            counters.entrySet().removeIf(counterEntry -> {
+                RateLimitCounter counter = counterEntry.getValue();
+                return counter.getRemainingTime() == 0 && counter.getCurrentCount() == 0;
+            });
+            return counters.isEmpty();
+        });
+
+        log.debug("Expired access control data cleaned up");
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/security/AiContentFilterService.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/security/AiContentFilterService.java
new file mode 100644
index 0000000..2f3f1d6
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/security/AiContentFilterService.java
@@ -0,0 +1,524 @@
+package org.dromara.ai.security;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+import java.util.regex.Pattern;
+
+/**
+ * AI内容过滤服务
+ * 提供敏感内容检测、过滤和安全控制功能
+ *
+ * @author pengles
+ * @date 2024-01-01
+ */
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class AiContentFilterService {
+
+    /**
+     * 内容过滤结果
+     */
+    public static class FilterResult {
+        private boolean passed;
+        private String filteredContent;
+        private List<String> violations;
+        private double riskScore;
+        private String riskLevel;
+        private Map<String, Object> details;
+
+        public FilterResult(boolean passed, String filteredContent) {
+            this.passed = passed;
+            this.filteredContent = filteredContent;
+            this.violations = new ArrayList<>();
+            this.riskScore = 0.0;
+            this.riskLevel = "LOW";
+            this.details = new HashMap<>();
+        }
+
+        // Getters and Setters
+        public boolean isPassed() {
+            return passed;
+        }
+
+        public void setPassed(boolean passed) {
+            this.passed = passed;
+        }
+
+        public String getFilteredContent() {
+            return filteredContent;
+        }
+
+        public void setFilteredContent(String filteredContent) {
+            this.filteredContent = filteredContent;
+        }
+
+        public List<String> getViolations() {
+            return violations;
+        }
+
+        public void setViolations(List<String> violations) {
+            this.violations = violations;
+        }
+
+        public double getRiskScore() {
+            return riskScore;
+        }
+
+        public void setRiskScore(double riskScore) {
+            this.riskScore = riskScore;
+        }
+
+        public String getRiskLevel() {
+            return riskLevel;
+        }
+
+        public void setRiskLevel(String riskLevel) {
+            this.riskLevel = riskLevel;
+        }
+
+        public Map<String, Object> getDetails() {
+            return details;
+        }
+
+        public void setDetails(Map<String, Object> details) {
+            this.details = details;
+        }
+    }
+
+    /**
+     * 过滤策略枚举
+     */
+    public enum FilterStrategy {
+        STRICT,     // 严格模式
+        MODERATE,   // 中等模式
+        LENIENT     // 宽松模式
+    }
+
+    /**
+     * 违规类型枚举
+     */
+    public enum ViolationType {
+        PROFANITY,          // 脏话
+        HATE_SPEECH,        // 仇恨言论
+        VIOLENCE,           // 暴力内容
+        SEXUAL_CONTENT,     // 性内容
+        ILLEGAL_ACTIVITY,   // 非法活动
+        PERSONAL_INFO,      // 个人信息
+        SPAM,               // 垃圾信息
+        MALICIOUS_CODE,     // 恶意代码
+        POLITICAL_SENSITIVE, // 政治敏感
+        COMMERCIAL_AD       // 商业广告
+    }
+
+    // 敏感词库
+    private static final Set<String> PROFANITY_WORDS = Set.of(
+            "fuck", "shit", "damn", "bitch", "asshole", "bastard"
+            // 这里应该包含更完整的敏感词库
+    );
+
+    private static final Set<String> HATE_SPEECH_WORDS = Set.of(
+            "nazi", "terrorist", "kill", "murder", "genocide"
+            // 仇恨言论关键词
+    );
+
+    private static final Set<String> VIOLENCE_WORDS = Set.of(
+            "bomb", "weapon", "gun", "knife", "attack", "violence"
+            // 暴力相关关键词
+    );
+
+    private static final Set<String> SEXUAL_WORDS = Set.of(
+            "porn", "sex", "nude", "naked", "adult"
+            // 性内容关键词
+    );
+
+    // 正则表达式模式
+    private static final Pattern EMAIL_PATTERN = Pattern.compile(
+            "[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}"
+    );
+
+    private static final Pattern PHONE_PATTERN = Pattern.compile(
+            "\\b\\d{3}-\\d{3}-\\d{4}\\b|\\b\\d{10}\\b|\\(\\d{3}\\)\\s*\\d{3}-\\d{4}"
+    );
+
+    private static final Pattern ID_CARD_PATTERN = Pattern.compile(
+            "\\b\\d{15}|\\d{18}\\b"
+    );
+
+    private static final Pattern MALICIOUS_CODE_PATTERN = Pattern.compile(
+            "<script[^>]*>.*?</script>|javascript:|eval\\(|exec\\(|system\\(",
+            Pattern.CASE_INSENSITIVE | Pattern.DOTALL
+    );
+
+    /**
+     * 过滤输入内容
+     *
+     * @param content  待过滤内容
+     * @param strategy 过滤策略
+     * @return 过滤结果
+     */
+    public FilterResult filterInput(String content, FilterStrategy strategy) {
+        if (content == null || content.trim().isEmpty()) {
+            return new FilterResult(true, content);
+        }
+
+        FilterResult result = new FilterResult(true, content);
+        String filteredContent = content;
+        List<String> violations = new ArrayList<>();
+        double riskScore = 0.0;
+
+        // 1. 检测脏话
+        FilterResult profanityResult = checkProfanity(filteredContent, strategy);
+        if (!profanityResult.isPassed()) {
+            violations.addAll(profanityResult.getViolations());
+            filteredContent = profanityResult.getFilteredContent();
+            riskScore += 10;
+        }
+
+        // 2. 检测仇恨言论
+        FilterResult hateSpeechResult = checkHateSpeech(filteredContent, strategy);
+        if (!hateSpeechResult.isPassed()) {
+            violations.addAll(hateSpeechResult.getViolations());
+            riskScore += 30;
+        }
+
+        // 3. 检测暴力内容
+        FilterResult violenceResult = checkViolence(filteredContent, strategy);
+        if (!violenceResult.isPassed()) {
+            violations.addAll(violenceResult.getViolations());
+            riskScore += 25;
+        }
+
+        // 4. 检测性内容
+        FilterResult sexualResult = checkSexualContent(filteredContent, strategy);
+        if (!sexualResult.isPassed()) {
+            violations.addAll(sexualResult.getViolations());
+            riskScore += 20;
+        }
+
+        // 5. 检测个人信息
+        FilterResult personalInfoResult = checkPersonalInfo(filteredContent, strategy);
+        if (!personalInfoResult.isPassed()) {
+            violations.addAll(personalInfoResult.getViolations());
+            filteredContent = personalInfoResult.getFilteredContent();
+            riskScore += 15;
+        }
+
+        // 6. 检测恶意代码
+        FilterResult maliciousCodeResult = checkMaliciousCode(filteredContent, strategy);
+        if (!maliciousCodeResult.isPassed()) {
+            violations.addAll(maliciousCodeResult.getViolations());
+            riskScore += 40;
+        }
+
+        // 7. 检测垃圾信息
+        FilterResult spamResult = checkSpam(filteredContent, strategy);
+        if (!spamResult.isPassed()) {
+            violations.addAll(spamResult.getViolations());
+            riskScore += 5;
+        }
+
+        // 设置结果
+        result.setFilteredContent(filteredContent);
+        result.setViolations(violations);
+        result.setRiskScore(riskScore);
+        result.setRiskLevel(calculateRiskLevel(riskScore));
+        result.setPassed(violations.isEmpty() || isAcceptableRisk(riskScore, strategy));
+
+        // 记录详细信息
+        Map<String, Object> details = new HashMap<>();
+        details.put("originalLength", content.length());
+        details.put("filteredLength", filteredContent.length());
+        details.put("strategy", strategy.name());
+        details.put("violationCount", violations.size());
+        result.setDetails(details);
+
+        log.info("Content filter result: passed={}, riskScore={}, violations={}",
+                result.isPassed(), riskScore, violations.size());
+
+        return result;
+    }
+
+    /**
+     * 过滤输出内容
+     *
+     * @param content  待过滤内容
+     * @param strategy 过滤策略
+     * @return 过滤结果
+     */
+    public FilterResult filterOutput(String content, FilterStrategy strategy) {
+        // 输出过滤通常比输入过滤更严格
+        FilterResult result = filterInput(content, strategy);
+
+        // 额外的输出特定检查
+        if (result.isPassed()) {
+            // 检查是否包含可能的提示注入攻击
+            if (containsPromptInjection(content)) {
+                result.setPassed(false);
+                result.getViolations().add("PROMPT_INJECTION");
+                result.setRiskScore(result.getRiskScore() + 50);
+                result.setRiskLevel("HIGH");
+            }
+        }
+
+        return result;
+    }
+
+    /**
+     * 检测脏话
+     */
+    private FilterResult checkProfanity(String content, FilterStrategy strategy) {
+        FilterResult result = new FilterResult(true, content);
+        String lowerContent = content.toLowerCase();
+        String filteredContent = content;
+
+        for (String word : PROFANITY_WORDS) {
+            if (lowerContent.contains(word)) {
+                result.setPassed(false);
+                result.getViolations().add(ViolationType.PROFANITY.name() + ": " + word);
+
+                // 根据策略决定是否替换
+                if (strategy == FilterStrategy.STRICT || strategy == FilterStrategy.MODERATE) {
+                    filteredContent = filteredContent.replaceAll(
+                            "(?i)" + Pattern.quote(word), "*".repeat(word.length())
+                    );
+                }
+            }
+        }
+
+        result.setFilteredContent(filteredContent);
+        return result;
+    }
+
+    /**
+     * 检测仇恨言论
+     */
+    private FilterResult checkHateSpeech(String content, FilterStrategy strategy) {
+        FilterResult result = new FilterResult(true, content);
+        String lowerContent = content.toLowerCase();
+
+        for (String word : HATE_SPEECH_WORDS) {
+            if (lowerContent.contains(word)) {
+                result.setPassed(false);
+                result.getViolations().add(ViolationType.HATE_SPEECH.name() + ": " + word);
+            }
+        }
+
+        return result;
+    }
+
+    /**
+     * 检测暴力内容
+     */
+    private FilterResult checkViolence(String content, FilterStrategy strategy) {
+        FilterResult result = new FilterResult(true, content);
+        String lowerContent = content.toLowerCase();
+
+        for (String word : VIOLENCE_WORDS) {
+            if (lowerContent.contains(word)) {
+                result.setPassed(false);
+                result.getViolations().add(ViolationType.VIOLENCE.name() + ": " + word);
+            }
+        }
+
+        return result;
+    }
+
+    /**
+     * 检测性内容
+     */
+    private FilterResult checkSexualContent(String content, FilterStrategy strategy) {
+        FilterResult result = new FilterResult(true, content);
+        String lowerContent = content.toLowerCase();
+
+        for (String word : SEXUAL_WORDS) {
+            if (lowerContent.contains(word)) {
+                result.setPassed(false);
+                result.getViolations().add(ViolationType.SEXUAL_CONTENT.name() + ": " + word);
+            }
+        }
+
+        return result;
+    }
+
+    /**
+     * 检测个人信息
+     */
+    private FilterResult checkPersonalInfo(String content, FilterStrategy strategy) {
+        FilterResult result = new FilterResult(true, content);
+        String filteredContent = content;
+
+        // 检测邮箱
+        if (EMAIL_PATTERN.matcher(content).find()) {
+            result.setPassed(false);
+            result.getViolations().add(ViolationType.PERSONAL_INFO.name() + ": EMAIL");
+            if (strategy != FilterStrategy.LENIENT) {
+                filteredContent = EMAIL_PATTERN.matcher(filteredContent)
+                        .replaceAll("[EMAIL_REDACTED]");
+            }
+        }
+
+        // 检测电话号码
+        if (PHONE_PATTERN.matcher(content).find()) {
+            result.setPassed(false);
+            result.getViolations().add(ViolationType.PERSONAL_INFO.name() + ": PHONE");
+            if (strategy != FilterStrategy.LENIENT) {
+                filteredContent = PHONE_PATTERN.matcher(filteredContent)
+                        .replaceAll("[PHONE_REDACTED]");
+            }
+        }
+
+        // 检测身份证号
+        if (ID_CARD_PATTERN.matcher(content).find()) {
+            result.setPassed(false);
+            result.getViolations().add(ViolationType.PERSONAL_INFO.name() + ": ID_CARD");
+            if (strategy != FilterStrategy.LENIENT) {
+                filteredContent = ID_CARD_PATTERN.matcher(filteredContent)
+                        .replaceAll("[ID_REDACTED]");
+            }
+        }
+
+        result.setFilteredContent(filteredContent);
+        return result;
+    }
+
+    /**
+     * 检测恶意代码
+     */
+    private FilterResult checkMaliciousCode(String content, FilterStrategy strategy) {
+        FilterResult result = new FilterResult(true, content);
+
+        if (MALICIOUS_CODE_PATTERN.matcher(content).find()) {
+            result.setPassed(false);
+            result.getViolations().add(ViolationType.MALICIOUS_CODE.name());
+        }
+
+        return result;
+    }
+
+    /**
+     * 检测垃圾信息
+     */
+    private FilterResult checkSpam(String content, FilterStrategy strategy) {
+        FilterResult result = new FilterResult(true, content);
+
+        // 简单的垃圾信息检测逻辑
+        String lowerContent = content.toLowerCase();
+
+        // 检测重复字符
+        if (hasExcessiveRepetition(content)) {
+            result.setPassed(false);
+            result.getViolations().add(ViolationType.SPAM.name() + ": REPETITION");
+        }
+
+        // 检测常见垃圾词汇
+        String[] spamWords = {"free", "win", "prize", "click here", "buy now"};
+        for (String word : spamWords) {
+            if (lowerContent.contains(word)) {
+                result.setPassed(false);
+                result.getViolations().add(ViolationType.SPAM.name() + ": " + word);
+                break;
+            }
+        }
+
+        return result;
+    }
+
+    /**
+     * 检测提示注入攻击
+     */
+    private boolean containsPromptInjection(String content) {
+        String lowerContent = content.toLowerCase();
+        String[] injectionPatterns = {
+                "ignore previous instructions",
+                "forget everything above",
+                "new instructions:",
+                "system prompt:",
+                "act as",
+                "pretend to be",
+                "roleplay as"
+        };
+
+        for (String pattern : injectionPatterns) {
+            if (lowerContent.contains(pattern)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * 检测过度重复
+     */
+    private boolean hasExcessiveRepetition(String content) {
+        if (content.length() < 10) {
+            return false;
+        }
+
+        // 检测连续重复字符
+        int maxRepeat = 0;
+        int currentRepeat = 1;
+        char lastChar = content.charAt(0);
+
+        for (int i = 1; i < content.length(); i++) {
+            if (content.charAt(i) == lastChar) {
+                currentRepeat++;
+            } else {
+                maxRepeat = Math.max(maxRepeat, currentRepeat);
+                currentRepeat = 1;
+                lastChar = content.charAt(i);
+            }
+        }
+
+        return maxRepeat > 5; // 超过5个连续相同字符认为是垃圾信息
+    }
+
+    /**
+     * 计算风险等级
+     */
+    private String calculateRiskLevel(double riskScore) {
+        if (riskScore >= 50) {
+            return "HIGH";
+        } else if (riskScore >= 20) {
+            return "MEDIUM";
+        } else if (riskScore > 0) {
+            return "LOW";
+        } else {
+            return "NONE";
+        }
+    }
+
+    /**
+     * 判断风险是否可接受
+     */
+    private boolean isAcceptableRisk(double riskScore, FilterStrategy strategy) {
+        switch (strategy) {
+            case STRICT:
+                return riskScore < 10;
+            case MODERATE:
+                return riskScore < 30;
+            case LENIENT:
+                return riskScore < 50;
+            default:
+                return false;
+        }
+    }
+
+    /**
+     * 获取过滤统计信息
+     */
+    public Map<String, Object> getFilterStats() {
+        Map<String, Object> stats = new HashMap<>();
+        stats.put("profanityWordsCount", PROFANITY_WORDS.size());
+        stats.put("hateSpeechWordsCount", HATE_SPEECH_WORDS.size());
+        stats.put("violenceWordsCount", VIOLENCE_WORDS.size());
+        stats.put("sexualWordsCount", SEXUAL_WORDS.size());
+        stats.put("supportedViolationTypes", ViolationType.values().length);
+        stats.put("availableStrategies", FilterStrategy.values());
+        return stats;
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/security/AiSecurityManager.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/security/AiSecurityManager.java
new file mode 100644
index 0000000..6353273
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/security/AiSecurityManager.java
@@ -0,0 +1,556 @@
+package org.dromara.ai.security;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.ai.domain.dto.AiChatRequest;
+import org.dromara.ai.domain.dto.AiChatResponse;
+import org.springframework.stereotype.Component;
+
+import java.time.LocalDateTime;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * AI安全管理器
+ * 整合内容过滤和访问控制功能，提供统一的安全服务接口
+ *
+ * @author pengles
+ * @date 2024-01-01
+ */
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class AiSecurityManager {
+
+    private final AiContentFilterService contentFilterService;
+    private final AiAccessControlService accessControlService;
+
+    /**
+     * 安全检查结果
+     */
+    public static class SecurityCheckResult {
+        private boolean passed;
+        private String reason;
+        private AiChatRequest filteredRequest;
+        private AiChatResponse filteredResponse;
+        private Map<String, Object> securityDetails;
+
+        public SecurityCheckResult(boolean passed, String reason) {
+            this.passed = passed;
+            this.reason = reason;
+            this.securityDetails = new HashMap<>();
+        }
+
+        // Getters and Setters
+        public boolean isPassed() {
+            return passed;
+        }
+
+        public void setPassed(boolean passed) {
+            this.passed = passed;
+        }
+
+        public String getReason() {
+            return reason;
+        }
+
+        public void setReason(String reason) {
+            this.reason = reason;
+        }
+
+        public AiChatRequest getFilteredRequest() {
+            return filteredRequest;
+        }
+
+        public void setFilteredRequest(AiChatRequest filteredRequest) {
+            this.filteredRequest = filteredRequest;
+        }
+
+        public AiChatResponse getFilteredResponse() {
+            return filteredResponse;
+        }
+
+        public void setFilteredResponse(AiChatResponse filteredResponse) {
+            this.filteredResponse = filteredResponse;
+        }
+
+        public Map<String, Object> getSecurityDetails() {
+            return securityDetails;
+        }
+
+        public void setSecurityDetails(Map<String, Object> securityDetails) {
+            this.securityDetails = securityDetails;
+        }
+    }
+
+    /**
+     * 安全策略配置
+     */
+    public static class SecurityPolicy {
+        private boolean enableContentFilter;
+        private boolean enableAccessControl;
+        private AiContentFilterService.FilterStrategy filterStrategy;
+        private boolean logViolations;
+        private boolean blockOnViolation;
+        private int maxViolationsPerHour;
+        private boolean enableIpFiltering;
+        private boolean enableRateLimit;
+
+        public SecurityPolicy() {
+            this.enableContentFilter = true;
+            this.enableAccessControl = true;
+            this.filterStrategy = AiContentFilterService.FilterStrategy.MODERATE;
+            this.logViolations = true;
+            this.blockOnViolation = true;
+            this.maxViolationsPerHour = 10;
+            this.enableIpFiltering = true;
+            this.enableRateLimit = true;
+        }
+
+        // Getters and Setters
+        public boolean isEnableContentFilter() {
+            return enableContentFilter;
+        }
+
+        public void setEnableContentFilter(boolean enableContentFilter) {
+            this.enableContentFilter = enableContentFilter;
+        }
+
+        public boolean isEnableAccessControl() {
+            return enableAccessControl;
+        }
+
+        public void setEnableAccessControl(boolean enableAccessControl) {
+            this.enableAccessControl = enableAccessControl;
+        }
+
+        public AiContentFilterService.FilterStrategy getFilterStrategy() {
+            return filterStrategy;
+        }
+
+        public void setFilterStrategy(AiContentFilterService.FilterStrategy filterStrategy) {
+            this.filterStrategy = filterStrategy;
+        }
+
+        public boolean isLogViolations() {
+            return logViolations;
+        }
+
+        public void setLogViolations(boolean logViolations) {
+            this.logViolations = logViolations;
+        }
+
+        public boolean isBlockOnViolation() {
+            return blockOnViolation;
+        }
+
+        public void setBlockOnViolation(boolean blockOnViolation) {
+            this.blockOnViolation = blockOnViolation;
+        }
+
+        public int getMaxViolationsPerHour() {
+            return maxViolationsPerHour;
+        }
+
+        public void setMaxViolationsPerHour(int maxViolationsPerHour) {
+            this.maxViolationsPerHour = maxViolationsPerHour;
+        }
+
+        public boolean isEnableIpFiltering() {
+            return enableIpFiltering;
+        }
+
+        public void setEnableIpFiltering(boolean enableIpFiltering) {
+            this.enableIpFiltering = enableIpFiltering;
+        }
+
+        public boolean isEnableRateLimit() {
+            return enableRateLimit;
+        }
+
+        public void setEnableRateLimit(boolean enableRateLimit) {
+            this.enableRateLimit = enableRateLimit;
+        }
+    }
+
+    // 默认安全策略
+    private SecurityPolicy defaultPolicy = new SecurityPolicy();
+
+    /**
+     * 检查请求安全性
+     *
+     * @param request   AI聊天请求
+     * @param userId    用户ID
+     * @param ipAddress IP地址
+     * @param apiKey    API密钥
+     * @return 安全检查结果
+     */
+    public SecurityCheckResult checkRequestSecurity(AiChatRequest request, String userId,
+                                                    String ipAddress, String apiKey) {
+        return checkRequestSecurity(request, userId, ipAddress, apiKey, defaultPolicy);
+    }
+
+    /**
+     * 检查请求安全性（带策略）
+     *
+     * @param request   AI聊天请求
+     * @param userId    用户ID
+     * @param ipAddress IP地址
+     * @param apiKey    API密钥
+     * @param policy    安全策略
+     * @return 安全检查结果
+     */
+    public SecurityCheckResult checkRequestSecurity(AiChatRequest request, String userId,
+                                                    String ipAddress, String apiKey, SecurityPolicy policy) {
+        SecurityCheckResult result = new SecurityCheckResult(true, "Security check passed");
+        Map<String, Object> details = result.getSecurityDetails();
+        details.put("checkTime", LocalDateTime.now());
+        details.put("userId", userId);
+        details.put("ipAddress", ipAddress);
+
+        try {
+            // 1. API密钥验证
+            if (apiKey != null && !apiKey.isEmpty()) {
+                String validatedUserId = accessControlService.validateApiKey(apiKey);
+                if (validatedUserId == null) {
+                    result.setPassed(false);
+                    result.setReason("Invalid API key");
+                    details.put("apiKeyValid", false);
+                    return result;
+                }
+                // 如果没有提供userId，使用API密钥验证的用户ID
+                if (userId == null || userId.isEmpty()) {
+                    userId = validatedUserId;
+                }
+                details.put("apiKeyValid", true);
+                details.put("validatedUserId", validatedUserId);
+            }
+
+            // 2. IP访问控制
+            if (policy.isEnableIpFiltering() && ipAddress != null) {
+                AiAccessControlService.AccessResult ipResult = accessControlService.checkIpAccess(ipAddress);
+                if (!ipResult.isAllowed()) {
+                    result.setPassed(false);
+                    result.setReason("IP access denied: " + ipResult.getReason());
+                    details.put("ipAccessDenied", true);
+                    details.put("ipDenyReason", ipResult.getReason());
+                    return result;
+                }
+                details.put("ipAccessGranted", true);
+            }
+
+            // 3. 用户访问控制
+            if (policy.isEnableAccessControl() && userId != null) {
+                // 计算资源消耗（基于消息长度和复杂度）
+                long resourceCost = calculateResourceCost(request);
+
+                AiAccessControlService.AccessResult accessResult = accessControlService.checkAccess(
+                        userId, "chat", resourceCost);
+
+                if (!accessResult.isAllowed()) {
+                    result.setPassed(false);
+                    result.setReason("Access denied: " + accessResult.getReason());
+                    details.put("accessDenied", true);
+                    details.put("accessDenyReason", accessResult.getReason());
+                    details.put("remainingQuota", accessResult.getRemainingQuota());
+                    return result;
+                }
+                details.put("accessGranted", true);
+                details.put("resourceCost", resourceCost);
+                details.put("remainingQuota", accessResult.getRemainingQuota());
+                details.putAll(accessResult.getDetails());
+            }
+
+            // 4. 内容过滤
+            if (policy.isEnableContentFilter()) {
+                AiChatRequest filteredRequest = filterRequestContent(request, policy.getFilterStrategy());
+                if (filteredRequest == null) {
+                    result.setPassed(false);
+                    result.setReason("Request content violates security policy");
+                    details.put("contentFiltered", true);
+
+                    // 记录违规
+                    if (policy.isLogViolations() && userId != null) {
+                        accessControlService.recordViolation(userId, "CONTENT_VIOLATION",
+                                "Request content filtered");
+                    }
+                    return result;
+                }
+                result.setFilteredRequest(filteredRequest);
+                details.put("contentFilterPassed", true);
+            } else {
+                result.setFilteredRequest(request);
+            }
+
+            log.debug("Request security check passed for user: {}, IP: {}", userId, ipAddress);
+            return result;
+
+        } catch (Exception e) {
+            log.error("Error during request security check", e);
+            result.setPassed(false);
+            result.setReason("Security check failed due to internal error");
+            details.put("error", e.getMessage());
+            return result;
+        }
+    }
+
+    /**
+     * 检查响应安全性
+     *
+     * @param response AI聊天响应
+     * @param userId   用户ID
+     * @return 安全检查结果
+     */
+    public SecurityCheckResult checkResponseSecurity(AiChatResponse response, String userId) {
+        return checkResponseSecurity(response, userId, defaultPolicy);
+    }
+
+    /**
+     * 检查响应安全性（带策略）
+     *
+     * @param response AI聊天响应
+     * @param userId   用户ID
+     * @param policy   安全策略
+     * @return 安全检查结果
+     */
+    public SecurityCheckResult checkResponseSecurity(AiChatResponse response, String userId, SecurityPolicy policy) {
+        SecurityCheckResult result = new SecurityCheckResult(true, "Response security check passed");
+        Map<String, Object> details = result.getSecurityDetails();
+        details.put("checkTime", LocalDateTime.now());
+        details.put("userId", userId);
+
+        try {
+            // 内容过滤
+            if (policy.isEnableContentFilter()) {
+                AiChatResponse filteredResponse = filterResponseContent(response, policy.getFilterStrategy());
+                if (filteredResponse == null) {
+                    result.setPassed(false);
+                    result.setReason("Response content violates security policy");
+                    details.put("contentFiltered", true);
+
+                    // 记录违规
+                    if (policy.isLogViolations() && userId != null) {
+                        accessControlService.recordViolation(userId, "RESPONSE_CONTENT_VIOLATION",
+                                "Response content filtered");
+                    }
+                    return result;
+                }
+                result.setFilteredResponse(filteredResponse);
+                details.put("contentFilterPassed", true);
+            } else {
+                result.setFilteredResponse(response);
+            }
+
+            log.debug("Response security check passed for user: {}", userId);
+            return result;
+
+        } catch (Exception e) {
+            log.error("Error during response security check", e);
+            result.setPassed(false);
+            result.setReason("Response security check failed due to internal error");
+            details.put("error", e.getMessage());
+            return result;
+        }
+    }
+
+    /**
+     * 过滤请求内容
+     *
+     * @param request  原始请求
+     * @param strategy 过滤策略
+     * @return 过滤后的请求，如果违规返回null
+     */
+    private AiChatRequest filterRequestContent(AiChatRequest request,
+                                               AiContentFilterService.FilterStrategy strategy) {
+        if (request == null || request.getMessages() == null) {
+            return request;
+        }
+
+        // 创建请求副本
+        AiChatRequest filteredRequest = new AiChatRequest();
+        filteredRequest.setModel(request.getModel());
+        filteredRequest.setStream(request.getStream());
+        filteredRequest.setMaxTokens(request.getMaxTokens());
+        filteredRequest.setTemperature(request.getTemperature());
+        filteredRequest.setTopP(request.getTopP());
+        filteredRequest.setFrequencyPenalty(request.getFrequencyPenalty());
+        filteredRequest.setPresencePenalty(request.getPresencePenalty());
+        filteredRequest.setStop(request.getStop());
+        filteredRequest.setUserId(request.getUserId());
+        filteredRequest.setMessages(new java.util.ArrayList<>());
+
+        // 过滤每条消息
+        for (AiChatRequest.AiMessage message : request.getMessages()) {
+            if (message.getContent() != null) {
+                AiContentFilterService.FilterResult filterResult =
+                        contentFilterService.filterInput(message.getContent(), strategy);
+
+                if (!filterResult.isPassed()) {
+                    log.warn("Message content filtered: violations={}, riskScore={}",
+                            filterResult.getViolations(), filterResult.getRiskScore());
+                    return null; // 拒绝整个请求
+                }
+
+                // 使用过滤后的内容
+                AiChatRequest.AiMessage filteredMessage = new AiChatRequest.AiMessage();
+                filteredMessage.setRole(message.getRole());
+                filteredMessage.setContent(filterResult.getFilteredContent());
+                filteredMessage.setName(message.getName());
+                filteredRequest.getMessages().add(filteredMessage);
+            } else {
+                filteredRequest.getMessages().add(message);
+            }
+        }
+
+        return filteredRequest;
+    }
+
+    /**
+     * 过滤响应内容
+     *
+     * @param response 原始响应
+     * @param strategy 过滤策略
+     * @return 过滤后的响应，如果违规返回null
+     */
+    private AiChatResponse filterResponseContent(AiChatResponse response,
+                                                 AiContentFilterService.FilterStrategy strategy) {
+        if (response == null || response.getChoices() == null) {
+            return response;
+        }
+
+        // 创建响应副本
+        AiChatResponse filteredResponse = new AiChatResponse();
+        filteredResponse.setId(response.getId());
+        filteredResponse.setObject(response.getObject());
+        filteredResponse.setCreated(response.getCreated());
+        filteredResponse.setModel(response.getModel());
+        filteredResponse.setUsage(response.getUsage());
+        filteredResponse.setSuccess(response.getSuccess());
+        filteredResponse.setError(response.getError());
+        filteredResponse.setChoices(new java.util.ArrayList<>());
+
+        // 过滤每个选择
+        for (AiChatResponse.Choice choice : response.getChoices()) {
+            if (choice.getMessage() != null && choice.getMessage().getContent() != null) {
+                AiContentFilterService.FilterResult filterResult =
+                        contentFilterService.filterOutput(choice.getMessage().getContent(), strategy);
+
+                if (!filterResult.isPassed()) {
+                    log.warn("Response content filtered: violations={}, riskScore={}",
+                            filterResult.getViolations(), filterResult.getRiskScore());
+                    return null; // 拒绝整个响应
+                }
+
+                // 使用过滤后的内容
+                AiChatResponse.Choice filteredChoice = new AiChatResponse.Choice();
+                filteredChoice.setIndex(choice.getIndex());
+                filteredChoice.setFinishReason(choice.getFinishReason());
+
+                AiChatRequest.AiMessage filteredMessage = new AiChatRequest.AiMessage();
+                filteredMessage.setRole(choice.getMessage().getRole());
+                filteredMessage.setContent(filterResult.getFilteredContent());
+                filteredChoice.setMessage(filteredMessage);
+
+                filteredResponse.getChoices().add(filteredChoice);
+            } else {
+                filteredResponse.getChoices().add(choice);
+            }
+        }
+
+        return filteredResponse;
+    }
+
+    /**
+     * 计算资源消耗
+     *
+     * @param request AI聊天请求
+     * @return 资源消耗值
+     */
+    private long calculateResourceCost(AiChatRequest request) {
+        if (request == null || request.getMessages() == null) {
+            return 1;
+        }
+
+        long cost = 0;
+
+        // 基于消息数量
+        cost += request.getMessages().size();
+
+        // 基于内容长度
+        for (AiChatRequest.AiMessage message : request.getMessages()) {
+            if (message.getContent() != null) {
+                cost += message.getContent().length() / 100; // 每100字符1个单位
+            }
+        }
+
+        // 基于模型复杂度
+        if (request.getModel() != null) {
+            String model = request.getModel().toLowerCase();
+            if (model.contains("gpt-4") || model.contains("claude-3")) {
+                cost *= 3; // 高级模型消耗更多
+            } else if (model.contains("gpt-3.5")) {
+                cost *= 2;
+            }
+        }
+
+        // 基于参数设置
+        if (request.getMaxTokens() != null && request.getMaxTokens() > 1000) {
+            cost += request.getMaxTokens() / 1000; // 每1000 token增加1个单位
+        }
+
+        return Math.max(1, cost); // 最少1个单位
+    }
+
+    /**
+     * 设置默认安全策略
+     *
+     * @param policy 安全策略
+     */
+    public void setDefaultSecurityPolicy(SecurityPolicy policy) {
+        this.defaultPolicy = policy;
+        log.info("Default security policy updated");
+    }
+
+    /**
+     * 获取默认安全策略
+     *
+     * @return 安全策略
+     */
+    public SecurityPolicy getDefaultSecurityPolicy() {
+        return defaultPolicy;
+    }
+
+    /**
+     * 获取安全统计信息
+     *
+     * @return 统计信息
+     */
+    public Map<String, Object> getSecurityStats() {
+        Map<String, Object> stats = new HashMap<>();
+
+        // 访问控制统计
+        stats.putAll(accessControlService.getAccessControlStats());
+
+        // 内容过滤统计
+        stats.putAll(contentFilterService.getFilterStats());
+
+        // 安全策略信息
+        Map<String, Object> policyInfo = new HashMap<>();
+        policyInfo.put("contentFilterEnabled", defaultPolicy.isEnableContentFilter());
+        policyInfo.put("accessControlEnabled", defaultPolicy.isEnableAccessControl());
+        policyInfo.put("filterStrategy", defaultPolicy.getFilterStrategy().name());
+        policyInfo.put("ipFilteringEnabled", defaultPolicy.isEnableIpFiltering());
+        policyInfo.put("rateLimitEnabled", defaultPolicy.isEnableRateLimit());
+        stats.put("securityPolicy", policyInfo);
+
+        return stats;
+    }
+
+    /**
+     * 清理过期数据
+     */
+    public void cleanup() {
+        accessControlService.cleanupExpiredData();
+        log.debug("Security manager cleanup completed");
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/service/AiChatHistoryService.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/service/AiChatHistoryService.java
new file mode 100644
index 0000000..cb0c5ae
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/service/AiChatHistoryService.java
@@ -0,0 +1,480 @@
+package org.dromara.ai.service;
+
+import lombok.Data;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.ai.domain.AiChatRecord;
+import org.dromara.ai.domain.bo.AiChatRecordBo;
+import org.dromara.ai.domain.dto.AiChatRequest;
+import org.dromara.ai.domain.dto.AiChatResponse;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.redis.utils.RedisUtils;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.time.Duration;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * AI聊天历史服务
+ * 提供聊天历史的存储、检索和管理功能
+ *
+ * @author pengles
+ */
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class AiChatHistoryService {
+
+    private final org.dromara.ai.service.AiChatRecordService aiChatRecordService;
+    private final org.dromara.ai.service.AiUsageStatsService aiUsageStatsService;
+
+    /**
+     * Redis键前缀
+     */
+    private static final String HISTORY_KEY_PREFIX = "ai:chat:history:";
+
+    /**
+     * 会话统计键前缀
+     */
+    private static final String STATS_KEY_PREFIX = "ai:chat:stats:";
+
+    /**
+     * 历史记录默认过期时间（30天）
+     */
+    private static final Duration DEFAULT_EXPIRE_DURATION = Duration.ofDays(30);
+
+    /**
+     * 单次历史记录最大数量
+     */
+    private static final int MAX_HISTORY_SIZE = 1000;
+
+    /**
+     * 保存聊天历史
+     *
+     * @param sessionId 会话ID
+     * @param request   聊天请求
+     * @param response  聊天响应
+     */
+    public void saveHistory(String sessionId, AiChatRequest request, AiChatResponse response) {
+        if (StringUtils.isBlank(sessionId)) {
+            return;
+        }
+
+        try {
+            String historyKey = HISTORY_KEY_PREFIX + sessionId;
+
+            // 获取当前历史记录
+            List<AiChatRequest.AiMessage> history = getHistoryInternal(sessionId);
+            if (history == null) {
+                history = new ArrayList<>();
+            }
+
+            // 添加用户消息（只保存最后一条用户消息，避免重复）
+            if (request.getMessages() != null && !request.getMessages().isEmpty()) {
+                // 获取最后一条用户消息
+                AiChatRequest.AiMessage lastUserMessage = request.getMessages().stream()
+                        .filter(msg -> "user".equals(msg.getRole()))
+                        .reduce((first, second) -> second)
+                        .orElse(null);
+
+                if (lastUserMessage != null) {
+                    history.add(createMessageCopy(lastUserMessage));
+                }
+            }
+
+            // 添加助手响应消息
+            if (response != null && response.getChoices() != null && !response.getChoices().isEmpty()) {
+                AiChatResponse.Choice choice = response.getChoices().get(0);
+                if (choice.getMessage() != null && choice.getMessage().getContent() != null) {
+                    AiChatRequest.AiMessage assistantMsg = createMessageCopy(choice.getMessage());
+                    assistantMsg.setRole("assistant");
+                    history.add(assistantMsg);
+                }
+            }
+
+            // 限制历史记录大小
+            if (history.size() > MAX_HISTORY_SIZE) {
+                history = history.subList(history.size() - MAX_HISTORY_SIZE, history.size());
+            }
+
+            // 保存到Redis
+            RedisUtils.setCacheObject(historyKey, history, DEFAULT_EXPIRE_DURATION);
+
+            // 保存到数据库
+            saveToDatabase(sessionId, request, response);
+
+            // 更新会话统计
+            updateSessionStats(sessionId, request, response);
+
+        } catch (Exception e) {
+            log.error("保存聊天历史失败 - 会话: {}", sessionId, e);
+        }
+    }
+
+    /**
+     * 保存聊天记录到数据库
+     */
+    private void saveToDatabase(String sessionId, AiChatRequest request, AiChatResponse response) {
+        try {
+            List<AiChatRecordBo> recordBoList = new ArrayList<>();
+            Long userId = null;
+            try {
+                if (StringUtils.isNotBlank(request.getUserId())) {
+                    userId = Long.parseLong(request.getUserId());
+                }
+            } catch (NumberFormatException e) {
+                log.warn("用户ID格式错误: {}", request.getUserId());
+            }
+
+            // 保存用户消息
+            if (request.getMessages() != null && !request.getMessages().isEmpty()) {
+                AiChatRequest.AiMessage lastUserMessage = request.getMessages().stream()
+                        .filter(msg -> "user".equals(msg.getRole()))
+                        .reduce((first, second) -> second)
+                        .orElse(null);
+
+                if (lastUserMessage != null && StringUtils.isNotBlank(lastUserMessage.getContent())) {
+                    AiChatRecordBo userRecordBo = new AiChatRecordBo();
+                    userRecordBo.setSessionId(sessionId);
+                    userRecordBo.setUserId(userId);
+                    userRecordBo.setProviderName(response != null ? response.getProvider() : null);
+                    userRecordBo.setModelName(request.getModel());
+                    userRecordBo.setMessageType("USER");
+                    userRecordBo.setContent(lastUserMessage.getContent());
+                    userRecordBo.setIsStream(request.getStream() != null && request.getStream() ? 1 : 0);
+                    recordBoList.add(userRecordBo);
+                }
+            }
+
+            // 保存助手响应消息
+            if (response != null && response.getChoices() != null && !response.getChoices().isEmpty()) {
+                AiChatResponse.Choice choice = response.getChoices().get(0);
+                if (choice.getMessage() != null && StringUtils.isNotBlank(choice.getMessage().getContent())) {
+                    AiChatRecordBo assistantRecordBo = new AiChatRecordBo();
+                    assistantRecordBo.setSessionId(sessionId);
+                    assistantRecordBo.setUserId(userId);
+                    assistantRecordBo.setProviderName(response.getProvider());
+                    assistantRecordBo.setModelName(response.getModel());
+                    assistantRecordBo.setMessageType("ASSISTANT");
+                    assistantRecordBo.setContent(choice.getMessage().getContent());
+                    assistantRecordBo.setIsStream(request.getStream() != null && request.getStream() ? 1 : 0);
+
+                    // 设置Token使用信息
+                    if (response.getUsage() != null) {
+                        assistantRecordBo.setTokensUsed(response.getUsage().getTotalTokens());
+                    }
+
+                    // 设置成本（如果有）
+                    // 注意：成本计算需要在业务层实现，这里可以预留字段
+
+                    // 设置响应时间
+                    if (response.getResponseTime() != null) {
+                        assistantRecordBo.setResponseTime(response.getResponseTime().intValue());
+                    }
+
+                    // 设置错误信息
+                    if (StringUtils.isNotBlank(response.getError())) {
+                        assistantRecordBo.setErrorMessage(response.getError());
+                    }
+
+                    recordBoList.add(assistantRecordBo);
+                }
+            }
+
+            // 批量保存到数据库
+            if (!recordBoList.isEmpty()) {
+                aiChatRecordService.insertBatch(recordBoList);
+            }
+
+            // 记录使用统计（只统计助手响应，避免重复统计）
+            // 无论成功或失败都记录，以便统计错误次数
+            if (response != null) {
+                Long userIdLong = userId;
+                String providerName = response.getProvider();
+                String modelName = response.getModel();
+                Long tokens = response.getUsage() != null ? Long.valueOf(response.getUsage().getTotalTokens() != null ? response.getUsage().getTotalTokens() : 0) : 0L;
+                BigDecimal cost = null; // 成本计算需要在业务层实现
+                Integer responseTime = response.getResponseTime() != null ? response.getResponseTime().intValue() : null;
+                Boolean success = response.getSuccess() != null ? response.getSuccess() : false;
+
+                if (userIdLong != null && StringUtils.isNotBlank(providerName)) {
+                    aiUsageStatsService.recordUsage(userIdLong, providerName, modelName, tokens, cost, responseTime, success);
+                }
+            }
+
+        } catch (Exception e) {
+            log.error("保存聊天记录到数据库失败 - 会话: {}", sessionId, e);
+            // 不抛出异常，避免影响Redis保存
+        }
+    }
+
+    /**
+     * 获取聊天历史（内部方法，不限制数量）
+     */
+    private List<AiChatRequest.AiMessage> getHistoryInternal(String sessionId) {
+        if (StringUtils.isBlank(sessionId)) {
+            return null;
+        }
+
+        try {
+            String historyKey = HISTORY_KEY_PREFIX + sessionId;
+            return RedisUtils.getCacheObject(historyKey);
+        } catch (Exception e) {
+            log.error("获取聊天历史失败 - 会话: {}", sessionId, e);
+            return null;
+        }
+    }
+
+    /**
+     * 获取聊天历史
+     *
+     * @param sessionId 会话ID
+     * @param limit     限制数量
+     * @return 聊天历史列表
+     */
+    public List<AiChatRequest.AiMessage> getHistory(String sessionId, Integer limit) {
+        if (StringUtils.isBlank(sessionId)) {
+            return Collections.emptyList();
+        }
+
+        try {
+            List<AiChatRequest.AiMessage> history = getHistoryInternal(sessionId);
+
+            if (history == null || history.isEmpty()) {
+                return Collections.emptyList();
+            }
+
+            // 限制返回数量
+            if (limit != null && limit > 0 && history.size() > limit) {
+                return new ArrayList<>(history.subList(history.size() - limit, history.size()));
+            }
+
+            return new ArrayList<>(history);
+
+        } catch (Exception e) {
+            log.error("获取聊天历史失败 - 会话: {}", sessionId, e);
+            return Collections.emptyList();
+        }
+    }
+
+    /**
+     * 清除聊天历史
+     *
+     * @param sessionId 会话ID
+     */
+    public void clearHistory(String sessionId) {
+        if (StringUtils.isBlank(sessionId)) {
+            return;
+        }
+
+        try {
+            String historyKey = HISTORY_KEY_PREFIX + sessionId;
+            String statsKey = STATS_KEY_PREFIX + sessionId;
+
+            RedisUtils.deleteObject(historyKey);
+            RedisUtils.deleteObject(statsKey);
+
+            log.info("清除聊天历史成功 - 会话: {}", sessionId);
+
+        } catch (Exception e) {
+            log.error("清除聊天历史失败 - 会话: {}", sessionId, e);
+        }
+    }
+
+    /**
+     * 获取会话统计信息
+     *
+     * @param sessionId 会话ID
+     * @return 统计信息
+     */
+    public SessionStats getSessionStats(String sessionId) {
+        if (StringUtils.isBlank(sessionId)) {
+            return new SessionStats();
+        }
+
+        try {
+            String statsKey = STATS_KEY_PREFIX + sessionId;
+            SessionStats stats = RedisUtils.getCacheObject(statsKey);
+
+            if (stats == null) {
+                // 如果统计不存在，从历史记录计算
+                stats = calculateStatsFromHistory(sessionId);
+            }
+
+            return stats != null ? stats : new SessionStats();
+
+        } catch (Exception e) {
+            log.error("获取会话统计失败 - 会话: {}", sessionId, e);
+            return new SessionStats();
+        }
+    }
+
+    /**
+     * 更新会话统计
+     */
+    private void updateSessionStats(String sessionId, AiChatRequest request, AiChatResponse response) {
+        try {
+            String statsKey = STATS_KEY_PREFIX + sessionId;
+            SessionStats stats = RedisUtils.getCacheObject(statsKey);
+
+            if (stats == null) {
+                stats = new SessionStats();
+                stats.setSessionId(sessionId);
+                stats.setCreatedAt(LocalDateTime.now());
+            }
+
+            stats.setLastUpdatedAt(LocalDateTime.now());
+            stats.setMessageCount(stats.getMessageCount() + 1);
+
+            // 更新token使用统计
+            if (response != null && response.getUsage() != null) {
+                if (response.getUsage().getPromptTokens() != null) {
+                    stats.setTotalPromptTokens(stats.getTotalPromptTokens() + response.getUsage().getPromptTokens());
+                }
+                if (response.getUsage().getCompletionTokens() != null) {
+                    stats.setTotalCompletionTokens(stats.getTotalCompletionTokens() + response.getUsage().getCompletionTokens());
+                }
+                if (response.getUsage().getTotalTokens() != null) {
+                    stats.setTotalTokens(stats.getTotalTokens() + response.getUsage().getTotalTokens());
+                }
+            }
+
+            // 更新响应时间统计
+            if (response != null && response.getResponseTime() != null) {
+                if (stats.getTotalResponseTime() == null) {
+                    stats.setTotalResponseTime(0L);
+                }
+                stats.setTotalResponseTime(stats.getTotalResponseTime() + response.getResponseTime());
+                if (stats.getMaxResponseTime() == null || response.getResponseTime() > stats.getMaxResponseTime()) {
+                    stats.setMaxResponseTime(response.getResponseTime());
+                }
+                if (stats.getMinResponseTime() == null || response.getResponseTime() < stats.getMinResponseTime()) {
+                    stats.setMinResponseTime(response.getResponseTime());
+                }
+            }
+
+            // 保存统计信息
+            RedisUtils.setCacheObject(statsKey, stats, DEFAULT_EXPIRE_DURATION);
+
+        } catch (Exception e) {
+            log.error("更新会话统计失败 - 会话: {}", sessionId, e);
+        }
+    }
+
+    /**
+     * 从历史记录计算统计信息
+     */
+    private SessionStats calculateStatsFromHistory(String sessionId) {
+        List<AiChatRequest.AiMessage> history = getHistoryInternal(sessionId);
+        if (history == null || history.isEmpty()) {
+            return new SessionStats();
+        }
+
+        SessionStats stats = new SessionStats();
+        stats.setSessionId(sessionId);
+        stats.setMessageCount(history.size());
+
+        // 计算用户和助手消息数量
+        long userCount = history.stream().filter(msg -> "user".equals(msg.getRole())).count();
+        long assistantCount = history.stream().filter(msg -> "assistant".equals(msg.getRole())).count();
+        stats.setUserMessageCount((int) userCount);
+        stats.setAssistantMessageCount((int) assistantCount);
+
+        return stats;
+    }
+
+    /**
+     * 创建消息副本
+     */
+    private AiChatRequest.AiMessage createMessageCopy(AiChatRequest.AiMessage original) {
+        AiChatRequest.AiMessage copy = new AiChatRequest.AiMessage();
+        copy.setRole(original.getRole());
+        copy.setContent(original.getContent());
+        copy.setName(original.getName());
+        // 注意：不复制functionCall和toolCalls，因为它们可能包含复杂对象
+        return copy;
+    }
+
+    /**
+     * 会话统计信息
+     */
+    @Data
+    public static class SessionStats {
+        /**
+         * 会话ID
+         */
+        private String sessionId;
+
+        /**
+         * 消息总数
+         */
+        private Integer messageCount = 0;
+
+        /**
+         * 用户消息数量
+         */
+        private Integer userMessageCount = 0;
+
+        /**
+         * 助手消息数量
+         */
+        private Integer assistantMessageCount = 0;
+
+        /**
+         * 总prompt tokens
+         */
+        private Integer totalPromptTokens = 0;
+
+        /**
+         * 总completion tokens
+         */
+        private Integer totalCompletionTokens = 0;
+
+        /**
+         * 总tokens
+         */
+        private Integer totalTokens = 0;
+
+        /**
+         * 总响应时间（毫秒）
+         */
+        private Long totalResponseTime = 0L;
+
+        /**
+         * 最大响应时间（毫秒）
+         */
+        private Long maxResponseTime = null;
+
+        /**
+         * 最小响应时间（毫秒）
+         */
+        private Long minResponseTime = null;
+
+        /**
+         * 平均响应时间（毫秒）
+         */
+        public Double getAvgResponseTime() {
+            if (messageCount == null || messageCount == 0 || totalResponseTime == null) {
+                return 0.0;
+            }
+            return (double) totalResponseTime / messageCount;
+        }
+
+        /**
+         * 创建时间
+         */
+        private LocalDateTime createdAt;
+
+        /**
+         * 最后更新时间
+         */
+        private LocalDateTime lastUpdatedAt;
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/service/AiChatRecordService.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/service/AiChatRecordService.java
new file mode 100644
index 0000000..43b80ef
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/service/AiChatRecordService.java
@@ -0,0 +1,56 @@
+package org.dromara.ai.service;
+
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.ai.domain.bo.AiChatRecordBo;
+import org.dromara.ai.domain.vo.AiChatRecordVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * AI聊天记录Service接口
+ *
+ * @author pengles
+ */
+public interface AiChatRecordService {
+
+    /**
+     * 查询AI聊天记录
+     */
+    AiChatRecordVo queryById(Long id);
+
+    /**
+     * 查询AI聊天记录列表
+     */
+    TableDataInfo<AiChatRecordVo> queryPageList(AiChatRecordBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询AI聊天记录列表
+     */
+    List<AiChatRecordVo> queryList(AiChatRecordBo bo);
+
+    /**
+     * 新增AI聊天记录
+     */
+    Boolean insertByBo(AiChatRecordBo bo);
+
+    /**
+     * 批量新增AI聊天记录
+     */
+    Boolean insertBatch(List<AiChatRecordBo> boList);
+
+    /**
+     * 校验并批量删除AI聊天记录信息
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    /**
+     * 归档聊天记录（删除指定日期之前的记录）
+     *
+     * @param beforeDate 归档日期（删除此日期之前的记录）
+     * @return 删除的记录数
+     */
+    Integer archiveChatRecords(java.util.Date beforeDate);
+
+}
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/service/AiChatService.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/service/AiChatService.java
new file mode 100644
index 0000000..131964c
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/service/AiChatService.java
@@ -0,0 +1,375 @@
+package org.dromara.ai.service;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.ai.domain.dto.AiChatRequest;
+import org.dromara.ai.domain.dto.AiChatResponse;
+import org.dromara.ai.provider.AiProvider;
+import org.dromara.ai.provider.AiProviderManager;
+import org.dromara.knowledge.domain.vo.KnowledgeSearchResultVo;
+import org.dromara.knowledge.service.KnowledgeVectorService;
+import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import java.util.stream.Collectors;
+
+/**
+ * AI聊天服务
+ * 提供统一的AI聊天接口，支持同步、异步和流式对话模式
+ *
+ * @author pengles
+ */
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class AiChatService {
+
+    private final AiProviderManager providerManager;
+    private final KnowledgeVectorService knowledgeVectorService;
+    private final org.dromara.ai.mcp.McpIntegrationService mcpIntegrationService;
+    private final AiChatHistoryService chatHistoryService;
+
+    /**
+     * 同步聊天对话
+     *
+     * @param request 聊天请求
+     * @return 聊天响应
+     */
+    public AiChatResponse chat(AiChatRequest request) {
+        log.info("开始AI聊天对话 - 用户: {}, 模型: {}", request.getUserId(), request.getModel());
+
+        try {
+            // 预处理请求
+            preprocessRequest(request);
+            mcpIntegrationService.enrichMessages(request);
+
+            // 知识库增强
+            if (Boolean.TRUE.equals(request.getEnableKnowledge()) && StringUtils.hasText(request.getKnowledgeId())) {
+                enhanceWithKnowledge(request);
+            }
+
+            // 执行聊天
+            AiChatResponse response = providerManager.chat(request);
+
+            // 后处理响应
+            postprocessResponse(response, request);
+
+            // 保存聊天历史
+            if (StringUtils.hasText(request.getSessionId())) {
+                chatHistoryService.saveHistory(request.getSessionId(), request, response);
+            }
+
+            log.info("AI聊天对话完成 - 用户: {}, 响应时间: {}ms",
+                    request.getUserId(), response.getResponseTime());
+
+            return response;
+
+        } catch (Exception e) {
+            log.error("AI聊天对话失败 - 用户: {}", request.getUserId(), e);
+            return createErrorResponse(e, request);
+        }
+    }
+
+    /**
+     * 异步聊天对话
+     *
+     * @param request 聊天请求
+     * @return 异步聊天响应
+     */
+    public CompletableFuture<AiChatResponse> chatAsync(AiChatRequest request) {
+        log.info("开始异步AI聊天对话 - 用户: {}, 模型: {}", request.getUserId(), request.getModel());
+
+        return CompletableFuture.supplyAsync(() -> {
+            try {
+                // 预处理请求
+                preprocessRequest(request);
+                mcpIntegrationService.enrichMessages(request);
+
+                // 知识库增强
+                if (Boolean.TRUE.equals(request.getEnableKnowledge()) && StringUtils.hasText(request.getKnowledgeId())) {
+                    enhanceWithKnowledge(request);
+                }
+
+                return request;
+
+            } catch (Exception e) {
+                log.error("异步AI聊天预处理失败 - 用户: {}", request.getUserId(), e);
+                throw new RuntimeException(e);
+            }
+        }).thenCompose(preprocessedRequest -> {
+            return providerManager.chatAsync(preprocessedRequest)
+                    .thenApply(response -> {
+                        // 后处理响应
+                        postprocessResponse(response, preprocessedRequest);
+
+                        // 保存聊天历史
+                        if (org.springframework.util.StringUtils.hasText(preprocessedRequest.getSessionId())) {
+                            chatHistoryService.saveHistory(preprocessedRequest.getSessionId(), preprocessedRequest, response);
+                        }
+
+                        log.info("异步AI聊天对话完成 - 用户: {}, 响应时间: {}ms",
+                                preprocessedRequest.getUserId(), response.getResponseTime());
+
+                        return response;
+                    });
+        }).exceptionally(throwable -> {
+            log.error("异步AI聊天对话失败 - 用户: {}", request.getUserId(), throwable);
+            return createErrorResponse(throwable, request);
+        });
+    }
+
+    /**
+     * 流式聊天对话
+     *
+     * @param request  聊天请求
+     * @param callback 流式回调
+     */
+    public void chatStream(AiChatRequest request, StreamCallback callback) {
+        log.info("开始流式AI聊天对话 - 用户: {}, 模型: {}", request.getUserId(), request.getModel());
+
+        try {
+            // 预处理请求
+            preprocessRequest(request);
+            mcpIntegrationService.enrichMessages(request);
+
+            // 知识库增强
+            if (Boolean.TRUE.equals(request.getEnableKnowledge()) && StringUtils.hasText(request.getKnowledgeId())) {
+                enhanceWithKnowledge(request);
+            }
+
+            // 执行流式聊天
+            providerManager.chatStream(request, new AiProvider.StreamCallback() {
+                @Override
+                public void onChunk(String chunk) {
+                    callback.onChunk(chunk);
+                }
+
+                @Override
+                public void onComplete(AiChatResponse response) {
+                    // 后处理响应
+                    postprocessResponse(response, request);
+
+                    // 保存聊天历史
+                    if (StringUtils.hasText(request.getSessionId())) {
+                        chatHistoryService.saveHistory(request.getSessionId(), request, response);
+                    }
+
+                    log.info("流式AI聊天对话完成 - 用户: {}, 响应时间: {}ms",
+                            request.getUserId(), response.getResponseTime());
+
+                    callback.onComplete(response);
+                }
+
+                @Override
+                public void onError(Throwable error) {
+                    log.error("流式AI聊天对话失败 - 用户: {}", request.getUserId(), error);
+                    callback.onError(error);
+                }
+            });
+
+        } catch (Exception e) {
+            log.error("流式AI聊天对话启动失败 - 用户: {}", request.getUserId(), e);
+            callback.onError(e);
+        }
+    }
+
+    /**
+     * 批量聊天对话
+     *
+     * @param requests 聊天请求列表
+     * @return 聊天响应列表
+     */
+    public List<CompletableFuture<AiChatResponse>> chatBatch(List<AiChatRequest> requests) {
+        log.info("开始批量AI聊天对话 - 请求数量: {}", requests.size());
+
+        return requests.stream()
+                .map(this::chatAsync)
+                .collect(Collectors.toList());
+    }
+
+    /**
+     * 等待所有批量聊天完成
+     *
+     * @param futures 异步响应列表
+     * @return 聊天响应列表
+     */
+    public List<AiChatResponse> waitForBatchCompletion(List<CompletableFuture<AiChatResponse>> futures) {
+        CompletableFuture<Void> allOf = CompletableFuture.allOf(
+                futures.toArray(new CompletableFuture[0])
+        );
+
+        return allOf.thenApply(v ->
+                futures.stream()
+                        .map(CompletableFuture::join)
+                        .collect(Collectors.toList())
+        ).join();
+    }
+
+    /**
+     * 预处理请求
+     *
+     * @param request 聊天请求
+     */
+    private void preprocessRequest(AiChatRequest request) {
+        // 设置默认值
+        if (request.getTemperature() == null) {
+            request.setTemperature(0.7);
+        }
+        if (request.getMaxTokens() == null) {
+            request.setMaxTokens(2000);
+        }
+        if (request.getStream() == null) {
+            request.setStream(false);
+        }
+
+        // 验证请求参数
+        validateRequest(request);
+
+        // 记录请求日志
+        log.debug("预处理AI聊天请求 - 用户: {}, 消息数: {}",
+                request.getUserId(), request.getMessages() != null ? request.getMessages().size() : 0);
+    }
+
+    /**
+     * 验证请求参数
+     *
+     * @param request 聊天请求
+     */
+    private void validateRequest(AiChatRequest request) {
+        if (request.getMessages() == null || request.getMessages().isEmpty()) {
+            throw new IllegalArgumentException("消息列表不能为空");
+        }
+
+        if (request.getTemperature() != null && (request.getTemperature() < 0 || request.getTemperature() > 2)) {
+            throw new IllegalArgumentException("温度参数必须在0-2之间");
+        }
+
+        if (request.getTopP() != null && (request.getTopP() < 0 || request.getTopP() > 1)) {
+            throw new IllegalArgumentException("Top-p参数必须在0-1之间");
+        }
+
+        if (request.getMaxTokens() != null && request.getMaxTokens() <= 0) {
+            throw new IllegalArgumentException("最大token数必须大于0");
+        }
+    }
+
+    /**
+     * 知识库增强
+     *
+     * @param request 聊天请求
+     */
+    private void enhanceWithKnowledge(AiChatRequest request) {
+        try {
+            // 获取最后一条用户消息
+            String userMessage = request.getMessages().stream()
+                    .filter(msg -> "user".equals(msg.getRole()))
+                    .reduce((first, second) -> second)
+                    .map(AiChatRequest.AiMessage::getContent)
+                    .orElse("");
+
+            if (StringUtils.hasText(userMessage)) {
+                // 执行知识库检索
+                List<KnowledgeSearchResultVo> searchResults = knowledgeVectorService.vectorSimilaritySearch(
+                        request.getKnowledgeId(),
+                        userMessage,
+                        request.getModel(),
+                        request.getKnowledgeLimit() != null ? request.getKnowledgeLimit() : 5,
+                        request.getKnowledgeThreshold() != null ? request.getKnowledgeThreshold() : 0.7
+                );
+
+                if (!searchResults.isEmpty()) {
+                    // 构建知识库上下文
+                    StringBuilder contextBuilder = new StringBuilder();
+                    contextBuilder.append("以下是相关的知识库信息，请参考这些信息回答用户问题：\n\n");
+
+                    for (int i = 0; i < searchResults.size(); i++) {
+                        KnowledgeSearchResultVo result = searchResults.get(i);
+                        contextBuilder.append(String.format("[知识%d] %s\n", i + 1, result.getContent()));
+                    }
+
+                    contextBuilder.append("\n请基于以上知识库信息回答用户问题。如果知识库中没有相关信息，请明确说明。\n\n");
+
+                    // 在消息列表开头添加系统消息
+                    AiChatRequest.AiMessage systemMessage = new AiChatRequest.AiMessage()
+                            .setRole("system")
+                            .setContent(contextBuilder.toString());
+
+                    List<AiChatRequest.AiMessage> enhancedMessages = new ArrayList<>();
+                    enhancedMessages.add(systemMessage);
+                    enhancedMessages.addAll(request.getMessages());
+
+                    request.setMessages(enhancedMessages);
+
+                    log.debug("知识库增强完成 - 检索到{}条相关信息", searchResults.size());
+                }
+            }
+
+        } catch (Exception e) {
+            log.warn("知识库增强失败，继续使用原始请求", e);
+        }
+    }
+
+    /**
+     * 后处理响应
+     *
+     * @param response 聊天响应
+     * @param request  原始请求
+     */
+    private void postprocessResponse(AiChatResponse response, AiChatRequest request) {
+        // 设置用户信息
+        if (response.getExtra() == null) {
+            response.setExtra(new java.util.HashMap<>());
+        }
+        response.getExtra().put("userId", request.getUserId());
+        response.getExtra().put("sessionId", request.getSessionId());
+
+        // 记录响应日志
+        log.debug("后处理AI聊天响应 - 用户: {}, 成功: {}",
+                request.getUserId(), response.getSuccess());
+    }
+
+    /**
+     * 创建错误响应
+     *
+     * @param error   错误信息
+     * @param request 原始请求
+     * @return 错误响应
+     */
+    private AiChatResponse createErrorResponse(Throwable error, AiChatRequest request) {
+        return new AiChatResponse()
+                .setSuccess(false)
+                .setError(error.getMessage())
+                .setErrorCode("CHAT_ERROR")
+                .setModel(request.getModel())
+                .setCreateTime(java.time.LocalDateTime.now());
+    }
+
+    /**
+     * 流式回调接口
+     */
+    public interface StreamCallback {
+        /**
+         * 接收流式数据
+         *
+         * @param chunk 数据块
+         */
+        void onChunk(String chunk);
+
+        /**
+         * 流式完成
+         *
+         * @param response 完整响应
+         */
+        void onComplete(AiChatResponse response);
+
+        /**
+         * 流式错误
+         *
+         * @param error 错误信息
+         */
+        void onError(Throwable error);
+    }
+}
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/service/AiCodingAssistantService.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/service/AiCodingAssistantService.java
new file mode 100644
index 0000000..63e4879
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/service/AiCodingAssistantService.java
@@ -0,0 +1,140 @@
+package org.dromara.ai.service;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.ai.domain.dto.AiChatRequest;
+import org.dromara.ai.domain.dto.AiChatResponse;
+import org.dromara.common.json.utils.JsonUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * AI代码助手服务
+ * 提供代码分析、重构建议和项目脚手架生成功能
+ *
+ * @author pengles
+ */
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class AiCodingAssistantService {
+
+    private final AiChatService aiChatService;
+
+    /**
+     * 代码分析
+     * 提供代码审查、复杂度评估、潜在缺陷分析和重构建议
+     *
+     * @param code   代码内容
+     * @param model  模型名称
+     * @param params 额外参数（如语言类型、分析深度等）
+     * @param userId 用户ID
+     * @return 分析结果
+     */
+    public AiChatResponse analyzeCode(String code, String model, Map<String, Object> params, String userId) {
+        log.info("开始代码分析 - 用户: {}, 代码长度: {}", userId, code != null ? code.length() : 0);
+
+        List<AiChatRequest.AiMessage> messages = new ArrayList<>();
+
+        // 构建系统提示词
+        StringBuilder systemPrompt = new StringBuilder();
+        systemPrompt.append("你是一位经验丰富的软件工程师和代码审查专家。请对提供的代码进行全面分析，包括：\n");
+        systemPrompt.append("1. 代码质量和可读性评估\n");
+        systemPrompt.append("2. 潜在缺陷和安全隐患识别\n");
+        systemPrompt.append("3. 性能优化建议\n");
+        systemPrompt.append("4. 代码复杂度分析\n");
+        systemPrompt.append("5. 最佳实践建议\n");
+        systemPrompt.append("6. 具体的重构建议和示例代码\n\n");
+        systemPrompt.append("请以结构化的方式输出分析结果，包括问题点、严重程度、建议改进方案等。");
+
+        messages.add(new AiChatRequest.AiMessage()
+                .setRole("system")
+                .setContent(systemPrompt.toString()));
+
+        // 构建用户消息
+        StringBuilder userMessage = new StringBuilder();
+        if (params != null && params.containsKey("language")) {
+            userMessage.append("编程语言: ").append(params.get("language")).append("\n\n");
+        }
+        userMessage.append("请分析以下代码：\n\n");
+        userMessage.append("```\n");
+        userMessage.append(code);
+        userMessage.append("\n```");
+
+        messages.add(new AiChatRequest.AiMessage()
+                .setRole("user")
+                .setContent(userMessage.toString()));
+
+        AiChatRequest req = new AiChatRequest()
+                .setModel(model != null && !model.isBlank() ? model : "gpt-4")
+                .setMessages(messages)
+                .setUserId(userId)
+                .setTemperature(0.3) // 降低温度以获得更稳定的分析结果
+                .setExtra(params != null ? params : new HashMap<>());
+
+        return aiChatService.chat(req);
+    }
+
+    /**
+     * 生成项目脚手架
+     * 根据应用类型和选项生成项目结构和配置
+     *
+     * @param appType 应用类型（如 SpringBoot、Vue、React 等）
+     * @param options 选项（如数据库类型、构建工具等）
+     * @param model   模型名称
+     * @param userId  用户ID
+     * @return 脚手架生成结果
+     */
+    public AiChatResponse generateScaffold(String appType, Map<String, Object> options, String model, String userId) {
+        log.info("开始生成项目脚手架 - 用户: {}, 类型: {}", userId, appType);
+
+        List<AiChatRequest.AiMessage> messages = new ArrayList<>();
+
+        // 构建系统提示词
+        StringBuilder systemPrompt = new StringBuilder();
+        systemPrompt.append("你是一位经验丰富的全栈架构师。请根据用户需求生成详细的项目脚手架方案，包括：\n");
+        systemPrompt.append("1. 完整的项目目录结构（文件树形式）\n");
+        systemPrompt.append("2. 关键配置文件的完整内容（如 pom.xml、package.json、application.yml 等）\n");
+        systemPrompt.append("3. 依赖列表（包括版本号）\n");
+        systemPrompt.append("4. 初始化命令和脚本\n");
+        systemPrompt.append("5. README.md 文件内容\n");
+        systemPrompt.append("6. 项目架构说明\n\n");
+        systemPrompt.append("请以结构化的方式输出，确保所有配置和代码都是可执行的。");
+
+        messages.add(new AiChatRequest.AiMessage()
+                .setRole("system")
+                .setContent(systemPrompt.toString()));
+
+        // 构建用户消息
+        StringBuilder userMessage = new StringBuilder();
+        userMessage.append("请为以下需求生成项目脚手架：\n\n");
+        userMessage.append("应用类型: ").append(appType).append("\n");
+
+        if (options != null && !options.isEmpty()) {
+            userMessage.append("选项配置:\n");
+            try {
+                userMessage.append(JsonUtils.toJsonString(options));
+            } catch (Exception e) {
+                options.forEach((key, value) -> userMessage.append("  - ").append(key).append(": ").append(value).append("\n"));
+            }
+        }
+
+        messages.add(new AiChatRequest.AiMessage()
+                .setRole("user")
+                .setContent(userMessage.toString()));
+
+        AiChatRequest req = new AiChatRequest()
+                .setModel(model != null && !model.isBlank() ? model : "gpt-4")
+                .setMessages(messages)
+                .setUserId(userId)
+                .setTemperature(0.7)
+                .setMaxTokens(4000) // 脚手架内容较长，增加token限制
+                .setExtra(options != null ? options : new HashMap<>());
+
+        return aiChatService.chat(req);
+    }
+}
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/service/AiModelService.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/service/AiModelService.java
new file mode 100644
index 0000000..fed9f0f
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/service/AiModelService.java
@@ -0,0 +1,440 @@
+package org.dromara.ai.service;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.ai.domain.dto.AiModelInfo;
+import org.dromara.ai.provider.AiProvider;
+import org.dromara.ai.provider.AiProviderManager;
+import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.stream.Collectors;
+
+/**
+ * AI模型管理服务
+ * 提供AI模型的注册、配置、监控和管理功能
+ *
+ * @author pengles
+ */
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class AiModelService {
+
+    private final AiProviderManager providerManager;
+
+    /**
+     * 模型配置缓存
+     */
+    private final Map<String, AiModelInfo> modelConfigCache = new ConcurrentHashMap<>();
+
+    /**
+     * 模型使用统计
+     */
+    private final Map<String, ModelUsageStats> modelUsageStats = new ConcurrentHashMap<>();
+
+    /**
+     * 获取所有可用模型
+     *
+     * @return 模型列表
+     */
+    public List<AiModelInfo> getAllModels() {
+        log.debug("获取所有可用模型");
+
+        List<AiModelInfo> allModels = new ArrayList<>();
+
+        // 从所有Provider获取模型
+        List<AiProvider> providers = providerManager.getAllProviders();
+        for (AiProvider provider : providers) {
+            try {
+                List<AiModelInfo> supportedModels = provider.getSupportedModels();
+                for (AiModelInfo modelInfo : supportedModels) {
+                    if (modelInfo != null) {
+                        // 添加使用统计信息
+                        enrichModelWithStats(modelInfo);
+                        allModels.add(modelInfo);
+                    }
+                }
+            } catch (Exception e) {
+                log.warn("获取Provider模型失败: {}", provider.getProviderName(), e);
+            }
+        }
+
+        // 添加缓存中的自定义模型配置
+        allModels.addAll(modelConfigCache.values());
+
+        log.info("获取到{}个可用模型", allModels.size());
+        return allModels;
+    }
+
+    /**
+     * 根据Provider类型获取模型
+     *
+     * @param providerType Provider类型
+     * @return 模型列表
+     */
+    public List<AiModelInfo> getModelsByProvider(String providerType) {
+        log.debug("获取Provider模型: {}", providerType);
+
+        List<AiProvider> providers = providerManager.getAvailableProviders();
+        List<AiModelInfo> models = new ArrayList<>();
+
+        for (AiProvider provider : providers) {
+            try {
+                List<AiModelInfo> supportedModels = provider.getSupportedModels();
+                for (AiModelInfo modelInfo : supportedModels) {
+                    if (modelInfo != null) {
+                        enrichModelWithStats(modelInfo);
+                        models.add(modelInfo);
+                    }
+                }
+            } catch (Exception e) {
+                log.warn("获取Provider模型失败: {}", provider.getProviderName(), e);
+            }
+        }
+
+        return models;
+    }
+
+    /**
+     * 根据模型ID获取模型信息
+     *
+     * @param modelId 模型ID
+     * @return 模型信息
+     */
+    public AiModelInfo getModelById(String modelId) {
+        log.debug("获取模型信息: {}", modelId);
+
+        // 先从缓存查找
+        AiModelInfo cachedModel = modelConfigCache.get(modelId);
+        if (cachedModel != null) {
+            enrichModelWithStats(cachedModel);
+            return cachedModel;
+        }
+
+        // 从Provider查找
+        AiProvider provider = providerManager.getProviderByModel(modelId);
+        if (provider != null) {
+            try {
+                AiModelInfo modelInfo = provider.getModelInfo(modelId);
+                if (modelInfo != null) {
+                    enrichModelWithStats(modelInfo);
+                    return modelInfo;
+                }
+            } catch (Exception e) {
+                log.warn("从Provider获取模型信息失败: {}", modelId, e);
+            }
+        }
+
+        log.warn("未找到模型: {}", modelId);
+        return null;
+    }
+
+    /**
+     * 检查模型是否可用
+     *
+     * @param modelId 模型ID
+     * @return 是否可用
+     */
+    public boolean isModelAvailable(String modelId) {
+        log.debug("检查模型可用性: {}", modelId);
+
+        AiProvider provider = providerManager.getProviderByModel(modelId);
+        if (provider != null) {
+            try {
+                return provider.isModelSupported(modelId) && provider.isAvailable();
+            } catch (Exception e) {
+                log.warn("检查模型可用性失败: {}", modelId, e);
+                return false;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * 注册自定义模型配置
+     *
+     * @param modelInfo 模型信息
+     * @return 是否成功
+     */
+    public boolean registerModel(AiModelInfo modelInfo) {
+        log.info("注册自定义模型: {}", modelInfo.getId());
+
+        try {
+            // 验证模型信息
+            validateModelInfo(modelInfo);
+
+            // 设置注册时间
+            modelInfo.setCreated(LocalDateTime.now());
+            modelInfo.setUpdated(LocalDateTime.now());
+
+            // 缓存模型配置
+            modelConfigCache.put(modelInfo.getId(), modelInfo);
+
+            log.info("模型注册成功: {}", modelInfo.getId());
+            return true;
+
+        } catch (Exception e) {
+            log.error("模型注册失败: {}", modelInfo.getId(), e);
+            return false;
+        }
+    }
+
+    /**
+     * 更新模型配置
+     *
+     * @param modelInfo 模型信息
+     * @return 是否成功
+     */
+    public boolean updateModel(AiModelInfo modelInfo) {
+        log.info("更新模型配置: {}", modelInfo.getId());
+
+        try {
+            // 验证模型信息
+            validateModelInfo(modelInfo);
+
+            // 检查模型是否存在
+            if (!modelConfigCache.containsKey(modelInfo.getId())) {
+                log.warn("模型不存在，无法更新: {}", modelInfo.getId());
+                return false;
+            }
+
+            // 设置更新时间
+            modelInfo.setUpdated(LocalDateTime.now());
+
+            // 更新缓存
+            modelConfigCache.put(modelInfo.getId(), modelInfo);
+
+            log.info("模型配置更新成功: {}", modelInfo.getId());
+            return true;
+
+        } catch (Exception e) {
+            log.error("模型配置更新失败: {}", modelInfo.getId(), e);
+            return false;
+        }
+    }
+
+    /**
+     * 删除模型配置
+     *
+     * @param modelId 模型ID
+     * @return 是否成功
+     */
+    public boolean deleteModel(String modelId) {
+        log.info("删除模型配置: {}", modelId);
+
+        try {
+            AiModelInfo removed = modelConfigCache.remove(modelId);
+            if (removed != null) {
+                // 清理使用统计
+                modelUsageStats.remove(modelId);
+                log.info("模型配置删除成功: {}", modelId);
+                return true;
+            } else {
+                log.warn("模型不存在，无法删除: {}", modelId);
+                return false;
+            }
+        } catch (Exception e) {
+            log.error("模型配置删除失败: {}", modelId, e);
+            return false;
+        }
+    }
+
+    /**
+     * 获取模型使用统计
+     *
+     * @param modelId 模型ID
+     * @return 使用统计
+     */
+    public ModelUsageStats getModelUsageStats(String modelId) {
+        return modelUsageStats.getOrDefault(modelId, new ModelUsageStats());
+    }
+
+    /**
+     * 获取所有模型使用统计
+     *
+     * @return 使用统计映射
+     */
+    public Map<String, ModelUsageStats> getAllModelUsageStats() {
+        return new HashMap<>(modelUsageStats);
+    }
+
+    /**
+     * 记录模型使用
+     *
+     * @param modelId      模型ID
+     * @param inputTokens  输入token数
+     * @param outputTokens 输出token数
+     * @param responseTime 响应时间(毫秒)
+     * @param success      是否成功
+     */
+    public void recordModelUsage(String modelId, int inputTokens, int outputTokens,
+                                 long responseTime, boolean success) {
+        ModelUsageStats stats = modelUsageStats.computeIfAbsent(modelId, k -> new ModelUsageStats());
+        stats.recordUsage(inputTokens, outputTokens, responseTime, success);
+
+        log.debug("记录模型使用: {} - 输入:{}, 输出:{}, 响应时间:{}ms, 成功:{}",
+                modelId, inputTokens, outputTokens, responseTime, success);
+    }
+
+    /**
+     * 重置模型使用统计
+     *
+     * @param modelId 模型ID
+     */
+    public void resetModelUsageStats(String modelId) {
+        modelUsageStats.remove(modelId);
+        log.info("重置模型使用统计: {}", modelId);
+    }
+
+    /**
+     * 重置所有模型使用统计
+     */
+    public void resetAllModelUsageStats() {
+        modelUsageStats.clear();
+        log.info("重置所有模型使用统计");
+    }
+
+    /**
+     * 获取热门模型排行
+     *
+     * @param limit 限制数量
+     * @return 热门模型列表
+     */
+    public List<String> getPopularModels(int limit) {
+        return modelUsageStats.entrySet().stream()
+                .sorted((e1, e2) -> Long.compare(e2.getValue().getTotalRequests(), e1.getValue().getTotalRequests()))
+                .limit(limit)
+                .map(Map.Entry::getKey)
+                .collect(Collectors.toList());
+    }
+
+    /**
+     * 获取模型性能排行
+     *
+     * @param limit 限制数量
+     * @return 性能排行列表
+     */
+    public List<String> getPerformantModels(int limit) {
+        return modelUsageStats.entrySet().stream()
+                .filter(e -> e.getValue().getTotalRequests() > 0)
+                .sorted((e1, e2) -> Double.compare(e1.getValue().getAverageResponseTime(), e2.getValue().getAverageResponseTime()))
+                .limit(limit)
+                .map(Map.Entry::getKey)
+                .collect(Collectors.toList());
+    }
+
+    /**
+     * 验证模型信息
+     *
+     * @param modelInfo 模型信息
+     */
+    private void validateModelInfo(AiModelInfo modelInfo) {
+        if (modelInfo == null) {
+            throw new IllegalArgumentException("模型信息不能为空");
+        }
+
+        if (!StringUtils.hasText(modelInfo.getId())) {
+            throw new IllegalArgumentException("模型ID不能为空");
+        }
+
+        if (!StringUtils.hasText(modelInfo.getName())) {
+            throw new IllegalArgumentException("模型名称不能为空");
+        }
+
+        if (modelInfo.getProvider() == null) {
+            throw new IllegalArgumentException("模型Provider不能为空");
+        }
+    }
+
+    /**
+     * 为模型添加统计信息
+     *
+     * @param modelInfo 模型信息
+     */
+    private void enrichModelWithStats(AiModelInfo modelInfo) {
+        ModelUsageStats stats = getModelUsageStats(modelInfo.getId());
+
+        if (modelInfo.getExtra() == null) {
+            modelInfo.setExtra(new HashMap<>());
+        }
+
+        modelInfo.getExtra().put("totalRequests", stats.getTotalRequests());
+        modelInfo.getExtra().put("successRate", stats.getSuccessRate());
+        modelInfo.getExtra().put("averageResponseTime", stats.getAverageResponseTime());
+        modelInfo.getExtra().put("totalTokens", stats.getTotalInputTokens() + stats.getTotalOutputTokens());
+    }
+
+    /**
+     * 模型使用统计类
+     */
+    public static class ModelUsageStats {
+        private long totalRequests = 0;
+        private long successfulRequests = 0;
+        private long totalInputTokens = 0;
+        private long totalOutputTokens = 0;
+        private long totalResponseTime = 0;
+        private LocalDateTime firstUsed;
+        private LocalDateTime lastUsed;
+
+        public synchronized void recordUsage(int inputTokens, int outputTokens, long responseTime, boolean success) {
+            totalRequests++;
+            if (success) {
+                successfulRequests++;
+            }
+            totalInputTokens += inputTokens;
+            totalOutputTokens += outputTokens;
+            totalResponseTime += responseTime;
+
+            LocalDateTime now = LocalDateTime.now();
+            if (firstUsed == null) {
+                firstUsed = now;
+            }
+            lastUsed = now;
+        }
+
+        public double getSuccessRate() {
+            return totalRequests > 0 ? (double) successfulRequests / totalRequests : 0.0;
+        }
+
+        public double getAverageResponseTime() {
+            return totalRequests > 0 ? (double) totalResponseTime / totalRequests : 0.0;
+        }
+
+        // Getters
+        public long getTotalRequests() {
+            return totalRequests;
+        }
+
+        public long getSuccessfulRequests() {
+            return successfulRequests;
+        }
+
+        public long getTotalInputTokens() {
+            return totalInputTokens;
+        }
+
+        public long getTotalOutputTokens() {
+            return totalOutputTokens;
+        }
+
+        public long getTotalResponseTime() {
+            return totalResponseTime;
+        }
+
+        public LocalDateTime getFirstUsed() {
+            return firstUsed;
+        }
+
+        public LocalDateTime getLastUsed() {
+            return lastUsed;
+        }
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/service/AiPaintingFavoriteService.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/service/AiPaintingFavoriteService.java
new file mode 100644
index 0000000..9c79c46
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/service/AiPaintingFavoriteService.java
@@ -0,0 +1,94 @@
+package org.dromara.ai.service;
+
+import org.dromara.ai.domain.bo.AiPaintingFavoriteBo;
+import org.dromara.ai.domain.vo.AiPaintingFavoriteVo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * AI绘画作品收藏Service接口
+ *
+ * @author pengles
+ */
+public interface AiPaintingFavoriteService {
+
+    /**
+     * 查询AI绘画作品收藏
+     *
+     * @param id 主键
+     * @return 结果
+     */
+    AiPaintingFavoriteVo queryById(Long id);
+
+    /**
+     * 查询AI绘画作品收藏列表
+     *
+     * @param bo         查询条件
+     * @param pageQuery  分页查询条件
+     * @return 分页结果
+     */
+    TableDataInfo<AiPaintingFavoriteVo> queryPageList(AiPaintingFavoriteBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询AI绘画作品收藏列表
+     *
+     * @param bo 查询条件
+     * @return 列表
+     */
+    List<AiPaintingFavoriteVo> queryList(AiPaintingFavoriteBo bo);
+
+    /**
+     * 新增AI绘画作品收藏
+     *
+     * @param bo AI绘画作品收藏
+     * @return 是否成功
+     */
+    Boolean insertByBo(AiPaintingFavoriteBo bo);
+
+    /**
+     * 修改AI绘画作品收藏
+     *
+     * @param bo AI绘画作品收藏
+     * @return 是否成功
+     */
+    Boolean updateByBo(AiPaintingFavoriteBo bo);
+
+    /**
+     * 批量删除AI绘画作品收藏
+     *
+     * @param ids     需要删除的ID集合
+     * @param isValid 是否校验,true-删除前校验,false-不校验
+     * @return 是否成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    /**
+     * 检查用户是否已收藏该绘画作品
+     *
+     * @param userId 用户ID
+     * @param paintingRecordId 绘画记录ID
+     * @return 是否已收藏
+     */
+    Boolean isFavorited(Long userId, Long paintingRecordId);
+
+    /**
+     * 取消收藏
+     *
+     * @param userId 用户ID
+     * @param paintingRecordId 绘画记录ID
+     * @return 是否成功
+     */
+    Boolean cancelFavorite(Long userId, Long paintingRecordId);
+
+    /**
+     * 根据用户ID查询收藏列表
+     *
+     * @param userId 用户ID
+     * @return 收藏列表
+     */
+    List<AiPaintingFavoriteVo> queryByUserId(Long userId);
+
+}
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/service/AiPaintingRecordService.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/service/AiPaintingRecordService.java
new file mode 100644
index 0000000..95b594b
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/service/AiPaintingRecordService.java
@@ -0,0 +1,108 @@
+package org.dromara.ai.service;
+
+import org.dromara.ai.domain.bo.AiPaintingRecordBo;
+import org.dromara.ai.domain.vo.AiPaintingRecordVo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * AI绘画历史记录Service接口
+ *
+ * @author pengles
+ */
+public interface AiPaintingRecordService {
+
+    /**
+     * 查询AI绘画历史记录
+     *
+     * @param id 主键
+     * @return 结果
+     */
+    AiPaintingRecordVo queryById(Long id);
+
+    /**
+     * 查询AI绘画历史记录列表
+     *
+     * @param bo         查询条件
+     * @param pageQuery  分页查询条件
+     * @return 分页结果
+     */
+    TableDataInfo<AiPaintingRecordVo> queryPageList(AiPaintingRecordBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询AI绘画历史记录列表
+     *
+     * @param bo 查询条件
+     * @return 列表
+     */
+    List<AiPaintingRecordVo> queryList(AiPaintingRecordBo bo);
+
+    /**
+     * 新增AI绘画历史记录
+     *
+     * @param bo AI绘画历史记录
+     * @return 是否成功
+     */
+    Boolean insertByBo(AiPaintingRecordBo bo);
+
+    /**
+     * 修改AI绘画历史记录
+     *
+     * @param bo AI绘画历史记录
+     * @return 是否成功
+     */
+    Boolean updateByBo(AiPaintingRecordBo bo);
+
+    /**
+     * 批量删除AI绘画历史记录
+     *
+     * @param ids     需要删除的ID集合
+     * @param isValid 是否校验,true-删除前校验,false-不校验
+     * @return 是否成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    /**
+     * 根据任务ID查询记录
+     *
+     * @param taskId 任务ID
+     * @return 记录
+     */
+    AiPaintingRecordVo queryByTaskId(String taskId);
+
+    /**
+     * 根据任务ID更新记录
+     *
+     * @param bo 记录数据
+     * @return 是否成功
+     */
+    Boolean updateByTaskId(AiPaintingRecordBo bo);
+
+    /**
+     * 生成分享码
+     *
+     * @param id 记录ID
+     * @return 分享码
+     */
+    String generateShareCode(Long id);
+
+    /**
+     * 取消分享
+     *
+     * @param id 记录ID
+     * @return 是否成功
+     */
+    Boolean cancelShare(Long id);
+
+    /**
+     * 根据分享码查询记录
+     *
+     * @param shareCode 分享码
+     * @return 记录
+     */
+    AiPaintingRecordVo queryByShareCode(String shareCode);
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/service/AiPaintingService.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/service/AiPaintingService.java
new file mode 100644
index 0000000..53ed562
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/service/AiPaintingService.java
@@ -0,0 +1,132 @@
+package org.dromara.ai.service;
+
+import jakarta.annotation.PostConstruct;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import okhttp3.OkHttpClient;
+import org.dromara.ai.painting.PaintingEngineType;
+import org.dromara.ai.painting.PaintingProvider;
+import org.dromara.ai.painting.PaintingStatus;
+import org.dromara.ai.painting.PaintingTask;
+import org.dromara.ai.painting.provider.DallE3Provider;
+import org.dromara.ai.painting.provider.MidJourneyProvider;
+import org.dromara.ai.painting.provider.StableDiffusionProvider;
+import org.dromara.common.redis.utils.RedisUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
+
+import java.time.Instant;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+/**
+ * AI绘画服务
+ * 提供统一的AI绘画任务管理、状态跟踪和进度推送功能
+ *
+ * @author pengles
+ */
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class AiPaintingService {
+    private final DallE3Provider dallE3Provider;
+    private final MidJourneyProvider midJourneyProvider;
+    private final StableDiffusionProvider stableDiffusionProvider;
+    private final ExecutorService executor = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors());
+    private final Map<String, SseEmitter> emitters = new ConcurrentHashMap<>();
+    private final OkHttpClient client = new OkHttpClient();
+
+    @PostConstruct
+    public void init() {
+    }
+
+    public String createTask(PaintingEngineType engine, String prompt, Map<String, Object> params) {
+        PaintingTask task = new PaintingTask();
+        task.setId(UUID.randomUUID().toString());
+        task.setEngine(engine);
+        task.setPrompt(prompt);
+        task.setParams(params != null ? params : new HashMap<>());
+        task.setStatus(PaintingStatus.PENDING);
+        task.setProgress(0);
+        task.setUpdatedAt(Instant.now());
+        saveTask(task);
+        executor.submit(() -> runTask(task.getId()));
+        return task.getId();
+    }
+
+    public PaintingTask getTask(String taskId) {
+        PaintingTask t = RedisUtils.getCacheObject(key(taskId));
+        return t;
+    }
+
+    public void addEmitter(String taskId, SseEmitter emitter) {
+        emitters.put(taskId, emitter);
+    }
+
+    private void runTask(String taskId) {
+        PaintingTask task = getTask(taskId);
+        if (task == null) return;
+        task.setStatus(PaintingStatus.RUNNING);
+        task.setProgress(10);
+        task.setUpdatedAt(Instant.now());
+        saveTask(task);
+        push(taskId, Map.of("status", "RUNNING", "progress", task.getProgress()));
+        PaintingProvider provider = resolveProvider(task.getEngine());
+        try {
+            List<String> images = provider.create(task.getPrompt(), task.getParams());
+            task.setImages(images);
+            task.setProgress(100);
+            task.setStatus(PaintingStatus.SUCCESS);
+            task.setUpdatedAt(Instant.now());
+            saveTask(task);
+            push(taskId, Map.of("status", "SUCCESS", "progress", 100, "images", images));
+            complete(taskId);
+        } catch (Exception e) {
+            task.setStatus(PaintingStatus.FAILED);
+            task.setMessage(e.getMessage());
+            task.setUpdatedAt(Instant.now());
+            saveTask(task);
+            push(taskId, Map.of("status", "FAILED", "message", e.getMessage()));
+            complete(taskId);
+        }
+    }
+
+    private PaintingProvider resolveProvider(PaintingEngineType type) {
+        if (type == PaintingEngineType.DALL_E_3) return dallE3Provider;
+        if (type == PaintingEngineType.MIDJOURNEY) return midJourneyProvider;
+        return stableDiffusionProvider;
+    }
+
+    private void push(String taskId, Object data) {
+        SseEmitter emitter = emitters.get(taskId);
+        if (emitter == null) return;
+        try {
+            emitter.send(data);
+        } catch (Exception ignored) {
+        }
+    }
+
+    private void complete(String taskId) {
+        SseEmitter emitter = emitters.remove(taskId);
+        if (emitter == null) return;
+        try {
+            emitter.send("[DONE]");
+            emitter.complete();
+        } catch (Exception ignored) {
+        }
+    }
+
+    private void saveTask(PaintingTask task) {
+        RedisUtils.setCacheObject(key(task.getId()), task);
+    }
+
+    private String key(String taskId) {
+        return "ai:painting:task:" + taskId;
+    }
+}
+
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/service/AiPaintingTemplateService.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/service/AiPaintingTemplateService.java
new file mode 100644
index 0000000..3f7ad0e
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/service/AiPaintingTemplateService.java
@@ -0,0 +1,77 @@
+package org.dromara.ai.service;
+
+import org.dromara.ai.domain.bo.AiPaintingTemplateBo;
+import org.dromara.ai.domain.vo.AiPaintingTemplateVo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * AI绘画参数模板Service接口
+ *
+ * @author pengles
+ */
+public interface AiPaintingTemplateService {
+
+    /**
+     * 查询AI绘画参数模板
+     *
+     * @param id 主键
+     * @return 结果
+     */
+    AiPaintingTemplateVo queryById(Long id);
+
+    /**
+     * 查询AI绘画参数模板列表
+     *
+     * @param bo         查询条件
+     * @param pageQuery  分页查询条件
+     * @return 分页结果
+     */
+    TableDataInfo<AiPaintingTemplateVo> queryPageList(AiPaintingTemplateBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询AI绘画参数模板列表
+     *
+     * @param bo 查询条件
+     * @return 列表
+     */
+    List<AiPaintingTemplateVo> queryList(AiPaintingTemplateBo bo);
+
+    /**
+     * 新增AI绘画参数模板
+     *
+     * @param bo AI绘画参数模板
+     * @return 是否成功
+     */
+    Boolean insertByBo(AiPaintingTemplateBo bo);
+
+    /**
+     * 修改AI绘画参数模板
+     *
+     * @param bo AI绘画参数模板
+     * @return 是否成功
+     */
+    Boolean updateByBo(AiPaintingTemplateBo bo);
+
+    /**
+     * 批量删除AI绘画参数模板
+     *
+     * @param ids     需要删除的ID集合
+     * @param isValid 是否校验,true-删除前校验,false-不校验
+     * @return 是否成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    /**
+     * 根据引擎类型查询可用的模板列表（公开模板 + 用户私有模板）
+     *
+     * @param engineType 引擎类型
+     * @param userId     用户ID（可为空）
+     * @return 模板列表
+     */
+    List<AiPaintingTemplateVo> queryAvailableTemplates(String engineType, Long userId);
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/service/AiProviderConfigHistoryService.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/service/AiProviderConfigHistoryService.java
new file mode 100644
index 0000000..a0c0308
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/service/AiProviderConfigHistoryService.java
@@ -0,0 +1,68 @@
+package org.dromara.ai.service;
+
+import org.dromara.ai.domain.bo.AiProviderConfigHistoryBo;
+import org.dromara.ai.domain.vo.AiProviderConfigHistoryVo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * AI Provider配置历史Service接口
+ *
+ * @author pengles
+ */
+public interface AiProviderConfigHistoryService {
+
+    /**
+     * 查询AI Provider配置历史
+     *
+     * @param id 主键
+     * @return 结果
+     */
+    AiProviderConfigHistoryVo queryById(Long id);
+
+    /**
+     * 查询AI Provider配置历史列表
+     *
+     * @param bo         查询条件
+     * @param pageQuery  分页查询条件
+     * @return 分页结果
+     */
+    TableDataInfo<AiProviderConfigHistoryVo> queryPageList(AiProviderConfigHistoryBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询AI Provider配置历史列表
+     *
+     * @param bo 查询条件
+     * @return 列表
+     */
+    List<AiProviderConfigHistoryVo> queryList(AiProviderConfigHistoryBo bo);
+
+    /**
+     * 新增AI Provider配置历史
+     *
+     * @param bo AI Provider配置历史
+     * @return 是否成功
+     */
+    Boolean insertByBo(AiProviderConfigHistoryBo bo);
+
+    /**
+     * 批量删除AI Provider配置历史
+     *
+     * @param ids     需要删除的ID集合
+     * @param isValid 是否校验,true-删除前校验,false-不校验
+     * @return 是否成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    /**
+     * 根据配置ID查询历史记录列表
+     *
+     * @param configId 配置ID
+     * @return 历史记录列表
+     */
+    List<AiProviderConfigHistoryVo> queryByConfigId(Long configId);
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/service/AiProviderConfigService.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/service/AiProviderConfigService.java
new file mode 100644
index 0000000..a9aa833
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/service/AiProviderConfigService.java
@@ -0,0 +1,58 @@
+package org.dromara.ai.service;
+
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.ai.domain.bo.AiProviderConfigBo;
+import org.dromara.ai.domain.vo.AiProviderConfigVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * AI Provider配置Service接口
+ *
+ * @author pengles
+ */
+public interface AiProviderConfigService {
+
+    /**
+     * 查询AI Provider配置
+     */
+    AiProviderConfigVo queryById(Long id);
+
+    /**
+     * 查询AI Provider配置列表
+     */
+    TableDataInfo<AiProviderConfigVo> queryPageList(AiProviderConfigBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询AI Provider配置列表
+     */
+    List<AiProviderConfigVo> queryList(AiProviderConfigBo bo);
+
+    /**
+     * 新增AI Provider配置
+     */
+    Boolean insertByBo(AiProviderConfigBo bo);
+
+    /**
+     * 修改AI Provider配置
+     */
+    Boolean updateByBo(AiProviderConfigBo bo);
+
+    /**
+     * 校验并批量删除AI Provider配置信息
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    /**
+     * 启用/禁用Provider配置
+     */
+    Boolean changeEnabled(Long id, Integer enabled);
+
+    /**
+     * 根据Provider名称查询配置
+     */
+    AiProviderConfigVo queryByProviderName(String providerName);
+
+}
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/service/AiRatingRecordService.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/service/AiRatingRecordService.java
new file mode 100644
index 0000000..7294a29
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/service/AiRatingRecordService.java
@@ -0,0 +1,53 @@
+package org.dromara.ai.service;
+
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.ai.domain.bo.AiRatingRecordBo;
+import org.dromara.ai.domain.vo.AiRatingRecordVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * AI评价记录Service接口
+ *
+ * @author pengles
+ */
+public interface AiRatingRecordService {
+
+    /**
+     * 查询AI评价记录
+     */
+    AiRatingRecordVo queryById(Long id);
+
+    /**
+     * 查询AI评价记录列表
+     */
+    TableDataInfo<AiRatingRecordVo> queryPageList(AiRatingRecordBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询AI评价记录列表
+     */
+    List<AiRatingRecordVo> queryList(AiRatingRecordBo bo);
+
+    /**
+     * 新增AI评价记录
+     */
+    Boolean insertByBo(AiRatingRecordBo bo);
+
+    /**
+     * 校验并批量删除AI评价记录信息
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    /**
+     * 根据消息ID查询评价记录
+     */
+    AiRatingRecordVo queryByMessageId(String messageId, Long userId);
+
+    /**
+     * 获取平均评分
+     */
+    Double getAverageRating(String providerName);
+
+}
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/service/AiSensitiveWordService.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/service/AiSensitiveWordService.java
new file mode 100644
index 0000000..a1161c6
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/service/AiSensitiveWordService.java
@@ -0,0 +1,93 @@
+package org.dromara.ai.service;
+
+import org.dromara.ai.domain.bo.AiSensitiveWordBo;
+import org.dromara.ai.domain.vo.AiSensitiveWordVo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * AI敏感词Service接口
+ *
+ * @author pengles
+ */
+public interface AiSensitiveWordService {
+
+    /**
+     * 查询AI敏感词
+     *
+     * @param id 主键
+     * @return 结果
+     */
+    AiSensitiveWordVo queryById(Long id);
+
+    /**
+     * 查询AI敏感词列表
+     *
+     * @param bo         查询条件
+     * @param pageQuery  分页查询条件
+     * @return 分页结果
+     */
+    TableDataInfo<AiSensitiveWordVo> queryPageList(AiSensitiveWordBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询AI敏感词列表
+     *
+     * @param bo 查询条件
+     * @return 列表
+     */
+    List<AiSensitiveWordVo> queryList(AiSensitiveWordBo bo);
+
+    /**
+     * 新增AI敏感词
+     *
+     * @param bo AI敏感词
+     * @return 是否成功
+     */
+    Boolean insertByBo(AiSensitiveWordBo bo);
+
+    /**
+     * 修改AI敏感词
+     *
+     * @param bo AI敏感词
+     * @return 是否成功
+     */
+    Boolean updateByBo(AiSensitiveWordBo bo);
+
+    /**
+     * 批量删除AI敏感词
+     *
+     * @param ids     需要删除的ID集合
+     * @param isValid 是否校验,true-删除前校验,false-不校验
+     * @return 是否成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    /**
+     * 启用/禁用敏感词
+     *
+     * @param id     敏感词ID
+     * @param enabled 启用状态(0=禁用 1=启用)
+     * @return 是否成功
+     */
+    Boolean changeEnabled(Long id, Integer enabled);
+
+    /**
+     * 根据词类型获取启用的敏感词集合
+     *
+     * @param wordType 词类型
+     * @return 敏感词集合
+     */
+    Set<String> getEnabledWordsByType(String wordType);
+
+    /**
+     * 获取所有启用的敏感词集合（按类型分组）
+     *
+     * @return 敏感词集合Map，key为词类型，value为敏感词集合
+     */
+    java.util.Map<String, Set<String>> getAllEnabledWords();
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/service/AiUsageStatsService.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/service/AiUsageStatsService.java
new file mode 100644
index 0000000..52d9544
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/service/AiUsageStatsService.java
@@ -0,0 +1,87 @@
+package org.dromara.ai.service;
+
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.ai.domain.bo.AiUsageStatsBo;
+import org.dromara.ai.domain.vo.AiUsageStatsVo;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * AI使用统计Service接口
+ *
+ * @author pengles
+ */
+public interface AiUsageStatsService {
+
+    /**
+     * 查询AI使用统计
+     */
+    AiUsageStatsVo queryById(Long id);
+
+    /**
+     * 查询AI使用统计列表
+     */
+    TableDataInfo<AiUsageStatsVo> queryPageList(AiUsageStatsBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询AI使用统计列表
+     */
+    List<AiUsageStatsVo> queryList(AiUsageStatsBo bo);
+
+    /**
+     * 记录使用统计
+     *
+     * @param userId       用户ID
+     * @param providerName Provider名称
+     * @param modelName    模型名称
+     * @param tokens       使用的Token数
+     * @param cost         成本
+     * @param responseTime 响应时间(毫秒)
+     * @param success      是否成功
+     */
+    void recordUsage(Long userId, String providerName, String modelName,
+                     Long tokens, java.math.BigDecimal cost, Integer responseTime, Boolean success);
+
+    /**
+     * 获取汇总统计
+     *
+     * @param startDate 开始日期
+     * @param endDate   结束日期
+     * @return 汇总统计数据
+     */
+    Map<String, Object> getSummaryStats(Date startDate, Date endDate);
+
+    /**
+     * 获取用户统计
+     *
+     * @param userId    用户ID
+     * @param startDate 开始日期
+     * @param endDate   结束日期
+     * @return 用户统计数据
+     */
+    Map<String, Object> getUserStats(Long userId, Date startDate, Date endDate);
+
+    /**
+     * 获取Provider统计
+     *
+     * @param providerName Provider名称
+     * @param startDate    开始日期
+     * @param endDate      结束日期
+     * @return Provider统计数据
+     */
+    Map<String, Object> getProviderStats(String providerName, Date startDate, Date endDate);
+
+    /**
+     * 获取趋势数据
+     *
+     * @param startDate 开始日期
+     * @param endDate   结束日期
+     * @param groupBy   分组方式（day/week/month）
+     * @return 趋势数据列表
+     */
+    List<Map<String, Object>> getTrendData(Date startDate, Date endDate, String groupBy);
+
+}
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/service/AiUserQuotaService.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/service/AiUserQuotaService.java
new file mode 100644
index 0000000..aa9f2ba
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/service/AiUserQuotaService.java
@@ -0,0 +1,95 @@
+package org.dromara.ai.service;
+
+import org.dromara.ai.domain.bo.AiUserQuotaBo;
+import org.dromara.ai.domain.vo.AiUserQuotaVo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * AI用户配额Service接口
+ *
+ * @author pengles
+ */
+public interface AiUserQuotaService {
+
+    /**
+     * 查询AI用户配额
+     *
+     * @param id 主键
+     * @return 结果
+     */
+    AiUserQuotaVo queryById(Long id);
+
+    /**
+     * 查询AI用户配额列表
+     *
+     * @param bo         查询条件
+     * @param pageQuery  分页查询条件
+     * @return 分页结果
+     */
+    TableDataInfo<AiUserQuotaVo> queryPageList(AiUserQuotaBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询AI用户配额列表
+     *
+     * @param bo 查询条件
+     * @return 列表
+     */
+    List<AiUserQuotaVo> queryList(AiUserQuotaBo bo);
+
+    /**
+     * 新增AI用户配额
+     *
+     * @param bo AI用户配额
+     * @return 是否成功
+     */
+    Boolean insertByBo(AiUserQuotaBo bo);
+
+    /**
+     * 修改AI用户配额
+     *
+     * @param bo AI用户配额
+     * @return 是否成功
+     */
+    Boolean updateByBo(AiUserQuotaBo bo);
+
+    /**
+     * 批量删除AI用户配额
+     *
+     * @param ids     需要删除的ID集合
+     * @param isValid 是否校验,true-删除前校验,false-不校验
+     * @return 是否成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    /**
+     * 根据用户ID查询配额
+     *
+     * @param userId 用户ID
+     * @return 配额信息
+     */
+    AiUserQuotaVo queryByUserId(Long userId);
+
+    /**
+     * 重置用户配额（按日/按月）
+     *
+     * @param userId 用户ID
+     * @param resetType 重置类型(DAILY/MONTHLY)
+     * @return 是否成功
+     */
+    Boolean resetQuota(Long userId, String resetType);
+
+    /**
+     * 增加用户配额使用量
+     *
+     * @param userId 用户ID
+     * @param dailyAmount 日使用量
+     * @param monthlyAmount 月使用量
+     * @return 是否成功
+     */
+    Boolean increaseUsage(Long userId, Long dailyAmount, Long monthlyAmount);
+
+}
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/service/SimpleAiService.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/service/SimpleAiService.java
new file mode 100644
index 0000000..d3fbda7
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/service/SimpleAiService.java
@@ -0,0 +1,153 @@
+package org.dromara.ai.service;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.knowledge.domain.vo.KnowledgeSearchResultVo;
+import org.dromara.knowledge.service.KnowledgeInfoService;
+import org.dromara.knowledge.service.KnowledgeVectorService;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 简化的AI服务
+ * 主要功能：调用knowledge模块进行知识检索
+ *
+ * @author pengles
+ */
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class SimpleAiService {
+
+    private final KnowledgeInfoService knowledgeInfoService;
+    private final KnowledgeVectorService knowledgeVectorService;
+
+    /**
+     * 基于知识库的问答
+     *
+     * @param knowledgeId 知识库ID
+     * @param question    用户问题
+     * @param limit       返回结果数量限制
+     * @return AI回答
+     */
+    public String askWithKnowledge(String knowledgeId, String question, Integer limit) {
+        log.info("基于知识库问答 - 知识库ID: {}, 问题: {}", knowledgeId, question);
+
+        try {
+            // 1. 从知识库搜索相关内容
+            List<KnowledgeSearchResultVo> searchResults = knowledgeInfoService.searchKnowledge(
+                    knowledgeId, question, limit != null ? limit : 5
+            );
+
+            if (searchResults.isEmpty()) {
+                return "抱歉，在知识库中没有找到相关信息。";
+            }
+
+            // 2. 构建回答
+            StringBuilder answer = new StringBuilder();
+            answer.append("根据知识库搜索结果，为您提供以下信息：\n\n");
+
+            for (int i = 0; i < searchResults.size(); i++) {
+                KnowledgeSearchResultVo result = searchResults.get(i);
+                answer.append(String.format("%d. %s\n", i + 1, result.getContent()));
+                if (result.getSimilarityScore() != null) {
+                    answer.append(String.format("   (相关度: %.2f)\n", result.getSimilarityScore()));
+                }
+                answer.append("\n");
+            }
+
+            return answer.toString();
+
+        } catch (Exception e) {
+            log.error("知识库问答失败", e);
+            return "抱歉，处理您的问题时出现错误，请稍后重试。";
+        }
+    }
+
+    /**
+     * 向量相似度搜索
+     *
+     * @param knowledgeId 知识库ID
+     * @param queryText   查询文本
+     * @param modelName   模型名称
+     * @param topK        返回前K个结果
+     * @param threshold   相似度阈值
+     * @return 搜索结果
+     */
+    public List<KnowledgeSearchResultVo> vectorSearch(String knowledgeId, String queryText,
+                                                      String modelName, Integer topK, Double threshold) {
+        log.info("向量搜索 - 知识库ID: {}, 查询: {}, 模型: {}", knowledgeId, queryText, modelName);
+
+        try {
+            return knowledgeVectorService.vectorSimilaritySearch(
+                    knowledgeId, queryText, modelName,
+                    topK != null ? topK : 5,
+                    threshold != null ? threshold : 0.7
+            );
+        } catch (Exception e) {
+            log.error("向量搜索失败", e);
+            return List.of();
+        }
+    }
+
+    /**
+     * 获取知识库统计信息
+     *
+     * @param knowledgeId 知识库ID
+     * @return 统计信息
+     */
+    public Map<String, Object> getKnowledgeStats(String knowledgeId) {
+        log.info("获取知识库统计信息 - 知识库ID: {}", knowledgeId);
+
+        try {
+            Map<String, Object> stats = knowledgeVectorService.getVectorStatistics(knowledgeId);
+            if (stats == null) {
+                stats = new HashMap<>();
+            }
+
+            // 添加知识库状态信息
+            var status = knowledgeInfoService.getKnowledgeStatus(knowledgeId);
+            if (status != null) {
+                stats.put("status", status);
+            }
+
+            return stats;
+
+        } catch (Exception e) {
+            log.error("获取知识库统计信息失败", e);
+            return Map.of("error", "获取统计信息失败");
+        }
+    }
+
+    /**
+     * 检查模型是否可用
+     *
+     * @param modelName 模型名称
+     * @return 是否可用
+     */
+    public boolean isModelAvailable(String modelName) {
+        try {
+            return knowledgeVectorService.isModelAvailable(modelName);
+        } catch (Exception e) {
+            log.error("检查模型可用性失败: {}", modelName, e);
+            return false;
+        }
+    }
+
+    /**
+     * 获取可用的模型列表
+     *
+     * @return 模型列表
+     */
+    public List<String> getAvailableModels() {
+        try {
+            return knowledgeVectorService.getAvailableModels();
+        } catch (Exception e) {
+            log.error("获取可用模型列表失败", e);
+            return List.of();
+        }
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/service/impl/AiChatRecordServiceImpl.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/service/impl/AiChatRecordServiceImpl.java
new file mode 100644
index 0000000..ac53019
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/service/impl/AiChatRecordServiceImpl.java
@@ -0,0 +1,157 @@
+package org.dromara.ai.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.ai.domain.AiChatRecord;
+import org.dromara.ai.domain.bo.AiChatRecordBo;
+import org.dromara.ai.domain.vo.AiChatRecordVo;
+import org.dromara.ai.mapper.AiChatRecordMapper;
+import org.dromara.ai.service.AiChatRecordService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * AI聊天记录Service业务层处理
+ *
+ * @author pengles
+ */
+@RequiredArgsConstructor
+@Service
+public class AiChatRecordServiceImpl implements AiChatRecordService {
+
+    private final AiChatRecordMapper baseMapper;
+
+    /**
+     * 查询AI聊天记录
+     */
+    @Override
+    public AiChatRecordVo queryById(Long id) {
+        AiChatRecordVo vo = baseMapper.selectVoById(id);
+        if (vo != null) {
+            // 转换流式字段
+            vo.setIsStreamStr(vo.getIsStream() != null && vo.getIsStream() == 1 ? "是" : "否");
+        }
+        return vo;
+    }
+
+    /**
+     * 查询AI聊天记录列表
+     */
+    @Override
+    public TableDataInfo<AiChatRecordVo> queryPageList(AiChatRecordBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<AiChatRecord> lqw = buildQueryWrapper(bo);
+        Page<AiChatRecordVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        // 转换流式字段
+        result.getRecords().forEach(vo -> {
+            vo.setIsStreamStr(vo.getIsStream() != null && vo.getIsStream() == 1 ? "是" : "否");
+        });
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询AI聊天记录列表
+     */
+    @Override
+    public List<AiChatRecordVo> queryList(AiChatRecordBo bo) {
+        LambdaQueryWrapper<AiChatRecord> lqw = buildQueryWrapper(bo);
+        List<AiChatRecordVo> list = baseMapper.selectVoList(lqw);
+        // 转换流式字段
+        list.forEach(vo -> {
+            vo.setIsStreamStr(vo.getIsStream() != null && vo.getIsStream() == 1 ? "是" : "否");
+        });
+        return list;
+    }
+
+    /**
+     * 构建查询条件
+     */
+    private LambdaQueryWrapper<AiChatRecord> buildQueryWrapper(AiChatRecordBo bo) {
+        LambdaQueryWrapper<AiChatRecord> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(StringUtils.isNotBlank(bo.getSessionId()), AiChatRecord::getSessionId, bo.getSessionId());
+        lqw.eq(bo.getUserId() != null, AiChatRecord::getUserId, bo.getUserId());
+        lqw.like(StringUtils.isNotBlank(bo.getProviderName()), AiChatRecord::getProviderName, bo.getProviderName());
+        lqw.like(StringUtils.isNotBlank(bo.getModelName()), AiChatRecord::getModelName, bo.getModelName());
+        lqw.eq(StringUtils.isNotBlank(bo.getMessageType()), AiChatRecord::getMessageType, bo.getMessageType());
+        // 内容搜索（模糊查询）
+        lqw.like(StringUtils.isNotBlank(bo.getContent()), AiChatRecord::getContent, bo.getContent());
+        lqw.eq(bo.getIsStream() != null, AiChatRecord::getIsStream, bo.getIsStream());
+        // 时间范围查询
+        lqw.ge(bo.getCreateTimeStart() != null, AiChatRecord::getCreateTime, bo.getCreateTimeStart());
+        lqw.le(bo.getCreateTimeEnd() != null, AiChatRecord::getCreateTime, bo.getCreateTimeEnd());
+        // 按创建时间倒序
+        lqw.orderByDesc(AiChatRecord::getCreateTime);
+        return lqw;
+    }
+
+    /**
+     * 新增AI聊天记录
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean insertByBo(AiChatRecordBo bo) {
+        AiChatRecord add = MapstructUtils.convert(bo, AiChatRecord.class);
+        // 设置默认值
+        if (add.getIsStream() == null) {
+            add.setIsStream(0);
+        }
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 批量新增AI聊天记录
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean insertBatch(List<AiChatRecordBo> boList) {
+        if (boList == null || boList.isEmpty()) {
+            return true;
+        }
+        List<AiChatRecord> recordList = boList.stream()
+                .map(bo -> {
+                    AiChatRecord record = MapstructUtils.convert(bo, AiChatRecord.class);
+                    if (record.getIsStream() == null) {
+                        record.setIsStream(0);
+                    }
+                    return record;
+                })
+                .collect(Collectors.toList());
+        return baseMapper.insertBatch(recordList);
+    }
+
+    /**
+     * 批量删除AI聊天记录信息
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+
+    /**
+     * 归档聊天记录（删除指定日期之前的记录）
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Integer archiveChatRecords(java.util.Date beforeDate) {
+        if (beforeDate == null) {
+            return 0;
+        }
+        LambdaQueryWrapper<AiChatRecord> lqw = new LambdaQueryWrapper<>();
+        lqw.lt(AiChatRecord::getCreateTime, beforeDate);
+        return baseMapper.delete(lqw);
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/service/impl/AiPaintingFavoriteServiceImpl.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/service/impl/AiPaintingFavoriteServiceImpl.java
new file mode 100644
index 0000000..89c26b7
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/service/impl/AiPaintingFavoriteServiceImpl.java
@@ -0,0 +1,176 @@
+package org.dromara.ai.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.ai.domain.AiPaintingFavorite;
+import org.dromara.ai.domain.bo.AiPaintingFavoriteBo;
+import org.dromara.ai.domain.vo.AiPaintingFavoriteVo;
+import org.dromara.ai.domain.vo.AiPaintingRecordVo;
+import org.dromara.ai.mapper.AiPaintingFavoriteMapper;
+import org.dromara.ai.service.AiPaintingFavoriteService;
+import org.dromara.ai.service.AiPaintingRecordService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * AI绘画作品收藏Service业务层处理
+ *
+ * @author pengles
+ */
+@RequiredArgsConstructor
+@Service
+public class AiPaintingFavoriteServiceImpl implements AiPaintingFavoriteService {
+
+    private final AiPaintingFavoriteMapper baseMapper;
+    private final AiPaintingRecordService paintingRecordService;
+
+    /**
+     * 查询AI绘画作品收藏
+     */
+    @Override
+    public AiPaintingFavoriteVo queryById(Long id) {
+        AiPaintingFavoriteVo vo = baseMapper.selectVoById(id);
+        if (vo != null) {
+            enrichPaintingRecord(vo);
+        }
+        return vo;
+    }
+
+    /**
+     * 查询AI绘画作品收藏列表
+     */
+    @Override
+    public TableDataInfo<AiPaintingFavoriteVo> queryPageList(AiPaintingFavoriteBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<AiPaintingFavorite> lqw = buildQueryWrapper(bo);
+        Page<AiPaintingFavoriteVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        result.getRecords().forEach(this::enrichPaintingRecord);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询AI绘画作品收藏列表
+     */
+    @Override
+    public List<AiPaintingFavoriteVo> queryList(AiPaintingFavoriteBo bo) {
+        LambdaQueryWrapper<AiPaintingFavorite> lqw = buildQueryWrapper(bo);
+        List<AiPaintingFavoriteVo> list = baseMapper.selectVoList(lqw);
+        list.forEach(this::enrichPaintingRecord);
+        return list;
+    }
+
+    /**
+     * 构建查询条件
+     */
+    private LambdaQueryWrapper<AiPaintingFavorite> buildQueryWrapper(AiPaintingFavoriteBo bo) {
+        LambdaQueryWrapper<AiPaintingFavorite> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(bo.getUserId() != null, AiPaintingFavorite::getUserId, bo.getUserId());
+        lqw.eq(bo.getPaintingRecordId() != null, AiPaintingFavorite::getPaintingRecordId, bo.getPaintingRecordId());
+        lqw.eq(StringUtils.isNotBlank(bo.getTaskId()), AiPaintingFavorite::getTaskId, bo.getTaskId());
+        // 时间范围查询
+        lqw.ge(bo.getCreateTimeStart() != null, AiPaintingFavorite::getCreateTime, bo.getCreateTimeStart());
+        lqw.le(bo.getCreateTimeEnd() != null, AiPaintingFavorite::getCreateTime, bo.getCreateTimeEnd());
+        // 按收藏时间倒序排序
+        lqw.orderByDesc(AiPaintingFavorite::getCreateTime);
+        return lqw;
+    }
+
+    /**
+     * 丰富绘画记录信息
+     */
+    private void enrichPaintingRecord(AiPaintingFavoriteVo vo) {
+        if (vo.getPaintingRecordId() != null) {
+            AiPaintingRecordVo record = paintingRecordService.queryById(vo.getPaintingRecordId());
+            vo.setPaintingRecord(record);
+        }
+    }
+
+    /**
+     * 新增AI绘画作品收藏
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean insertByBo(AiPaintingFavoriteBo bo) {
+        // 检查是否已收藏
+        if (bo.getUserId() != null && bo.getPaintingRecordId() != null) {
+            Boolean favorited = isFavorited(bo.getUserId(), bo.getPaintingRecordId());
+            if (favorited) {
+                throw new ServiceException("该作品已被收藏");
+            }
+        }
+
+        AiPaintingFavorite add = MapstructUtils.convert(bo, AiPaintingFavorite.class);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改AI绘画作品收藏
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean updateByBo(AiPaintingFavoriteBo bo) {
+        AiPaintingFavorite update = MapstructUtils.convert(bo, AiPaintingFavorite.class);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 批量删除AI绘画作品收藏
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if (isValid) {
+            // 可以添加业务校验逻辑
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+
+    /**
+     * 检查用户是否已收藏该绘画作品
+     */
+    @Override
+    public Boolean isFavorited(Long userId, Long paintingRecordId) {
+        LambdaQueryWrapper<AiPaintingFavorite> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(AiPaintingFavorite::getUserId, userId);
+        lqw.eq(AiPaintingFavorite::getPaintingRecordId, paintingRecordId);
+        return baseMapper.selectCount(lqw) > 0;
+    }
+
+    /**
+     * 取消收藏
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean cancelFavorite(Long userId, Long paintingRecordId) {
+        LambdaQueryWrapper<AiPaintingFavorite> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(AiPaintingFavorite::getUserId, userId);
+        lqw.eq(AiPaintingFavorite::getPaintingRecordId, paintingRecordId);
+        return baseMapper.delete(lqw) > 0;
+    }
+
+    /**
+     * 根据用户ID查询收藏列表
+     */
+    @Override
+    public List<AiPaintingFavoriteVo> queryByUserId(Long userId) {
+        LambdaQueryWrapper<AiPaintingFavorite> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(AiPaintingFavorite::getUserId, userId);
+        lqw.orderByDesc(AiPaintingFavorite::getCreateTime);
+        List<AiPaintingFavoriteVo> list = baseMapper.selectVoList(lqw);
+        list.forEach(this::enrichPaintingRecord);
+        return list;
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/service/impl/AiPaintingRecordServiceImpl.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/service/impl/AiPaintingRecordServiceImpl.java
new file mode 100644
index 0000000..2713fe5
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/service/impl/AiPaintingRecordServiceImpl.java
@@ -0,0 +1,269 @@
+package org.dromara.ai.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.ai.domain.AiPaintingRecord;
+import org.dromara.ai.domain.bo.AiPaintingRecordBo;
+import org.dromara.ai.domain.vo.AiPaintingRecordVo;
+import org.dromara.ai.mapper.AiPaintingRecordMapper;
+import org.dromara.ai.service.AiPaintingRecordService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.UUID;
+
+/**
+ * AI绘画历史记录Service业务层处理
+ *
+ * @author pengles
+ */
+@RequiredArgsConstructor
+@Service
+public class AiPaintingRecordServiceImpl implements AiPaintingRecordService {
+
+    private final AiPaintingRecordMapper baseMapper;
+
+    /**
+     * 查询AI绘画历史记录
+     */
+    @Override
+    public AiPaintingRecordVo queryById(Long id) {
+        AiPaintingRecordVo vo = baseMapper.selectVoById(id);
+        if (vo != null) {
+            convertFields(vo);
+        }
+        return vo;
+    }
+
+    /**
+     * 查询AI绘画历史记录列表
+     */
+    @Override
+    public TableDataInfo<AiPaintingRecordVo> queryPageList(AiPaintingRecordBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<AiPaintingRecord> lqw = buildQueryWrapper(bo);
+        Page<AiPaintingRecordVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        result.getRecords().forEach(this::convertFields);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询AI绘画历史记录列表
+     */
+    @Override
+    public List<AiPaintingRecordVo> queryList(AiPaintingRecordBo bo) {
+        LambdaQueryWrapper<AiPaintingRecord> lqw = buildQueryWrapper(bo);
+        List<AiPaintingRecordVo> list = baseMapper.selectVoList(lqw);
+        list.forEach(this::convertFields);
+        return list;
+    }
+
+    /**
+     * 构建查询条件
+     */
+    private LambdaQueryWrapper<AiPaintingRecord> buildQueryWrapper(AiPaintingRecordBo bo) {
+        LambdaQueryWrapper<AiPaintingRecord> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(StringUtils.isNotBlank(bo.getTaskId()), AiPaintingRecord::getTaskId, bo.getTaskId());
+        lqw.eq(bo.getUserId() != null, AiPaintingRecord::getUserId, bo.getUserId());
+        lqw.eq(StringUtils.isNotBlank(bo.getEngineType()), AiPaintingRecord::getEngineType, bo.getEngineType());
+        lqw.eq(StringUtils.isNotBlank(bo.getStatus()), AiPaintingRecord::getStatus, bo.getStatus());
+        lqw.like(StringUtils.isNotBlank(bo.getPrompt()), AiPaintingRecord::getPrompt, bo.getPrompt());
+        lqw.eq(StringUtils.isNotBlank(bo.getShareCode()), AiPaintingRecord::getShareCode, bo.getShareCode());
+        lqw.eq(bo.getIsPublic() != null, AiPaintingRecord::getIsPublic, bo.getIsPublic());
+        // 时间范围查询
+        lqw.ge(bo.getCreateTimeStart() != null, AiPaintingRecord::getCreateTime, bo.getCreateTimeStart());
+        lqw.le(bo.getCreateTimeEnd() != null, AiPaintingRecord::getCreateTime, bo.getCreateTimeEnd());
+        // 按创建时间倒序排序
+        lqw.orderByDesc(AiPaintingRecord::getCreateTime);
+        return lqw;
+    }
+
+    /**
+     * 转换字段（用于显示）
+     */
+    private void convertFields(AiPaintingRecordVo vo) {
+        // 转换引擎类型
+        vo.setEngineTypeStr(convertEngineType(vo.getEngineType()));
+        // 转换状态
+        vo.setStatusStr(convertStatus(vo.getStatus()));
+        // 转换是否公开
+        vo.setIsPublicStr(convertIsPublic(vo.getIsPublic()));
+    }
+
+    /**
+     * 转换引擎类型
+     */
+    private String convertEngineType(String engineType) {
+        if (StringUtils.isBlank(engineType)) {
+            return "";
+        }
+        return switch (engineType) {
+            case "DALL_E_3" -> "DALL·E 3";
+            case "MIDJOURNEY" -> "MidJourney";
+            case "STABLE_DIFFUSION" -> "Stable Diffusion";
+            default -> engineType;
+        };
+    }
+
+    /**
+     * 转换状态
+     */
+    private String convertStatus(String status) {
+        if (StringUtils.isBlank(status)) {
+            return "";
+        }
+        return switch (status) {
+            case "PENDING" -> "待处理";
+            case "RUNNING" -> "处理中";
+            case "SUCCESS" -> "成功";
+            case "FAILED" -> "失败";
+            default -> status;
+        };
+    }
+
+    /**
+     * 转换是否公开
+     */
+    private String convertIsPublic(Integer isPublic) {
+        if (isPublic == null) {
+            return "私有";
+        }
+        return isPublic == 1 ? "公开" : "私有";
+    }
+
+    /**
+     * 新增AI绘画历史记录
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean insertByBo(AiPaintingRecordBo bo) {
+        AiPaintingRecord add = MapstructUtils.convert(bo, AiPaintingRecord.class);
+        // 设置默认值
+        if (add.getProgress() == null) {
+            add.setProgress(0);
+        }
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改AI绘画历史记录
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean updateByBo(AiPaintingRecordBo bo) {
+        AiPaintingRecord update = MapstructUtils.convert(bo, AiPaintingRecord.class);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 批量删除AI绘画历史记录
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if (isValid) {
+            // 可以添加业务校验逻辑
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+
+    /**
+     * 根据任务ID查询记录
+     */
+    @Override
+    public AiPaintingRecordVo queryByTaskId(String taskId) {
+        LambdaQueryWrapper<AiPaintingRecord> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(AiPaintingRecord::getTaskId, taskId);
+        AiPaintingRecord record = baseMapper.selectOne(lqw);
+        if (record != null) {
+            AiPaintingRecordVo vo = MapstructUtils.convert(record, AiPaintingRecordVo.class);
+            convertFields(vo);
+            return vo;
+        }
+        return null;
+    }
+
+    /**
+     * 根据任务ID更新记录
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean updateByTaskId(AiPaintingRecordBo bo) {
+        LambdaQueryWrapper<AiPaintingRecord> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(AiPaintingRecord::getTaskId, bo.getTaskId());
+        AiPaintingRecord record = baseMapper.selectOne(lqw);
+        if (record == null) {
+            // 如果记录不存在，则插入
+            return insertByBo(bo);
+        } else {
+            // 如果记录存在，则更新
+            bo.setId(record.getId());
+            return updateByBo(bo);
+        }
+    }
+
+    /**
+     * 生成分享码
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public String generateShareCode(Long id) {
+        AiPaintingRecord record = baseMapper.selectById(id);
+        if (record == null) {
+            throw new ServiceException("绘画记录不存在");
+        }
+        // 生成唯一分享码（使用UUID，去除横线）
+        String shareCode = UUID.randomUUID().toString().replace("-", "");
+        record.setShareCode(shareCode);
+        record.setIsPublic(1); // 设置为公开分享
+        baseMapper.updateById(record);
+        return shareCode;
+    }
+
+    /**
+     * 取消分享
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean cancelShare(Long id) {
+        AiPaintingRecord record = baseMapper.selectById(id);
+        if (record == null) {
+            throw new ServiceException("绘画记录不存在");
+        }
+        record.setShareCode(null);
+        record.setIsPublic(0); // 设置为私有
+        return baseMapper.updateById(record) > 0;
+    }
+
+    /**
+     * 根据分享码查询记录
+     */
+    @Override
+    public AiPaintingRecordVo queryByShareCode(String shareCode) {
+        if (StringUtils.isBlank(shareCode)) {
+            return null;
+        }
+        LambdaQueryWrapper<AiPaintingRecord> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(AiPaintingRecord::getShareCode, shareCode);
+        lqw.eq(AiPaintingRecord::getIsPublic, 1); // 只查询公开分享的记录
+        AiPaintingRecord record = baseMapper.selectOne(lqw);
+        if (record != null) {
+            AiPaintingRecordVo vo = MapstructUtils.convert(record, AiPaintingRecordVo.class);
+            convertFields(vo);
+            return vo;
+        }
+        return null;
+    }
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/service/impl/AiPaintingTemplateServiceImpl.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/service/impl/AiPaintingTemplateServiceImpl.java
new file mode 100644
index 0000000..200f75c
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/service/impl/AiPaintingTemplateServiceImpl.java
@@ -0,0 +1,177 @@
+package org.dromara.ai.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.ai.domain.AiPaintingTemplate;
+import org.dromara.ai.domain.bo.AiPaintingTemplateBo;
+import org.dromara.ai.domain.vo.AiPaintingTemplateVo;
+import org.dromara.ai.mapper.AiPaintingTemplateMapper;
+import org.dromara.ai.service.AiPaintingTemplateService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * AI绘画参数模板Service业务层处理
+ *
+ * @author pengles
+ */
+@RequiredArgsConstructor
+@Service
+public class AiPaintingTemplateServiceImpl implements AiPaintingTemplateService {
+
+    private final AiPaintingTemplateMapper baseMapper;
+
+    /**
+     * 查询AI绘画参数模板
+     */
+    @Override
+    public AiPaintingTemplateVo queryById(Long id) {
+        AiPaintingTemplateVo vo = baseMapper.selectVoById(id);
+        if (vo != null) {
+            convertFields(vo);
+        }
+        return vo;
+    }
+
+    /**
+     * 查询AI绘画参数模板列表
+     */
+    @Override
+    public TableDataInfo<AiPaintingTemplateVo> queryPageList(AiPaintingTemplateBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<AiPaintingTemplate> lqw = buildQueryWrapper(bo);
+        Page<AiPaintingTemplateVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        result.getRecords().forEach(this::convertFields);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询AI绘画参数模板列表
+     */
+    @Override
+    public List<AiPaintingTemplateVo> queryList(AiPaintingTemplateBo bo) {
+        LambdaQueryWrapper<AiPaintingTemplate> lqw = buildQueryWrapper(bo);
+        List<AiPaintingTemplateVo> list = baseMapper.selectVoList(lqw);
+        list.forEach(this::convertFields);
+        return list;
+    }
+
+    /**
+     * 构建查询条件
+     */
+    private LambdaQueryWrapper<AiPaintingTemplate> buildQueryWrapper(AiPaintingTemplateBo bo) {
+        LambdaQueryWrapper<AiPaintingTemplate> lqw = new LambdaQueryWrapper<>();
+        lqw.like(StringUtils.isNotBlank(bo.getTemplateName()), AiPaintingTemplate::getTemplateName, bo.getTemplateName());
+        lqw.eq(bo.getUserId() != null, AiPaintingTemplate::getUserId, bo.getUserId());
+        lqw.eq(StringUtils.isNotBlank(bo.getEngineType()), AiPaintingTemplate::getEngineType, bo.getEngineType());
+        lqw.eq(bo.getIsPublic() != null, AiPaintingTemplate::getIsPublic, bo.getIsPublic());
+        // 时间范围查询
+        lqw.ge(bo.getCreateTimeStart() != null, AiPaintingTemplate::getCreateTime, bo.getCreateTimeStart());
+        lqw.le(bo.getCreateTimeEnd() != null, AiPaintingTemplate::getCreateTime, bo.getCreateTimeEnd());
+        // 按排序和创建时间排序
+        lqw.orderByAsc(AiPaintingTemplate::getSort);
+        lqw.orderByDesc(AiPaintingTemplate::getCreateTime);
+        return lqw;
+    }
+
+    /**
+     * 转换字段（用于显示）
+     */
+    private void convertFields(AiPaintingTemplateVo vo) {
+        // 转换引擎类型
+        vo.setEngineTypeStr(convertEngineType(vo.getEngineType()));
+        // 转换公开状态
+        vo.setIsPublicStr(vo.getIsPublic() != null && vo.getIsPublic() == 1 ? "公开" : "私有");
+    }
+
+    /**
+     * 转换引擎类型
+     */
+    private String convertEngineType(String engineType) {
+        if (StringUtils.isBlank(engineType)) {
+            return "";
+        }
+        return switch (engineType) {
+            case "DALL_E_3" -> "DALL·E 3";
+            case "MIDJOURNEY" -> "MidJourney";
+            case "STABLE_DIFFUSION" -> "Stable Diffusion";
+            default -> engineType;
+        };
+    }
+
+    /**
+     * 新增AI绘画参数模板
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean insertByBo(AiPaintingTemplateBo bo) {
+        AiPaintingTemplate add = MapstructUtils.convert(bo, AiPaintingTemplate.class);
+        // 设置默认值
+        if (add.getIsPublic() == null) {
+            add.setIsPublic(0); // 默认私有
+        }
+        if (add.getSort() == null) {
+            add.setSort(0);
+        }
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改AI绘画参数模板
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean updateByBo(AiPaintingTemplateBo bo) {
+        AiPaintingTemplate update = MapstructUtils.convert(bo, AiPaintingTemplate.class);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 批量删除AI绘画参数模板
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if (isValid) {
+            // 可以添加业务校验逻辑
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+
+    /**
+     * 根据引擎类型查询可用的模板列表（公开模板 + 用户私有模板）
+     */
+    @Override
+    public List<AiPaintingTemplateVo> queryAvailableTemplates(String engineType, Long userId) {
+        LambdaQueryWrapper<AiPaintingTemplate> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(AiPaintingTemplate::getEngineType, engineType);
+        // 查询公开模板或用户私有模板
+        if (userId != null) {
+            lqw.and(wrapper -> wrapper
+                    .eq(AiPaintingTemplate::getIsPublic, 1)  // 公开模板
+                    .or(w -> w.eq(AiPaintingTemplate::getUserId, userId).eq(AiPaintingTemplate::getIsPublic, 0))  // 用户私有模板
+            );
+        } else {
+            // 未登录用户只能看到公开模板
+            lqw.eq(AiPaintingTemplate::getIsPublic, 1);
+        }
+        // 按排序和创建时间排序
+        lqw.orderByAsc(AiPaintingTemplate::getSort);
+        lqw.orderByDesc(AiPaintingTemplate::getCreateTime);
+        List<AiPaintingTemplateVo> list = baseMapper.selectVoList(lqw);
+        list.forEach(this::convertFields);
+        return list;
+    }
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/service/impl/AiProviderConfigHistoryServiceImpl.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/service/impl/AiProviderConfigHistoryServiceImpl.java
new file mode 100644
index 0000000..415eca6
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/service/impl/AiProviderConfigHistoryServiceImpl.java
@@ -0,0 +1,147 @@
+package org.dromara.ai.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.ai.domain.AiProviderConfigHistory;
+import org.dromara.ai.domain.bo.AiProviderConfigHistoryBo;
+import org.dromara.ai.domain.vo.AiProviderConfigHistoryVo;
+import org.dromara.ai.mapper.AiProviderConfigHistoryMapper;
+import org.dromara.ai.service.AiProviderConfigHistoryService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * AI Provider配置历史Service业务层处理
+ *
+ * @author pengles
+ */
+@RequiredArgsConstructor
+@Service
+public class AiProviderConfigHistoryServiceImpl implements AiProviderConfigHistoryService {
+
+    private final AiProviderConfigHistoryMapper baseMapper;
+
+    /**
+     * 查询AI Provider配置历史
+     */
+    @Override
+    public AiProviderConfigHistoryVo queryById(Long id) {
+        AiProviderConfigHistoryVo vo = baseMapper.selectVoById(id);
+        if (vo != null) {
+            // 转换操作类型字段
+            vo.setOperationTypeStr(convertOperationType(vo.getOperationType()));
+        }
+        return vo;
+    }
+
+    /**
+     * 查询AI Provider配置历史列表
+     */
+    @Override
+    public TableDataInfo<AiProviderConfigHistoryVo> queryPageList(AiProviderConfigHistoryBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<AiProviderConfigHistory> lqw = buildQueryWrapper(bo);
+        Page<AiProviderConfigHistoryVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        // 转换操作类型字段
+        result.getRecords().forEach(vo -> {
+            vo.setOperationTypeStr(convertOperationType(vo.getOperationType()));
+        });
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询AI Provider配置历史列表
+     */
+    @Override
+    public List<AiProviderConfigHistoryVo> queryList(AiProviderConfigHistoryBo bo) {
+        LambdaQueryWrapper<AiProviderConfigHistory> lqw = buildQueryWrapper(bo);
+        List<AiProviderConfigHistoryVo> list = baseMapper.selectVoList(lqw);
+        // 转换操作类型字段
+        list.forEach(vo -> {
+            vo.setOperationTypeStr(convertOperationType(vo.getOperationType()));
+        });
+        return list;
+    }
+
+    /**
+     * 构建查询条件
+     */
+    private LambdaQueryWrapper<AiProviderConfigHistory> buildQueryWrapper(AiProviderConfigHistoryBo bo) {
+        LambdaQueryWrapper<AiProviderConfigHistory> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(bo.getConfigId() != null, AiProviderConfigHistory::getConfigId, bo.getConfigId());
+        lqw.eq(StringUtils.isNotBlank(bo.getProviderName()), AiProviderConfigHistory::getProviderName, bo.getProviderName());
+        lqw.eq(StringUtils.isNotBlank(bo.getOperationType()), AiProviderConfigHistory::getOperationType, bo.getOperationType());
+        lqw.eq(StringUtils.isNotBlank(bo.getOperationBy()), AiProviderConfigHistory::getOperationBy, bo.getOperationBy());
+        // 时间范围查询
+        lqw.ge(bo.getOperationTimeStart() != null, AiProviderConfigHistory::getOperationTime, bo.getOperationTimeStart());
+        lqw.le(bo.getOperationTimeEnd() != null, AiProviderConfigHistory::getOperationTime, bo.getOperationTimeEnd());
+        // 按操作时间倒序排序
+        lqw.orderByDesc(AiProviderConfigHistory::getOperationTime);
+        return lqw;
+    }
+
+    /**
+     * 新增AI Provider配置历史
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean insertByBo(AiProviderConfigHistoryBo bo) {
+        AiProviderConfigHistory add = MapstructUtils.convert(bo, AiProviderConfigHistory.class);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 批量删除AI Provider配置历史
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if (isValid) {
+            // 可以添加业务校验逻辑
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+
+    /**
+     * 根据配置ID查询历史记录列表
+     */
+    @Override
+    public List<AiProviderConfigHistoryVo> queryByConfigId(Long configId) {
+        LambdaQueryWrapper<AiProviderConfigHistory> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(AiProviderConfigHistory::getConfigId, configId);
+        lqw.orderByDesc(AiProviderConfigHistory::getOperationTime);
+        List<AiProviderConfigHistoryVo> list = baseMapper.selectVoList(lqw);
+        // 转换操作类型字段
+        list.forEach(vo -> {
+            vo.setOperationTypeStr(convertOperationType(vo.getOperationType()));
+        });
+        return list;
+    }
+
+    /**
+     * 转换操作类型
+     */
+    private String convertOperationType(String operationType) {
+        if (StringUtils.isBlank(operationType)) {
+            return "";
+        }
+        return switch (operationType) {
+            case "CREATE" -> "创建";
+            case "UPDATE" -> "更新";
+            case "DELETE" -> "删除";
+            default -> operationType;
+        };
+    }
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/service/impl/AiProviderConfigServiceImpl.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/service/impl/AiProviderConfigServiceImpl.java
new file mode 100644
index 0000000..ecd72f4
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/service/impl/AiProviderConfigServiceImpl.java
@@ -0,0 +1,262 @@
+package org.dromara.ai.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.json.utils.JsonUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.ai.domain.AiProviderConfig;
+import org.dromara.ai.domain.bo.AiProviderConfigBo;
+import org.dromara.ai.domain.bo.AiProviderConfigHistoryBo;
+import org.dromara.ai.domain.vo.AiProviderConfigVo;
+import org.dromara.ai.mapper.AiProviderConfigMapper;
+import org.dromara.ai.service.AiProviderConfigService;
+import org.dromara.ai.service.AiProviderConfigHistoryService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * AI Provider配置Service业务层处理
+ *
+ * @author pengles
+ */
+@RequiredArgsConstructor
+@Service
+public class AiProviderConfigServiceImpl implements AiProviderConfigService {
+
+    private final AiProviderConfigMapper baseMapper;
+    private final AiProviderConfigHistoryService configHistoryService;
+
+    /**
+     * 查询AI Provider配置
+     */
+    @Override
+    public AiProviderConfigVo queryById(Long id) {
+        AiProviderConfigVo vo = baseMapper.selectVoById(id);
+        if (vo != null) {
+            // 转换启用状态字段
+            vo.setEnabledStr(vo.getEnabled() != null && vo.getEnabled() == 1 ? "启用" : "禁用");
+        }
+        return vo;
+    }
+
+    /**
+     * 查询AI Provider配置列表
+     */
+    @Override
+    public TableDataInfo<AiProviderConfigVo> queryPageList(AiProviderConfigBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<AiProviderConfig> lqw = buildQueryWrapper(bo);
+        Page<AiProviderConfigVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        // 转换启用状态字段
+        result.getRecords().forEach(vo -> {
+            vo.setEnabledStr(vo.getEnabled() != null && vo.getEnabled() == 1 ? "启用" : "禁用");
+        });
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询AI Provider配置列表
+     */
+    @Override
+    public List<AiProviderConfigVo> queryList(AiProviderConfigBo bo) {
+        LambdaQueryWrapper<AiProviderConfig> lqw = buildQueryWrapper(bo);
+        List<AiProviderConfigVo> list = baseMapper.selectVoList(lqw);
+        // 转换启用状态字段
+        list.forEach(vo -> {
+            vo.setEnabledStr(vo.getEnabled() != null && vo.getEnabled() == 1 ? "启用" : "禁用");
+        });
+        return list;
+    }
+
+    /**
+     * 构建查询条件
+     */
+    private LambdaQueryWrapper<AiProviderConfig> buildQueryWrapper(AiProviderConfigBo bo) {
+        LambdaQueryWrapper<AiProviderConfig> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(StringUtils.isNotBlank(bo.getProviderName()), AiProviderConfig::getProviderName, bo.getProviderName());
+        lqw.eq(StringUtils.isNotBlank(bo.getProviderType()), AiProviderConfig::getProviderType, bo.getProviderType());
+        lqw.eq(bo.getEnabled() != null, AiProviderConfig::getEnabled, bo.getEnabled());
+        lqw.eq(bo.getPriority() != null, AiProviderConfig::getPriority, bo.getPriority());
+        // 时间范围查询
+        lqw.ge(bo.getCreateTimeStart() != null, AiProviderConfig::getCreateTime, bo.getCreateTimeStart());
+        lqw.le(bo.getCreateTimeEnd() != null, AiProviderConfig::getCreateTime, bo.getCreateTimeEnd());
+        // 按优先级和创建时间排序
+        lqw.orderByAsc(AiProviderConfig::getPriority);
+        lqw.orderByDesc(AiProviderConfig::getCreateTime);
+        return lqw;
+    }
+
+    /**
+     * 新增AI Provider配置
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean insertByBo(AiProviderConfigBo bo) {
+        AiProviderConfig add = MapstructUtils.convert(bo, AiProviderConfig.class);
+        validEntityBeforeSave(add);
+        // 设置默认值
+        if (add.getEnabled() == null) {
+            add.setEnabled(1); // 默认启用
+        }
+        if (add.getPriority() == null) {
+            add.setPriority(0);
+        }
+        if (add.getWeight() == null) {
+            add.setWeight(1);
+        }
+        if (add.getMaxConcurrency() == null) {
+            add.setMaxConcurrency(10);
+        }
+        if (add.getTimeoutSeconds() == null) {
+            add.setTimeoutSeconds(30);
+        }
+        if (add.getMaxRetries() == null) {
+            add.setMaxRetries(3);
+        }
+        if (add.getHealthCheckInterval() == null) {
+            add.setHealthCheckInterval(60);
+        }
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+            // 记录历史
+            saveConfigHistory(add.getId(), add.getProviderName(), add, "CREATE", null);
+        }
+        return flag;
+    }
+
+    /**
+     * 修改AI Provider配置
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean updateByBo(AiProviderConfigBo bo) {
+        // 查询原配置
+        AiProviderConfig oldConfig = baseMapper.selectById(bo.getId());
+        if (oldConfig == null) {
+            throw new ServiceException("Provider配置不存在");
+        }
+        
+        AiProviderConfig update = MapstructUtils.convert(bo, AiProviderConfig.class);
+        validEntityBeforeSave(update);
+        boolean flag = baseMapper.updateById(update) > 0;
+        if (flag) {
+            // 查询更新后的配置
+            AiProviderConfig newConfig = baseMapper.selectById(bo.getId());
+            // 记录历史
+            saveConfigHistory(newConfig.getId(), newConfig.getProviderName(), newConfig, "UPDATE", null);
+        }
+        return flag;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(AiProviderConfig entity) {
+        // 检查Provider名称是否重复
+        LambdaQueryWrapper<AiProviderConfig> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(AiProviderConfig::getProviderName, entity.getProviderName());
+        if (entity.getId() != null) {
+            lqw.ne(AiProviderConfig::getId, entity.getId());
+        }
+        Long count = baseMapper.selectCount(lqw);
+        if (count > 0) {
+            throw new ServiceException("Provider名称已存在");
+        }
+    }
+
+    /**
+     * 批量删除AI Provider配置
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if (isValid) {
+            // 可以添加业务校验逻辑
+        }
+        // 查询待删除的配置，记录历史
+        for (Long id : ids) {
+            AiProviderConfig config = baseMapper.selectById(id);
+            if (config != null) {
+                saveConfigHistory(config.getId(), config.getProviderName(), config, "DELETE", null);
+            }
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+
+    /**
+     * 启用/禁用Provider配置
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean changeEnabled(Long id, Integer enabled) {
+        AiProviderConfig config = baseMapper.selectById(id);
+        if (config == null) {
+            throw new ServiceException("Provider配置不存在");
+        }
+        config.setEnabled(enabled);
+        boolean flag = baseMapper.updateById(config) > 0;
+        if (flag) {
+            // 查询更新后的配置
+            AiProviderConfig updatedConfig = baseMapper.selectById(id);
+            // 记录历史
+            String remark = enabled == 1 ? "启用配置" : "禁用配置";
+            saveConfigHistory(updatedConfig.getId(), updatedConfig.getProviderName(), updatedConfig, "UPDATE", remark);
+        }
+        return flag;
+    }
+
+    /**
+     * 根据Provider名称查询配置
+     */
+    @Override
+    public AiProviderConfigVo queryByProviderName(String providerName) {
+        LambdaQueryWrapper<AiProviderConfig> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(StringUtils.isNotBlank(providerName), AiProviderConfig::getProviderName, providerName);
+        AiProviderConfig config = baseMapper.selectOne(lqw);
+        if (config != null) {
+            AiProviderConfigVo vo = MapstructUtils.convert(config, AiProviderConfigVo.class);
+            vo.setEnabledStr(vo.getEnabled() != null && vo.getEnabled() == 1 ? "启用" : "禁用");
+            return vo;
+        }
+        return null;
+    }
+
+    /**
+     * 保存配置历史
+     */
+    private void saveConfigHistory(Long configId, String providerName, AiProviderConfig config, String operationType, String remark) {
+        try {
+            AiProviderConfigHistoryBo historyBo = new AiProviderConfigHistoryBo();
+            historyBo.setConfigId(configId);
+            historyBo.setProviderName(providerName);
+            // 将配置对象序列化为JSON字符串
+            historyBo.setConfigData(JsonUtils.toJsonString(config));
+            historyBo.setOperationType(operationType);
+            historyBo.setOperationTime(new Date());
+            // 获取当前登录用户
+            try {
+                String username = LoginHelper.getUsername();
+                historyBo.setOperationBy(username != null ? username : "system");
+            } catch (Exception e) {
+                historyBo.setOperationBy("system");
+            }
+            historyBo.setRemark(remark);
+            configHistoryService.insertByBo(historyBo);
+        } catch (Exception e) {
+            // 记录历史失败不影响主流程，只记录日志
+            // 注意：这里不要使用log，因为可能没有引入日志依赖，或者可以导入日志类
+            // log.warn("保存Provider配置历史失败", e);
+        }
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/service/impl/AiRatingRecordServiceImpl.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/service/impl/AiRatingRecordServiceImpl.java
new file mode 100644
index 0000000..9d16709
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/service/impl/AiRatingRecordServiceImpl.java
@@ -0,0 +1,175 @@
+package org.dromara.ai.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.ai.domain.AiRatingRecord;
+import org.dromara.ai.domain.bo.AiRatingRecordBo;
+import org.dromara.ai.domain.vo.AiRatingRecordVo;
+import org.dromara.ai.mapper.AiRatingRecordMapper;
+import org.dromara.ai.service.AiRatingRecordService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * AI评价记录Service业务层处理
+ *
+ * @author pengles
+ */
+@RequiredArgsConstructor
+@Service
+public class AiRatingRecordServiceImpl implements AiRatingRecordService {
+
+    private final AiRatingRecordMapper baseMapper;
+
+    /**
+     * 查询AI评价记录
+     */
+    @Override
+    public AiRatingRecordVo queryById(Long id) {
+        AiRatingRecordVo vo = baseMapper.selectVoById(id);
+        if (vo != null) {
+            // 转换匿名字段
+            vo.setAnonymousStr(vo.getAnonymous() != null && vo.getAnonymous() == 1 ? "是" : "否");
+        }
+        return vo;
+    }
+
+    /**
+     * 查询AI评价记录列表
+     */
+    @Override
+    public TableDataInfo<AiRatingRecordVo> queryPageList(AiRatingRecordBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<AiRatingRecord> lqw = buildQueryWrapper(bo);
+        Page<AiRatingRecordVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        // 转换匿名字段
+        result.getRecords().forEach(vo -> {
+            vo.setAnonymousStr(vo.getAnonymous() != null && vo.getAnonymous() == 1 ? "是" : "否");
+        });
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询AI评价记录列表
+     */
+    @Override
+    public List<AiRatingRecordVo> queryList(AiRatingRecordBo bo) {
+        LambdaQueryWrapper<AiRatingRecord> lqw = buildQueryWrapper(bo);
+        List<AiRatingRecordVo> list = baseMapper.selectVoList(lqw);
+        // 转换匿名字段
+        list.forEach(vo -> {
+            vo.setAnonymousStr(vo.getAnonymous() != null && vo.getAnonymous() == 1 ? "是" : "否");
+        });
+        return list;
+    }
+
+    /**
+     * 构建查询条件
+     */
+    private LambdaQueryWrapper<AiRatingRecord> buildQueryWrapper(AiRatingRecordBo bo) {
+        LambdaQueryWrapper<AiRatingRecord> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(StringUtils.isNotBlank(bo.getMessageId()), AiRatingRecord::getMessageId, bo.getMessageId());
+        lqw.eq(bo.getUserId() != null, AiRatingRecord::getUserId, bo.getUserId());
+        lqw.like(StringUtils.isNotBlank(bo.getProviderName()), AiRatingRecord::getProviderName, bo.getProviderName());
+        lqw.eq(bo.getRating() != null, AiRatingRecord::getRating, bo.getRating());
+        lqw.like(StringUtils.isNotBlank(bo.getDimension()), AiRatingRecord::getDimension, bo.getDimension());
+        lqw.eq(bo.getAnonymous() != null, AiRatingRecord::getAnonymous, bo.getAnonymous());
+        // 时间范围查询
+        lqw.ge(bo.getCreateTimeStart() != null, AiRatingRecord::getCreateTime, bo.getCreateTimeStart());
+        lqw.le(bo.getCreateTimeEnd() != null, AiRatingRecord::getCreateTime, bo.getCreateTimeEnd());
+        // 按创建时间倒序
+        lqw.orderByDesc(AiRatingRecord::getCreateTime);
+        return lqw;
+    }
+
+    /**
+     * 新增AI评价记录
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean insertByBo(AiRatingRecordBo bo) {
+        AiRatingRecord add = MapstructUtils.convert(bo, AiRatingRecord.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(AiRatingRecord entity) {
+        // 评分必须在1-5之间
+        if (entity.getRating() != null && (entity.getRating() < 1 || entity.getRating() > 5)) {
+            throw new ServiceException("评分必须在1-5之间");
+        }
+        // 检查是否已存在相同messageId和userId的评价记录
+        if (entity.getMessageId() != null && entity.getUserId() != null) {
+            LambdaQueryWrapper<AiRatingRecord> lqw = new LambdaQueryWrapper<>();
+            lqw.eq(AiRatingRecord::getMessageId, entity.getMessageId());
+            lqw.eq(AiRatingRecord::getUserId, entity.getUserId());
+            if (entity.getId() != null) {
+                lqw.ne(AiRatingRecord::getId, entity.getId());
+            }
+            Long count = baseMapper.selectCount(lqw);
+            if (count > 0) {
+                throw new ServiceException("该消息已评价，不能重复评价");
+            }
+        }
+    }
+
+    /**
+     * 批量删除AI评价记录
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if (isValid) {
+            // 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+
+    /**
+     * 根据消息ID查询评价记录
+     */
+    @Override
+    public AiRatingRecordVo queryByMessageId(String messageId, Long userId) {
+        LambdaQueryWrapper<AiRatingRecord> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(StringUtils.isNotBlank(messageId), AiRatingRecord::getMessageId, messageId);
+        lqw.eq(userId != null, AiRatingRecord::getUserId, userId);
+        AiRatingRecord record = baseMapper.selectOne(lqw);
+        if (record != null) {
+            AiRatingRecordVo vo = MapstructUtils.convert(record, AiRatingRecordVo.class);
+            vo.setAnonymousStr(vo.getAnonymous() != null && vo.getAnonymous() == 1 ? "是" : "否");
+            return vo;
+        }
+        return null;
+    }
+
+    /**
+     * 获取平均评分
+     */
+    @Override
+    public Double getAverageRating(String providerName) {
+        LambdaQueryWrapper<AiRatingRecord> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(StringUtils.isNotBlank(providerName), AiRatingRecord::getProviderName, providerName);
+        List<AiRatingRecord> list = baseMapper.selectList(lqw);
+        if (list.isEmpty()) {
+            return 0.0;
+        }
+        double sum = list.stream().mapToInt(AiRatingRecord::getRating).sum();
+        return sum / list.size();
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/service/impl/AiSensitiveWordServiceImpl.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/service/impl/AiSensitiveWordServiceImpl.java
new file mode 100644
index 0000000..3fed5aa
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/service/impl/AiSensitiveWordServiceImpl.java
@@ -0,0 +1,222 @@
+package org.dromara.ai.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.ai.domain.AiSensitiveWord;
+import org.dromara.ai.domain.bo.AiSensitiveWordBo;
+import org.dromara.ai.domain.vo.AiSensitiveWordVo;
+import org.dromara.ai.mapper.AiSensitiveWordMapper;
+import org.dromara.ai.service.AiSensitiveWordService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * AI敏感词Service业务层处理
+ *
+ * @author pengles
+ */
+@RequiredArgsConstructor
+@Service
+public class AiSensitiveWordServiceImpl implements AiSensitiveWordService {
+
+    private final AiSensitiveWordMapper baseMapper;
+
+    /**
+     * 查询AI敏感词
+     */
+    @Override
+    public AiSensitiveWordVo queryById(Long id) {
+        AiSensitiveWordVo vo = baseMapper.selectVoById(id);
+        if (vo != null) {
+            convertFields(vo);
+        }
+        return vo;
+    }
+
+    /**
+     * 查询AI敏感词列表
+     */
+    @Override
+    public TableDataInfo<AiSensitiveWordVo> queryPageList(AiSensitiveWordBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<AiSensitiveWord> lqw = buildQueryWrapper(bo);
+        Page<AiSensitiveWordVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        result.getRecords().forEach(this::convertFields);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询AI敏感词列表
+     */
+    @Override
+    public List<AiSensitiveWordVo> queryList(AiSensitiveWordBo bo) {
+        LambdaQueryWrapper<AiSensitiveWord> lqw = buildQueryWrapper(bo);
+        List<AiSensitiveWordVo> list = baseMapper.selectVoList(lqw);
+        list.forEach(this::convertFields);
+        return list;
+    }
+
+    /**
+     * 构建查询条件
+     */
+    private LambdaQueryWrapper<AiSensitiveWord> buildQueryWrapper(AiSensitiveWordBo bo) {
+        LambdaQueryWrapper<AiSensitiveWord> lqw = new LambdaQueryWrapper<>();
+        lqw.like(StringUtils.isNotBlank(bo.getWord()), AiSensitiveWord::getWord, bo.getWord());
+        lqw.eq(StringUtils.isNotBlank(bo.getWordType()), AiSensitiveWord::getWordType, bo.getWordType());
+        lqw.eq(bo.getEnabled() != null, AiSensitiveWord::getEnabled, bo.getEnabled());
+        // 时间范围查询
+        lqw.ge(bo.getCreateTimeStart() != null, AiSensitiveWord::getCreateTime, bo.getCreateTimeStart());
+        lqw.le(bo.getCreateTimeEnd() != null, AiSensitiveWord::getCreateTime, bo.getCreateTimeEnd());
+        // 按优先级和创建时间排序
+        lqw.orderByDesc(AiSensitiveWord::getPriority);
+        lqw.orderByDesc(AiSensitiveWord::getCreateTime);
+        return lqw;
+    }
+
+    /**
+     * 转换字段（用于显示）
+     */
+    private void convertFields(AiSensitiveWordVo vo) {
+        // 转换启用状态
+        vo.setEnabledStr(vo.getEnabled() != null && vo.getEnabled() == 1 ? "启用" : "禁用");
+        // 转换词类型
+        vo.setWordTypeStr(convertWordType(vo.getWordType()));
+    }
+
+    /**
+     * 转换词类型
+     */
+    private String convertWordType(String wordType) {
+        if (StringUtils.isBlank(wordType)) {
+            return "";
+        }
+        return switch (wordType) {
+            case "PROFANITY" -> "脏话";
+            case "HATE_SPEECH" -> "仇恨言论";
+            case "VIOLENCE" -> "暴力内容";
+            case "SEXUAL_CONTENT" -> "性内容";
+            case "ILLEGAL_ACTIVITY" -> "非法活动";
+            case "PERSONAL_INFO" -> "个人信息";
+            case "SPAM" -> "垃圾信息";
+            case "MALICIOUS_CODE" -> "恶意代码";
+            case "POLITICAL_SENSITIVE" -> "政治敏感";
+            case "COMMERCIAL_AD" -> "商业广告";
+            default -> wordType;
+        };
+    }
+
+    /**
+     * 新增AI敏感词
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean insertByBo(AiSensitiveWordBo bo) {
+        AiSensitiveWord add = MapstructUtils.convert(bo, AiSensitiveWord.class);
+        validEntityBeforeSave(add);
+        // 设置默认值
+        if (add.getEnabled() == null) {
+            add.setEnabled(1); // 默认启用
+        }
+        if (add.getPriority() == null) {
+            add.setPriority(0);
+        }
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改AI敏感词
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean updateByBo(AiSensitiveWordBo bo) {
+        AiSensitiveWord update = MapstructUtils.convert(bo, AiSensitiveWord.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(AiSensitiveWord entity) {
+        // 检查敏感词是否重复
+        LambdaQueryWrapper<AiSensitiveWord> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(AiSensitiveWord::getWord, entity.getWord());
+        if (entity.getId() != null) {
+            lqw.ne(AiSensitiveWord::getId, entity.getId());
+        }
+        Long count = baseMapper.selectCount(lqw);
+        if (count > 0) {
+            throw new ServiceException("敏感词已存在");
+        }
+    }
+
+    /**
+     * 批量删除AI敏感词
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if (isValid) {
+            // 可以添加业务校验逻辑
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+
+    /**
+     * 启用/禁用敏感词
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean changeEnabled(Long id, Integer enabled) {
+        AiSensitiveWord word = baseMapper.selectById(id);
+        if (word == null) {
+            throw new ServiceException("敏感词不存在");
+        }
+        word.setEnabled(enabled);
+        return baseMapper.updateById(word) > 0;
+    }
+
+    /**
+     * 根据词类型获取启用的敏感词集合
+     */
+    @Override
+    public Set<String> getEnabledWordsByType(String wordType) {
+        LambdaQueryWrapper<AiSensitiveWord> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(AiSensitiveWord::getWordType, wordType);
+        lqw.eq(AiSensitiveWord::getEnabled, 1);
+        List<AiSensitiveWord> list = baseMapper.selectList(lqw);
+        return list.stream()
+                .map(AiSensitiveWord::getWord)
+                .collect(Collectors.toSet());
+    }
+
+    /**
+     * 获取所有启用的敏感词集合（按类型分组）
+     */
+    @Override
+    public Map<String, Set<String>> getAllEnabledWords() {
+        LambdaQueryWrapper<AiSensitiveWord> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(AiSensitiveWord::getEnabled, 1);
+        List<AiSensitiveWord> list = baseMapper.selectList(lqw);
+        
+        Map<String, Set<String>> result = new HashMap<>();
+        for (AiSensitiveWord word : list) {
+            result.computeIfAbsent(word.getWordType(), k -> new HashSet<>())
+                    .add(word.getWord());
+        }
+        return result;
+    }
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/service/impl/AiUsageStatsServiceImpl.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/service/impl/AiUsageStatsServiceImpl.java
new file mode 100644
index 0000000..c4f93eb
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/service/impl/AiUsageStatsServiceImpl.java
@@ -0,0 +1,305 @@
+package org.dromara.ai.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.ai.domain.AiUsageStats;
+import org.dromara.ai.domain.bo.AiUsageStatsBo;
+import org.dromara.ai.domain.vo.AiUsageStatsVo;
+import org.dromara.ai.mapper.AiUsageStatsMapper;
+import org.dromara.ai.service.AiUsageStatsService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.time.LocalDate;
+import java.time.ZoneId;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * AI使用统计Service业务层处理
+ *
+ * @author pengles
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class AiUsageStatsServiceImpl implements AiUsageStatsService {
+
+    private final AiUsageStatsMapper baseMapper;
+
+    /**
+     * 查询AI使用统计
+     */
+    @Override
+    public AiUsageStatsVo queryById(Long id) {
+        AiUsageStatsVo vo = baseMapper.selectVoById(id);
+        if (vo != null) {
+            calculateSuccessRate(vo);
+        }
+        return vo;
+    }
+
+    /**
+     * 查询AI使用统计列表
+     */
+    @Override
+    public TableDataInfo<AiUsageStatsVo> queryPageList(AiUsageStatsBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<AiUsageStats> lqw = buildQueryWrapper(bo);
+        Page<AiUsageStatsVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        // 计算成功率
+        result.getRecords().forEach(this::calculateSuccessRate);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询AI使用统计列表
+     */
+    @Override
+    public List<AiUsageStatsVo> queryList(AiUsageStatsBo bo) {
+        LambdaQueryWrapper<AiUsageStats> lqw = buildQueryWrapper(bo);
+        List<AiUsageStatsVo> list = baseMapper.selectVoList(lqw);
+        // 计算成功率
+        list.forEach(this::calculateSuccessRate);
+        return list;
+    }
+
+    /**
+     * 构建查询条件
+     */
+    private LambdaQueryWrapper<AiUsageStats> buildQueryWrapper(AiUsageStatsBo bo) {
+        LambdaQueryWrapper<AiUsageStats> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(bo.getUserId() != null, AiUsageStats::getUserId, bo.getUserId());
+        lqw.like(StringUtils.isNotBlank(bo.getProviderName()), AiUsageStats::getProviderName, bo.getProviderName());
+        lqw.like(StringUtils.isNotBlank(bo.getModelName()), AiUsageStats::getModelName, bo.getModelName());
+        // 时间范围查询
+        lqw.ge(bo.getStatDateStart() != null, AiUsageStats::getStatDate, bo.getStatDateStart());
+        lqw.le(bo.getStatDateEnd() != null, AiUsageStats::getStatDate, bo.getStatDateEnd());
+        // 按统计日期倒序
+        lqw.orderByDesc(AiUsageStats::getStatDate);
+        return lqw;
+    }
+
+    /**
+     * 记录使用统计
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void recordUsage(Long userId, String providerName, String modelName,
+                           Long tokens, BigDecimal cost, Integer responseTime, Boolean success) {
+        if (userId == null || StringUtils.isBlank(providerName)) {
+            return;
+        }
+
+        try {
+            // 获取今天的日期（只取日期部分，忽略时间）
+            LocalDate localDate = LocalDate.now();
+            Date statDate = Date.from(localDate.atStartOfDay(ZoneId.systemDefault()).toInstant());
+
+            // 查询是否存在当天的统计记录
+            LambdaQueryWrapper<AiUsageStats> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.eq(AiUsageStats::getUserId, userId)
+                    .eq(AiUsageStats::getProviderName, providerName)
+                    .eq(statDate != null, AiUsageStats::getStatDate, statDate);
+            if (StringUtils.isNotBlank(modelName)) {
+                queryWrapper.eq(AiUsageStats::getModelName, modelName);
+            } else {
+                queryWrapper.isNull(AiUsageStats::getModelName);
+            }
+
+            AiUsageStats existing = baseMapper.selectOne(queryWrapper);
+
+            if (existing != null) {
+                // 更新现有记录
+                existing.setRequestCount((existing.getRequestCount() != null ? existing.getRequestCount() : 0) + 1);
+                if (success) {
+                    existing.setSuccessCount((existing.getSuccessCount() != null ? existing.getSuccessCount() : 0) + 1);
+                } else {
+                    existing.setErrorCount((existing.getErrorCount() != null ? existing.getErrorCount() : 0) + 1);
+                }
+                if (tokens != null && tokens > 0) {
+                    existing.setTotalTokens((existing.getTotalTokens() != null ? existing.getTotalTokens() : 0L) + tokens);
+                }
+                if (cost != null && cost.compareTo(BigDecimal.ZERO) > 0) {
+                    existing.setTotalCost((existing.getTotalCost() != null ? existing.getTotalCost() : BigDecimal.ZERO).add(cost));
+                }
+                // 重新计算平均响应时间
+                if (responseTime != null && responseTime > 0) {
+                    int oldRequestCount = existing.getRequestCount() - 1;
+                    int oldAvgResponseTime = existing.getAvgResponseTime() != null ? existing.getAvgResponseTime() : 0;
+                    int newAvgResponseTime = (oldAvgResponseTime * oldRequestCount + responseTime) / existing.getRequestCount();
+                    existing.setAvgResponseTime(newAvgResponseTime);
+                }
+
+                baseMapper.updateById(existing);
+            } else {
+                // 插入新记录
+                AiUsageStats stats = new AiUsageStats();
+                stats.setUserId(userId);
+                stats.setProviderName(providerName);
+                stats.setModelName(modelName);
+                stats.setStatDate(statDate);
+                stats.setRequestCount(1);
+                stats.setSuccessCount(success ? 1 : 0);
+                stats.setErrorCount(success ? 0 : 1);
+                stats.setTotalTokens(tokens != null ? tokens : 0L);
+                stats.setTotalCost(cost != null ? cost : BigDecimal.ZERO);
+                stats.setAvgResponseTime(responseTime != null ? responseTime : 0);
+                baseMapper.insert(stats);
+            }
+        } catch (Exception e) {
+            log.error("记录使用统计失败 - 用户: {}, Provider: {}, 模型: {}", userId, providerName, modelName, e);
+            // 不抛出异常，避免影响主业务流程
+        }
+    }
+
+    /**
+     * 获取汇总统计
+     */
+    @Override
+    public Map<String, Object> getSummaryStats(Date startDate, Date endDate) {
+        LambdaQueryWrapper<AiUsageStats> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.ge(startDate != null, AiUsageStats::getStatDate, startDate)
+                .le(endDate != null, AiUsageStats::getStatDate, endDate);
+
+        List<AiUsageStats> list = baseMapper.selectList(queryWrapper);
+
+        Map<String, Object> result = new HashMap<>();
+        int totalRequests = list.stream().mapToInt(s -> s.getRequestCount() != null ? s.getRequestCount() : 0).sum();
+        int totalSuccess = list.stream().mapToInt(s -> s.getSuccessCount() != null ? s.getSuccessCount() : 0).sum();
+        int totalErrors = list.stream().mapToInt(s -> s.getErrorCount() != null ? s.getErrorCount() : 0).sum();
+        long totalTokens = list.stream().mapToLong(s -> s.getTotalTokens() != null ? s.getTotalTokens() : 0L).sum();
+        BigDecimal totalCost = list.stream()
+                .map(s -> s.getTotalCost() != null ? s.getTotalCost() : BigDecimal.ZERO)
+                .reduce(BigDecimal.ZERO, BigDecimal::add);
+
+        // 计算平均响应时间（加权平均）
+        int totalResponseTime = 0;
+        int requestCount = 0;
+        for (AiUsageStats stats : list) {
+            if (stats.getAvgResponseTime() != null && stats.getRequestCount() != null && stats.getRequestCount() > 0) {
+                totalResponseTime += stats.getAvgResponseTime() * stats.getRequestCount();
+                requestCount += stats.getRequestCount();
+            }
+        }
+        int avgResponseTime = requestCount > 0 ? totalResponseTime / requestCount : 0;
+
+        result.put("totalRequests", totalRequests);
+        result.put("totalSuccess", totalSuccess);
+        result.put("totalErrors", totalErrors);
+        result.put("totalTokens", totalTokens);
+        result.put("totalCost", totalCost);
+        result.put("avgResponseTime", avgResponseTime);
+        result.put("successRate", totalRequests > 0 ? (double) totalSuccess / totalRequests : 0.0);
+
+        return result;
+    }
+
+    /**
+     * 获取用户统计
+     */
+    @Override
+    public Map<String, Object> getUserStats(Long userId, Date startDate, Date endDate) {
+        LambdaQueryWrapper<AiUsageStats> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(AiUsageStats::getUserId, userId)
+                .ge(startDate != null, AiUsageStats::getStatDate, startDate)
+                .le(endDate != null, AiUsageStats::getStatDate, endDate);
+
+        List<AiUsageStats> list = baseMapper.selectList(queryWrapper);
+        return calculateStats(list);
+    }
+
+    /**
+     * 获取Provider统计
+     */
+    @Override
+    public Map<String, Object> getProviderStats(String providerName, Date startDate, Date endDate) {
+        LambdaQueryWrapper<AiUsageStats> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(AiUsageStats::getProviderName, providerName)
+                .ge(startDate != null, AiUsageStats::getStatDate, startDate)
+                .le(endDate != null, AiUsageStats::getStatDate, endDate);
+
+        List<AiUsageStats> list = baseMapper.selectList(queryWrapper);
+        return calculateStats(list);
+    }
+
+    /**
+     * 获取趋势数据
+     */
+    @Override
+    public List<Map<String, Object>> getTrendData(Date startDate, Date endDate, String groupBy) {
+        LambdaQueryWrapper<AiUsageStats> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.ge(startDate != null, AiUsageStats::getStatDate, startDate)
+                .le(endDate != null, AiUsageStats::getStatDate, endDate)
+                .orderByAsc(AiUsageStats::getStatDate);
+
+        List<AiUsageStats> list = baseMapper.selectList(queryWrapper);
+
+        // 按日期分组聚合
+        Map<Date, List<AiUsageStats>> grouped = list.stream()
+                .collect(Collectors.groupingBy(AiUsageStats::getStatDate));
+
+        List<Map<String, Object>> result = new ArrayList<>();
+        for (Map.Entry<Date, List<AiUsageStats>> entry : grouped.entrySet()) {
+            Map<String, Object> dayStats = calculateStats(entry.getValue());
+            dayStats.put("date", entry.getKey());
+            result.add(dayStats);
+        }
+
+        return result;
+    }
+
+    /**
+     * 计算统计数据
+     */
+    private Map<String, Object> calculateStats(List<AiUsageStats> list) {
+        Map<String, Object> result = new HashMap<>();
+        int totalRequests = list.stream().mapToInt(s -> s.getRequestCount() != null ? s.getRequestCount() : 0).sum();
+        int totalSuccess = list.stream().mapToInt(s -> s.getSuccessCount() != null ? s.getSuccessCount() : 0).sum();
+        int totalErrors = list.stream().mapToInt(s -> s.getErrorCount() != null ? s.getErrorCount() : 0).sum();
+        long totalTokens = list.stream().mapToLong(s -> s.getTotalTokens() != null ? s.getTotalTokens() : 0L).sum();
+        BigDecimal totalCost = list.stream()
+                .map(s -> s.getTotalCost() != null ? s.getTotalCost() : BigDecimal.ZERO)
+                .reduce(BigDecimal.ZERO, BigDecimal::add);
+
+        // 计算平均响应时间
+        int totalResponseTime = 0;
+        int requestCount = 0;
+        for (AiUsageStats stats : list) {
+            if (stats.getAvgResponseTime() != null && stats.getRequestCount() != null && stats.getRequestCount() > 0) {
+                totalResponseTime += stats.getAvgResponseTime() * stats.getRequestCount();
+                requestCount += stats.getRequestCount();
+            }
+        }
+        int avgResponseTime = requestCount > 0 ? totalResponseTime / requestCount : 0;
+
+        result.put("totalRequests", totalRequests);
+        result.put("totalSuccess", totalSuccess);
+        result.put("totalErrors", totalErrors);
+        result.put("totalTokens", totalTokens);
+        result.put("totalCost", totalCost);
+        result.put("avgResponseTime", avgResponseTime);
+        result.put("successRate", totalRequests > 0 ? (double) totalSuccess / totalRequests : 0.0);
+
+        return result;
+    }
+
+    /**
+     * 计算成功率
+     */
+    private void calculateSuccessRate(AiUsageStatsVo vo) {
+        if (vo.getRequestCount() != null && vo.getRequestCount() > 0) {
+            double rate = (double) (vo.getSuccessCount() != null ? vo.getSuccessCount() : 0) / vo.getRequestCount();
+            vo.setSuccessRate(BigDecimal.valueOf(rate).setScale(4, RoundingMode.HALF_UP).doubleValue());
+        } else {
+            vo.setSuccessRate(0.0);
+        }
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/service/impl/AiUserQuotaServiceImpl.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/service/impl/AiUserQuotaServiceImpl.java
new file mode 100644
index 0000000..a63f840
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/service/impl/AiUserQuotaServiceImpl.java
@@ -0,0 +1,308 @@
+package org.dromara.ai.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.ai.domain.AiUserQuota;
+import org.dromara.ai.domain.bo.AiUserQuotaBo;
+import org.dromara.ai.domain.vo.AiUserQuotaVo;
+import org.dromara.ai.mapper.AiUserQuotaMapper;
+import org.dromara.ai.service.AiUserQuotaService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Calendar;
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * AI用户配额Service业务层处理
+ *
+ * @author pengles
+ */
+@RequiredArgsConstructor
+@Service
+public class AiUserQuotaServiceImpl implements AiUserQuotaService {
+
+    private final AiUserQuotaMapper baseMapper;
+
+    /**
+     * 查询AI用户配额
+     */
+    @Override
+    public AiUserQuotaVo queryById(Long id) {
+        AiUserQuotaVo vo = baseMapper.selectVoById(id);
+        if (vo != null) {
+            convertFields(vo);
+        }
+        return vo;
+    }
+
+    /**
+     * 查询AI用户配额列表
+     */
+    @Override
+    public TableDataInfo<AiUserQuotaVo> queryPageList(AiUserQuotaBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<AiUserQuota> lqw = buildQueryWrapper(bo);
+        Page<AiUserQuotaVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        result.getRecords().forEach(this::convertFields);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询AI用户配额列表
+     */
+    @Override
+    public List<AiUserQuotaVo> queryList(AiUserQuotaBo bo) {
+        LambdaQueryWrapper<AiUserQuota> lqw = buildQueryWrapper(bo);
+        List<AiUserQuotaVo> list = baseMapper.selectVoList(lqw);
+        list.forEach(this::convertFields);
+        return list;
+    }
+
+    /**
+     * 构建查询条件
+     */
+    private LambdaQueryWrapper<AiUserQuota> buildQueryWrapper(AiUserQuotaBo bo) {
+        LambdaQueryWrapper<AiUserQuota> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(bo.getUserId() != null, AiUserQuota::getUserId, bo.getUserId());
+        lqw.eq(StringUtils.isNotBlank(bo.getPermissionLevel()), AiUserQuota::getPermissionLevel, bo.getPermissionLevel());
+        // 时间范围查询
+        lqw.ge(bo.getCreateTimeStart() != null, AiUserQuota::getCreateTime, bo.getCreateTimeStart());
+        lqw.le(bo.getCreateTimeEnd() != null, AiUserQuota::getCreateTime, bo.getCreateTimeEnd());
+        // 按创建时间倒序排序
+        lqw.orderByDesc(AiUserQuota::getCreateTime);
+        return lqw;
+    }
+
+    /**
+     * 转换字段（用于显示）
+     */
+    private void convertFields(AiUserQuotaVo vo) {
+        // 转换权限级别
+        vo.setPermissionLevelStr(convertPermissionLevel(vo.getPermissionLevel()));
+        // 计算剩余配额
+        vo.setDailyRemaining(calculateRemaining(vo.getDailyQuota(), vo.getDailyUsed()));
+        vo.setMonthlyRemaining(calculateRemaining(vo.getMonthlyQuota(), vo.getMonthlyUsed()));
+    }
+
+    /**
+     * 转换权限级别
+     */
+    private String convertPermissionLevel(String permissionLevel) {
+        if (StringUtils.isBlank(permissionLevel)) {
+            return "";
+        }
+        return switch (permissionLevel) {
+            case "GUEST" -> "访客";
+            case "BASIC" -> "基础用户";
+            case "PREMIUM" -> "高级用户";
+            case "VIP" -> "VIP用户";
+            case "ADMIN" -> "管理员";
+            default -> permissionLevel;
+        };
+    }
+
+    /**
+     * 计算剩余配额
+     */
+    private Long calculateRemaining(Long quota, Long used) {
+        if (quota == null || quota <= 0) {
+            return -1L; // 无限制
+        }
+        if (used == null) {
+            used = 0L;
+        }
+        return Math.max(0, quota - used);
+    }
+
+    /**
+     * 新增AI用户配额
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean insertByBo(AiUserQuotaBo bo) {
+        // 检查用户配额是否已存在
+        LambdaQueryWrapper<AiUserQuota> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(AiUserQuota::getUserId, bo.getUserId());
+        Long count = baseMapper.selectCount(lqw);
+        if (count > 0) {
+            throw new ServiceException("该用户的配额记录已存在");
+        }
+
+        AiUserQuota add = MapstructUtils.convert(bo, AiUserQuota.class);
+        // 设置默认值
+        if (StringUtils.isBlank(add.getPermissionLevel())) {
+            add.setPermissionLevel("BASIC");
+        }
+        if (add.getDailyQuota() == null) {
+            add.setDailyQuota(0L); // 默认无限制
+        }
+        if (add.getMonthlyQuota() == null) {
+            add.setMonthlyQuota(0L); // 默认无限制
+        }
+        if (add.getDailyUsed() == null) {
+            add.setDailyUsed(0L);
+        }
+        if (add.getMonthlyUsed() == null) {
+            add.setMonthlyUsed(0L);
+        }
+        Date now = new Date();
+        if (add.getLastResetDaily() == null) {
+            add.setLastResetDaily(now);
+        }
+        if (add.getLastResetMonthly() == null) {
+            add.setLastResetMonthly(now);
+        }
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改AI用户配额
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean updateByBo(AiUserQuotaBo bo) {
+        AiUserQuota update = MapstructUtils.convert(bo, AiUserQuota.class);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 批量删除AI用户配额
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if (isValid) {
+            // 可以添加业务校验逻辑
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+
+    /**
+     * 根据用户ID查询配额
+     */
+    @Override
+    public AiUserQuotaVo queryByUserId(Long userId) {
+        LambdaQueryWrapper<AiUserQuota> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(AiUserQuota::getUserId, userId);
+        AiUserQuotaVo vo = baseMapper.selectVoOne(lqw);
+        if (vo != null) {
+            convertFields(vo);
+        }
+        return vo;
+    }
+
+    /**
+     * 重置用户配额（按日/按月）
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean resetQuota(Long userId, String resetType) {
+        AiUserQuota quota = baseMapper.selectOne(new LambdaQueryWrapper<AiUserQuota>()
+                .eq(AiUserQuota::getUserId, userId));
+        if (quota == null) {
+            throw new ServiceException("用户配额记录不存在");
+        }
+
+        Date now = new Date();
+        if ("DAILY".equals(resetType)) {
+            quota.setDailyUsed(0L);
+            quota.setLastResetDaily(now);
+        } else if ("MONTHLY".equals(resetType)) {
+            quota.setMonthlyUsed(0L);
+            quota.setLastResetMonthly(now);
+        } else {
+            throw new ServiceException("无效的重置类型");
+        }
+
+        return baseMapper.updateById(quota) > 0;
+    }
+
+    /**
+     * 增加用户配额使用量
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean increaseUsage(Long userId, Long dailyAmount, Long monthlyAmount) {
+        AiUserQuota quota = baseMapper.selectOne(new LambdaQueryWrapper<AiUserQuota>()
+                .eq(AiUserQuota::getUserId, userId));
+        if (quota == null) {
+            // 如果配额记录不存在，创建一个默认记录
+            quota = new AiUserQuota();
+            quota.setUserId(userId);
+            quota.setPermissionLevel("BASIC");
+            quota.setDailyQuota(0L);
+            quota.setMonthlyQuota(0L);
+            quota.setDailyUsed(0L);
+            quota.setMonthlyUsed(0L);
+            Date now = new Date();
+            quota.setLastResetDaily(now);
+            quota.setLastResetMonthly(now);
+            baseMapper.insert(quota);
+        }
+
+        Date now = new Date();
+        // 检查是否需要重置日配额
+        if (needResetDaily(quota.getLastResetDaily(), now)) {
+            quota.setDailyUsed(0L);
+            quota.setLastResetDaily(now);
+        }
+        // 检查是否需要重置月配额
+        if (needResetMonthly(quota.getLastResetMonthly(), now)) {
+            quota.setMonthlyUsed(0L);
+            quota.setLastResetMonthly(now);
+        }
+
+        // 增加使用量
+        if (dailyAmount != null && dailyAmount > 0) {
+            quota.setDailyUsed((quota.getDailyUsed() != null ? quota.getDailyUsed() : 0L) + dailyAmount);
+        }
+        if (monthlyAmount != null && monthlyAmount > 0) {
+            quota.setMonthlyUsed((quota.getMonthlyUsed() != null ? quota.getMonthlyUsed() : 0L) + monthlyAmount);
+        }
+
+        return baseMapper.updateById(quota) > 0;
+    }
+
+    /**
+     * 检查是否需要重置日配额
+     */
+    private boolean needResetDaily(Date lastReset, Date now) {
+        if (lastReset == null) {
+            return true;
+        }
+        Calendar last = Calendar.getInstance();
+        last.setTime(lastReset);
+        Calendar current = Calendar.getInstance();
+        current.setTime(now);
+        return last.get(Calendar.YEAR) != current.get(Calendar.YEAR) ||
+                last.get(Calendar.DAY_OF_YEAR) != current.get(Calendar.DAY_OF_YEAR);
+    }
+
+    /**
+     * 检查是否需要重置月配额
+     */
+    private boolean needResetMonthly(Date lastReset, Date now) {
+        if (lastReset == null) {
+            return true;
+        }
+        Calendar last = Calendar.getInstance();
+        last.setTime(lastReset);
+        Calendar current = Calendar.getInstance();
+        current.setTime(now);
+        return last.get(Calendar.YEAR) != current.get(Calendar.YEAR) ||
+                last.get(Calendar.MONTH) != current.get(Calendar.MONTH);
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/websocket/ChatWebSocketConfig.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/websocket/ChatWebSocketConfig.java
new file mode 100644
index 0000000..9a11582
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/websocket/ChatWebSocketConfig.java
@@ -0,0 +1,21 @@
+package org.dromara.ai.websocket;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.socket.WebSocketHandler;
+import org.springframework.web.socket.config.annotation.EnableWebSocket;
+import org.springframework.web.socket.config.annotation.WebSocketConfigurer;
+import org.springframework.web.socket.config.annotation.WebSocketHandlerRegistry;
+
+@Configuration
+@EnableWebSocket
+@RequiredArgsConstructor
+public class ChatWebSocketConfig implements WebSocketConfigurer {
+
+    private final WebSocketHandler chatWebSocketHandler;
+
+    @Override
+    public void registerWebSocketHandlers(WebSocketHandlerRegistry registry) {
+        registry.addHandler(chatWebSocketHandler, "/ws/ai/chat").setAllowedOrigins("*");
+    }
+}
diff --git a/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/websocket/ChatWebSocketHandler.java b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/websocket/ChatWebSocketHandler.java
new file mode 100644
index 0000000..bcdf5b7
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/main/java/org/dromara/ai/websocket/ChatWebSocketHandler.java
@@ -0,0 +1,81 @@
+package org.dromara.ai.websocket;
+
+import lombok.RequiredArgsConstructor;
+import org.dromara.ai.domain.dto.AiChatRequest;
+import org.dromara.ai.domain.dto.AiChatResponse;
+import org.dromara.ai.service.AiChatService;
+import org.springframework.stereotype.Component;
+import org.springframework.web.socket.*;
+
+import java.nio.charset.StandardCharsets;
+
+@Component
+@RequiredArgsConstructor
+public class ChatWebSocketHandler implements WebSocketHandler {
+
+    private final AiChatService aiChatService;
+
+    @Override
+    public void afterConnectionEstablished(WebSocketSession session) {
+    }
+
+    @Override
+    public void handleMessage(WebSocketSession session, WebSocketMessage<?> message) {
+        try {
+            String payload;
+            if (message instanceof TextMessage) {
+                payload = ((TextMessage) message).getPayload();
+            } else if (message instanceof BinaryMessage) {
+                payload = new String(((BinaryMessage) message).getPayload().array(), StandardCharsets.UTF_8);
+            } else {
+                return;
+            }
+            AiChatRequest req = org.dromara.common.json.utils.JsonUtils.parseObject(payload, AiChatRequest.class);
+            aiChatService.chatStream(req, new AiChatService.StreamCallback() {
+                @Override
+                public void onChunk(String chunk) {
+                    try {
+                        session.sendMessage(new TextMessage(chunk));
+                    } catch (Exception ignored) {
+                    }
+                }
+
+                @Override
+                public void onComplete(AiChatResponse response) {
+                    try {
+                        session.sendMessage(new TextMessage("[DONE]"));
+                    } catch (Exception ignored) {
+                    }
+                }
+
+                @Override
+                public void onError(Throwable error) {
+                    try {
+                        session.sendMessage(new TextMessage("[ERROR] " + error.getMessage()));
+                        session.close(CloseStatus.SERVER_ERROR);
+                    } catch (Exception ignored) {
+                    }
+                }
+            });
+        } catch (Exception e) {
+            try {
+                session.sendMessage(new TextMessage("[ERROR] " + e.getMessage()));
+                session.close(CloseStatus.SERVER_ERROR);
+            } catch (Exception ignored) {
+            }
+        }
+    }
+
+    @Override
+    public void handleTransportError(WebSocketSession session, Throwable exception) {
+    }
+
+    @Override
+    public void afterConnectionClosed(WebSocketSession session, CloseStatus closeStatus) {
+    }
+
+    @Override
+    public boolean supportsPartialMessages() {
+        return false;
+    }
+}
diff --git a/ruoyi-modules/ruoyi-ai/src/test/java/org/dromara/ai/integration/ApiGatewayIntegrationTest.java b/ruoyi-modules/ruoyi-ai/src/test/java/org/dromara/ai/integration/ApiGatewayIntegrationTest.java
new file mode 100644
index 0000000..5f20c51
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/test/java/org/dromara/ai/integration/ApiGatewayIntegrationTest.java
@@ -0,0 +1,7 @@
+package org.dromara.ai.integration;
+
+public class ApiGatewayIntegrationTest {
+    public void smoke() {
+        if (!true) throw new RuntimeException("should not happen");
+    }
+}
diff --git a/ruoyi-modules/ruoyi-ai/src/test/java/org/dromara/ai/mock/MockData.java b/ruoyi-modules/ruoyi-ai/src/test/java/org/dromara/ai/mock/MockData.java
new file mode 100644
index 0000000..43b80e1
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/test/java/org/dromara/ai/mock/MockData.java
@@ -0,0 +1,8 @@
+package org.dromara.ai.mock;
+
+public class MockData {
+    public static String simpleChatRequestJson() {
+        return "{\"model\":\"gpt-4o\",\"messages\":[{\"role\":\"user\",\"content\":\"hello\"}]}";
+    }
+}
+
diff --git a/ruoyi-modules/ruoyi-ai/src/test/java/org/dromara/ai/unit/ApiGatewayControllerTest.java b/ruoyi-modules/ruoyi-ai/src/test/java/org/dromara/ai/unit/ApiGatewayControllerTest.java
new file mode 100644
index 0000000..1c976b7
--- /dev/null
+++ b/ruoyi-modules/ruoyi-ai/src/test/java/org/dromara/ai/unit/ApiGatewayControllerTest.java
@@ -0,0 +1,7 @@
+package org.dromara.ai.unit;
+
+public class ApiGatewayControllerTest {
+    public void smoke() {
+        if (!true) throw new RuntimeException("should not happen");
+    }
+}
diff --git a/ruoyi-modules/ruoyi-chat/README.md b/ruoyi-modules/ruoyi-chat/README.md
new file mode 100644
index 0000000..f516199
--- /dev/null
+++ b/ruoyi-modules/ruoyi-chat/README.md
@@ -0,0 +1,747 @@
+# RuoYi Chat 模块
+
+## 模块简介
+
+`ruoyi-chat` 是 PoJie 项目的智能聊天系统模块，提供完整的聊天会话管理、消息处理、知识库集成和实时通信功能。该模块通过集成 `ruoyi-ai` 和 `ruoyi-knowledge` 模块，实现了基于知识库的智能问答系统（RAG），支持多种通信方式（REST API、SSE 流式、WebSocket）。
+
+## 功能特性
+
+### 1. 聊天会话管理 ✅
+
+- ✅ 创建和管理聊天会话
+- ✅ 支持多用户并发聊天
+- ✅ 会话历史记录和导出
+- ✅ 会话状态管理
+- ✅ 会话标题自动生成和手动编辑
+
+### 2. 消息处理 ✅
+
+- ✅ 实时消息发送和接收
+- ✅ 消息类型支持（文本、图片等）
+- ✅ 消息历史查询（支持分页和条件筛选）
+- ✅ 消息状态跟踪
+- ✅ Token 使用量和成本统计
+
+### 3. 知识库集成（RAG）✅
+
+- ✅ 基于知识库的智能问答
+- ✅ 上下文理解和构建
+- ✅ 向量相似度搜索
+- ✅ 智能回复生成
+- ✅ 知识库会话管理
+- ✅ 知识库内容搜索
+- **内部对接模块**：
+  - AI 模块：`AiChatService`（统一聊天接口）
+  - 知识库模块：`KnowledgeVectorService`（向量检索）
+
+### 4. 实时通信 ✅
+
+- ✅ **REST API**：标准 HTTP 接口
+- ✅ **SSE 流式**：服务器推送事件，支持流式对话（`ChatOpenApiController`）
+- ✅ **WebSocket**：STOMP 协议，实时双向通信（`ChatStompController`）
+
+### 5. 使用统计 ✅
+
+- ✅ Token 使用量统计
+- ✅ 聊天成本计算
+- ✅ 用户活跃度分析
+- ✅ 模型使用情况
+- ✅ 使用记录导出
+
+### 6. 配置管理 ✅
+
+- ✅ 聊天配置管理（键值对配置）
+- ✅ 模型配置管理（模型信息、价格、API 配置）
+- ✅ 配置分类管理
+- ✅ 配置导入导出
+
+## 目录结构
+
+```
+ruoyi-chat/
+├─ src/main/java/org/dromara/chat/
+│  ├─ controller/         # REST 控制器层
+│  │  ├─ AIKnowledgeChatController.java    # 知识库聊天控制器
+│  │  ├─ ChatSessionController.java        # 会话管理控制器
+│  │  ├─ ChatMessageController.java        # 消息管理控制器
+│  │  ├─ ChatOpenApiController.java        # 开放 API 控制器（SSE 流式）
+│  │  ├─ ChatStompController.java          # WebSocket 控制器（STOMP）
+│  │  ├─ ChatConfigController.java         # 配置管理控制器
+│  │  ├─ ChatModelController.java          # 模型管理控制器
+│  │  └─ ChatUsageTokenController.java     # Token 使用记录控制器
+│  ├─ service/            # 核心业务服务层
+│  │  ├─ AiKnowledgeChatService.java       # 知识库聊天服务
+│  │  ├─ ChatSessionService.java           # 会话管理服务
+│  │  ├─ ChatMessageService.java           # 消息管理服务
+│  │  ├─ ChatConfigService.java            # 配置管理服务
+│  │  ├─ ChatModelService.java             # 模型管理服务
+│  │  ├─ ChatUsageTokenService.java        # Token 使用记录服务
+│  │  └─ impl/                             # 服务实现类
+│  ├─ domain/             # 领域模型
+│  │  ├─ bo/              # 业务对象（Business Object）
+│  │  ├─ vo/              # 视图对象（View Object）
+│  │  ├─ request/         # 请求对象
+│  │  └─ *.java           # 实体类（Entity）
+│  ├─ mapper/             # MyBatis Mapper 接口
+│  ├─ config/             # 配置类（WebSocket 配置等）
+│  └─ client/             # Java SDK（统一网关封装）
+│     └─ ChatSdk.java
+└─ docs/                  # API 使用说明文档
+```
+
+## 模块结构
+
+```
+org.dromara.chat
+├── controller/              # 控制器层
+│   ├── AIKnowledgeChatController.java      # 知识库聊天
+│   ├── ChatSessionController.java          # 会话管理
+│   ├── ChatMessageController.java          # 消息管理
+│   ├── ChatOpenApiController.java          # 开放 API（SSE）
+│   ├── ChatStompController.java            # WebSocket（STOMP）
+│   ├── ChatConfigController.java           # 配置管理
+│   ├── ChatModelController.java            # 模型管理
+│   └── ChatUsageTokenController.java       # Token 统计
+├── service/                 # 服务层
+│   ├── AiKnowledgeChatService.java
+│   ├── ChatSessionService.java
+│   ├── ChatMessageService.java
+│   ├── ChatConfigService.java
+│   ├── ChatModelService.java
+│   ├── ChatUsageTokenService.java
+│   └── impl/                # 服务实现
+├── domain/                  # 领域模型
+│   ├── bo/                  # 业务对象
+│   ├── vo/                  # 视图对象
+│   ├── request/             # 请求对象
+│   ├── ChatSession.java     # 会话实体
+│   ├── ChatMessage.java     # 消息实体
+│   ├── ChatConfig.java      # 配置实体
+│   ├── ChatModel.java       # 模型实体
+│   └── ChatUsageToken.java  # Token 使用实体
+├── mapper/                  # MyBatis Mapper
+├── config/                  # 配置类
+│   └── StompWebSocketConfig.java
+└── client/                  # Java SDK
+    └── ChatSdk.java
+```
+
+## 架构设计
+
+```
+┌─────────────────────────────────────────────────────────────┐
+│                    Chat Controller Layer                    │
+├─────────────────────────────────────────────────────────────┤
+│  AIKnowledgeChatController │ ChatSessionController          │
+│  ChatMessageController     │ ChatConfigController           │
+│  ChatModelController       │ ChatUsageTokenController       │
+│  ChatOpenApiController     │ ChatStompController            │
+│  (SSE 流式)                │ (WebSocket)                    │
+└─────────────────────┬───────────────────────────────────────┘
+                      │
+┌─────────────────────▼───────────────────────────────────────┐
+│                    Service Layer                            │
+├─────────────────────────────────────────────────────────────┤
+│  AiKnowledgeChatService    │ ChatSessionService             │
+│  ChatMessageService        │ ChatConfigService              │
+│  ChatModelService          │ ChatUsageTokenService          │
+└─────────────────────┬───────────────────────────────────────┘
+                      │
+┌─────────────────────▼───────────────────────────────────────┐
+│                 Integration Layer                           │
+├─────────────────────────────────────────────────────────────┤
+│              RuoYi AI Module                               │
+│              └─ AiChatService                              │
+│              └─ AiChatHistoryService                       │
+│              └─ AiProviderManager                          │
+│                                                             │
+│              RuoYi Knowledge Module                        │
+│              └─ KnowledgeVectorService                     │
+│              └─ KnowledgeInfoService                       │
+└─────────────────────────────────────────────────────────────┘
+```
+
+## 数据库表结构
+
+### 1. 聊天会话表 (chat_session)
+
+存储用户聊天会话信息。
+
+| 字段名 | 类型 | 说明 |
+|--------|------|------|
+| id | BIGINT | 主键ID |
+| user_id | BIGINT | 用户ID |
+| session_title | VARCHAR(255) | 会话标题 |
+| session_content | TEXT | 会话内容 |
+| create_by | BIGINT | 创建者 |
+| create_time | DATETIME | 创建时间 |
+| update_by | BIGINT | 更新者 |
+| update_time | DATETIME | 更新时间 |
+| remark | VARCHAR(500) | 备注 |
+
+**索引**：`PRIMARY KEY (id)`
+
+### 2. 聊天消息表 (chat_message)
+
+存储聊天消息记录。
+
+| 字段名 | 类型 | 说明 |
+|--------|------|------|
+| id | BIGINT | 主键ID |
+| session_id | BIGINT | 会话ID |
+| user_id | BIGINT | 用户ID |
+| content | LONGTEXT | 消息内容 |
+| role | VARCHAR(255) | 对话角色（user/assistant/system） |
+| deduct_cost | DOUBLE(20,2) | 扣除金额（默认 0.00） |
+| total_tokens | INT(20) | 累计 Tokens（默认 0） |
+| model_name | VARCHAR(255) | 模型名称 |
+| create_by | BIGINT | 创建者 |
+| create_time | DATETIME | 创建时间 |
+| update_by | BIGINT | 更新者 |
+| update_time | DATETIME | 更新时间 |
+| remark | VARCHAR(500) | 备注 |
+
+**索引**：`PRIMARY KEY (id)`
+
+### 3. 聊天配置表 (chat_config)
+
+存储聊天系统配置（键值对形式）。
+
+| 字段名 | 类型 | 说明 |
+|--------|------|------|
+| id | BIGINT | 主键ID |
+| category | VARCHAR(255) | 配置类型 |
+| config_name | VARCHAR(255) | 配置名称 |
+| config_value | TEXT | 配置值 |
+| config_dict | VARCHAR(255) | 说明 |
+| create_by | BIGINT | 创建者 |
+| create_time | DATETIME | 创建时间 |
+| update_by | BIGINT | 更新者 |
+| update_time | DATETIME | 更新时间 |
+| remark | VARCHAR(500) | 备注 |
+| version | INT | 版本 |
+| del_flag | CHAR(1) | 删除标志（0存在 1删除） |
+| update_ip | VARCHAR(128) | 更新IP |
+
+**索引**：
+- `PRIMARY KEY (id)`
+- `UNIQUE KEY unique_category_key (category, config_name)`
+
+### 4. 聊天模型表 (chat_model)
+
+存储聊天模型配置信息。
+
+| 字段名 | 类型 | 说明 |
+|--------|------|------|
+| id | BIGINT | 主键ID |
+| category | VARCHAR(20) | 模型分类 |
+| model_name | VARCHAR(50) | 模型名称 |
+| model_describe | VARCHAR(255) | 模型描述 |
+| model_price | DOUBLE | 模型价格 |
+| model_type | CHAR(1) | 计费类型 |
+| model_show | CHAR(1) | 是否显示 |
+| system_prompt | VARCHAR(255) | 系统提示词 |
+| api_host | VARCHAR(255) | 请求地址 |
+| api_key | VARCHAR(255) | 密钥 |
+| api_url | VARCHAR(50) | 请求后缀 |
+| create_by | BIGINT | 创建者 |
+| create_time | DATETIME | 创建时间 |
+| update_by | BIGINT | 更新者 |
+| update_time | DATETIME | 更新时间 |
+| remark | VARCHAR(500) | 备注 |
+
+**索引**：`PRIMARY KEY (id)`
+
+### 5. Token 使用记录表 (chat_usage_token)
+
+存储用户 Token 使用统计。
+
+| 字段名 | 类型 | 说明 |
+|--------|------|------|
+| id | BIGINT | 主键ID |
+| user_id | BIGINT | 用户ID |
+| token | INT(10) | 待结算 token |
+| model_name | VARCHAR(64) | 模型名称 |
+| total_token | VARCHAR(255) | 累计使用 token |
+
+**索引**：`PRIMARY KEY (id)`
+
+**数据库脚本位置**：`script/sql/ry_chat.sql`
+
+## API 接口
+
+### 知识库聊天接口 (`/chat/knowledge`)
+
+#### 知识库问答
+- **接口**：`POST /chat/knowledge/chat`
+- **说明**：基于知识库进行智能问答
+- **权限**：`chat:knowledge:chat`
+- **参数**：
+  - `sessionId` (Long, 必填) - 会话ID
+  - `userId` (Long, 必填) - 用户ID
+  - `question` (String, 必填) - 问题
+  - `knowledgeId` (Long, 必填) - 知识库ID
+  - `modelName` (String, 必填) - 模型名称
+
+#### 创建知识库会话
+- **接口**：`POST /chat/knowledge/session`
+- **说明**：创建知识库聊天会话
+- **权限**：`chat:knowledge:session`
+- **参数**：
+  - `userId` (Long, 必填) - 用户ID
+  - `knowledgeId` (Long, 必填) - 知识库ID
+  - `sessionTitle` (String, 可选) - 会话标题
+
+#### 搜索知识内容
+- **接口**：`GET /chat/knowledge/search`
+- **说明**：搜索知识库内容
+- **权限**：`chat:knowledge:search`
+- **参数**：
+  - `knowledgeId` (Long, 必填) - 知识库ID
+  - `query` (String, 必填) - 查询内容
+  - `limit` (Integer, 可选, 默认5) - 返回数量
+
+#### 构建知识上下文
+- **接口**：`GET /chat/knowledge/context`
+- **说明**：构建知识库上下文
+- **权限**：`chat:knowledge:context`
+- **参数**：
+  - `knowledgeId` (Long, 必填) - 知识库ID
+  - `question` (String, 必填) - 问题
+
+#### 获取聊天历史
+- **接口**：`GET /chat/knowledge/history/{sessionId}`
+- **说明**：获取知识库聊天历史
+- **权限**：`chat:knowledge:history`
+- **参数**：
+  - `sessionId` (Long, 路径参数) - 会话ID
+  - `limit` (Integer, 可选, 默认20) - 返回数量
+
+### 会话管理接口 (`/chat/session`)
+
+- `GET /chat/session/list` - 查询会话列表（分页）
+- `GET /chat/session/{id}` - 获取会话详情
+- `POST /chat/session` - 创建新会话
+- `PUT /chat/session` - 更新会话
+- `DELETE /chat/session/{ids}` - 删除会话（批量）
+- `POST /chat/session/export` - 导出会话数据
+
+**权限前缀**：`chat:session:*`
+
+### 消息管理接口 (`/chat/message`)
+
+- `GET /chat/message/list` - 查询消息列表（分页）
+- `GET /chat/message/{id}` - 获取消息详情
+- `POST /chat/message` - 新增消息
+- `PUT /chat/message` - 更新消息
+- `DELETE /chat/message/{ids}` - 删除消息（批量）
+- `POST /chat/message/export` - 导出消息数据
+
+**权限前缀**：`chat:message:*`
+
+### 开放 API 接口 (`/chat`)
+
+#### SSE 流式聊天
+- **接口**：`POST /chat/send`
+- **说明**：SSE 流式聊天接口，支持 OpenAI 兼容格式
+- **认证**：需要登录（`@SaCheckLogin`）
+- **响应类型**：`text/event-stream`
+- **请求体**：JSON 格式
+  ```json
+  {
+    "model": "gpt-3.5-turbo",
+    "messages": [
+      {"role": "user", "content": "你好"}
+    ],
+    "sessionId": "1",
+    "temperature": 0.7,
+    "max_tokens": 2000
+  }
+  ```
+
+### WebSocket 接口
+
+#### STOMP 消息映射
+- **映射路径**：`/chat/send`
+- **说明**：STOMP 协议消息发送
+- **订阅主题**：`/topic/session/{sessionId}`
+- **配置类**：`StompWebSocketConfig`
+
+### 配置管理接口 (`/chat/config`)
+
+- `GET /chat/config/list` - 查询配置列表（分页）
+- `GET /chat/config/{id}` - 获取配置详情
+- `POST /chat/config` - 新增配置
+- `PUT /chat/config` - 更新配置
+- `DELETE /chat/config/{ids}` - 删除配置（批量）
+- `POST /chat/config/export` - 导出配置数据
+
+**权限前缀**：`chat:config:*`
+
+### 模型管理接口 (`/chat/model`)
+
+- `GET /chat/model/list` - 查询模型列表（分页）
+- `GET /chat/model/{id}` - 获取模型详情
+- `POST /chat/model` - 新增模型
+- `PUT /chat/model` - 更新模型
+- `DELETE /chat/model/{ids}` - 删除模型（批量）
+- `POST /chat/model/export` - 导出模型数据
+
+**权限前缀**：`chat:model:*`
+
+### Token 使用记录接口 (`/chat/token`)
+
+- `GET /chat/token/list` - 查询 Token 使用记录列表（分页）
+- `GET /chat/token/{id}` - 获取 Token 使用记录详情
+- `POST /chat/token` - 新增 Token 使用记录
+- `PUT /chat/token` - 更新 Token 使用记录
+- `DELETE /chat/token/{ids}` - 删除 Token 使用记录（批量）
+- `POST /chat/token/export` - 导出 Token 使用记录数据
+
+**权限前缀**：`chat:token:*`
+
+## 统一网关与协同
+
+### 后端统一网关
+
+Chat 模块可通过 `ruoyi-ai` 模块的统一网关进行对话：
+
+- `POST /api/ai/chat` - 同步聊天
+- `POST /api/ai/chat/async` - 异步聊天
+- `POST /api/ai/chat/stream` - 流式聊天（SSE）
+- `WS /ws/ai/chat` - WebSocket 实时通道
+
+### Chat 模块与 AI/Knowledge 的协同
+
+1. **知识库增强聊天**：
+   - 在 `AiKnowledgeChatServiceImpl` 中构建 `AiChatRequest`
+   - 调用 `AiChatService.chat`，开启知识库增强（`enableKnowledge=true`）
+   - 通过 `KnowledgeVectorService.vectorSimilaritySearch` 进行相关性检索
+   - 构建上下文并注入到消息中
+
+2. **聊天历史管理**：
+   - 使用 `AiChatHistoryService` 保存和管理聊天记录
+   - 支持 Redis 缓存和历史查询
+
+3. **模型管理**：
+   - 通过 `AiProviderManager` 获取可用模型列表
+   - 支持模型切换和负载均衡
+
+## 使用示例
+
+### 1. 创建知识库会话
+
+```bash
+curl -X POST "http://localhost:8080/chat/knowledge/session" \
+  -H "Content-Type: application/json" \
+  -H "Authorization: Bearer <token>" \
+  -d '{
+    "userId": 1,
+    "knowledgeId": 1,
+    "sessionTitle": "技术咨询会话"
+  }'
+```
+
+### 2. 知识库问答
+
+```bash
+curl -X POST "http://localhost:8080/chat/knowledge/chat" \
+  -H "Content-Type: application/x-www-form-urlencoded" \
+  -H "Authorization: Bearer <token>" \
+  -d "sessionId=1&userId=1&question=什么是Spring Boot？&knowledgeId=1&modelName=gpt-3.5-turbo"
+```
+
+### 3. SSE 流式聊天
+
+```bash
+curl -X POST "http://localhost:8080/chat/send" \
+  -H "Content-Type: application/json" \
+  -H "Authorization: Bearer <token>" \
+  -H "Accept: text/event-stream" \
+  -d '{
+    "model": "gpt-3.5-turbo",
+    "messages": [
+      {"role": "user", "content": "你好，请介绍一下你自己"}
+    ],
+    "sessionId": "1",
+    "temperature": 0.7
+  }'
+```
+
+### 4. 通过统一网关进行对话
+
+```bash
+curl -X POST "http://localhost:8080/api/ai/chat" \
+  -H "Content-Type: application/json" \
+  -H "Authorization: Bearer <token>" \
+  -d '{
+    "userId": "1",
+    "sessionId": "1",
+    "model": "gpt-4o-mini",
+    "enableKnowledge": true,
+    "knowledgeId": "1",
+    "knowledgeLimit": 5,
+    "knowledgeThreshold": 0.7,
+    "messages": [
+      {"role": "user", "content": "什么是Spring Boot？"}
+    ]
+  }'
+```
+
+### 5. 获取聊天历史
+
+```bash
+curl -X GET "http://localhost:8080/chat/knowledge/history/1?limit=10" \
+  -H "Authorization: Bearer <token>"
+```
+
+### 6. 查询会话列表
+
+```bash
+curl -X GET "http://localhost:8080/chat/session/list?pageNum=1&pageSize=10" \
+  -H "Authorization: Bearer <token>"
+```
+
+## Java SDK
+
+### ChatSdk（统一网关封装）
+
+封装类：`org.dromara.chat.client.ChatSdk`
+
+```java
+// 初始化 SDK
+ChatSdk sdk = new ChatSdk("http://localhost:8080")
+    .withToken("Bearer xxx");
+
+// 同步聊天
+String result = sdk.chat("{\"model\":\"gpt-4o\",\"messages\":[{\"role\":\"user\",\"content\":\"hello\"}]}");
+
+// 流式聊天（SSE）
+sdk.chatStream("{\"model\":\"gpt-4o\",\"messages\":[{\"role\":\"user\",\"content\":\"hello\"}]}", 
+    chunk -> System.out.println(chunk),
+    response -> System.out.println("Complete: " + response),
+    error -> System.err.println("Error: " + error));
+```
+
+## 配置说明
+
+### 应用配置
+
+Chat 模块依赖 `ruoyi-ai` 模块的配置，主要配置在 `application.yml` 中：
+
+```yaml
+ruoyi:
+  ai:
+    # 是否启用 AI 模块
+    enabled: true
+    
+    # 知识库配置
+    knowledge:
+      enabled: true
+      default-search-count: 5
+      similarity-threshold: 0.7
+      max-context-length: 4000
+      
+    # 流式响应配置
+    stream:
+      enabled: true
+      buffer-size: 1024
+      timeout: 60
+```
+
+### WebSocket 配置
+
+WebSocket 配置在 `StompWebSocketConfig` 中：
+
+- **端点路径**：`/ws`
+- **消息映射**：`/chat/send`
+- **订阅主题**：`/topic/session/{sessionId}`
+
+### 数据库配置
+
+确保已执行 `script/sql/ry_chat.sql` 初始化脚本。
+
+## 依赖模块
+
+### 核心依赖
+
+- **ruoyi-ai**: AI 服务集成
+  - `AiChatService` - 统一聊天服务
+  - `AiChatHistoryService` - 聊天历史服务
+  - `AiProviderManager` - Provider 管理器
+- **ruoyi-knowledge**: 知识库服务
+  - `KnowledgeVectorService` - 向量检索服务
+  - `KnowledgeInfoService` - 知识库信息服务
+- **ruoyi-common-core**: 核心工具类
+- **ruoyi-common-mybatis**: 数据库操作
+- **ruoyi-common-web**: Web 框架支持
+- **ruoyi-common-security**: 安全认证（Sa-Token）
+- **ruoyi-common-log**: 日志记录
+- **ruoyi-common-excel**: Excel 导出
+
+## 开发指南
+
+### 添加新的聊天类型
+
+1. 创建新的 Controller 类，继承 `BaseController`
+2. 实现对应的 Service 接口
+3. 添加相关的 BO 和 VO 类
+4. 配置路由映射和权限注解
+
+### 扩展消息类型
+
+1. 在 `ChatMessage` 实体中添加新字段
+2. 更新数据库表结构（修改 `ry_chat.sql`）
+3. 修改消息处理逻辑
+4. 添加相应的验证规则
+
+### 集成新的 AI 模型
+
+1. 在 `ruoyi-ai` 模块中添加新的 Provider
+2. 在 `chat_model` 表中添加模型配置
+3. 测试模型兼容性
+4. 更新文档
+
+### WebSocket 扩展
+
+1. 在 `StompWebSocketConfig` 中添加新的消息映射
+2. 创建对应的 Controller 处理消息
+3. 配置订阅主题
+4. 更新客户端连接代码
+
+## 认证与权限
+
+### 认证方式
+
+- **登录认证**：基于 Sa-Token，所有写操作需要登录态（`@SaCheckLogin`）
+- **权限控制**：管理接口需要相应权限（`@SaCheckPermission`）
+- **令牌格式**：`Authorization: Bearer <token>`
+
+### 权限列表
+
+- `chat:knowledge:*` - 知识库聊天权限
+- `chat:session:*` - 会话管理权限
+- `chat:message:*` - 消息管理权限
+- `chat:config:*` - 配置管理权限
+- `chat:model:*` - 模型管理权限
+- `chat:token:*` - Token 统计权限
+
+### 统一网关权限
+
+统一网关（`/api/ai/*`）需要相应的 AI 模块权限，如 `ai:chat:sync`、`ai:chat:stream` 等。
+
+## 监控和日志
+
+### 关键指标
+
+- 会话创建数量
+- 消息发送成功率
+- 平均响应时间
+- Token 使用量
+- 错误率统计
+- 知识库检索命中率
+
+### 日志配置
+
+```yaml
+logging:
+  level:
+    org.dromara.chat: DEBUG
+    org.dromara.ai: INFO
+    org.dromara.knowledge: INFO
+```
+
+### 日志记录
+
+- 所有接口调用记录（通过 `@Log` 注解）
+- 异常错误日志
+- 性能监控日志
+- Token 使用日志
+
+## 故障排除
+
+### 常见问题
+
+1. **AI 服务不可用**
+   - 检查 `ruoyi-ai` 模块状态
+   - 验证 API 密钥配置
+   - 查看网络连接
+   - 检查 Provider 配置
+
+2. **知识库搜索失败**
+   - 确认知识库 ID 有效
+   - 检查知识库内容是否已索引
+   - 验证搜索权限
+   - 查看向量服务状态
+
+3. **会话创建失败**
+   - 检查用户权限
+   - 验证数据库连接
+   - 查看参数格式
+   - 检查会话表结构
+
+4. **SSE 流式响应中断**
+   - 检查网络连接稳定性
+   - 查看超时配置
+   - 验证模型响应时间
+   - 检查服务器资源
+
+5. **WebSocket 连接失败**
+   - 检查 WebSocket 配置
+   - 验证 STOMP 端点路径
+   - 查看防火墙设置
+   - 检查客户端连接代码
+
+### 性能优化
+
+1. **数据库优化**
+   - 添加适当索引（session_id, user_id, create_time 等）
+   - 定期清理历史数据
+   - 使用连接池
+   - 考虑分表策略（按时间或用户）
+
+2. **缓存策略**
+   - 缓存热门会话
+   - 缓存知识库搜索结果
+   - 使用 Redis 缓存会话信息
+   - 缓存模型配置信息
+
+3. **异步处理**
+   - 异步保存消息
+   - 后台统计计算
+   - 队列处理长任务
+   - 异步日志记录
+
+4. **流式响应优化**
+   - 调整缓冲区大小
+   - 优化模型响应时间
+   - 使用连接池管理 SSE 连接
+   - 实现背压控制
+
+## 版本历史
+
+- **v1.0.0**: 初始版本，基础聊天功能
+- **v1.1.0**: 添加知识库集成（RAG）
+- **v1.2.0**: 支持多模型切换
+- **v1.3.0**: 增加使用统计功能
+- **v1.4.0**: 对接统一 AI 网关与 RAG 能力，完善文档与 SDK
+- **v1.5.0**: 添加 SSE 流式支持和 WebSocket 实时通信
+
+## 贡献指南
+
+1. Fork 项目
+2. 创建功能分支（`git checkout -b feature/AmazingFeature`）
+3. 提交代码变更（`git commit -m 'Add some AmazingFeature'`）
+4. 推送到分支（`git push origin feature/AmazingFeature`）
+5. 创建 Pull Request
+6. 等待代码审查
+
+## 许可证
+
+本项目采用 MIT 许可证，详见 LICENSE 文件。
+
+## 相关文档
+
+- [RuoYi AI 模块文档](../ruoyi-ai/README.md)
+- [RuoYi Knowledge 模块文档](../ruoyi-knowledge/README.md)
+- [API 使用文档](./docs/API.md)
diff --git a/ruoyi-modules/ruoyi-chat/pom.xml b/ruoyi-modules/ruoyi-chat/pom.xml
new file mode 100644
index 0000000..40bcd54
--- /dev/null
+++ b/ruoyi-modules/ruoyi-chat/pom.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>org.dromara</groupId>
+        <artifactId>ruoyi-modules</artifactId>
+        <version>${revision}</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>ruoyi-chat</artifactId>
+    <description>chat聊天模块</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-doc</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-mybatis</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-translation</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-log</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-excel</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-security</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-idempotent</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-sensitive</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-encrypt</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-ai</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+
+</project>
diff --git a/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/client/ChatSdk.java b/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/client/ChatSdk.java
new file mode 100644
index 0000000..c275a9d
--- /dev/null
+++ b/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/client/ChatSdk.java
@@ -0,0 +1,38 @@
+package org.dromara.chat.client;
+
+import java.net.URI;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+
+public class ChatSdk {
+    private final HttpClient client = HttpClient.newHttpClient();
+    private final String baseUrl;
+    private String token;
+
+    public ChatSdk(String baseUrl) {
+        this.baseUrl = baseUrl.endsWith("/") ? baseUrl.substring(0, baseUrl.length() - 1) : baseUrl;
+    }
+
+    public ChatSdk withToken(String token) {
+        this.token = token;
+        return this;
+    }
+
+    public String chat(String jsonBody) {
+        HttpRequest.Builder b = HttpRequest.newBuilder()
+                .uri(URI.create(baseUrl + "/api/ai/chat"))
+                .header("Content-Type", "application/json");
+        if (token != null && !token.isEmpty()) {
+            b.header("Authorization", token);
+        }
+        HttpRequest req = b.POST(HttpRequest.BodyPublishers.ofString(jsonBody)).build();
+        try {
+            HttpResponse<String> resp = client.send(req, HttpResponse.BodyHandlers.ofString());
+            return resp.body();
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+}
+
diff --git a/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/config/StompWebSocketConfig.java b/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/config/StompWebSocketConfig.java
new file mode 100644
index 0000000..161544c
--- /dev/null
+++ b/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/config/StompWebSocketConfig.java
@@ -0,0 +1,37 @@
+package org.dromara.chat.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.messaging.simp.config.MessageBrokerRegistry;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
+import org.springframework.web.socket.config.annotation.EnableWebSocketMessageBroker;
+import org.springframework.web.socket.config.annotation.StompEndpointRegistry;
+import org.springframework.web.socket.config.annotation.WebSocketMessageBrokerConfigurer;
+
+@Configuration
+@EnableWebSocketMessageBroker
+public class StompWebSocketConfig implements WebSocketMessageBrokerConfigurer {
+    @Override
+    public void registerStompEndpoints(StompEndpointRegistry registry) {
+        registry.addEndpoint("/ws/chat").setAllowedOriginPatterns("*");
+    }
+
+    @Override
+    public void configureMessageBroker(MessageBrokerRegistry registry) {
+        registry.setApplicationDestinationPrefixes("/app");
+        ThreadPoolTaskScheduler scheduler = taskScheduler();
+        registry.enableSimpleBroker("/topic")
+                .setHeartbeatValue(new long[]{30000, 30000})
+                .setTaskScheduler(scheduler);
+    }
+
+    @Bean
+    public ThreadPoolTaskScheduler taskScheduler() {
+        ThreadPoolTaskScheduler scheduler = new ThreadPoolTaskScheduler();
+        scheduler.setPoolSize(1);
+        scheduler.setThreadNamePrefix("stomp-heartbeat-");
+        scheduler.initialize();
+        return scheduler;
+    }
+}
+
diff --git a/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/controller/AIKnowledgeChatController.java b/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/controller/AIKnowledgeChatController.java
new file mode 100644
index 0000000..4b2b341
--- /dev/null
+++ b/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/controller/AIKnowledgeChatController.java
@@ -0,0 +1,97 @@
+package org.dromara.chat.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import lombok.RequiredArgsConstructor;
+import org.dromara.chat.domain.vo.ChatMessageVo;
+import org.dromara.chat.domain.vo.ChatSessionVo;
+import org.dromara.chat.service.AiKnowledgeChatService;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.web.core.BaseController;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 知识库聊天控制器
+ *
+ * @author pengles
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/chat/knowledge")
+public class AIKnowledgeChatController extends BaseController {
+
+    private final AiKnowledgeChatService knowledgeChatService;
+
+    /**
+     * 基于知识库进行智能问答
+     */
+    @SaCheckPermission("chat:knowledge:chat")
+    @Log(title = "知识库问答", businessType = BusinessType.OTHER)
+    @PostMapping("/chat")
+    public R<ChatMessageVo> chatWithKnowledge(
+            @RequestParam Long sessionId,
+            @RequestParam Long userId,
+            @RequestParam String question,
+            @RequestParam Long knowledgeId,
+            @RequestParam String modelName) {
+        ChatMessageVo response = knowledgeChatService.chatWithKnowledge(sessionId, userId, question, knowledgeId, modelName);
+        return R.ok(response);
+    }
+
+    /**
+     * 创建知识库聊天会话
+     */
+    @SaCheckPermission("chat:knowledge:session")
+    @Log(title = "创建知识库会话", businessType = BusinessType.INSERT)
+    @PostMapping("/session")
+    public R<ChatSessionVo> createKnowledgeSession(
+            @RequestParam Long userId,
+            @RequestParam Long knowledgeId,
+            @RequestParam(required = false) String sessionTitle) {
+        ChatSessionVo session = knowledgeChatService.createKnowledgeSession(userId, knowledgeId, sessionTitle);
+        return R.ok(session);
+    }
+
+    /**
+     * 搜索知识库内容
+     */
+    @SaCheckPermission("chat:knowledge:search")
+    @GetMapping("/search")
+    public R<List<String>> searchKnowledgeContent(
+            @RequestParam Long knowledgeId,
+            @RequestParam String query,
+            @RequestParam(defaultValue = "5") Integer limit) {
+        List<String> results = knowledgeChatService.searchKnowledgeContent(knowledgeId, query, limit);
+        return R.ok(results);
+    }
+
+    /**
+     * 构建知识库上下文
+     */
+    @SaCheckPermission("chat:knowledge:context")
+    @GetMapping("/context")
+    public R<String> buildKnowledgeContext(
+            @RequestParam Long knowledgeId,
+            @RequestParam String question) {
+        String context = knowledgeChatService.buildKnowledgeContext(knowledgeId, question);
+        return R.ok(context);
+    }
+
+    /**
+     * 获取知识库聊天历史
+     */
+    @SaCheckPermission("chat:knowledge:history")
+    @GetMapping("/history/{sessionId}")
+    public R<List<ChatMessageVo>> getKnowledgeChatHistory(
+            @PathVariable Long sessionId,
+            @RequestParam(defaultValue = "20") Integer limit) {
+        List<ChatMessageVo> history = knowledgeChatService.getKnowledgeChatHistory(sessionId, limit);
+        return R.ok(history);
+    }
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/controller/ChatConfigController.java b/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/controller/ChatConfigController.java
new file mode 100644
index 0000000..b859d28
--- /dev/null
+++ b/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/controller/ChatConfigController.java
@@ -0,0 +1,111 @@
+package org.dromara.chat.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
+import org.dromara.chat.domain.bo.ChatConfigBo;
+import org.dromara.chat.domain.vo.ChatConfigVo;
+import org.dromara.chat.service.ChatConfigService;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 聊天配置控制器
+ *
+ * @author pengles
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/chat/config")
+public class ChatConfigController extends BaseController {
+
+    private final ChatConfigService chatConfigService;
+
+    /**
+     * 查询聊天配置列表
+     */
+    @SaCheckPermission("chat:config:list")
+    @GetMapping("/list")
+    public TableDataInfo<ChatConfigVo> list(ChatConfigBo bo, PageQuery pageQuery) {
+        return chatConfigService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出聊天配置列表
+     */
+    @SaCheckPermission("chat:config:export")
+    @Log(title = "聊天配置", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(ChatConfigBo bo, HttpServletResponse response) {
+        List<ChatConfigVo> list = chatConfigService.queryList(bo);
+        ExcelUtil.exportExcel(list, "聊天配置", ChatConfigVo.class, response);
+    }
+
+    /**
+     * 获取聊天配置详细信息
+     */
+    @SaCheckPermission("chat:config:query")
+    @GetMapping("/{id}")
+    public R<ChatConfigVo> getInfo(@PathVariable Long id) {
+        return R.ok(chatConfigService.queryById(id));
+    }
+
+    /**
+     * 新增聊天配置
+     */
+    @SaCheckPermission("chat:config:add")
+    @Log(title = "聊天配置", businessType = BusinessType.INSERT)
+    @PostMapping
+    public R<Void> add(@Validated @RequestBody ChatConfigBo bo) {
+        return toAjax(chatConfigService.insertByBo(bo));
+    }
+
+    /**
+     * 修改聊天配置
+     */
+    @SaCheckPermission("chat:config:edit")
+    @Log(title = "聊天配置", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public R<Void> edit(@Validated @RequestBody ChatConfigBo bo) {
+        return toAjax(chatConfigService.updateByBo(bo));
+    }
+
+    /**
+     * 删除聊天配置
+     */
+    @SaCheckPermission("chat:config:remove")
+    @Log(title = "聊天配置", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@PathVariable Long[] ids) {
+        return toAjax(chatConfigService.deleteWithValidByIds(List.of(ids), true));
+    }
+
+    /**
+     * 根据配置分类查询配置列表
+     */
+    @SaCheckPermission("chat:config:query")
+    @GetMapping("/category/{category}")
+    public R<List<ChatConfigVo>> getByCategory(@PathVariable String category) {
+        return R.ok(chatConfigService.queryListByCategory(category));
+    }
+
+    /**
+     * 根据配置名称查询配置
+     */
+    @SaCheckPermission("chat:config:query")
+    @GetMapping("/name/{configName}")
+    public R<ChatConfigVo> getByConfigName(@PathVariable String configName) {
+        return R.ok(chatConfigService.queryByConfigName(configName));
+    }
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/controller/ChatMessageController.java b/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/controller/ChatMessageController.java
new file mode 100644
index 0000000..d506fec
--- /dev/null
+++ b/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/controller/ChatMessageController.java
@@ -0,0 +1,120 @@
+package org.dromara.chat.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
+import org.dromara.chat.domain.bo.ChatMessageBo;
+import org.dromara.chat.domain.vo.ChatMessageVo;
+import org.dromara.chat.service.ChatMessageService;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 聊天消息控制器
+ *
+ * @author pengles
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/chat/message")
+public class ChatMessageController extends BaseController {
+
+    private final ChatMessageService chatMessageService;
+
+    /**
+     * 查询聊天消息列表
+     */
+    @SaCheckPermission("chat:message:list")
+    @GetMapping("/list")
+    public TableDataInfo<ChatMessageVo> list(ChatMessageBo bo, PageQuery pageQuery) {
+        return chatMessageService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出聊天消息列表
+     */
+    @SaCheckPermission("chat:message:export")
+    @Log(title = "聊天消息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(ChatMessageBo bo, HttpServletResponse response) {
+        List<ChatMessageVo> list = chatMessageService.queryList(bo);
+        ExcelUtil.exportExcel(list, "聊天消息", ChatMessageVo.class, response);
+    }
+
+    /**
+     * 获取聊天消息详细信息
+     */
+    @SaCheckPermission("chat:message:query")
+    @GetMapping("/{id}")
+    public R<ChatMessageVo> getInfo(@PathVariable Long id) {
+        return R.ok(chatMessageService.queryById(id));
+    }
+
+    /**
+     * 新增聊天消息
+     */
+    @SaCheckPermission("chat:message:add")
+    @Log(title = "聊天消息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public R<Void> add(@Validated @RequestBody ChatMessageBo bo) {
+        return toAjax(chatMessageService.insertByBo(bo));
+    }
+
+    /**
+     * 修改聊天消息
+     */
+    @SaCheckPermission("chat:message:edit")
+    @Log(title = "聊天消息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public R<Void> edit(@Validated @RequestBody ChatMessageBo bo) {
+        return toAjax(chatMessageService.updateByBo(bo));
+    }
+
+    /**
+     * 删除聊天消息
+     */
+    @SaCheckPermission("chat:message:remove")
+    @Log(title = "聊天消息", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@PathVariable Long[] ids) {
+        return toAjax(chatMessageService.deleteWithValidByIds(List.of(ids), true));
+    }
+
+    /**
+     * 根据会话ID查询消息列表
+     */
+    @SaCheckPermission("chat:message:query")
+    @GetMapping("/session/{sessionId}")
+    public R<List<ChatMessageVo>> getBySessionId(@PathVariable Long sessionId) {
+        return R.ok(chatMessageService.queryListBySessionId(sessionId));
+    }
+
+    /**
+     * 根据用户ID查询消息列表
+     */
+    @SaCheckPermission("chat:message:query")
+    @GetMapping("/user/{userId}")
+    public R<List<ChatMessageVo>> getByUserId(@PathVariable Long userId) {
+        return R.ok(chatMessageService.queryListByUserId(userId));
+    }
+
+    /**
+     * 根据会话ID和用户ID查询消息列表
+     */
+    @SaCheckPermission("chat:message:query")
+    @GetMapping("/session/{sessionId}/user/{userId}")
+    public R<List<ChatMessageVo>> getBySessionIdAndUserId(@PathVariable Long sessionId, @PathVariable Long userId) {
+        return R.ok(chatMessageService.queryListBySessionIdAndUserId(sessionId, userId));
+    }
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/controller/ChatModelController.java b/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/controller/ChatModelController.java
new file mode 100644
index 0000000..a23a642
--- /dev/null
+++ b/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/controller/ChatModelController.java
@@ -0,0 +1,129 @@
+package org.dromara.chat.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
+import org.dromara.chat.domain.bo.ChatModelBo;
+import org.dromara.chat.domain.vo.ChatModelVo;
+import org.dromara.chat.service.ChatModelService;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 聊天模型控制器
+ *
+ * @author pengles
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/chat/model")
+public class ChatModelController extends BaseController {
+
+    private final ChatModelService chatModelService;
+
+    /**
+     * 查询聊天模型列表
+     */
+    @SaCheckPermission("chat:model:list")
+    @GetMapping("/list")
+    public TableDataInfo<ChatModelVo> list(ChatModelBo bo, PageQuery pageQuery) {
+        return chatModelService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出聊天模型列表
+     */
+    @SaCheckPermission("chat:model:export")
+    @Log(title = "聊天模型", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(ChatModelBo bo, HttpServletResponse response) {
+        List<ChatModelVo> list = chatModelService.queryList(bo);
+        ExcelUtil.exportExcel(list, "聊天模型", ChatModelVo.class, response);
+    }
+
+    /**
+     * 获取聊天模型详细信息
+     */
+    @SaCheckPermission("chat:model:query")
+    @GetMapping("/{id}")
+    public R<ChatModelVo> getInfo(@PathVariable Long id) {
+        return R.ok(chatModelService.queryById(id));
+    }
+
+    /**
+     * 新增聊天模型
+     */
+    @SaCheckPermission("chat:model:add")
+    @Log(title = "聊天模型", businessType = BusinessType.INSERT)
+    @PostMapping
+    public R<Void> add(@Validated @RequestBody ChatModelBo bo) {
+        return toAjax(chatModelService.insertByBo(bo));
+    }
+
+    /**
+     * 修改聊天模型
+     */
+    @SaCheckPermission("chat:model:edit")
+    @Log(title = "聊天模型", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public R<Void> edit(@Validated @RequestBody ChatModelBo bo) {
+        return toAjax(chatModelService.updateByBo(bo));
+    }
+
+    /**
+     * 删除聊天模型
+     */
+    @SaCheckPermission("chat:model:remove")
+    @Log(title = "聊天模型", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@PathVariable Long[] ids) {
+        return toAjax(chatModelService.deleteWithValidByIds(List.of(ids), true));
+    }
+
+    /**
+     * 根据模型分类查询模型列表
+     */
+    @SaCheckPermission("chat:model:query")
+    @GetMapping("/category/{category}")
+    public R<List<ChatModelVo>> getByCategory(@PathVariable String category) {
+        return R.ok(chatModelService.queryListByCategory(category));
+    }
+
+    /**
+     * 根据模型名称查询模型
+     */
+    @SaCheckPermission("chat:model:query")
+    @GetMapping("/name/{modelName}")
+    public R<ChatModelVo> getByModelName(@PathVariable String modelName) {
+        return R.ok(chatModelService.queryByModelName(modelName));
+    }
+
+    /**
+     * 查询显示的模型列表
+     */
+    @SaCheckPermission("chat:model:query")
+    @GetMapping("/show")
+    public R<List<ChatModelVo>> getShowModelList() {
+        return R.ok(chatModelService.queryShowModelList());
+    }
+
+    /**
+     * 根据模型类型查询模型列表
+     */
+    @SaCheckPermission("chat:model:query")
+    @GetMapping("/type/{modelType}")
+    public R<List<ChatModelVo>> getByModelType(@PathVariable String modelType) {
+        return R.ok(chatModelService.queryListByModelType(modelType));
+    }
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/controller/ChatOpenApiController.java b/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/controller/ChatOpenApiController.java
new file mode 100644
index 0000000..3ab0db2
--- /dev/null
+++ b/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/controller/ChatOpenApiController.java
@@ -0,0 +1,267 @@
+package org.dromara.chat.controller;
+
+import cn.dev33.satoken.annotation.SaCheckLogin;
+import cn.hutool.core.util.StrUtil;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.ai.domain.dto.AiChatRequest;
+import org.dromara.ai.domain.dto.AiChatResponse;
+import org.dromara.ai.service.AiChatService;
+import org.dromara.chat.domain.bo.ChatMessageBo;
+import org.dromara.chat.domain.vo.ChatSessionVo;
+import org.dromara.chat.service.ChatMessageService;
+import org.dromara.chat.service.ChatSessionService;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.json.utils.JsonUtils;
+import org.dromara.common.satoken.utils.LoginHelper;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
+
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * 开放聊天接口
+ *
+ * @author pengles
+ */
+@Slf4j
+@SaCheckLogin
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/chat")
+public class ChatOpenApiController {
+
+    private final AiChatService aiChatService;
+    private final ChatSessionService chatSessionService;
+    private final ChatMessageService chatMessageService;
+
+    @PostMapping(value = "/send", produces = MediaType.TEXT_EVENT_STREAM_VALUE)
+    public SseEmitter send(@RequestBody Map<String, Object> body) {
+        SseEmitter emitter = new SseEmitter(TimeUnit.MINUTES.toMillis(10));
+        Long userId;
+        try {
+            userId = LoginHelper.getUserId();
+        } catch (Exception e) {
+            emitter.completeWithError(new RuntimeException("未登录"));
+            return emitter;
+        }
+
+        try {
+            AiChatRequest req = toRequest(body);
+            req.setUserId(String.valueOf(userId));
+
+            // 获取或创建会话
+            String firstMsgContent = "";
+            if (req.getMessages() != null && !req.getMessages().isEmpty()) {
+                firstMsgContent = req.getMessages().get(req.getMessages().size() - 1).getContent();
+            }
+            Long sessionId = getOrCreateSession(userId, req.getSessionId(), firstMsgContent);
+            req.setSessionId(String.valueOf(sessionId));
+
+            // 如果是新会话，尝试通知前端sessionId
+            if (StrUtil.isBlank(req.getSessionId())) {
+                try {
+                    emitter.send(SseEmitter.event().name("session").data("{\"sessionId\":\"" + sessionId + "\"}"));
+                } catch (IOException e) {
+                    log.error("发送会话ID失败", e);
+                }
+            }
+
+            // 保存用户消息
+            saveUserMessage(sessionId, userId, firstMsgContent, req.getModel());
+
+            final StringBuilder fullText = new StringBuilder();
+            final Long finalSessionId = sessionId;
+            final String modelName = req.getModel();
+
+            aiChatService.chatStream(req, new AiChatService.StreamCallback() {
+                @Override
+                public void onChunk(String chunk) {
+                    String c = normalizeChunk(chunk);
+                    if ("[DONE]".equals(c)) {
+                        // ignore
+                    } else {
+                        fullText.append(c);
+                        try {
+                            emitter.send(toOpenAiDelta(c, false));
+                        } catch (IOException e) {
+                            log.debug("发送SSE失败", e);
+                        }
+                    }
+                }
+
+                @Override
+                public void onComplete(AiChatResponse response) {
+                    try {
+                        emitter.send(toOpenAiDelta("", true));
+                        emitter.send("[DONE]");
+                        emitter.complete();
+
+                        // 保存AI响应消息
+                        saveAiMessage(finalSessionId, userId, fullText.toString(), modelName);
+                    } catch (IOException e) {
+                        log.error("发送SSE完成标记失败", e);
+                        emitter.completeWithError(e);
+                    }
+                }
+
+                @Override
+                public void onError(Throwable error) {
+                    log.error("AI聊天出错", error);
+                    try {
+                        emitter.send("{\"error\":\"" + error.getMessage().replace("\"", "\\\"") + "\"}");
+                    } catch (IOException ignored) {
+                    }
+                    emitter.completeWithError(error);
+                }
+            });
+
+        } catch (Exception e) {
+            log.error("处理聊天请求失败", e);
+            try {
+                emitter.send("{\"error\":\"" + e.getMessage().replace("\"", "\\\"") + "\"}");
+            } catch (IOException ignored) {
+            }
+            emitter.completeWithError(e);
+        }
+        return emitter;
+    }
+
+    private Long getOrCreateSession(Long userId, String sessionIdStr, String firstMsgContent) {
+        if (StrUtil.isNotBlank(sessionIdStr)) {
+            Long sessionId = Long.parseLong(sessionIdStr);
+            ChatSessionVo session = chatSessionService.queryById(sessionId);
+            if (session == null) {
+                throw new RuntimeException("会话不存在");
+            }
+            if (!session.getUserId().equals(userId)) {
+                throw new RuntimeException("无权访问该会话");
+            }
+            return sessionId;
+        } else {
+            String title = "新对话";
+            if (StrUtil.isNotBlank(firstMsgContent)) {
+                title = StringUtils.substring(firstMsgContent, 0, 20);
+            }
+            ChatSessionVo session = chatSessionService.createNewSession(userId, title);
+            return session.getId();
+        }
+    }
+
+    private void saveUserMessage(Long sessionId, Long userId, String content, String modelName) {
+        if (StrUtil.isNotBlank(content)) {
+            ChatMessageBo userMsg = new ChatMessageBo();
+            userMsg.setSessionId(sessionId);
+            userMsg.setUserId(userId);
+            userMsg.setRole("user");
+            userMsg.setContent(content);
+            userMsg.setModelName(modelName);
+            userMsg.setCreateTime(new Date());
+            chatMessageService.insertByBo(userMsg);
+        }
+    }
+
+    private void saveAiMessage(Long sessionId, Long userId, String content, String modelName) {
+        if (StrUtil.isNotBlank(content)) {
+            ChatMessageBo aiMsg = new ChatMessageBo();
+            aiMsg.setSessionId(sessionId);
+            aiMsg.setUserId(userId);
+            aiMsg.setRole("assistant");
+            aiMsg.setContent(content);
+            aiMsg.setModelName(modelName);
+            aiMsg.setCreateTime(new Date());
+            aiMsg.setTotalTokens(0L);
+            aiMsg.setDeductCost(BigDecimal.ZERO);
+            chatMessageService.insertByBo(aiMsg);
+        }
+    }
+
+    private AiChatRequest toRequest(Map<String, Object> body) {
+        AiChatRequest req = new AiChatRequest();
+        req.setModel(asString(body.get("model")));
+        req.setTemperature(asDouble(body.get("temperature")));
+        req.setTopP(asDouble(body.get("top_p")));
+        req.setPresencePenalty(asDouble(body.get("presence_penalty")));
+        req.setFrequencyPenalty(asDouble(body.get("frequency_penalty")));
+        req.setMaxTokens(asInt(body.get("max_tokens")));
+        req.setStream(Boolean.TRUE);
+        req.setSessionId(asString(body.get("sessionId")));
+        Object msgs = body.get("messages");
+        if (msgs instanceof List<?> list) {
+            java.util.ArrayList<AiChatRequest.AiMessage> arr = new java.util.ArrayList<>();
+            for (Object o : list) {
+                if (o instanceof Map<?, ?> m) {
+                    AiChatRequest.AiMessage am = new AiChatRequest.AiMessage();
+                    am.setRole(asString(m.get("role")));
+                    am.setContent(asString(m.get("content")));
+                    arr.add(am);
+                }
+            }
+            req.setMessages(arr);
+        }
+        return req;
+    }
+
+    private String asString(Object o) {
+        return o == null ? null : String.valueOf(o);
+    }
+
+    private Double asDouble(Object o) {
+        try {
+            return o == null ? null : Double.valueOf(String.valueOf(o));
+        } catch (Exception e) {
+            return null;
+        }
+    }
+
+    private Integer asInt(Object o) {
+        try {
+            return o == null ? null : Integer.valueOf(String.valueOf(o));
+        } catch (Exception e) {
+            return null;
+        }
+    }
+
+    private String toOpenAiDelta(String content, boolean finish) {
+        String c = content == null ? "" : content;
+        String esc = c.replace("\\", "\\\\").replace("\"", "\\\"").replace("\n", "\\n").replace("\r", "\\r").replace("\t", "\\t");
+        String finishReason = finish ? "\"stop\"" : "null";
+        return "{\"choices\":[{\"delta\":{\"content\":\"" + esc + "\"},\"finish_reason\":" + finishReason + "}]}";
+    }
+
+    private String normalizeChunk(String chunk) {
+        if (chunk == null) return "";
+        String s = chunk.trim();
+        if ("[DONE]".equals(s)) return "[DONE]";
+        try {
+            Map<?, ?> m = JsonUtils.parseObject(s, Map.class);
+            if (m != null) {
+                Object choices = m.get("choices");
+                if (choices instanceof List<?> list && !list.isEmpty()) {
+                    Object first = list.get(0);
+                    if (first instanceof Map<?, ?> fm) {
+                        Object delta = fm.get("delta");
+                        if (delta instanceof Map<?, ?> dm) {
+                            Object c = dm.get("content");
+                            if (c == null) c = dm.get("reasoning_content");
+                            if (c != null) return String.valueOf(c);
+                        }
+                        Object text = fm.get("text");
+                        if (text != null) return String.valueOf(text);
+                    }
+                }
+            }
+        } catch (Exception ignore) {
+        }
+        return s;
+    }
+}
diff --git a/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/controller/ChatSessionController.java b/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/controller/ChatSessionController.java
new file mode 100644
index 0000000..c49425d
--- /dev/null
+++ b/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/controller/ChatSessionController.java
@@ -0,0 +1,122 @@
+package org.dromara.chat.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
+import org.dromara.chat.domain.bo.ChatSessionBo;
+import org.dromara.chat.domain.vo.ChatSessionVo;
+import org.dromara.chat.service.ChatSessionService;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 聊天会话控制器
+ *
+ * @author pengles
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/chat/session")
+public class ChatSessionController extends BaseController {
+
+    private final ChatSessionService chatSessionService;
+
+    /**
+     * 查询聊天会话列表
+     */
+    @SaCheckPermission("chat:session:list")
+    @GetMapping("/list")
+    public TableDataInfo<ChatSessionVo> list(ChatSessionBo bo, PageQuery pageQuery) {
+        return chatSessionService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出聊天会话列表
+     */
+    @SaCheckPermission("chat:session:export")
+    @Log(title = "聊天会话", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(ChatSessionBo bo, HttpServletResponse response) {
+        List<ChatSessionVo> list = chatSessionService.queryList(bo);
+        ExcelUtil.exportExcel(list, "聊天会话", ChatSessionVo.class, response);
+    }
+
+    /**
+     * 获取聊天会话详细信息
+     */
+    @SaCheckPermission("chat:session:query")
+    @GetMapping("/{id}")
+    public R<ChatSessionVo> getInfo(@PathVariable Long id) {
+        return R.ok(chatSessionService.queryById(id));
+    }
+
+    /**
+     * 新增聊天会话
+     */
+    @SaCheckPermission("chat:session:add")
+    @Log(title = "聊天会话", businessType = BusinessType.INSERT)
+    @PostMapping
+    public R<Void> add(@Validated @RequestBody ChatSessionBo bo) {
+        return toAjax(chatSessionService.insertByBo(bo));
+    }
+
+    /**
+     * 修改聊天会话
+     */
+    @SaCheckPermission("chat:session:edit")
+    @Log(title = "聊天会话", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public R<Void> edit(@Validated @RequestBody ChatSessionBo bo) {
+        return toAjax(chatSessionService.updateByBo(bo));
+    }
+
+    /**
+     * 删除聊天会话
+     */
+    @SaCheckPermission("chat:session:remove")
+    @Log(title = "聊天会话", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@PathVariable Long[] ids) {
+        return toAjax(chatSessionService.deleteWithValidByIds(List.of(ids), true));
+    }
+
+    /**
+     * 根据用户ID查询会话列表
+     */
+    @SaCheckPermission("chat:session:query")
+    @GetMapping("/user/{userId}")
+    public R<List<ChatSessionVo>> getByUserId(@PathVariable Long userId) {
+        return R.ok(chatSessionService.queryListByUserId(userId));
+    }
+
+    /**
+     * 创建新会话
+     */
+    @SaCheckPermission("chat:session:add")
+    @Log(title = "聊天会话", businessType = BusinessType.INSERT)
+    @PostMapping("/create")
+    public R<ChatSessionVo> createNewSession(@RequestParam Long userId, @RequestParam(required = false) String sessionTitle) {
+        return R.ok(chatSessionService.createNewSession(userId, sessionTitle));
+    }
+
+    /**
+     * 更新会话标题
+     */
+    @SaCheckPermission("chat:session:edit")
+    @Log(title = "聊天会话", businessType = BusinessType.UPDATE)
+    @PutMapping("/{sessionId}/title")
+    public R<Void> updateSessionTitle(@PathVariable Long sessionId, @RequestParam String sessionTitle) {
+        return toAjax(chatSessionService.updateSessionTitle(sessionId, sessionTitle));
+    }
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/controller/ChatStompController.java b/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/controller/ChatStompController.java
new file mode 100644
index 0000000..b61d679
--- /dev/null
+++ b/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/controller/ChatStompController.java
@@ -0,0 +1,43 @@
+package org.dromara.chat.controller;
+
+import lombok.RequiredArgsConstructor;
+import org.dromara.chat.domain.bo.ChatMessageBo;
+import org.dromara.chat.service.ChatMessageService;
+import org.springframework.messaging.handler.annotation.MessageMapping;
+import org.springframework.messaging.handler.annotation.Payload;
+import org.springframework.messaging.simp.SimpMessagingTemplate;
+import org.springframework.stereotype.Controller;
+
+import java.util.Map;
+
+@Controller
+@RequiredArgsConstructor
+public class ChatStompController {
+    private final SimpMessagingTemplate messagingTemplate;
+    private final ChatMessageService chatMessageService;
+
+    @MessageMapping("/chat/send")
+    public void send(@Payload Map<String, Object> payload) {
+        Long sessionId = toLong(payload.get("sessionId"));
+        Long userId = toLong(payload.get("userId"));
+        String content = String.valueOf(payload.get("content"));
+        ChatMessageBo bo = new ChatMessageBo();
+        bo.setSessionId(sessionId);
+        bo.setUserId(userId);
+        bo.setContent(content);
+        bo.setRole("user");
+        chatMessageService.insertByBo(bo);
+        messagingTemplate.convertAndSend("/topic/session/" + sessionId, Map.of(
+                "sessionId", sessionId, "userId", userId, "content", content));
+    }
+
+    private Long toLong(Object o) {
+        if (o == null) return null;
+        if (o instanceof Number) return ((Number) o).longValue();
+        try {
+            return Long.parseLong(String.valueOf(o));
+        } catch (Exception e) {
+            return null;
+        }
+    }
+}
diff --git a/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/controller/ChatUsageTokenController.java b/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/controller/ChatUsageTokenController.java
new file mode 100644
index 0000000..de2729a
--- /dev/null
+++ b/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/controller/ChatUsageTokenController.java
@@ -0,0 +1,129 @@
+package org.dromara.chat.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
+import org.dromara.chat.domain.bo.ChatUsageTokenBo;
+import org.dromara.chat.domain.vo.ChatUsageTokenVo;
+import org.dromara.chat.service.ChatUsageTokenService;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 聊天Token使用记录控制器
+ *
+ * @author pengles
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/chat/token")
+public class ChatUsageTokenController extends BaseController {
+
+    private final ChatUsageTokenService chatUsageTokenService;
+
+    /**
+     * 查询聊天Token使用记录列表
+     */
+    @SaCheckPermission("chat:token:list")
+    @GetMapping("/list")
+    public TableDataInfo<ChatUsageTokenVo> list(ChatUsageTokenBo bo, PageQuery pageQuery) {
+        return chatUsageTokenService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出聊天Token使用记录列表
+     */
+    @SaCheckPermission("chat:token:export")
+    @Log(title = "聊天Token使用记录", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(ChatUsageTokenBo bo, HttpServletResponse response) {
+        List<ChatUsageTokenVo> list = chatUsageTokenService.queryList(bo);
+        ExcelUtil.exportExcel(list, "聊天Token使用记录", ChatUsageTokenVo.class, response);
+    }
+
+    /**
+     * 获取聊天Token使用记录详细信息
+     */
+    @SaCheckPermission("chat:token:query")
+    @GetMapping("/{id}")
+    public R<ChatUsageTokenVo> getInfo(@PathVariable Long id) {
+        return R.ok(chatUsageTokenService.queryById(id));
+    }
+
+    /**
+     * 新增聊天Token使用记录
+     */
+    @SaCheckPermission("chat:token:add")
+    @Log(title = "聊天Token使用记录", businessType = BusinessType.INSERT)
+    @PostMapping
+    public R<Void> add(@Validated @RequestBody ChatUsageTokenBo bo) {
+        return toAjax(chatUsageTokenService.insertByBo(bo));
+    }
+
+    /**
+     * 修改聊天Token使用记录
+     */
+    @SaCheckPermission("chat:token:edit")
+    @Log(title = "聊天Token使用记录", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public R<Void> edit(@Validated @RequestBody ChatUsageTokenBo bo) {
+        return toAjax(chatUsageTokenService.updateByBo(bo));
+    }
+
+    /**
+     * 删除聊天Token使用记录
+     */
+    @SaCheckPermission("chat:token:remove")
+    @Log(title = "聊天Token使用记录", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@PathVariable Long[] ids) {
+        return toAjax(chatUsageTokenService.deleteWithValidByIds(List.of(ids), true));
+    }
+
+    /**
+     * 根据用户ID查询Token使用记录列表
+     */
+    @SaCheckPermission("chat:token:query")
+    @GetMapping("/user/{userId}")
+    public R<List<ChatUsageTokenVo>> getByUserId(@PathVariable Long userId) {
+        return R.ok(chatUsageTokenService.queryListByUserId(userId));
+    }
+
+    /**
+     * 根据模型名称查询Token使用记录列表
+     */
+    @SaCheckPermission("chat:token:query")
+    @GetMapping("/model/{modelName}")
+    public R<List<ChatUsageTokenVo>> getByModelName(@PathVariable String modelName) {
+        return R.ok(chatUsageTokenService.queryListByModelName(modelName));
+    }
+
+    /**
+     * 获取用户总Token使用量
+     */
+    @SaCheckPermission("chat:token:query")
+    @GetMapping("/total/user/{userId}")
+    public R<Long> getTotalTokenByUserId(@PathVariable Long userId) {
+        return R.ok(chatUsageTokenService.getTotalTokenByUserId(userId));
+    }
+
+    /**
+     * 获取模型总Token使用量
+     */
+    @SaCheckPermission("chat:token:query")
+    @GetMapping("/total/model/{modelName}")
+    public R<Long> getTotalTokenByModelName(@PathVariable String modelName) {
+        return R.ok(chatUsageTokenService.getTotalTokenByModelName(modelName));
+    }
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/domain/ChatConfig.java b/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/domain/ChatConfig.java
new file mode 100644
index 0000000..c18466e
--- /dev/null
+++ b/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/domain/ChatConfig.java
@@ -0,0 +1,88 @@
+package org.dromara.chat.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 聊天配置对象 chat_config
+ *
+ * @author pengles
+ */
+@Data
+@TableName("chat_config")
+public class ChatConfig implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 配置分类
+     */
+    private String category;
+
+    /**
+     * 配置名称
+     */
+    private String configName;
+
+    /**
+     * 配置值
+     */
+    private String configValue;
+
+    /**
+     * 配置字典
+     */
+    private String configDict;
+
+    /**
+     * 版本号
+     */
+    private String version;
+
+    /**
+     * 删除标志（0代表存在 2代表删除）
+     */
+    @TableLogic
+    private String delFlag;
+
+    /**
+     * 更新IP
+     */
+    private String updateIp;
+
+    /**
+     * 创建者
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createBy;
+
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 更新者
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateBy;
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/domain/ChatMessage.java b/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/domain/ChatMessage.java
new file mode 100644
index 0000000..0177a2e
--- /dev/null
+++ b/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/domain/ChatMessage.java
@@ -0,0 +1,91 @@
+package org.dromara.chat.domain;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 聊天消息对象 chat_message
+ *
+ * @author pengles
+ */
+@Data
+@TableName("chat_message")
+public class ChatMessage implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 会话ID
+     */
+    private Long sessionId;
+
+    /**
+     * 用户ID
+     */
+    private Long userId;
+
+    /**
+     * 消息内容
+     */
+    private String content;
+
+    /**
+     * 角色（user/assistant/system）
+     */
+    private String role;
+
+    /**
+     * 扣费成本
+     */
+    private BigDecimal deductCost;
+
+    /**
+     * 总token数
+     */
+    private Long totalTokens;
+
+    /**
+     * 模型名称
+     */
+    private String modelName;
+
+    /**
+     * 创建者
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createBy;
+
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 更新者
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateBy;
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/domain/ChatModel.java b/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/domain/ChatModel.java
new file mode 100644
index 0000000..829d931
--- /dev/null
+++ b/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/domain/ChatModel.java
@@ -0,0 +1,100 @@
+package org.dromara.chat.domain;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 聊天模型对象 chat_model
+ *
+ * @author pengles
+ */
+@Data
+@TableName("chat_model")
+public class ChatModel implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 模型分类
+     */
+    private String category;
+
+    /**
+     * 模型名称
+     */
+    private String modelName;
+
+    /**
+     * 模型描述
+     */
+    private String modelDescribe;
+
+    /**
+     * 模型价格
+     */
+    private BigDecimal modelPrice;
+
+    /**
+     * 模型类型
+     */
+    private String modelType;
+
+    /**
+     * 是否显示（0隐藏 1显示）
+     */
+    private String modelShow;
+
+    /**
+     * 系统提示词
+     */
+    private String systemPrompt;
+
+    /**
+     * API主机地址
+     */
+    private String apiHost;
+
+    /**
+     * API密钥
+     */
+    private String apiKey;
+
+    /**
+     * 创建者
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createBy;
+
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 更新者
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateBy;
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/domain/ChatSession.java b/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/domain/ChatSession.java
new file mode 100644
index 0000000..a2ea2f2
--- /dev/null
+++ b/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/domain/ChatSession.java
@@ -0,0 +1,70 @@
+package org.dromara.chat.domain;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 聊天会话对象 chat_session
+ *
+ * @author pengles
+ */
+@Data
+@TableName("chat_session")
+public class ChatSession implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 用户ID
+     */
+    private Long userId;
+
+    /**
+     * 会话标题
+     */
+    private String sessionTitle;
+
+    /**
+     * 会话内容
+     */
+    private String sessionContent;
+
+    /**
+     * 创建者
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createBy;
+
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 更新者
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateBy;
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/domain/ChatUsageToken.java b/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/domain/ChatUsageToken.java
new file mode 100644
index 0000000..abe415b
--- /dev/null
+++ b/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/domain/ChatUsageToken.java
@@ -0,0 +1,48 @@
+package org.dromara.chat.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 聊天使用令牌对象 chat_usage_token
+ *
+ * @author pengles
+ */
+@Data
+@TableName("chat_usage_token")
+public class ChatUsageToken implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 用户ID
+     */
+    private Long userId;
+
+    /**
+     * 令牌数量
+     */
+    private Long token;
+
+    /**
+     * 模型名称
+     */
+    private String modelName;
+
+    /**
+     * 总令牌数
+     */
+    private Long totalToken;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/domain/bo/ChatConfigBo.java b/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/domain/bo/ChatConfigBo.java
new file mode 100644
index 0000000..ec23c18
--- /dev/null
+++ b/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/domain/bo/ChatConfigBo.java
@@ -0,0 +1,62 @@
+package org.dromara.chat.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.dromara.chat.domain.ChatConfig;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+
+/**
+ * 聊天配置业务对象 chat_config
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = ChatConfig.class, reverseConvertGenerate = false)
+public class ChatConfigBo extends BaseEntity {
+
+    /**
+     * 主键ID
+     */
+    @NotNull(message = "主键ID不能为空", groups = {EditGroup.class})
+    private Long id;
+
+    /**
+     * 配置分类
+     */
+    @NotBlank(message = "配置分类不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String category;
+
+    /**
+     * 配置名称
+     */
+    @NotBlank(message = "配置名称不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String configName;
+
+    /**
+     * 配置值
+     */
+    @NotBlank(message = "配置值不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String configValue;
+
+    /**
+     * 配置字典
+     */
+    private String configDict;
+
+    /**
+     * 版本号
+     */
+    private String version;
+
+    /**
+     * 更新IP
+     */
+    private String updateIp;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/domain/bo/ChatMessageBo.java b/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/domain/bo/ChatMessageBo.java
new file mode 100644
index 0000000..ddbd973
--- /dev/null
+++ b/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/domain/bo/ChatMessageBo.java
@@ -0,0 +1,76 @@
+package org.dromara.chat.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.dromara.chat.domain.ChatMessage;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+
+import java.math.BigDecimal;
+
+/**
+ * 聊天消息业务对象 chat_message
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = ChatMessage.class, reverseConvertGenerate = false)
+public class ChatMessageBo extends BaseEntity {
+
+    /**
+     * 主键ID
+     */
+    @NotNull(message = "主键ID不能为空", groups = {EditGroup.class})
+    private Long id;
+
+    /**
+     * 会话ID
+     */
+    @NotNull(message = "会话ID不能为空", groups = {AddGroup.class, EditGroup.class})
+    private Long sessionId;
+
+    /**
+     * 用户ID
+     */
+    @NotNull(message = "用户ID不能为空", groups = {AddGroup.class, EditGroup.class})
+    private Long userId;
+
+    /**
+     * 消息类型（text/image/file）
+     */
+    @NotBlank(message = "消息类型不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String messageType;
+
+    /**
+     * 消息内容
+     */
+    @NotBlank(message = "消息内容不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String content;
+
+    /**
+     * 角色（user/assistant/system）
+     */
+    @NotBlank(message = "角色不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String role;
+
+    /**
+     * 扣费成本
+     */
+    private BigDecimal deductCost;
+
+    /**
+     * 总token数
+     */
+    private Long totalTokens;
+
+    /**
+     * 模型名称
+     */
+    private String modelName;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/domain/bo/ChatModelBo.java b/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/domain/bo/ChatModelBo.java
new file mode 100644
index 0000000..7f1a7df
--- /dev/null
+++ b/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/domain/bo/ChatModelBo.java
@@ -0,0 +1,78 @@
+package org.dromara.chat.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.dromara.chat.domain.ChatModel;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+
+import java.math.BigDecimal;
+
+/**
+ * 聊天模型业务对象 chat_model
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = ChatModel.class, reverseConvertGenerate = false)
+public class ChatModelBo extends BaseEntity {
+
+    /**
+     * 主键ID
+     */
+    @NotNull(message = "主键ID不能为空", groups = {EditGroup.class})
+    private Long id;
+
+    /**
+     * 模型分类
+     */
+    @NotBlank(message = "模型分类不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String category;
+
+    /**
+     * 模型名称
+     */
+    @NotBlank(message = "模型名称不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String modelName;
+
+    /**
+     * 模型描述
+     */
+    private String modelDescribe;
+
+    /**
+     * 模型价格
+     */
+    private BigDecimal modelPrice;
+
+    /**
+     * 模型类型
+     */
+    private String modelType;
+
+    /**
+     * 是否显示（0隐藏 1显示）
+     */
+    private String modelShow;
+
+    /**
+     * 系统提示词
+     */
+    private String systemPrompt;
+
+    /**
+     * API主机地址
+     */
+    private String apiHost;
+
+    /**
+     * API密钥
+     */
+    private String apiKey;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/domain/bo/ChatSessionBo.java b/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/domain/bo/ChatSessionBo.java
new file mode 100644
index 0000000..015ea69
--- /dev/null
+++ b/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/domain/bo/ChatSessionBo.java
@@ -0,0 +1,46 @@
+package org.dromara.chat.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.dromara.chat.domain.ChatSession;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+
+/**
+ * 聊天会话业务对象 chat_session
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = ChatSession.class, reverseConvertGenerate = false)
+public class ChatSessionBo extends BaseEntity {
+
+    /**
+     * 主键ID
+     */
+    @NotNull(message = "主键ID不能为空", groups = {EditGroup.class})
+    private Long id;
+
+    /**
+     * 用户ID
+     */
+    @NotNull(message = "用户ID不能为空", groups = {AddGroup.class, EditGroup.class})
+    private Long userId;
+
+    /**
+     * 会话标题
+     */
+    @NotBlank(message = "会话标题不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String sessionTitle;
+
+    /**
+     * 会话内容
+     */
+    private String sessionContent;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/domain/bo/ChatUsageTokenBo.java b/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/domain/bo/ChatUsageTokenBo.java
new file mode 100644
index 0000000..34e5d4a
--- /dev/null
+++ b/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/domain/bo/ChatUsageTokenBo.java
@@ -0,0 +1,53 @@
+package org.dromara.chat.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+import org.dromara.chat.domain.ChatUsageToken;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 聊天使用令牌业务对象 chat_usage_token
+ *
+ * @author pengles
+ */
+@Data
+@AutoMapper(target = ChatUsageToken.class, reverseConvertGenerate = false)
+public class ChatUsageTokenBo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @NotNull(message = "主键ID不能为空", groups = {EditGroup.class})
+    private Long id;
+
+    /**
+     * 用户ID
+     */
+    @NotNull(message = "用户ID不能为空", groups = {AddGroup.class, EditGroup.class})
+    private Long userId;
+
+    /**
+     * 令牌数量
+     */
+    @NotNull(message = "令牌数量不能为空", groups = {AddGroup.class, EditGroup.class})
+    private Long token;
+
+    /**
+     * 模型名称
+     */
+    private String modelName;
+
+    /**
+     * 总令牌数
+     */
+    private Long totalToken;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/domain/request/ChatRequest.java b/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/domain/request/ChatRequest.java
new file mode 100644
index 0000000..47f8640
--- /dev/null
+++ b/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/domain/request/ChatRequest.java
@@ -0,0 +1,31 @@
+package org.dromara.chat.domain.request;
+
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+
+/**
+ * 聊天请求基础类
+ *
+ * @author pengles
+ */
+@Data
+public class ChatRequest {
+
+    /**
+     * 会话ID
+     */
+    @NotBlank(message = "会话ID不能为空")
+    private String sessionId;
+
+    /**
+     * 消息内容
+     */
+    @NotBlank(message = "消息内容不能为空")
+    private String message;
+
+    /**
+     * 模型名称
+     */
+    private String modelName;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/domain/request/MultiProviderChatRequest.java b/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/domain/request/MultiProviderChatRequest.java
new file mode 100644
index 0000000..685872e
--- /dev/null
+++ b/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/domain/request/MultiProviderChatRequest.java
@@ -0,0 +1,40 @@
+package org.dromara.chat.domain.request;
+
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+
+/**
+ * 多Provider聊天请求
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class MultiProviderChatRequest extends ChatRequest {
+
+    /**
+     * Provider名称列表
+     */
+    @NotNull(message = "Provider列表不能为空")
+    @NotEmpty(message = "Provider列表不能为空")
+    private List<String> providerNames;
+
+    /**
+     * 是否合并结果
+     */
+    private Boolean mergeResults = true;
+
+    /**
+     * 最大并发数
+     */
+    private Integer maxConcurrency = 3;
+
+    /**
+     * 超时时间（秒）
+     */
+    private Integer timeoutSeconds = 30;
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/domain/request/RateRequest.java b/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/domain/request/RateRequest.java
new file mode 100644
index 0000000..3cca552
--- /dev/null
+++ b/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/domain/request/RateRequest.java
@@ -0,0 +1,46 @@
+package org.dromara.chat.domain.request;
+
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+/**
+ * 回答质量评估请求
+ *
+ * @author pengles
+ * @date 2024-01-01
+ */
+@Data
+public class RateRequest {
+
+    /**
+     * 消息ID
+     */
+    @NotBlank(message = "消息ID不能为空")
+    private String messageId;
+
+    /**
+     * 评分（1-5分）
+     */
+    @NotNull(message = "评分不能为空")
+    @Min(value = 1, message = "评分不能小于1")
+    @Max(value = 5, message = "评分不能大于5")
+    private Integer rating;
+
+    /**
+     * 反馈内容
+     */
+    private String feedback;
+
+    /**
+     * 评估维度
+     */
+    private String dimension;
+
+    /**
+     * 是否匿名
+     */
+    private Boolean anonymous = false;
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/domain/vo/ChatConfigVo.java b/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/domain/vo/ChatConfigVo.java
new file mode 100644
index 0000000..1cca656
--- /dev/null
+++ b/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/domain/vo/ChatConfigVo.java
@@ -0,0 +1,89 @@
+package org.dromara.chat.domain.vo;
+
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.chat.domain.ChatConfig;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 聊天配置视图对象 chat_config
+ *
+ * @author pengles
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = ChatConfig.class)
+public class ChatConfigVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @ExcelProperty(value = "主键ID")
+    private Long id;
+
+    /**
+     * 配置分类
+     */
+    @ExcelProperty(value = "配置分类")
+    private String category;
+
+    /**
+     * 配置名称
+     */
+    @ExcelProperty(value = "配置名称")
+    private String configName;
+
+    /**
+     * 配置值
+     */
+    @ExcelProperty(value = "配置值")
+    private String configValue;
+
+    /**
+     * 配置字典
+     */
+    @ExcelProperty(value = "配置字典")
+    private String configDict;
+
+    /**
+     * 版本号
+     */
+    @ExcelProperty(value = "版本号")
+    private String version;
+
+    /**
+     * 删除标志
+     */
+    @ExcelProperty(value = "删除标志", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "0=正常,2=删除")
+    private String delFlag;
+
+    /**
+     * 更新IP
+     */
+    @ExcelProperty(value = "更新IP")
+    private String updateIp;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "创建时间")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @ExcelProperty(value = "更新时间")
+    private Date updateTime;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/domain/vo/ChatMessageVo.java b/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/domain/vo/ChatMessageVo.java
new file mode 100644
index 0000000..96720c7
--- /dev/null
+++ b/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/domain/vo/ChatMessageVo.java
@@ -0,0 +1,87 @@
+package org.dromara.chat.domain.vo;
+
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.chat.domain.ChatMessage;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 聊天消息视图对象 chat_message
+ *
+ * @author pengles
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = ChatMessage.class)
+public class ChatMessageVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @ExcelProperty(value = "主键ID")
+    private Long id;
+
+    /**
+     * 会话ID
+     */
+    @ExcelProperty(value = "会话ID")
+    private Long sessionId;
+
+    /**
+     * 用户ID
+     */
+    @ExcelProperty(value = "用户ID")
+    private Long userId;
+
+    /**
+     * 消息内容
+     */
+    @ExcelProperty(value = "消息内容")
+    private String content;
+
+    /**
+     * 角色（user/assistant/system）
+     */
+    @ExcelProperty(value = "角色")
+    private String role;
+
+    /**
+     * 扣费成本
+     */
+    @ExcelProperty(value = "扣费成本")
+    private BigDecimal deductCost;
+
+    /**
+     * 总token数
+     */
+    @ExcelProperty(value = "总token数")
+    private Long totalTokens;
+
+    /**
+     * 模型名称
+     */
+    @ExcelProperty(value = "模型名称")
+    private String modelName;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "创建时间")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @ExcelProperty(value = "更新时间")
+    private Date updateTime;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/domain/vo/ChatModelVo.java b/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/domain/vo/ChatModelVo.java
new file mode 100644
index 0000000..ba939b9
--- /dev/null
+++ b/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/domain/vo/ChatModelVo.java
@@ -0,0 +1,102 @@
+package org.dromara.chat.domain.vo;
+
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.chat.domain.ChatModel;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 聊天模型视图对象 chat_model
+ *
+ * @author pengles
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = ChatModel.class)
+public class ChatModelVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @ExcelProperty(value = "主键ID")
+    private Long id;
+
+    /**
+     * 模型分类
+     */
+    @ExcelProperty(value = "模型分类")
+    private String category;
+
+    /**
+     * 模型名称
+     */
+    @ExcelProperty(value = "模型名称")
+    private String modelName;
+
+    /**
+     * 模型描述
+     */
+    @ExcelProperty(value = "模型描述")
+    private String modelDescribe;
+
+    /**
+     * 模型价格
+     */
+    @ExcelProperty(value = "模型价格")
+    private BigDecimal modelPrice;
+
+    /**
+     * 模型类型
+     */
+    @ExcelProperty(value = "模型类型")
+    private String modelType;
+
+    /**
+     * 是否显示（0隐藏 1显示）
+     */
+    @ExcelProperty(value = "是否显示", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "0=隐藏,1=显示")
+    private String modelShow;
+
+    /**
+     * 系统提示词
+     */
+    @ExcelProperty(value = "系统提示词")
+    private String systemPrompt;
+
+    /**
+     * API主机地址
+     */
+    @ExcelProperty(value = "API主机地址")
+    private String apiHost;
+
+    /**
+     * API密钥
+     */
+    @ExcelProperty(value = "API密钥")
+    private String apiKey;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "创建时间")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @ExcelProperty(value = "更新时间")
+    private Date updateTime;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/domain/vo/ChatSessionVo.java b/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/domain/vo/ChatSessionVo.java
new file mode 100644
index 0000000..9a9f6f2
--- /dev/null
+++ b/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/domain/vo/ChatSessionVo.java
@@ -0,0 +1,62 @@
+package org.dromara.chat.domain.vo;
+
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.chat.domain.ChatSession;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 聊天会话视图对象 chat_session
+ *
+ * @author pengles
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = ChatSession.class)
+public class ChatSessionVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @ExcelProperty(value = "主键ID")
+    private Long id;
+
+    /**
+     * 用户ID
+     */
+    @ExcelProperty(value = "用户ID")
+    private Long userId;
+
+    /**
+     * 会话标题
+     */
+    @ExcelProperty(value = "会话标题")
+    private String sessionTitle;
+
+    /**
+     * 会话内容
+     */
+    @ExcelProperty(value = "会话内容")
+    private String sessionContent;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "创建时间")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @ExcelProperty(value = "更新时间")
+    private Date updateTime;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/domain/vo/ChatUsageTokenVo.java b/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/domain/vo/ChatUsageTokenVo.java
new file mode 100644
index 0000000..5ec6c90
--- /dev/null
+++ b/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/domain/vo/ChatUsageTokenVo.java
@@ -0,0 +1,68 @@
+package org.dromara.chat.domain.vo;
+
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.chat.domain.ChatUsageToken;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 聊天Token使用记录视图对象 chat_usage_token
+ *
+ * @author pengles
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = ChatUsageToken.class)
+public class ChatUsageTokenVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @ExcelProperty(value = "主键ID")
+    private Long id;
+
+    /**
+     * 用户ID
+     */
+    @ExcelProperty(value = "用户ID")
+    private Long userId;
+
+    /**
+     * 使用token数
+     */
+    @ExcelProperty(value = "使用token数")
+    private Long token;
+
+    /**
+     * 模型名称
+     */
+    @ExcelProperty(value = "模型名称")
+    private String modelName;
+
+    /**
+     * 总token数
+     */
+    @ExcelProperty(value = "总token数")
+    private Long totalToken;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "创建时间")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @ExcelProperty(value = "更新时间")
+    private Date updateTime;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/mapper/ChatConfigMapper.java b/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/mapper/ChatConfigMapper.java
new file mode 100644
index 0000000..7a4d263
--- /dev/null
+++ b/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/mapper/ChatConfigMapper.java
@@ -0,0 +1,14 @@
+package org.dromara.chat.mapper;
+
+import org.dromara.chat.domain.ChatConfig;
+import org.dromara.chat.domain.vo.ChatConfigVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 聊天配置Mapper接口
+ *
+ * @author pengles
+ */
+public interface ChatConfigMapper extends BaseMapperPlus<ChatConfig, ChatConfigVo> {
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/mapper/ChatMessageMapper.java b/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/mapper/ChatMessageMapper.java
new file mode 100644
index 0000000..4d07ac0
--- /dev/null
+++ b/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/mapper/ChatMessageMapper.java
@@ -0,0 +1,14 @@
+package org.dromara.chat.mapper;
+
+import org.dromara.chat.domain.ChatMessage;
+import org.dromara.chat.domain.vo.ChatMessageVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 聊天消息Mapper接口
+ *
+ * @author pengles
+ */
+public interface ChatMessageMapper extends BaseMapperPlus<ChatMessage, ChatMessageVo> {
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/mapper/ChatModelMapper.java b/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/mapper/ChatModelMapper.java
new file mode 100644
index 0000000..8ecccd7
--- /dev/null
+++ b/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/mapper/ChatModelMapper.java
@@ -0,0 +1,14 @@
+package org.dromara.chat.mapper;
+
+import org.dromara.chat.domain.ChatModel;
+import org.dromara.chat.domain.vo.ChatModelVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 聊天模型Mapper接口
+ *
+ * @author pengles
+ */
+public interface ChatModelMapper extends BaseMapperPlus<ChatModel, ChatModelVo> {
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/mapper/ChatSessionMapper.java b/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/mapper/ChatSessionMapper.java
new file mode 100644
index 0000000..1d08f2c
--- /dev/null
+++ b/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/mapper/ChatSessionMapper.java
@@ -0,0 +1,14 @@
+package org.dromara.chat.mapper;
+
+import org.dromara.chat.domain.ChatSession;
+import org.dromara.chat.domain.vo.ChatSessionVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 聊天会话Mapper接口
+ *
+ * @author pengles
+ */
+public interface ChatSessionMapper extends BaseMapperPlus<ChatSession, ChatSessionVo> {
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/mapper/ChatUsageTokenMapper.java b/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/mapper/ChatUsageTokenMapper.java
new file mode 100644
index 0000000..bebee88
--- /dev/null
+++ b/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/mapper/ChatUsageTokenMapper.java
@@ -0,0 +1,14 @@
+package org.dromara.chat.mapper;
+
+import org.dromara.chat.domain.ChatUsageToken;
+import org.dromara.chat.domain.vo.ChatUsageTokenVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 聊天Token使用记录Mapper接口
+ *
+ * @author pengles
+ */
+public interface ChatUsageTokenMapper extends BaseMapperPlus<ChatUsageToken, ChatUsageTokenVo> {
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/service/AiKnowledgeChatService.java b/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/service/AiKnowledgeChatService.java
new file mode 100644
index 0000000..4d76398
--- /dev/null
+++ b/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/service/AiKnowledgeChatService.java
@@ -0,0 +1,65 @@
+package org.dromara.chat.service;
+
+import org.dromara.chat.domain.vo.ChatMessageVo;
+import org.dromara.chat.domain.vo.ChatSessionVo;
+
+import java.util.List;
+
+/**
+ * 知识库聊天服务接口
+ *
+ * @author pengles
+ */
+public interface AiKnowledgeChatService {
+
+    /**
+     * 基于知识库进行智能问答
+     *
+     * @param sessionId   会话ID
+     * @param userId      用户ID
+     * @param question    用户问题
+     * @param knowledgeId 知识库ID
+     * @param modelName   使用的模型名称
+     * @return 聊天回复消息
+     */
+    ChatMessageVo chatWithKnowledge(Long sessionId, Long userId, String question, Long knowledgeId, String modelName);
+
+    /**
+     * 创建知识库聊天会话
+     *
+     * @param userId       用户ID
+     * @param knowledgeId  知识库ID
+     * @param sessionTitle 会话标题
+     * @return 聊天会话
+     */
+    ChatSessionVo createKnowledgeSession(Long userId, Long knowledgeId, String sessionTitle);
+
+    /**
+     * 搜索相关知识库内容
+     *
+     * @param knowledgeId 知识库ID
+     * @param query       查询内容
+     * @param limit       返回数量限制
+     * @return 相关知识库内容列表
+     */
+    List<String> searchKnowledgeContent(Long knowledgeId, String query, Integer limit);
+
+    /**
+     * 构建知识库上下文
+     *
+     * @param knowledgeId 知识库ID
+     * @param question    用户问题
+     * @return 构建的上下文内容
+     */
+    String buildKnowledgeContext(Long knowledgeId, String question);
+
+    /**
+     * 获取知识库聊天历史
+     *
+     * @param sessionId 会话ID
+     * @param limit     返回数量限制
+     * @return 聊天历史消息列表
+     */
+    List<ChatMessageVo> getKnowledgeChatHistory(Long sessionId, Integer limit);
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/service/ChatConfigService.java b/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/service/ChatConfigService.java
new file mode 100644
index 0000000..b390133
--- /dev/null
+++ b/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/service/ChatConfigService.java
@@ -0,0 +1,60 @@
+package org.dromara.chat.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.dromara.chat.domain.ChatConfig;
+import org.dromara.chat.domain.bo.ChatConfigBo;
+import org.dromara.chat.domain.vo.ChatConfigVo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 聊天配置Service接口
+ *
+ * @author pengles
+ */
+public interface ChatConfigService extends IService<ChatConfig> {
+
+    /**
+     * 查询聊天配置
+     */
+    ChatConfigVo queryById(Long id);
+
+    /**
+     * 查询聊天配置列表
+     */
+    TableDataInfo<ChatConfigVo> queryPageList(ChatConfigBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询聊天配置列表
+     */
+    List<ChatConfigVo> queryList(ChatConfigBo bo);
+
+    /**
+     * 新增聊天配置
+     */
+    Boolean insertByBo(ChatConfigBo bo);
+
+    /**
+     * 修改聊天配置
+     */
+    Boolean updateByBo(ChatConfigBo bo);
+
+    /**
+     * 校验并批量删除聊天配置
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    /**
+     * 根据配置分类查询配置列表
+     */
+    List<ChatConfigVo> queryListByCategory(String category);
+
+    /**
+     * 根据配置名称查询配置
+     */
+    ChatConfigVo queryByConfigName(String configName);
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/service/ChatMessageService.java b/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/service/ChatMessageService.java
new file mode 100644
index 0000000..552f6cd
--- /dev/null
+++ b/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/service/ChatMessageService.java
@@ -0,0 +1,65 @@
+package org.dromara.chat.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.dromara.chat.domain.ChatMessage;
+import org.dromara.chat.domain.bo.ChatMessageBo;
+import org.dromara.chat.domain.vo.ChatMessageVo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 聊天消息Service接口
+ *
+ * @author pengles
+ */
+public interface ChatMessageService extends IService<ChatMessage> {
+
+    /**
+     * 查询聊天消息
+     */
+    ChatMessageVo queryById(Long id);
+
+    /**
+     * 查询聊天消息列表
+     */
+    TableDataInfo<ChatMessageVo> queryPageList(ChatMessageBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询聊天消息列表
+     */
+    List<ChatMessageVo> queryList(ChatMessageBo bo);
+
+    /**
+     * 新增聊天消息
+     */
+    Boolean insertByBo(ChatMessageBo bo);
+
+    /**
+     * 修改聊天消息
+     */
+    Boolean updateByBo(ChatMessageBo bo);
+
+    /**
+     * 校验并批量删除聊天消息
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    /**
+     * 根据会话ID查询消息列表
+     */
+    List<ChatMessageVo> queryListBySessionId(Long sessionId);
+
+    /**
+     * 根据用户ID查询消息列表
+     */
+    List<ChatMessageVo> queryListByUserId(Long userId);
+
+    /**
+     * 根据会话ID和用户ID查询消息列表
+     */
+    List<ChatMessageVo> queryListBySessionIdAndUserId(Long sessionId, Long userId);
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/service/ChatModelService.java b/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/service/ChatModelService.java
new file mode 100644
index 0000000..9c9e25e
--- /dev/null
+++ b/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/service/ChatModelService.java
@@ -0,0 +1,70 @@
+package org.dromara.chat.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.dromara.chat.domain.ChatModel;
+import org.dromara.chat.domain.bo.ChatModelBo;
+import org.dromara.chat.domain.vo.ChatModelVo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 聊天模型Service接口
+ *
+ * @author pengles
+ */
+public interface ChatModelService extends IService<ChatModel> {
+
+    /**
+     * 查询聊天模型
+     */
+    ChatModelVo queryById(Long id);
+
+    /**
+     * 查询聊天模型列表
+     */
+    TableDataInfo<ChatModelVo> queryPageList(ChatModelBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询聊天模型列表
+     */
+    List<ChatModelVo> queryList(ChatModelBo bo);
+
+    /**
+     * 新增聊天模型
+     */
+    Boolean insertByBo(ChatModelBo bo);
+
+    /**
+     * 修改聊天模型
+     */
+    Boolean updateByBo(ChatModelBo bo);
+
+    /**
+     * 校验并批量删除聊天模型
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    /**
+     * 根据模型分类查询模型列表
+     */
+    List<ChatModelVo> queryListByCategory(String category);
+
+    /**
+     * 根据模型名称查询模型
+     */
+    ChatModelVo queryByModelName(String modelName);
+
+    /**
+     * 查询显示的模型列表
+     */
+    List<ChatModelVo> queryShowModelList();
+
+    /**
+     * 根据模型类型查询模型列表
+     */
+    List<ChatModelVo> queryListByModelType(String modelType);
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/service/ChatSessionService.java b/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/service/ChatSessionService.java
new file mode 100644
index 0000000..a16202a
--- /dev/null
+++ b/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/service/ChatSessionService.java
@@ -0,0 +1,65 @@
+package org.dromara.chat.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.dromara.chat.domain.ChatSession;
+import org.dromara.chat.domain.bo.ChatSessionBo;
+import org.dromara.chat.domain.vo.ChatSessionVo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 聊天会话Service接口
+ *
+ * @author pengles
+ */
+public interface ChatSessionService extends IService<ChatSession> {
+
+    /**
+     * 查询聊天会话
+     */
+    ChatSessionVo queryById(Long id);
+
+    /**
+     * 查询聊天会话列表
+     */
+    TableDataInfo<ChatSessionVo> queryPageList(ChatSessionBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询聊天会话列表
+     */
+    List<ChatSessionVo> queryList(ChatSessionBo bo);
+
+    /**
+     * 新增聊天会话
+     */
+    Boolean insertByBo(ChatSessionBo bo);
+
+    /**
+     * 修改聊天会话
+     */
+    Boolean updateByBo(ChatSessionBo bo);
+
+    /**
+     * 校验并批量删除聊天会话
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    /**
+     * 根据用户ID查询会话列表
+     */
+    List<ChatSessionVo> queryListByUserId(Long userId);
+
+    /**
+     * 创建新会话
+     */
+    ChatSessionVo createNewSession(Long userId, String sessionTitle);
+
+    /**
+     * 更新会话标题
+     */
+    Boolean updateSessionTitle(Long sessionId, String sessionTitle);
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/service/ChatUsageTokenService.java b/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/service/ChatUsageTokenService.java
new file mode 100644
index 0000000..2f23f6e
--- /dev/null
+++ b/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/service/ChatUsageTokenService.java
@@ -0,0 +1,70 @@
+package org.dromara.chat.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.dromara.chat.domain.ChatUsageToken;
+import org.dromara.chat.domain.bo.ChatUsageTokenBo;
+import org.dromara.chat.domain.vo.ChatUsageTokenVo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 聊天Token使用记录Service接口
+ *
+ * @author pengles
+ */
+public interface ChatUsageTokenService extends IService<ChatUsageToken> {
+
+    /**
+     * 查询聊天Token使用记录
+     */
+    ChatUsageTokenVo queryById(Long id);
+
+    /**
+     * 查询聊天Token使用记录列表
+     */
+    TableDataInfo<ChatUsageTokenVo> queryPageList(ChatUsageTokenBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询聊天Token使用记录列表
+     */
+    List<ChatUsageTokenVo> queryList(ChatUsageTokenBo bo);
+
+    /**
+     * 新增聊天Token使用记录
+     */
+    Boolean insertByBo(ChatUsageTokenBo bo);
+
+    /**
+     * 修改聊天Token使用记录
+     */
+    Boolean updateByBo(ChatUsageTokenBo bo);
+
+    /**
+     * 校验并批量删除聊天Token使用记录
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    /**
+     * 根据用户ID查询Token使用记录列表
+     */
+    List<ChatUsageTokenVo> queryListByUserId(Long userId);
+
+    /**
+     * 根据模型名称查询Token使用记录列表
+     */
+    List<ChatUsageTokenVo> queryListByModelName(String modelName);
+
+    /**
+     * 统计用户总Token使用量
+     */
+    Long getTotalTokenByUserId(Long userId);
+
+    /**
+     * 统计模型总Token使用量
+     */
+    Long getTotalTokenByModelName(String modelName);
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/service/impl/AiKnowledgeChatServiceImpl.java b/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/service/impl/AiKnowledgeChatServiceImpl.java
new file mode 100644
index 0000000..d98cc4f
--- /dev/null
+++ b/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/service/impl/AiKnowledgeChatServiceImpl.java
@@ -0,0 +1,198 @@
+package org.dromara.chat.service.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.ai.domain.dto.AiChatRequest;
+import org.dromara.ai.domain.dto.AiChatResponse;
+import org.dromara.ai.service.AiChatService;
+import org.dromara.chat.domain.bo.ChatMessageBo;
+import org.dromara.chat.domain.bo.ChatSessionBo;
+import org.dromara.chat.domain.vo.ChatMessageVo;
+import org.dromara.chat.domain.vo.ChatSessionVo;
+import org.dromara.chat.service.AiKnowledgeChatService;
+import org.dromara.chat.service.ChatMessageService;
+import org.dromara.chat.service.ChatSessionService;
+import org.dromara.knowledge.domain.vo.KnowledgeInfoVo;
+import org.dromara.knowledge.domain.vo.KnowledgeSearchResultVo;
+import org.dromara.knowledge.service.KnowledgeInfoService;
+import org.dromara.knowledge.service.KnowledgeVectorService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.math.BigDecimal;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 知识库聊天服务实现
+ *
+ * @author pengles
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class AiKnowledgeChatServiceImpl implements AiKnowledgeChatService {
+
+    private final ChatSessionService chatSessionService;
+    private final ChatMessageService chatMessageService;
+    private final KnowledgeInfoService knowledgeInfoService;
+    private final KnowledgeVectorService knowledgeVectorService;
+    private final AiChatService aiChatService;
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public ChatMessageVo chatWithKnowledge(Long sessionId, Long userId, String question, Long knowledgeId, String modelName) {
+        // 验证会话是否存在
+        ChatSessionVo session = chatSessionService.queryById(sessionId);
+        if (ObjectUtil.isNull(session)) {
+            throw new RuntimeException("会话不存在");
+        }
+
+        // 验证知识库是否存在
+        KnowledgeInfoVo knowledge = knowledgeInfoService.queryById(knowledgeId);
+        if (ObjectUtil.isNull(knowledge)) {
+            throw new RuntimeException("知识库不存在");
+        }
+
+        // 保存用户问题
+        ChatMessageBo userMessageBo = new ChatMessageBo();
+        userMessageBo.setSessionId(sessionId);
+        userMessageBo.setUserId(userId);
+        userMessageBo.setMessageType("text");
+        userMessageBo.setContent(question);
+        userMessageBo.setRole("user");
+        userMessageBo.setModelName(modelName);
+        userMessageBo.setCreateTime(new Date());
+        chatMessageService.insertByBo(userMessageBo);
+
+        try {
+            AiChatRequest req = new AiChatRequest()
+                .setUserId(String.valueOf(userId))
+                .setSessionId(String.valueOf(sessionId))
+                .setModel(modelName)
+                .setEnableKnowledge(true)
+                .setKnowledgeId(String.valueOf(knowledgeId))
+                .setKnowledgeLimit(5)
+                .setKnowledgeThreshold(0.7)
+                .setMessages(java.util.List.of(
+                    new AiChatRequest.AiMessage().setRole("user").setContent(question)
+                ));
+
+            AiChatResponse resp = aiChatService.chat(req);
+            String aiAnswer = "";
+            if (resp != null && resp.getChoices() != null && !resp.getChoices().isEmpty()) {
+                AiChatRequest.AiMessage msg = resp.getChoices().get(0).getMessage();
+                if (msg != null && StrUtil.isNotBlank(msg.getContent())) {
+                    aiAnswer = msg.getContent();
+                }
+            }
+            if (StrUtil.isBlank(aiAnswer)) {
+                throw new RuntimeException("AI服务返回空回答");
+            }
+
+            // 保存AI回复
+            ChatMessageBo aiMessageBo = new ChatMessageBo();
+            aiMessageBo.setSessionId(sessionId);
+            aiMessageBo.setUserId(userId);
+            aiMessageBo.setMessageType("text");
+            aiMessageBo.setContent(aiAnswer);
+            aiMessageBo.setRole("assistant");
+            aiMessageBo.setModelName(modelName);
+            aiMessageBo.setTotalTokens(0L); // 简化版本不统计token
+            aiMessageBo.setDeductCost(BigDecimal.ZERO); // 简化版本不计费
+            aiMessageBo.setCreateTime(new Date());
+            chatMessageService.insertByBo(aiMessageBo);
+
+            return chatMessageService.queryById(aiMessageBo.getId());
+
+        } catch (Exception e) {
+            log.error("知识库聊天失败 - 用户: {}, 会话: {}, 知识库: {}", userId, sessionId, knowledgeId, e);
+
+            // 保存错误回复
+            ChatMessageBo errorMessageBo = new ChatMessageBo();
+            errorMessageBo.setSessionId(sessionId);
+            errorMessageBo.setUserId(userId);
+            errorMessageBo.setMessageType("text");
+            errorMessageBo.setContent("抱歉，AI服务暂时不可用，请稍后重试。");
+            errorMessageBo.setRole("assistant");
+            errorMessageBo.setModelName(modelName);
+            errorMessageBo.setCreateTime(new Date());
+            chatMessageService.insertByBo(errorMessageBo);
+
+            return chatMessageService.queryById(errorMessageBo.getId());
+        }
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public ChatSessionVo createKnowledgeSession(Long userId, Long knowledgeId, String sessionTitle) {
+        // 验证知识库是否存在
+        KnowledgeInfoVo knowledge = knowledgeInfoService.queryById(knowledgeId);
+        if (ObjectUtil.isNull(knowledge)) {
+            throw new RuntimeException("知识库不存在");
+        }
+
+        // 如果没有提供标题，使用知识库名称作为默认标题
+        if (StrUtil.isBlank(sessionTitle)) {
+            sessionTitle = "基于" + knowledge.getKnowledgeName() + "的对话";
+        }
+
+        // 创建会话
+        ChatSessionBo sessionBo = new ChatSessionBo();
+        sessionBo.setUserId(userId);
+        sessionBo.setSessionTitle(sessionTitle);
+        sessionBo.setSessionContent("知识库ID: " + knowledgeId);
+        sessionBo.setCreateTime(new Date());
+        chatSessionService.insertByBo(sessionBo);
+
+        return chatSessionService.queryById(sessionBo.getId());
+    }
+
+    @Override
+    public List<String> searchKnowledgeContent(Long knowledgeId, String query, Integer limit) {
+        try {
+            log.info("搜索知识库内容 - 知识库: {}, 查询: {}, 限制: {}", knowledgeId, query, limit);
+            List<KnowledgeSearchResultVo> searchResults = knowledgeVectorService.vectorSimilaritySearch(
+                    String.valueOf(knowledgeId), query, "default", limit != null ? limit : 5, 0.7
+            );
+            return searchResults.stream().map(KnowledgeSearchResultVo::getContent).toList();
+        } catch (Exception e) {
+            log.error("搜索知识库内容失败 - 知识库: {}, 查询: {}", knowledgeId, query, e);
+            return Collections.emptyList();
+        }
+    }
+
+    @Override
+    public String buildKnowledgeContext(Long knowledgeId, String question) {
+        // 搜索相关知识库内容
+        List<String> relevantContent = searchKnowledgeContent(knowledgeId, question, 3);
+
+        StringBuilder context = new StringBuilder();
+        context.append("以下是相关的知识库内容:\n\n");
+
+        for (int i = 0; i < relevantContent.size(); i++) {
+            context.append("参考资料 ").append(i + 1).append(": ");
+            context.append(relevantContent.get(i)).append("\n\n");
+        }
+
+        return context.toString();
+    }
+
+    @Override
+    public List<ChatMessageVo> getKnowledgeChatHistory(Long sessionId, Integer limit) {
+        // 获取会话的聊天历史
+        List<ChatMessageVo> messages = chatMessageService.queryListBySessionId(sessionId);
+
+        // 如果指定了限制数量，返回最近的消息
+        if (limit != null && limit > 0 && messages.size() > limit) {
+            return messages.subList(Math.max(0, messages.size() - limit), messages.size());
+        }
+
+        return messages;
+    }
+
+
+}
diff --git a/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/service/impl/ChatConfigServiceImpl.java b/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/service/impl/ChatConfigServiceImpl.java
new file mode 100644
index 0000000..938ffe0
--- /dev/null
+++ b/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/service/impl/ChatConfigServiceImpl.java
@@ -0,0 +1,129 @@
+package org.dromara.chat.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.RequiredArgsConstructor;
+import org.dromara.chat.domain.ChatConfig;
+import org.dromara.chat.domain.bo.ChatConfigBo;
+import org.dromara.chat.domain.vo.ChatConfigVo;
+import org.dromara.chat.mapper.ChatConfigMapper;
+import org.dromara.chat.service.ChatConfigService;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.springframework.stereotype.Service;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 聊天配置Service业务层处理
+ *
+ * @author pengles
+ */
+@RequiredArgsConstructor
+@Service
+public class ChatConfigServiceImpl extends ServiceImpl<ChatConfigMapper, ChatConfig> implements ChatConfigService {
+
+    /**
+     * 查询聊天配置
+     */
+    @Override
+    public ChatConfigVo queryById(Long id) {
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 查询聊天配置列表
+     */
+    @Override
+    public TableDataInfo<ChatConfigVo> queryPageList(ChatConfigBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<ChatConfig> lqw = buildQueryWrapper(bo);
+        Page<ChatConfigVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询聊天配置列表
+     */
+    @Override
+    public List<ChatConfigVo> queryList(ChatConfigBo bo) {
+        LambdaQueryWrapper<ChatConfig> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<ChatConfig> buildQueryWrapper(ChatConfigBo bo) {
+        LambdaQueryWrapper<ChatConfig> lqw = Wrappers.lambdaQuery();
+        lqw.like(StringUtils.isNotBlank(bo.getCategory()), ChatConfig::getCategory, bo.getCategory());
+        lqw.like(StringUtils.isNotBlank(bo.getConfigName()), ChatConfig::getConfigName, bo.getConfigName());
+        lqw.like(StringUtils.isNotBlank(bo.getConfigValue()), ChatConfig::getConfigValue, bo.getConfigValue());
+        lqw.eq(StringUtils.isNotBlank(bo.getVersion()), ChatConfig::getVersion, bo.getVersion());
+        return lqw;
+    }
+
+    /**
+     * 新增聊天配置
+     */
+    @Override
+    public Boolean insertByBo(ChatConfigBo bo) {
+        ChatConfig add = MapstructUtils.convert(bo, ChatConfig.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改聊天配置
+     */
+    @Override
+    public Boolean updateByBo(ChatConfigBo bo) {
+        ChatConfig update = MapstructUtils.convert(bo, ChatConfig.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(ChatConfig entity) {
+        // TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除聊天配置
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if (isValid) {
+            // TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+
+    /**
+     * 根据配置分类查询配置列表
+     */
+    @Override
+    public List<ChatConfigVo> queryListByCategory(String category) {
+        LambdaQueryWrapper<ChatConfig> lqw = Wrappers.lambdaQuery();
+        lqw.eq(ChatConfig::getCategory, category);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    /**
+     * 根据配置名称查询配置
+     */
+    @Override
+    public ChatConfigVo queryByConfigName(String configName) {
+        LambdaQueryWrapper<ChatConfig> lqw = Wrappers.lambdaQuery();
+        lqw.eq(ChatConfig::getConfigName, configName);
+        return baseMapper.selectVoOne(lqw);
+    }
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/service/impl/ChatMessageServiceImpl.java b/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/service/impl/ChatMessageServiceImpl.java
new file mode 100644
index 0000000..b195366
--- /dev/null
+++ b/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/service/impl/ChatMessageServiceImpl.java
@@ -0,0 +1,151 @@
+package org.dromara.chat.service.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.RequiredArgsConstructor;
+import org.dromara.chat.domain.ChatMessage;
+import org.dromara.chat.domain.bo.ChatMessageBo;
+import org.dromara.chat.domain.vo.ChatMessageVo;
+import org.dromara.chat.mapper.ChatMessageMapper;
+import org.dromara.chat.service.ChatMessageService;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.springframework.stereotype.Service;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 聊天消息Service业务层处理
+ *
+ * @author pengles
+ */
+@RequiredArgsConstructor
+@Service
+public class ChatMessageServiceImpl extends ServiceImpl<ChatMessageMapper, ChatMessage> implements ChatMessageService {
+
+    /**
+     * 查询聊天消息
+     */
+    @Override
+    public ChatMessageVo queryById(Long id) {
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 查询聊天消息列表
+     */
+    @Override
+    public TableDataInfo<ChatMessageVo> queryPageList(ChatMessageBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<ChatMessage> lqw = buildQueryWrapper(bo);
+        Page<ChatMessageVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询聊天消息列表
+     */
+    @Override
+    public List<ChatMessageVo> queryList(ChatMessageBo bo) {
+        LambdaQueryWrapper<ChatMessage> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<ChatMessage> buildQueryWrapper(ChatMessageBo bo) {
+        LambdaQueryWrapper<ChatMessage> lqw = Wrappers.lambdaQuery();
+        lqw.eq(ObjectUtil.isNotNull(bo.getSessionId()), ChatMessage::getSessionId, bo.getSessionId());
+        lqw.eq(ObjectUtil.isNotNull(bo.getUserId()), ChatMessage::getUserId, bo.getUserId());
+        lqw.like(StringUtils.isNotBlank(bo.getContent()), ChatMessage::getContent, bo.getContent());
+        lqw.eq(StringUtils.isNotBlank(bo.getRole()), ChatMessage::getRole, bo.getRole());
+        lqw.eq(StringUtils.isNotBlank(bo.getModelName()), ChatMessage::getModelName, bo.getModelName());
+        lqw.orderByDesc(ChatMessage::getCreateTime);
+        return lqw;
+    }
+
+    /**
+     * 新增聊天消息
+     */
+    @Override
+    public Boolean insertByBo(ChatMessageBo bo) {
+        ChatMessage add = MapstructUtils.convert(bo, ChatMessage.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改聊天消息
+     */
+    @Override
+    public Boolean updateByBo(ChatMessageBo bo) {
+        ChatMessage update = MapstructUtils.convert(bo, ChatMessage.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(ChatMessage entity) {
+        if (StringUtils.isBlank(entity.getContent())) {
+            throw new IllegalArgumentException("消息内容不能为空");
+        }
+        if (StringUtils.isBlank(entity.getRole())) {
+            entity.setRole("user");
+        }
+    }
+
+    /**
+     * 校验并批量删除聊天消息
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if (isValid) {
+            // 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+
+    /**
+     * 根据会话ID查询消息列表
+     */
+    @Override
+    public List<ChatMessageVo> queryListBySessionId(Long sessionId) {
+        LambdaQueryWrapper<ChatMessage> lqw = Wrappers.lambdaQuery();
+        lqw.eq(ChatMessage::getSessionId, sessionId);
+        lqw.orderByAsc(ChatMessage::getCreateTime);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    /**
+     * 根据用户ID查询消息列表
+     */
+    @Override
+    public List<ChatMessageVo> queryListByUserId(Long userId) {
+        LambdaQueryWrapper<ChatMessage> lqw = Wrappers.lambdaQuery();
+        lqw.eq(ChatMessage::getUserId, userId);
+        lqw.orderByDesc(ChatMessage::getCreateTime);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    /**
+     * 根据会话ID和用户ID查询消息列表
+     */
+    @Override
+    public List<ChatMessageVo> queryListBySessionIdAndUserId(Long sessionId, Long userId) {
+        LambdaQueryWrapper<ChatMessage> lqw = Wrappers.lambdaQuery();
+        lqw.eq(ChatMessage::getSessionId, sessionId);
+        lqw.eq(ChatMessage::getUserId, userId);
+        lqw.orderByAsc(ChatMessage::getCreateTime);
+        return baseMapper.selectVoList(lqw);
+    }
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/service/impl/ChatModelServiceImpl.java b/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/service/impl/ChatModelServiceImpl.java
new file mode 100644
index 0000000..1694ae0
--- /dev/null
+++ b/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/service/impl/ChatModelServiceImpl.java
@@ -0,0 +1,150 @@
+package org.dromara.chat.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.RequiredArgsConstructor;
+import org.dromara.chat.domain.ChatModel;
+import org.dromara.chat.domain.bo.ChatModelBo;
+import org.dromara.chat.domain.vo.ChatModelVo;
+import org.dromara.chat.mapper.ChatModelMapper;
+import org.dromara.chat.service.ChatModelService;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.springframework.stereotype.Service;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 聊天模型Service业务层处理
+ *
+ * @author pengles
+ */
+@RequiredArgsConstructor
+@Service
+public class ChatModelServiceImpl extends ServiceImpl<ChatModelMapper, ChatModel> implements ChatModelService {
+
+    /**
+     * 查询聊天模型
+     */
+    @Override
+    public ChatModelVo queryById(Long id) {
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 查询聊天模型列表
+     */
+    @Override
+    public TableDataInfo<ChatModelVo> queryPageList(ChatModelBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<ChatModel> lqw = buildQueryWrapper(bo);
+        Page<ChatModelVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询聊天模型列表
+     */
+    @Override
+    public List<ChatModelVo> queryList(ChatModelBo bo) {
+        LambdaQueryWrapper<ChatModel> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<ChatModel> buildQueryWrapper(ChatModelBo bo) {
+        LambdaQueryWrapper<ChatModel> lqw = Wrappers.lambdaQuery();
+        lqw.like(StringUtils.isNotBlank(bo.getCategory()), ChatModel::getCategory, bo.getCategory());
+        lqw.like(StringUtils.isNotBlank(bo.getModelName()), ChatModel::getModelName, bo.getModelName());
+        lqw.like(StringUtils.isNotBlank(bo.getModelDescribe()), ChatModel::getModelDescribe, bo.getModelDescribe());
+        lqw.eq(StringUtils.isNotBlank(bo.getModelType()), ChatModel::getModelType, bo.getModelType());
+        lqw.eq(StringUtils.isNotBlank(bo.getModelShow()), ChatModel::getModelShow, bo.getModelShow());
+        return lqw;
+    }
+
+    /**
+     * 新增聊天模型
+     */
+    @Override
+    public Boolean insertByBo(ChatModelBo bo) {
+        ChatModel add = MapstructUtils.convert(bo, ChatModel.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改聊天模型
+     */
+    @Override
+    public Boolean updateByBo(ChatModelBo bo) {
+        ChatModel update = MapstructUtils.convert(bo, ChatModel.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(ChatModel entity) {
+        // TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除聊天模型
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if (isValid) {
+            // TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+
+    /**
+     * 根据模型分类查询模型列表
+     */
+    @Override
+    public List<ChatModelVo> queryListByCategory(String category) {
+        LambdaQueryWrapper<ChatModel> lqw = Wrappers.lambdaQuery();
+        lqw.eq(ChatModel::getCategory, category);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    /**
+     * 根据模型名称查询模型
+     */
+    @Override
+    public ChatModelVo queryByModelName(String modelName) {
+        LambdaQueryWrapper<ChatModel> lqw = Wrappers.lambdaQuery();
+        lqw.eq(ChatModel::getModelName, modelName);
+        return baseMapper.selectVoOne(lqw);
+    }
+
+    /**
+     * 查询显示的模型列表
+     */
+    @Override
+    public List<ChatModelVo> queryShowModelList() {
+        LambdaQueryWrapper<ChatModel> lqw = Wrappers.lambdaQuery();
+        lqw.eq(ChatModel::getModelShow, "1");
+        return baseMapper.selectVoList(lqw);
+    }
+
+    /**
+     * 根据模型类型查询模型列表
+     */
+    @Override
+    public List<ChatModelVo> queryListByModelType(String modelType) {
+        LambdaQueryWrapper<ChatModel> lqw = Wrappers.lambdaQuery();
+        lqw.eq(ChatModel::getModelType, modelType);
+        return baseMapper.selectVoList(lqw);
+    }
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/service/impl/ChatSessionServiceImpl.java b/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/service/impl/ChatSessionServiceImpl.java
new file mode 100644
index 0000000..b772ca6
--- /dev/null
+++ b/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/service/impl/ChatSessionServiceImpl.java
@@ -0,0 +1,157 @@
+package org.dromara.chat.service.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.RequiredArgsConstructor;
+import org.dromara.chat.domain.ChatMessage;
+import org.dromara.chat.domain.ChatSession;
+import org.dromara.chat.domain.bo.ChatSessionBo;
+import org.dromara.chat.domain.vo.ChatSessionVo;
+import org.dromara.chat.mapper.ChatMessageMapper;
+import org.dromara.chat.mapper.ChatSessionMapper;
+import org.dromara.chat.service.ChatSessionService;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 聊天会话Service业务层处理
+ *
+ * @author pengles
+ */
+@RequiredArgsConstructor
+@Service
+public class ChatSessionServiceImpl extends ServiceImpl<ChatSessionMapper, ChatSession> implements ChatSessionService {
+
+    private final ChatMessageMapper chatMessageMapper;
+
+    /**
+     * 查询聊天会话
+     */
+    @Override
+    public ChatSessionVo queryById(Long id) {
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 查询聊天会话列表
+     */
+    @Override
+    public TableDataInfo<ChatSessionVo> queryPageList(ChatSessionBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<ChatSession> lqw = buildQueryWrapper(bo);
+        Page<ChatSessionVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询聊天会话列表
+     */
+    @Override
+    public List<ChatSessionVo> queryList(ChatSessionBo bo) {
+        LambdaQueryWrapper<ChatSession> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<ChatSession> buildQueryWrapper(ChatSessionBo bo) {
+        LambdaQueryWrapper<ChatSession> lqw = Wrappers.lambdaQuery();
+        lqw.eq(ObjectUtil.isNotNull(bo.getUserId()), ChatSession::getUserId, bo.getUserId());
+        lqw.like(StringUtils.isNotBlank(bo.getSessionTitle()), ChatSession::getSessionTitle, bo.getSessionTitle());
+        lqw.orderByDesc(ChatSession::getUpdateTime);
+        return lqw;
+    }
+
+    /**
+     * 新增聊天会话
+     */
+    @Override
+    public Boolean insertByBo(ChatSessionBo bo) {
+        ChatSession add = MapstructUtils.convert(bo, ChatSession.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改聊天会话
+     */
+    @Override
+    public Boolean updateByBo(ChatSessionBo bo) {
+        ChatSession update = MapstructUtils.convert(bo, ChatSession.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(ChatSession entity) {
+        if (StringUtils.isBlank(entity.getSessionTitle())) {
+            entity.setSessionTitle("新会话");
+        }
+        if (entity.getSessionTitle().length() > 50) {
+            entity.setSessionTitle(entity.getSessionTitle().substring(0, 50));
+        }
+    }
+
+    /**
+     * 校验并批量删除聊天会话
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if (isValid) {
+            // 删除关联的消息
+            LambdaQueryWrapper<ChatMessage> lqw = Wrappers.lambdaQuery();
+            lqw.in(ChatMessage::getSessionId, ids);
+            chatMessageMapper.delete(lqw);
+        }
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+
+    /**
+     * 根据用户ID查询会话列表
+     */
+    @Override
+    public List<ChatSessionVo> queryListByUserId(Long userId) {
+        LambdaQueryWrapper<ChatSession> lqw = Wrappers.lambdaQuery();
+        lqw.eq(ChatSession::getUserId, userId);
+        lqw.orderByDesc(ChatSession::getUpdateTime);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    /**
+     * 创建新会话
+     */
+    @Override
+    public ChatSessionVo createNewSession(Long userId, String sessionTitle) {
+        ChatSession session = new ChatSession();
+        session.setUserId(userId);
+        session.setSessionTitle(sessionTitle);
+        baseMapper.insert(session);
+        return baseMapper.selectVoById(session.getId());
+    }
+
+    /**
+     * 更新会话标题
+     */
+    @Override
+    public Boolean updateSessionTitle(Long sessionId, String sessionTitle) {
+        ChatSession session = new ChatSession();
+        session.setId(sessionId);
+        session.setSessionTitle(sessionTitle);
+        return baseMapper.updateById(session) > 0;
+    }
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/service/impl/ChatUsageTokenServiceImpl.java b/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/service/impl/ChatUsageTokenServiceImpl.java
new file mode 100644
index 0000000..0d22f22
--- /dev/null
+++ b/ruoyi-modules/ruoyi-chat/src/main/java/org/dromara/chat/service/impl/ChatUsageTokenServiceImpl.java
@@ -0,0 +1,152 @@
+package org.dromara.chat.service.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.RequiredArgsConstructor;
+import org.dromara.chat.domain.ChatUsageToken;
+import org.dromara.chat.domain.bo.ChatUsageTokenBo;
+import org.dromara.chat.domain.vo.ChatUsageTokenVo;
+import org.dromara.chat.mapper.ChatUsageTokenMapper;
+import org.dromara.chat.service.ChatUsageTokenService;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.springframework.stereotype.Service;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 聊天Token使用记录Service业务层处理
+ *
+ * @author pengles
+ */
+@RequiredArgsConstructor
+@Service
+public class ChatUsageTokenServiceImpl extends ServiceImpl<ChatUsageTokenMapper, ChatUsageToken> implements ChatUsageTokenService {
+
+    /**
+     * 查询聊天Token使用记录
+     */
+    @Override
+    public ChatUsageTokenVo queryById(Long id) {
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 查询聊天Token使用记录列表
+     */
+    @Override
+    public TableDataInfo<ChatUsageTokenVo> queryPageList(ChatUsageTokenBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<ChatUsageToken> lqw = buildQueryWrapper(bo);
+        Page<ChatUsageTokenVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询聊天Token使用记录列表
+     */
+    @Override
+    public List<ChatUsageTokenVo> queryList(ChatUsageTokenBo bo) {
+        LambdaQueryWrapper<ChatUsageToken> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<ChatUsageToken> buildQueryWrapper(ChatUsageTokenBo bo) {
+        LambdaQueryWrapper<ChatUsageToken> lqw = Wrappers.lambdaQuery();
+        lqw.eq(ObjectUtil.isNotNull(bo.getUserId()), ChatUsageToken::getUserId, bo.getUserId());
+        lqw.eq(StringUtils.isNotBlank(bo.getModelName()), ChatUsageToken::getModelName, bo.getModelName());
+        return lqw;
+    }
+
+    /**
+     * 新增聊天Token使用记录
+     */
+    @Override
+    public Boolean insertByBo(ChatUsageTokenBo bo) {
+        ChatUsageToken add = MapstructUtils.convert(bo, ChatUsageToken.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改聊天Token使用记录
+     */
+    @Override
+    public Boolean updateByBo(ChatUsageTokenBo bo) {
+        ChatUsageToken update = MapstructUtils.convert(bo, ChatUsageToken.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(ChatUsageToken entity) {
+        // TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除聊天Token使用记录
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if (isValid) {
+            // TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+
+    /**
+     * 根据用户ID查询Token使用记录列表
+     */
+    @Override
+    public List<ChatUsageTokenVo> queryListByUserId(Long userId) {
+        LambdaQueryWrapper<ChatUsageToken> lqw = Wrappers.lambdaQuery();
+        lqw.eq(ChatUsageToken::getUserId, userId);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    /**
+     * 根据模型名称查询Token使用记录列表
+     */
+    @Override
+    public List<ChatUsageTokenVo> queryListByModelName(String modelName) {
+        LambdaQueryWrapper<ChatUsageToken> lqw = Wrappers.lambdaQuery();
+        lqw.eq(ChatUsageToken::getModelName, modelName);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    /**
+     * 统计用户总Token使用量
+     */
+    @Override
+    public Long getTotalTokenByUserId(Long userId) {
+        LambdaQueryWrapper<ChatUsageToken> lqw = Wrappers.lambdaQuery();
+        lqw.eq(ChatUsageToken::getUserId, userId);
+        lqw.select(ChatUsageToken::getToken);
+        List<ChatUsageToken> list = baseMapper.selectList(lqw);
+        return list.stream().mapToLong(ChatUsageToken::getToken).sum();
+    }
+
+    /**
+     * 统计模型总Token使用量
+     */
+    @Override
+    public Long getTotalTokenByModelName(String modelName) {
+        LambdaQueryWrapper<ChatUsageToken> lqw = Wrappers.lambdaQuery();
+        lqw.eq(ChatUsageToken::getModelName, modelName);
+        lqw.select(ChatUsageToken::getToken);
+        List<ChatUsageToken> list = baseMapper.selectList(lqw);
+        return list.stream().mapToLong(ChatUsageToken::getToken).sum();
+    }
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-chat/src/test/java/org/dromara/chat/service/ChatSessionServiceTest.java b/ruoyi-modules/ruoyi-chat/src/test/java/org/dromara/chat/service/ChatSessionServiceTest.java
new file mode 100644
index 0000000..56f50f2
--- /dev/null
+++ b/ruoyi-modules/ruoyi-chat/src/test/java/org/dromara/chat/service/ChatSessionServiceTest.java
@@ -0,0 +1,56 @@
+package org.dromara.chat.service;
+
+import org.dromara.chat.domain.ChatSession;
+import org.dromara.chat.domain.bo.ChatSessionBo;
+import org.dromara.chat.mapper.ChatSessionMapper;
+import org.dromara.chat.service.impl.ChatSessionServiceImpl;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+/**
+ * ChatSessionService单元测试
+ */
+@ExtendWith(MockitoExtension.class)
+public class ChatSessionServiceTest {
+
+    @Mock
+    private ChatSessionMapper chatSessionMapper;
+
+    @InjectMocks
+    private ChatSessionServiceImpl chatSessionService;
+
+    @BeforeEach
+    public void setUp() {
+    }
+
+    @Test
+    public void testInsertByBo() {
+        ChatSessionBo bo = new ChatSessionBo();
+        bo.setUserId(1L);
+        bo.setSessionTitle("Test Session");
+
+        Mockito.when(chatSessionMapper.insert(Mockito.any(ChatSession.class))).thenReturn(1);
+
+        Boolean result = chatSessionService.insertByBo(bo);
+        Assertions.assertTrue(result);
+        Mockito.verify(chatSessionMapper).insert(Mockito.any(ChatSession.class));
+    }
+
+    @Test
+    public void testUpdateSessionTitle() {
+        Long sessionId = 1L;
+        String newTitle = "Updated Title";
+
+        Mockito.when(chatSessionMapper.updateById(Mockito.any(ChatSession.class))).thenReturn(1);
+
+        Boolean result = chatSessionService.updateSessionTitle(sessionId, newTitle);
+        Assertions.assertTrue(result);
+        Mockito.verify(chatSessionMapper).updateById(Mockito.any(ChatSession.class));
+    }
+}
diff --git a/ruoyi-modules/ruoyi-face/README.md b/ruoyi-modules/ruoyi-face/README.md
new file mode 100644
index 0000000..f516199
--- /dev/null
+++ b/ruoyi-modules/ruoyi-face/README.md
@@ -0,0 +1,747 @@
+# RuoYi Chat 模块
+
+## 模块简介
+
+`ruoyi-chat` 是 PoJie 项目的智能聊天系统模块，提供完整的聊天会话管理、消息处理、知识库集成和实时通信功能。该模块通过集成 `ruoyi-ai` 和 `ruoyi-knowledge` 模块，实现了基于知识库的智能问答系统（RAG），支持多种通信方式（REST API、SSE 流式、WebSocket）。
+
+## 功能特性
+
+### 1. 聊天会话管理 ✅
+
+- ✅ 创建和管理聊天会话
+- ✅ 支持多用户并发聊天
+- ✅ 会话历史记录和导出
+- ✅ 会话状态管理
+- ✅ 会话标题自动生成和手动编辑
+
+### 2. 消息处理 ✅
+
+- ✅ 实时消息发送和接收
+- ✅ 消息类型支持（文本、图片等）
+- ✅ 消息历史查询（支持分页和条件筛选）
+- ✅ 消息状态跟踪
+- ✅ Token 使用量和成本统计
+
+### 3. 知识库集成（RAG）✅
+
+- ✅ 基于知识库的智能问答
+- ✅ 上下文理解和构建
+- ✅ 向量相似度搜索
+- ✅ 智能回复生成
+- ✅ 知识库会话管理
+- ✅ 知识库内容搜索
+- **内部对接模块**：
+  - AI 模块：`AiChatService`（统一聊天接口）
+  - 知识库模块：`KnowledgeVectorService`（向量检索）
+
+### 4. 实时通信 ✅
+
+- ✅ **REST API**：标准 HTTP 接口
+- ✅ **SSE 流式**：服务器推送事件，支持流式对话（`ChatOpenApiController`）
+- ✅ **WebSocket**：STOMP 协议，实时双向通信（`ChatStompController`）
+
+### 5. 使用统计 ✅
+
+- ✅ Token 使用量统计
+- ✅ 聊天成本计算
+- ✅ 用户活跃度分析
+- ✅ 模型使用情况
+- ✅ 使用记录导出
+
+### 6. 配置管理 ✅
+
+- ✅ 聊天配置管理（键值对配置）
+- ✅ 模型配置管理（模型信息、价格、API 配置）
+- ✅ 配置分类管理
+- ✅ 配置导入导出
+
+## 目录结构
+
+```
+ruoyi-chat/
+├─ src/main/java/org/dromara/chat/
+│  ├─ controller/         # REST 控制器层
+│  │  ├─ AIKnowledgeChatController.java    # 知识库聊天控制器
+│  │  ├─ ChatSessionController.java        # 会话管理控制器
+│  │  ├─ ChatMessageController.java        # 消息管理控制器
+│  │  ├─ ChatOpenApiController.java        # 开放 API 控制器（SSE 流式）
+│  │  ├─ ChatStompController.java          # WebSocket 控制器（STOMP）
+│  │  ├─ ChatConfigController.java         # 配置管理控制器
+│  │  ├─ ChatModelController.java          # 模型管理控制器
+│  │  └─ ChatUsageTokenController.java     # Token 使用记录控制器
+│  ├─ service/            # 核心业务服务层
+│  │  ├─ AiKnowledgeChatService.java       # 知识库聊天服务
+│  │  ├─ ChatSessionService.java           # 会话管理服务
+│  │  ├─ ChatMessageService.java           # 消息管理服务
+│  │  ├─ ChatConfigService.java            # 配置管理服务
+│  │  ├─ ChatModelService.java             # 模型管理服务
+│  │  ├─ ChatUsageTokenService.java        # Token 使用记录服务
+│  │  └─ impl/                             # 服务实现类
+│  ├─ domain/             # 领域模型
+│  │  ├─ bo/              # 业务对象（Business Object）
+│  │  ├─ vo/              # 视图对象（View Object）
+│  │  ├─ request/         # 请求对象
+│  │  └─ *.java           # 实体类（Entity）
+│  ├─ mapper/             # MyBatis Mapper 接口
+│  ├─ config/             # 配置类（WebSocket 配置等）
+│  └─ client/             # Java SDK（统一网关封装）
+│     └─ ChatSdk.java
+└─ docs/                  # API 使用说明文档
+```
+
+## 模块结构
+
+```
+org.dromara.chat
+├── controller/              # 控制器层
+│   ├── AIKnowledgeChatController.java      # 知识库聊天
+│   ├── ChatSessionController.java          # 会话管理
+│   ├── ChatMessageController.java          # 消息管理
+│   ├── ChatOpenApiController.java          # 开放 API（SSE）
+│   ├── ChatStompController.java            # WebSocket（STOMP）
+│   ├── ChatConfigController.java           # 配置管理
+│   ├── ChatModelController.java            # 模型管理
+│   └── ChatUsageTokenController.java       # Token 统计
+├── service/                 # 服务层
+│   ├── AiKnowledgeChatService.java
+│   ├── ChatSessionService.java
+│   ├── ChatMessageService.java
+│   ├── ChatConfigService.java
+│   ├── ChatModelService.java
+│   ├── ChatUsageTokenService.java
+│   └── impl/                # 服务实现
+├── domain/                  # 领域模型
+│   ├── bo/                  # 业务对象
+│   ├── vo/                  # 视图对象
+│   ├── request/             # 请求对象
+│   ├── ChatSession.java     # 会话实体
+│   ├── ChatMessage.java     # 消息实体
+│   ├── ChatConfig.java      # 配置实体
+│   ├── ChatModel.java       # 模型实体
+│   └── ChatUsageToken.java  # Token 使用实体
+├── mapper/                  # MyBatis Mapper
+├── config/                  # 配置类
+│   └── StompWebSocketConfig.java
+└── client/                  # Java SDK
+    └── ChatSdk.java
+```
+
+## 架构设计
+
+```
+┌─────────────────────────────────────────────────────────────┐
+│                    Chat Controller Layer                    │
+├─────────────────────────────────────────────────────────────┤
+│  AIKnowledgeChatController │ ChatSessionController          │
+│  ChatMessageController     │ ChatConfigController           │
+│  ChatModelController       │ ChatUsageTokenController       │
+│  ChatOpenApiController     │ ChatStompController            │
+│  (SSE 流式)                │ (WebSocket)                    │
+└─────────────────────┬───────────────────────────────────────┘
+                      │
+┌─────────────────────▼───────────────────────────────────────┐
+│                    Service Layer                            │
+├─────────────────────────────────────────────────────────────┤
+│  AiKnowledgeChatService    │ ChatSessionService             │
+│  ChatMessageService        │ ChatConfigService              │
+│  ChatModelService          │ ChatUsageTokenService          │
+└─────────────────────┬───────────────────────────────────────┘
+                      │
+┌─────────────────────▼───────────────────────────────────────┐
+│                 Integration Layer                           │
+├─────────────────────────────────────────────────────────────┤
+│              RuoYi AI Module                               │
+│              └─ AiChatService                              │
+│              └─ AiChatHistoryService                       │
+│              └─ AiProviderManager                          │
+│                                                             │
+│              RuoYi Knowledge Module                        │
+│              └─ KnowledgeVectorService                     │
+│              └─ KnowledgeInfoService                       │
+└─────────────────────────────────────────────────────────────┘
+```
+
+## 数据库表结构
+
+### 1. 聊天会话表 (chat_session)
+
+存储用户聊天会话信息。
+
+| 字段名 | 类型 | 说明 |
+|--------|------|------|
+| id | BIGINT | 主键ID |
+| user_id | BIGINT | 用户ID |
+| session_title | VARCHAR(255) | 会话标题 |
+| session_content | TEXT | 会话内容 |
+| create_by | BIGINT | 创建者 |
+| create_time | DATETIME | 创建时间 |
+| update_by | BIGINT | 更新者 |
+| update_time | DATETIME | 更新时间 |
+| remark | VARCHAR(500) | 备注 |
+
+**索引**：`PRIMARY KEY (id)`
+
+### 2. 聊天消息表 (chat_message)
+
+存储聊天消息记录。
+
+| 字段名 | 类型 | 说明 |
+|--------|------|------|
+| id | BIGINT | 主键ID |
+| session_id | BIGINT | 会话ID |
+| user_id | BIGINT | 用户ID |
+| content | LONGTEXT | 消息内容 |
+| role | VARCHAR(255) | 对话角色（user/assistant/system） |
+| deduct_cost | DOUBLE(20,2) | 扣除金额（默认 0.00） |
+| total_tokens | INT(20) | 累计 Tokens（默认 0） |
+| model_name | VARCHAR(255) | 模型名称 |
+| create_by | BIGINT | 创建者 |
+| create_time | DATETIME | 创建时间 |
+| update_by | BIGINT | 更新者 |
+| update_time | DATETIME | 更新时间 |
+| remark | VARCHAR(500) | 备注 |
+
+**索引**：`PRIMARY KEY (id)`
+
+### 3. 聊天配置表 (chat_config)
+
+存储聊天系统配置（键值对形式）。
+
+| 字段名 | 类型 | 说明 |
+|--------|------|------|
+| id | BIGINT | 主键ID |
+| category | VARCHAR(255) | 配置类型 |
+| config_name | VARCHAR(255) | 配置名称 |
+| config_value | TEXT | 配置值 |
+| config_dict | VARCHAR(255) | 说明 |
+| create_by | BIGINT | 创建者 |
+| create_time | DATETIME | 创建时间 |
+| update_by | BIGINT | 更新者 |
+| update_time | DATETIME | 更新时间 |
+| remark | VARCHAR(500) | 备注 |
+| version | INT | 版本 |
+| del_flag | CHAR(1) | 删除标志（0存在 1删除） |
+| update_ip | VARCHAR(128) | 更新IP |
+
+**索引**：
+- `PRIMARY KEY (id)`
+- `UNIQUE KEY unique_category_key (category, config_name)`
+
+### 4. 聊天模型表 (chat_model)
+
+存储聊天模型配置信息。
+
+| 字段名 | 类型 | 说明 |
+|--------|------|------|
+| id | BIGINT | 主键ID |
+| category | VARCHAR(20) | 模型分类 |
+| model_name | VARCHAR(50) | 模型名称 |
+| model_describe | VARCHAR(255) | 模型描述 |
+| model_price | DOUBLE | 模型价格 |
+| model_type | CHAR(1) | 计费类型 |
+| model_show | CHAR(1) | 是否显示 |
+| system_prompt | VARCHAR(255) | 系统提示词 |
+| api_host | VARCHAR(255) | 请求地址 |
+| api_key | VARCHAR(255) | 密钥 |
+| api_url | VARCHAR(50) | 请求后缀 |
+| create_by | BIGINT | 创建者 |
+| create_time | DATETIME | 创建时间 |
+| update_by | BIGINT | 更新者 |
+| update_time | DATETIME | 更新时间 |
+| remark | VARCHAR(500) | 备注 |
+
+**索引**：`PRIMARY KEY (id)`
+
+### 5. Token 使用记录表 (chat_usage_token)
+
+存储用户 Token 使用统计。
+
+| 字段名 | 类型 | 说明 |
+|--------|------|------|
+| id | BIGINT | 主键ID |
+| user_id | BIGINT | 用户ID |
+| token | INT(10) | 待结算 token |
+| model_name | VARCHAR(64) | 模型名称 |
+| total_token | VARCHAR(255) | 累计使用 token |
+
+**索引**：`PRIMARY KEY (id)`
+
+**数据库脚本位置**：`script/sql/ry_chat.sql`
+
+## API 接口
+
+### 知识库聊天接口 (`/chat/knowledge`)
+
+#### 知识库问答
+- **接口**：`POST /chat/knowledge/chat`
+- **说明**：基于知识库进行智能问答
+- **权限**：`chat:knowledge:chat`
+- **参数**：
+  - `sessionId` (Long, 必填) - 会话ID
+  - `userId` (Long, 必填) - 用户ID
+  - `question` (String, 必填) - 问题
+  - `knowledgeId` (Long, 必填) - 知识库ID
+  - `modelName` (String, 必填) - 模型名称
+
+#### 创建知识库会话
+- **接口**：`POST /chat/knowledge/session`
+- **说明**：创建知识库聊天会话
+- **权限**：`chat:knowledge:session`
+- **参数**：
+  - `userId` (Long, 必填) - 用户ID
+  - `knowledgeId` (Long, 必填) - 知识库ID
+  - `sessionTitle` (String, 可选) - 会话标题
+
+#### 搜索知识内容
+- **接口**：`GET /chat/knowledge/search`
+- **说明**：搜索知识库内容
+- **权限**：`chat:knowledge:search`
+- **参数**：
+  - `knowledgeId` (Long, 必填) - 知识库ID
+  - `query` (String, 必填) - 查询内容
+  - `limit` (Integer, 可选, 默认5) - 返回数量
+
+#### 构建知识上下文
+- **接口**：`GET /chat/knowledge/context`
+- **说明**：构建知识库上下文
+- **权限**：`chat:knowledge:context`
+- **参数**：
+  - `knowledgeId` (Long, 必填) - 知识库ID
+  - `question` (String, 必填) - 问题
+
+#### 获取聊天历史
+- **接口**：`GET /chat/knowledge/history/{sessionId}`
+- **说明**：获取知识库聊天历史
+- **权限**：`chat:knowledge:history`
+- **参数**：
+  - `sessionId` (Long, 路径参数) - 会话ID
+  - `limit` (Integer, 可选, 默认20) - 返回数量
+
+### 会话管理接口 (`/chat/session`)
+
+- `GET /chat/session/list` - 查询会话列表（分页）
+- `GET /chat/session/{id}` - 获取会话详情
+- `POST /chat/session` - 创建新会话
+- `PUT /chat/session` - 更新会话
+- `DELETE /chat/session/{ids}` - 删除会话（批量）
+- `POST /chat/session/export` - 导出会话数据
+
+**权限前缀**：`chat:session:*`
+
+### 消息管理接口 (`/chat/message`)
+
+- `GET /chat/message/list` - 查询消息列表（分页）
+- `GET /chat/message/{id}` - 获取消息详情
+- `POST /chat/message` - 新增消息
+- `PUT /chat/message` - 更新消息
+- `DELETE /chat/message/{ids}` - 删除消息（批量）
+- `POST /chat/message/export` - 导出消息数据
+
+**权限前缀**：`chat:message:*`
+
+### 开放 API 接口 (`/chat`)
+
+#### SSE 流式聊天
+- **接口**：`POST /chat/send`
+- **说明**：SSE 流式聊天接口，支持 OpenAI 兼容格式
+- **认证**：需要登录（`@SaCheckLogin`）
+- **响应类型**：`text/event-stream`
+- **请求体**：JSON 格式
+  ```json
+  {
+    "model": "gpt-3.5-turbo",
+    "messages": [
+      {"role": "user", "content": "你好"}
+    ],
+    "sessionId": "1",
+    "temperature": 0.7,
+    "max_tokens": 2000
+  }
+  ```
+
+### WebSocket 接口
+
+#### STOMP 消息映射
+- **映射路径**：`/chat/send`
+- **说明**：STOMP 协议消息发送
+- **订阅主题**：`/topic/session/{sessionId}`
+- **配置类**：`StompWebSocketConfig`
+
+### 配置管理接口 (`/chat/config`)
+
+- `GET /chat/config/list` - 查询配置列表（分页）
+- `GET /chat/config/{id}` - 获取配置详情
+- `POST /chat/config` - 新增配置
+- `PUT /chat/config` - 更新配置
+- `DELETE /chat/config/{ids}` - 删除配置（批量）
+- `POST /chat/config/export` - 导出配置数据
+
+**权限前缀**：`chat:config:*`
+
+### 模型管理接口 (`/chat/model`)
+
+- `GET /chat/model/list` - 查询模型列表（分页）
+- `GET /chat/model/{id}` - 获取模型详情
+- `POST /chat/model` - 新增模型
+- `PUT /chat/model` - 更新模型
+- `DELETE /chat/model/{ids}` - 删除模型（批量）
+- `POST /chat/model/export` - 导出模型数据
+
+**权限前缀**：`chat:model:*`
+
+### Token 使用记录接口 (`/chat/token`)
+
+- `GET /chat/token/list` - 查询 Token 使用记录列表（分页）
+- `GET /chat/token/{id}` - 获取 Token 使用记录详情
+- `POST /chat/token` - 新增 Token 使用记录
+- `PUT /chat/token` - 更新 Token 使用记录
+- `DELETE /chat/token/{ids}` - 删除 Token 使用记录（批量）
+- `POST /chat/token/export` - 导出 Token 使用记录数据
+
+**权限前缀**：`chat:token:*`
+
+## 统一网关与协同
+
+### 后端统一网关
+
+Chat 模块可通过 `ruoyi-ai` 模块的统一网关进行对话：
+
+- `POST /api/ai/chat` - 同步聊天
+- `POST /api/ai/chat/async` - 异步聊天
+- `POST /api/ai/chat/stream` - 流式聊天（SSE）
+- `WS /ws/ai/chat` - WebSocket 实时通道
+
+### Chat 模块与 AI/Knowledge 的协同
+
+1. **知识库增强聊天**：
+   - 在 `AiKnowledgeChatServiceImpl` 中构建 `AiChatRequest`
+   - 调用 `AiChatService.chat`，开启知识库增强（`enableKnowledge=true`）
+   - 通过 `KnowledgeVectorService.vectorSimilaritySearch` 进行相关性检索
+   - 构建上下文并注入到消息中
+
+2. **聊天历史管理**：
+   - 使用 `AiChatHistoryService` 保存和管理聊天记录
+   - 支持 Redis 缓存和历史查询
+
+3. **模型管理**：
+   - 通过 `AiProviderManager` 获取可用模型列表
+   - 支持模型切换和负载均衡
+
+## 使用示例
+
+### 1. 创建知识库会话
+
+```bash
+curl -X POST "http://localhost:8080/chat/knowledge/session" \
+  -H "Content-Type: application/json" \
+  -H "Authorization: Bearer <token>" \
+  -d '{
+    "userId": 1,
+    "knowledgeId": 1,
+    "sessionTitle": "技术咨询会话"
+  }'
+```
+
+### 2. 知识库问答
+
+```bash
+curl -X POST "http://localhost:8080/chat/knowledge/chat" \
+  -H "Content-Type: application/x-www-form-urlencoded" \
+  -H "Authorization: Bearer <token>" \
+  -d "sessionId=1&userId=1&question=什么是Spring Boot？&knowledgeId=1&modelName=gpt-3.5-turbo"
+```
+
+### 3. SSE 流式聊天
+
+```bash
+curl -X POST "http://localhost:8080/chat/send" \
+  -H "Content-Type: application/json" \
+  -H "Authorization: Bearer <token>" \
+  -H "Accept: text/event-stream" \
+  -d '{
+    "model": "gpt-3.5-turbo",
+    "messages": [
+      {"role": "user", "content": "你好，请介绍一下你自己"}
+    ],
+    "sessionId": "1",
+    "temperature": 0.7
+  }'
+```
+
+### 4. 通过统一网关进行对话
+
+```bash
+curl -X POST "http://localhost:8080/api/ai/chat" \
+  -H "Content-Type: application/json" \
+  -H "Authorization: Bearer <token>" \
+  -d '{
+    "userId": "1",
+    "sessionId": "1",
+    "model": "gpt-4o-mini",
+    "enableKnowledge": true,
+    "knowledgeId": "1",
+    "knowledgeLimit": 5,
+    "knowledgeThreshold": 0.7,
+    "messages": [
+      {"role": "user", "content": "什么是Spring Boot？"}
+    ]
+  }'
+```
+
+### 5. 获取聊天历史
+
+```bash
+curl -X GET "http://localhost:8080/chat/knowledge/history/1?limit=10" \
+  -H "Authorization: Bearer <token>"
+```
+
+### 6. 查询会话列表
+
+```bash
+curl -X GET "http://localhost:8080/chat/session/list?pageNum=1&pageSize=10" \
+  -H "Authorization: Bearer <token>"
+```
+
+## Java SDK
+
+### ChatSdk（统一网关封装）
+
+封装类：`org.dromara.chat.client.ChatSdk`
+
+```java
+// 初始化 SDK
+ChatSdk sdk = new ChatSdk("http://localhost:8080")
+    .withToken("Bearer xxx");
+
+// 同步聊天
+String result = sdk.chat("{\"model\":\"gpt-4o\",\"messages\":[{\"role\":\"user\",\"content\":\"hello\"}]}");
+
+// 流式聊天（SSE）
+sdk.chatStream("{\"model\":\"gpt-4o\",\"messages\":[{\"role\":\"user\",\"content\":\"hello\"}]}", 
+    chunk -> System.out.println(chunk),
+    response -> System.out.println("Complete: " + response),
+    error -> System.err.println("Error: " + error));
+```
+
+## 配置说明
+
+### 应用配置
+
+Chat 模块依赖 `ruoyi-ai` 模块的配置，主要配置在 `application.yml` 中：
+
+```yaml
+ruoyi:
+  ai:
+    # 是否启用 AI 模块
+    enabled: true
+    
+    # 知识库配置
+    knowledge:
+      enabled: true
+      default-search-count: 5
+      similarity-threshold: 0.7
+      max-context-length: 4000
+      
+    # 流式响应配置
+    stream:
+      enabled: true
+      buffer-size: 1024
+      timeout: 60
+```
+
+### WebSocket 配置
+
+WebSocket 配置在 `StompWebSocketConfig` 中：
+
+- **端点路径**：`/ws`
+- **消息映射**：`/chat/send`
+- **订阅主题**：`/topic/session/{sessionId}`
+
+### 数据库配置
+
+确保已执行 `script/sql/ry_chat.sql` 初始化脚本。
+
+## 依赖模块
+
+### 核心依赖
+
+- **ruoyi-ai**: AI 服务集成
+  - `AiChatService` - 统一聊天服务
+  - `AiChatHistoryService` - 聊天历史服务
+  - `AiProviderManager` - Provider 管理器
+- **ruoyi-knowledge**: 知识库服务
+  - `KnowledgeVectorService` - 向量检索服务
+  - `KnowledgeInfoService` - 知识库信息服务
+- **ruoyi-common-core**: 核心工具类
+- **ruoyi-common-mybatis**: 数据库操作
+- **ruoyi-common-web**: Web 框架支持
+- **ruoyi-common-security**: 安全认证（Sa-Token）
+- **ruoyi-common-log**: 日志记录
+- **ruoyi-common-excel**: Excel 导出
+
+## 开发指南
+
+### 添加新的聊天类型
+
+1. 创建新的 Controller 类，继承 `BaseController`
+2. 实现对应的 Service 接口
+3. 添加相关的 BO 和 VO 类
+4. 配置路由映射和权限注解
+
+### 扩展消息类型
+
+1. 在 `ChatMessage` 实体中添加新字段
+2. 更新数据库表结构（修改 `ry_chat.sql`）
+3. 修改消息处理逻辑
+4. 添加相应的验证规则
+
+### 集成新的 AI 模型
+
+1. 在 `ruoyi-ai` 模块中添加新的 Provider
+2. 在 `chat_model` 表中添加模型配置
+3. 测试模型兼容性
+4. 更新文档
+
+### WebSocket 扩展
+
+1. 在 `StompWebSocketConfig` 中添加新的消息映射
+2. 创建对应的 Controller 处理消息
+3. 配置订阅主题
+4. 更新客户端连接代码
+
+## 认证与权限
+
+### 认证方式
+
+- **登录认证**：基于 Sa-Token，所有写操作需要登录态（`@SaCheckLogin`）
+- **权限控制**：管理接口需要相应权限（`@SaCheckPermission`）
+- **令牌格式**：`Authorization: Bearer <token>`
+
+### 权限列表
+
+- `chat:knowledge:*` - 知识库聊天权限
+- `chat:session:*` - 会话管理权限
+- `chat:message:*` - 消息管理权限
+- `chat:config:*` - 配置管理权限
+- `chat:model:*` - 模型管理权限
+- `chat:token:*` - Token 统计权限
+
+### 统一网关权限
+
+统一网关（`/api/ai/*`）需要相应的 AI 模块权限，如 `ai:chat:sync`、`ai:chat:stream` 等。
+
+## 监控和日志
+
+### 关键指标
+
+- 会话创建数量
+- 消息发送成功率
+- 平均响应时间
+- Token 使用量
+- 错误率统计
+- 知识库检索命中率
+
+### 日志配置
+
+```yaml
+logging:
+  level:
+    org.dromara.chat: DEBUG
+    org.dromara.ai: INFO
+    org.dromara.knowledge: INFO
+```
+
+### 日志记录
+
+- 所有接口调用记录（通过 `@Log` 注解）
+- 异常错误日志
+- 性能监控日志
+- Token 使用日志
+
+## 故障排除
+
+### 常见问题
+
+1. **AI 服务不可用**
+   - 检查 `ruoyi-ai` 模块状态
+   - 验证 API 密钥配置
+   - 查看网络连接
+   - 检查 Provider 配置
+
+2. **知识库搜索失败**
+   - 确认知识库 ID 有效
+   - 检查知识库内容是否已索引
+   - 验证搜索权限
+   - 查看向量服务状态
+
+3. **会话创建失败**
+   - 检查用户权限
+   - 验证数据库连接
+   - 查看参数格式
+   - 检查会话表结构
+
+4. **SSE 流式响应中断**
+   - 检查网络连接稳定性
+   - 查看超时配置
+   - 验证模型响应时间
+   - 检查服务器资源
+
+5. **WebSocket 连接失败**
+   - 检查 WebSocket 配置
+   - 验证 STOMP 端点路径
+   - 查看防火墙设置
+   - 检查客户端连接代码
+
+### 性能优化
+
+1. **数据库优化**
+   - 添加适当索引（session_id, user_id, create_time 等）
+   - 定期清理历史数据
+   - 使用连接池
+   - 考虑分表策略（按时间或用户）
+
+2. **缓存策略**
+   - 缓存热门会话
+   - 缓存知识库搜索结果
+   - 使用 Redis 缓存会话信息
+   - 缓存模型配置信息
+
+3. **异步处理**
+   - 异步保存消息
+   - 后台统计计算
+   - 队列处理长任务
+   - 异步日志记录
+
+4. **流式响应优化**
+   - 调整缓冲区大小
+   - 优化模型响应时间
+   - 使用连接池管理 SSE 连接
+   - 实现背压控制
+
+## 版本历史
+
+- **v1.0.0**: 初始版本，基础聊天功能
+- **v1.1.0**: 添加知识库集成（RAG）
+- **v1.2.0**: 支持多模型切换
+- **v1.3.0**: 增加使用统计功能
+- **v1.4.0**: 对接统一 AI 网关与 RAG 能力，完善文档与 SDK
+- **v1.5.0**: 添加 SSE 流式支持和 WebSocket 实时通信
+
+## 贡献指南
+
+1. Fork 项目
+2. 创建功能分支（`git checkout -b feature/AmazingFeature`）
+3. 提交代码变更（`git commit -m 'Add some AmazingFeature'`）
+4. 推送到分支（`git push origin feature/AmazingFeature`）
+5. 创建 Pull Request
+6. 等待代码审查
+
+## 许可证
+
+本项目采用 MIT 许可证，详见 LICENSE 文件。
+
+## 相关文档
+
+- [RuoYi AI 模块文档](../ruoyi-ai/README.md)
+- [RuoYi Knowledge 模块文档](../ruoyi-knowledge/README.md)
+- [API 使用文档](./docs/API.md)
diff --git a/ruoyi-modules/ruoyi-face/pom.xml b/ruoyi-modules/ruoyi-face/pom.xml
new file mode 100644
index 0000000..2400c61
--- /dev/null
+++ b/ruoyi-modules/ruoyi-face/pom.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>org.dromara</groupId>
+        <artifactId>ruoyi-modules</artifactId>
+        <version>${revision}</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>ruoyi-face</artifactId>
+    <description>chat聊天模块</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-doc</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-mybatis</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-translation</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-log</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-excel</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-security</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-idempotent</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-sensitive</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-encrypt</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-ai</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+
+</project>
diff --git a/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/client/ChatSdk.java b/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/client/ChatSdk.java
new file mode 100644
index 0000000..c275a9d
--- /dev/null
+++ b/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/client/ChatSdk.java
@@ -0,0 +1,38 @@
+package org.dromara.chat.client;
+
+import java.net.URI;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+
+public class ChatSdk {
+    private final HttpClient client = HttpClient.newHttpClient();
+    private final String baseUrl;
+    private String token;
+
+    public ChatSdk(String baseUrl) {
+        this.baseUrl = baseUrl.endsWith("/") ? baseUrl.substring(0, baseUrl.length() - 1) : baseUrl;
+    }
+
+    public ChatSdk withToken(String token) {
+        this.token = token;
+        return this;
+    }
+
+    public String chat(String jsonBody) {
+        HttpRequest.Builder b = HttpRequest.newBuilder()
+                .uri(URI.create(baseUrl + "/api/ai/chat"))
+                .header("Content-Type", "application/json");
+        if (token != null && !token.isEmpty()) {
+            b.header("Authorization", token);
+        }
+        HttpRequest req = b.POST(HttpRequest.BodyPublishers.ofString(jsonBody)).build();
+        try {
+            HttpResponse<String> resp = client.send(req, HttpResponse.BodyHandlers.ofString());
+            return resp.body();
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+}
+
diff --git a/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/config/StompWebSocketConfig.java b/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/config/StompWebSocketConfig.java
new file mode 100644
index 0000000..161544c
--- /dev/null
+++ b/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/config/StompWebSocketConfig.java
@@ -0,0 +1,37 @@
+package org.dromara.chat.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.messaging.simp.config.MessageBrokerRegistry;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
+import org.springframework.web.socket.config.annotation.EnableWebSocketMessageBroker;
+import org.springframework.web.socket.config.annotation.StompEndpointRegistry;
+import org.springframework.web.socket.config.annotation.WebSocketMessageBrokerConfigurer;
+
+@Configuration
+@EnableWebSocketMessageBroker
+public class StompWebSocketConfig implements WebSocketMessageBrokerConfigurer {
+    @Override
+    public void registerStompEndpoints(StompEndpointRegistry registry) {
+        registry.addEndpoint("/ws/chat").setAllowedOriginPatterns("*");
+    }
+
+    @Override
+    public void configureMessageBroker(MessageBrokerRegistry registry) {
+        registry.setApplicationDestinationPrefixes("/app");
+        ThreadPoolTaskScheduler scheduler = taskScheduler();
+        registry.enableSimpleBroker("/topic")
+                .setHeartbeatValue(new long[]{30000, 30000})
+                .setTaskScheduler(scheduler);
+    }
+
+    @Bean
+    public ThreadPoolTaskScheduler taskScheduler() {
+        ThreadPoolTaskScheduler scheduler = new ThreadPoolTaskScheduler();
+        scheduler.setPoolSize(1);
+        scheduler.setThreadNamePrefix("stomp-heartbeat-");
+        scheduler.initialize();
+        return scheduler;
+    }
+}
+
diff --git a/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/controller/AIKnowledgeChatController.java b/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/controller/AIKnowledgeChatController.java
new file mode 100644
index 0000000..4b2b341
--- /dev/null
+++ b/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/controller/AIKnowledgeChatController.java
@@ -0,0 +1,97 @@
+package org.dromara.chat.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import lombok.RequiredArgsConstructor;
+import org.dromara.chat.domain.vo.ChatMessageVo;
+import org.dromara.chat.domain.vo.ChatSessionVo;
+import org.dromara.chat.service.AiKnowledgeChatService;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.web.core.BaseController;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 知识库聊天控制器
+ *
+ * @author pengles
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/chat/knowledge")
+public class AIKnowledgeChatController extends BaseController {
+
+    private final AiKnowledgeChatService knowledgeChatService;
+
+    /**
+     * 基于知识库进行智能问答
+     */
+    @SaCheckPermission("chat:knowledge:chat")
+    @Log(title = "知识库问答", businessType = BusinessType.OTHER)
+    @PostMapping("/chat")
+    public R<ChatMessageVo> chatWithKnowledge(
+            @RequestParam Long sessionId,
+            @RequestParam Long userId,
+            @RequestParam String question,
+            @RequestParam Long knowledgeId,
+            @RequestParam String modelName) {
+        ChatMessageVo response = knowledgeChatService.chatWithKnowledge(sessionId, userId, question, knowledgeId, modelName);
+        return R.ok(response);
+    }
+
+    /**
+     * 创建知识库聊天会话
+     */
+    @SaCheckPermission("chat:knowledge:session")
+    @Log(title = "创建知识库会话", businessType = BusinessType.INSERT)
+    @PostMapping("/session")
+    public R<ChatSessionVo> createKnowledgeSession(
+            @RequestParam Long userId,
+            @RequestParam Long knowledgeId,
+            @RequestParam(required = false) String sessionTitle) {
+        ChatSessionVo session = knowledgeChatService.createKnowledgeSession(userId, knowledgeId, sessionTitle);
+        return R.ok(session);
+    }
+
+    /**
+     * 搜索知识库内容
+     */
+    @SaCheckPermission("chat:knowledge:search")
+    @GetMapping("/search")
+    public R<List<String>> searchKnowledgeContent(
+            @RequestParam Long knowledgeId,
+            @RequestParam String query,
+            @RequestParam(defaultValue = "5") Integer limit) {
+        List<String> results = knowledgeChatService.searchKnowledgeContent(knowledgeId, query, limit);
+        return R.ok(results);
+    }
+
+    /**
+     * 构建知识库上下文
+     */
+    @SaCheckPermission("chat:knowledge:context")
+    @GetMapping("/context")
+    public R<String> buildKnowledgeContext(
+            @RequestParam Long knowledgeId,
+            @RequestParam String question) {
+        String context = knowledgeChatService.buildKnowledgeContext(knowledgeId, question);
+        return R.ok(context);
+    }
+
+    /**
+     * 获取知识库聊天历史
+     */
+    @SaCheckPermission("chat:knowledge:history")
+    @GetMapping("/history/{sessionId}")
+    public R<List<ChatMessageVo>> getKnowledgeChatHistory(
+            @PathVariable Long sessionId,
+            @RequestParam(defaultValue = "20") Integer limit) {
+        List<ChatMessageVo> history = knowledgeChatService.getKnowledgeChatHistory(sessionId, limit);
+        return R.ok(history);
+    }
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/controller/ChatConfigController.java b/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/controller/ChatConfigController.java
new file mode 100644
index 0000000..b859d28
--- /dev/null
+++ b/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/controller/ChatConfigController.java
@@ -0,0 +1,111 @@
+package org.dromara.chat.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
+import org.dromara.chat.domain.bo.ChatConfigBo;
+import org.dromara.chat.domain.vo.ChatConfigVo;
+import org.dromara.chat.service.ChatConfigService;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 聊天配置控制器
+ *
+ * @author pengles
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/chat/config")
+public class ChatConfigController extends BaseController {
+
+    private final ChatConfigService chatConfigService;
+
+    /**
+     * 查询聊天配置列表
+     */
+    @SaCheckPermission("chat:config:list")
+    @GetMapping("/list")
+    public TableDataInfo<ChatConfigVo> list(ChatConfigBo bo, PageQuery pageQuery) {
+        return chatConfigService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出聊天配置列表
+     */
+    @SaCheckPermission("chat:config:export")
+    @Log(title = "聊天配置", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(ChatConfigBo bo, HttpServletResponse response) {
+        List<ChatConfigVo> list = chatConfigService.queryList(bo);
+        ExcelUtil.exportExcel(list, "聊天配置", ChatConfigVo.class, response);
+    }
+
+    /**
+     * 获取聊天配置详细信息
+     */
+    @SaCheckPermission("chat:config:query")
+    @GetMapping("/{id}")
+    public R<ChatConfigVo> getInfo(@PathVariable Long id) {
+        return R.ok(chatConfigService.queryById(id));
+    }
+
+    /**
+     * 新增聊天配置
+     */
+    @SaCheckPermission("chat:config:add")
+    @Log(title = "聊天配置", businessType = BusinessType.INSERT)
+    @PostMapping
+    public R<Void> add(@Validated @RequestBody ChatConfigBo bo) {
+        return toAjax(chatConfigService.insertByBo(bo));
+    }
+
+    /**
+     * 修改聊天配置
+     */
+    @SaCheckPermission("chat:config:edit")
+    @Log(title = "聊天配置", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public R<Void> edit(@Validated @RequestBody ChatConfigBo bo) {
+        return toAjax(chatConfigService.updateByBo(bo));
+    }
+
+    /**
+     * 删除聊天配置
+     */
+    @SaCheckPermission("chat:config:remove")
+    @Log(title = "聊天配置", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@PathVariable Long[] ids) {
+        return toAjax(chatConfigService.deleteWithValidByIds(List.of(ids), true));
+    }
+
+    /**
+     * 根据配置分类查询配置列表
+     */
+    @SaCheckPermission("chat:config:query")
+    @GetMapping("/category/{category}")
+    public R<List<ChatConfigVo>> getByCategory(@PathVariable String category) {
+        return R.ok(chatConfigService.queryListByCategory(category));
+    }
+
+    /**
+     * 根据配置名称查询配置
+     */
+    @SaCheckPermission("chat:config:query")
+    @GetMapping("/name/{configName}")
+    public R<ChatConfigVo> getByConfigName(@PathVariable String configName) {
+        return R.ok(chatConfigService.queryByConfigName(configName));
+    }
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/controller/ChatMessageController.java b/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/controller/ChatMessageController.java
new file mode 100644
index 0000000..d506fec
--- /dev/null
+++ b/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/controller/ChatMessageController.java
@@ -0,0 +1,120 @@
+package org.dromara.chat.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
+import org.dromara.chat.domain.bo.ChatMessageBo;
+import org.dromara.chat.domain.vo.ChatMessageVo;
+import org.dromara.chat.service.ChatMessageService;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 聊天消息控制器
+ *
+ * @author pengles
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/chat/message")
+public class ChatMessageController extends BaseController {
+
+    private final ChatMessageService chatMessageService;
+
+    /**
+     * 查询聊天消息列表
+     */
+    @SaCheckPermission("chat:message:list")
+    @GetMapping("/list")
+    public TableDataInfo<ChatMessageVo> list(ChatMessageBo bo, PageQuery pageQuery) {
+        return chatMessageService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出聊天消息列表
+     */
+    @SaCheckPermission("chat:message:export")
+    @Log(title = "聊天消息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(ChatMessageBo bo, HttpServletResponse response) {
+        List<ChatMessageVo> list = chatMessageService.queryList(bo);
+        ExcelUtil.exportExcel(list, "聊天消息", ChatMessageVo.class, response);
+    }
+
+    /**
+     * 获取聊天消息详细信息
+     */
+    @SaCheckPermission("chat:message:query")
+    @GetMapping("/{id}")
+    public R<ChatMessageVo> getInfo(@PathVariable Long id) {
+        return R.ok(chatMessageService.queryById(id));
+    }
+
+    /**
+     * 新增聊天消息
+     */
+    @SaCheckPermission("chat:message:add")
+    @Log(title = "聊天消息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public R<Void> add(@Validated @RequestBody ChatMessageBo bo) {
+        return toAjax(chatMessageService.insertByBo(bo));
+    }
+
+    /**
+     * 修改聊天消息
+     */
+    @SaCheckPermission("chat:message:edit")
+    @Log(title = "聊天消息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public R<Void> edit(@Validated @RequestBody ChatMessageBo bo) {
+        return toAjax(chatMessageService.updateByBo(bo));
+    }
+
+    /**
+     * 删除聊天消息
+     */
+    @SaCheckPermission("chat:message:remove")
+    @Log(title = "聊天消息", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@PathVariable Long[] ids) {
+        return toAjax(chatMessageService.deleteWithValidByIds(List.of(ids), true));
+    }
+
+    /**
+     * 根据会话ID查询消息列表
+     */
+    @SaCheckPermission("chat:message:query")
+    @GetMapping("/session/{sessionId}")
+    public R<List<ChatMessageVo>> getBySessionId(@PathVariable Long sessionId) {
+        return R.ok(chatMessageService.queryListBySessionId(sessionId));
+    }
+
+    /**
+     * 根据用户ID查询消息列表
+     */
+    @SaCheckPermission("chat:message:query")
+    @GetMapping("/user/{userId}")
+    public R<List<ChatMessageVo>> getByUserId(@PathVariable Long userId) {
+        return R.ok(chatMessageService.queryListByUserId(userId));
+    }
+
+    /**
+     * 根据会话ID和用户ID查询消息列表
+     */
+    @SaCheckPermission("chat:message:query")
+    @GetMapping("/session/{sessionId}/user/{userId}")
+    public R<List<ChatMessageVo>> getBySessionIdAndUserId(@PathVariable Long sessionId, @PathVariable Long userId) {
+        return R.ok(chatMessageService.queryListBySessionIdAndUserId(sessionId, userId));
+    }
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/controller/ChatModelController.java b/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/controller/ChatModelController.java
new file mode 100644
index 0000000..a23a642
--- /dev/null
+++ b/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/controller/ChatModelController.java
@@ -0,0 +1,129 @@
+package org.dromara.chat.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
+import org.dromara.chat.domain.bo.ChatModelBo;
+import org.dromara.chat.domain.vo.ChatModelVo;
+import org.dromara.chat.service.ChatModelService;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 聊天模型控制器
+ *
+ * @author pengles
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/chat/model")
+public class ChatModelController extends BaseController {
+
+    private final ChatModelService chatModelService;
+
+    /**
+     * 查询聊天模型列表
+     */
+    @SaCheckPermission("chat:model:list")
+    @GetMapping("/list")
+    public TableDataInfo<ChatModelVo> list(ChatModelBo bo, PageQuery pageQuery) {
+        return chatModelService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出聊天模型列表
+     */
+    @SaCheckPermission("chat:model:export")
+    @Log(title = "聊天模型", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(ChatModelBo bo, HttpServletResponse response) {
+        List<ChatModelVo> list = chatModelService.queryList(bo);
+        ExcelUtil.exportExcel(list, "聊天模型", ChatModelVo.class, response);
+    }
+
+    /**
+     * 获取聊天模型详细信息
+     */
+    @SaCheckPermission("chat:model:query")
+    @GetMapping("/{id}")
+    public R<ChatModelVo> getInfo(@PathVariable Long id) {
+        return R.ok(chatModelService.queryById(id));
+    }
+
+    /**
+     * 新增聊天模型
+     */
+    @SaCheckPermission("chat:model:add")
+    @Log(title = "聊天模型", businessType = BusinessType.INSERT)
+    @PostMapping
+    public R<Void> add(@Validated @RequestBody ChatModelBo bo) {
+        return toAjax(chatModelService.insertByBo(bo));
+    }
+
+    /**
+     * 修改聊天模型
+     */
+    @SaCheckPermission("chat:model:edit")
+    @Log(title = "聊天模型", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public R<Void> edit(@Validated @RequestBody ChatModelBo bo) {
+        return toAjax(chatModelService.updateByBo(bo));
+    }
+
+    /**
+     * 删除聊天模型
+     */
+    @SaCheckPermission("chat:model:remove")
+    @Log(title = "聊天模型", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@PathVariable Long[] ids) {
+        return toAjax(chatModelService.deleteWithValidByIds(List.of(ids), true));
+    }
+
+    /**
+     * 根据模型分类查询模型列表
+     */
+    @SaCheckPermission("chat:model:query")
+    @GetMapping("/category/{category}")
+    public R<List<ChatModelVo>> getByCategory(@PathVariable String category) {
+        return R.ok(chatModelService.queryListByCategory(category));
+    }
+
+    /**
+     * 根据模型名称查询模型
+     */
+    @SaCheckPermission("chat:model:query")
+    @GetMapping("/name/{modelName}")
+    public R<ChatModelVo> getByModelName(@PathVariable String modelName) {
+        return R.ok(chatModelService.queryByModelName(modelName));
+    }
+
+    /**
+     * 查询显示的模型列表
+     */
+    @SaCheckPermission("chat:model:query")
+    @GetMapping("/show")
+    public R<List<ChatModelVo>> getShowModelList() {
+        return R.ok(chatModelService.queryShowModelList());
+    }
+
+    /**
+     * 根据模型类型查询模型列表
+     */
+    @SaCheckPermission("chat:model:query")
+    @GetMapping("/type/{modelType}")
+    public R<List<ChatModelVo>> getByModelType(@PathVariable String modelType) {
+        return R.ok(chatModelService.queryListByModelType(modelType));
+    }
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/controller/ChatOpenApiController.java b/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/controller/ChatOpenApiController.java
new file mode 100644
index 0000000..3ab0db2
--- /dev/null
+++ b/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/controller/ChatOpenApiController.java
@@ -0,0 +1,267 @@
+package org.dromara.chat.controller;
+
+import cn.dev33.satoken.annotation.SaCheckLogin;
+import cn.hutool.core.util.StrUtil;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.ai.domain.dto.AiChatRequest;
+import org.dromara.ai.domain.dto.AiChatResponse;
+import org.dromara.ai.service.AiChatService;
+import org.dromara.chat.domain.bo.ChatMessageBo;
+import org.dromara.chat.domain.vo.ChatSessionVo;
+import org.dromara.chat.service.ChatMessageService;
+import org.dromara.chat.service.ChatSessionService;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.json.utils.JsonUtils;
+import org.dromara.common.satoken.utils.LoginHelper;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
+
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * 开放聊天接口
+ *
+ * @author pengles
+ */
+@Slf4j
+@SaCheckLogin
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/chat")
+public class ChatOpenApiController {
+
+    private final AiChatService aiChatService;
+    private final ChatSessionService chatSessionService;
+    private final ChatMessageService chatMessageService;
+
+    @PostMapping(value = "/send", produces = MediaType.TEXT_EVENT_STREAM_VALUE)
+    public SseEmitter send(@RequestBody Map<String, Object> body) {
+        SseEmitter emitter = new SseEmitter(TimeUnit.MINUTES.toMillis(10));
+        Long userId;
+        try {
+            userId = LoginHelper.getUserId();
+        } catch (Exception e) {
+            emitter.completeWithError(new RuntimeException("未登录"));
+            return emitter;
+        }
+
+        try {
+            AiChatRequest req = toRequest(body);
+            req.setUserId(String.valueOf(userId));
+
+            // 获取或创建会话
+            String firstMsgContent = "";
+            if (req.getMessages() != null && !req.getMessages().isEmpty()) {
+                firstMsgContent = req.getMessages().get(req.getMessages().size() - 1).getContent();
+            }
+            Long sessionId = getOrCreateSession(userId, req.getSessionId(), firstMsgContent);
+            req.setSessionId(String.valueOf(sessionId));
+
+            // 如果是新会话，尝试通知前端sessionId
+            if (StrUtil.isBlank(req.getSessionId())) {
+                try {
+                    emitter.send(SseEmitter.event().name("session").data("{\"sessionId\":\"" + sessionId + "\"}"));
+                } catch (IOException e) {
+                    log.error("发送会话ID失败", e);
+                }
+            }
+
+            // 保存用户消息
+            saveUserMessage(sessionId, userId, firstMsgContent, req.getModel());
+
+            final StringBuilder fullText = new StringBuilder();
+            final Long finalSessionId = sessionId;
+            final String modelName = req.getModel();
+
+            aiChatService.chatStream(req, new AiChatService.StreamCallback() {
+                @Override
+                public void onChunk(String chunk) {
+                    String c = normalizeChunk(chunk);
+                    if ("[DONE]".equals(c)) {
+                        // ignore
+                    } else {
+                        fullText.append(c);
+                        try {
+                            emitter.send(toOpenAiDelta(c, false));
+                        } catch (IOException e) {
+                            log.debug("发送SSE失败", e);
+                        }
+                    }
+                }
+
+                @Override
+                public void onComplete(AiChatResponse response) {
+                    try {
+                        emitter.send(toOpenAiDelta("", true));
+                        emitter.send("[DONE]");
+                        emitter.complete();
+
+                        // 保存AI响应消息
+                        saveAiMessage(finalSessionId, userId, fullText.toString(), modelName);
+                    } catch (IOException e) {
+                        log.error("发送SSE完成标记失败", e);
+                        emitter.completeWithError(e);
+                    }
+                }
+
+                @Override
+                public void onError(Throwable error) {
+                    log.error("AI聊天出错", error);
+                    try {
+                        emitter.send("{\"error\":\"" + error.getMessage().replace("\"", "\\\"") + "\"}");
+                    } catch (IOException ignored) {
+                    }
+                    emitter.completeWithError(error);
+                }
+            });
+
+        } catch (Exception e) {
+            log.error("处理聊天请求失败", e);
+            try {
+                emitter.send("{\"error\":\"" + e.getMessage().replace("\"", "\\\"") + "\"}");
+            } catch (IOException ignored) {
+            }
+            emitter.completeWithError(e);
+        }
+        return emitter;
+    }
+
+    private Long getOrCreateSession(Long userId, String sessionIdStr, String firstMsgContent) {
+        if (StrUtil.isNotBlank(sessionIdStr)) {
+            Long sessionId = Long.parseLong(sessionIdStr);
+            ChatSessionVo session = chatSessionService.queryById(sessionId);
+            if (session == null) {
+                throw new RuntimeException("会话不存在");
+            }
+            if (!session.getUserId().equals(userId)) {
+                throw new RuntimeException("无权访问该会话");
+            }
+            return sessionId;
+        } else {
+            String title = "新对话";
+            if (StrUtil.isNotBlank(firstMsgContent)) {
+                title = StringUtils.substring(firstMsgContent, 0, 20);
+            }
+            ChatSessionVo session = chatSessionService.createNewSession(userId, title);
+            return session.getId();
+        }
+    }
+
+    private void saveUserMessage(Long sessionId, Long userId, String content, String modelName) {
+        if (StrUtil.isNotBlank(content)) {
+            ChatMessageBo userMsg = new ChatMessageBo();
+            userMsg.setSessionId(sessionId);
+            userMsg.setUserId(userId);
+            userMsg.setRole("user");
+            userMsg.setContent(content);
+            userMsg.setModelName(modelName);
+            userMsg.setCreateTime(new Date());
+            chatMessageService.insertByBo(userMsg);
+        }
+    }
+
+    private void saveAiMessage(Long sessionId, Long userId, String content, String modelName) {
+        if (StrUtil.isNotBlank(content)) {
+            ChatMessageBo aiMsg = new ChatMessageBo();
+            aiMsg.setSessionId(sessionId);
+            aiMsg.setUserId(userId);
+            aiMsg.setRole("assistant");
+            aiMsg.setContent(content);
+            aiMsg.setModelName(modelName);
+            aiMsg.setCreateTime(new Date());
+            aiMsg.setTotalTokens(0L);
+            aiMsg.setDeductCost(BigDecimal.ZERO);
+            chatMessageService.insertByBo(aiMsg);
+        }
+    }
+
+    private AiChatRequest toRequest(Map<String, Object> body) {
+        AiChatRequest req = new AiChatRequest();
+        req.setModel(asString(body.get("model")));
+        req.setTemperature(asDouble(body.get("temperature")));
+        req.setTopP(asDouble(body.get("top_p")));
+        req.setPresencePenalty(asDouble(body.get("presence_penalty")));
+        req.setFrequencyPenalty(asDouble(body.get("frequency_penalty")));
+        req.setMaxTokens(asInt(body.get("max_tokens")));
+        req.setStream(Boolean.TRUE);
+        req.setSessionId(asString(body.get("sessionId")));
+        Object msgs = body.get("messages");
+        if (msgs instanceof List<?> list) {
+            java.util.ArrayList<AiChatRequest.AiMessage> arr = new java.util.ArrayList<>();
+            for (Object o : list) {
+                if (o instanceof Map<?, ?> m) {
+                    AiChatRequest.AiMessage am = new AiChatRequest.AiMessage();
+                    am.setRole(asString(m.get("role")));
+                    am.setContent(asString(m.get("content")));
+                    arr.add(am);
+                }
+            }
+            req.setMessages(arr);
+        }
+        return req;
+    }
+
+    private String asString(Object o) {
+        return o == null ? null : String.valueOf(o);
+    }
+
+    private Double asDouble(Object o) {
+        try {
+            return o == null ? null : Double.valueOf(String.valueOf(o));
+        } catch (Exception e) {
+            return null;
+        }
+    }
+
+    private Integer asInt(Object o) {
+        try {
+            return o == null ? null : Integer.valueOf(String.valueOf(o));
+        } catch (Exception e) {
+            return null;
+        }
+    }
+
+    private String toOpenAiDelta(String content, boolean finish) {
+        String c = content == null ? "" : content;
+        String esc = c.replace("\\", "\\\\").replace("\"", "\\\"").replace("\n", "\\n").replace("\r", "\\r").replace("\t", "\\t");
+        String finishReason = finish ? "\"stop\"" : "null";
+        return "{\"choices\":[{\"delta\":{\"content\":\"" + esc + "\"},\"finish_reason\":" + finishReason + "}]}";
+    }
+
+    private String normalizeChunk(String chunk) {
+        if (chunk == null) return "";
+        String s = chunk.trim();
+        if ("[DONE]".equals(s)) return "[DONE]";
+        try {
+            Map<?, ?> m = JsonUtils.parseObject(s, Map.class);
+            if (m != null) {
+                Object choices = m.get("choices");
+                if (choices instanceof List<?> list && !list.isEmpty()) {
+                    Object first = list.get(0);
+                    if (first instanceof Map<?, ?> fm) {
+                        Object delta = fm.get("delta");
+                        if (delta instanceof Map<?, ?> dm) {
+                            Object c = dm.get("content");
+                            if (c == null) c = dm.get("reasoning_content");
+                            if (c != null) return String.valueOf(c);
+                        }
+                        Object text = fm.get("text");
+                        if (text != null) return String.valueOf(text);
+                    }
+                }
+            }
+        } catch (Exception ignore) {
+        }
+        return s;
+    }
+}
diff --git a/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/controller/ChatSessionController.java b/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/controller/ChatSessionController.java
new file mode 100644
index 0000000..c49425d
--- /dev/null
+++ b/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/controller/ChatSessionController.java
@@ -0,0 +1,122 @@
+package org.dromara.chat.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
+import org.dromara.chat.domain.bo.ChatSessionBo;
+import org.dromara.chat.domain.vo.ChatSessionVo;
+import org.dromara.chat.service.ChatSessionService;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 聊天会话控制器
+ *
+ * @author pengles
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/chat/session")
+public class ChatSessionController extends BaseController {
+
+    private final ChatSessionService chatSessionService;
+
+    /**
+     * 查询聊天会话列表
+     */
+    @SaCheckPermission("chat:session:list")
+    @GetMapping("/list")
+    public TableDataInfo<ChatSessionVo> list(ChatSessionBo bo, PageQuery pageQuery) {
+        return chatSessionService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出聊天会话列表
+     */
+    @SaCheckPermission("chat:session:export")
+    @Log(title = "聊天会话", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(ChatSessionBo bo, HttpServletResponse response) {
+        List<ChatSessionVo> list = chatSessionService.queryList(bo);
+        ExcelUtil.exportExcel(list, "聊天会话", ChatSessionVo.class, response);
+    }
+
+    /**
+     * 获取聊天会话详细信息
+     */
+    @SaCheckPermission("chat:session:query")
+    @GetMapping("/{id}")
+    public R<ChatSessionVo> getInfo(@PathVariable Long id) {
+        return R.ok(chatSessionService.queryById(id));
+    }
+
+    /**
+     * 新增聊天会话
+     */
+    @SaCheckPermission("chat:session:add")
+    @Log(title = "聊天会话", businessType = BusinessType.INSERT)
+    @PostMapping
+    public R<Void> add(@Validated @RequestBody ChatSessionBo bo) {
+        return toAjax(chatSessionService.insertByBo(bo));
+    }
+
+    /**
+     * 修改聊天会话
+     */
+    @SaCheckPermission("chat:session:edit")
+    @Log(title = "聊天会话", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public R<Void> edit(@Validated @RequestBody ChatSessionBo bo) {
+        return toAjax(chatSessionService.updateByBo(bo));
+    }
+
+    /**
+     * 删除聊天会话
+     */
+    @SaCheckPermission("chat:session:remove")
+    @Log(title = "聊天会话", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@PathVariable Long[] ids) {
+        return toAjax(chatSessionService.deleteWithValidByIds(List.of(ids), true));
+    }
+
+    /**
+     * 根据用户ID查询会话列表
+     */
+    @SaCheckPermission("chat:session:query")
+    @GetMapping("/user/{userId}")
+    public R<List<ChatSessionVo>> getByUserId(@PathVariable Long userId) {
+        return R.ok(chatSessionService.queryListByUserId(userId));
+    }
+
+    /**
+     * 创建新会话
+     */
+    @SaCheckPermission("chat:session:add")
+    @Log(title = "聊天会话", businessType = BusinessType.INSERT)
+    @PostMapping("/create")
+    public R<ChatSessionVo> createNewSession(@RequestParam Long userId, @RequestParam(required = false) String sessionTitle) {
+        return R.ok(chatSessionService.createNewSession(userId, sessionTitle));
+    }
+
+    /**
+     * 更新会话标题
+     */
+    @SaCheckPermission("chat:session:edit")
+    @Log(title = "聊天会话", businessType = BusinessType.UPDATE)
+    @PutMapping("/{sessionId}/title")
+    public R<Void> updateSessionTitle(@PathVariable Long sessionId, @RequestParam String sessionTitle) {
+        return toAjax(chatSessionService.updateSessionTitle(sessionId, sessionTitle));
+    }
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/controller/ChatStompController.java b/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/controller/ChatStompController.java
new file mode 100644
index 0000000..b61d679
--- /dev/null
+++ b/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/controller/ChatStompController.java
@@ -0,0 +1,43 @@
+package org.dromara.chat.controller;
+
+import lombok.RequiredArgsConstructor;
+import org.dromara.chat.domain.bo.ChatMessageBo;
+import org.dromara.chat.service.ChatMessageService;
+import org.springframework.messaging.handler.annotation.MessageMapping;
+import org.springframework.messaging.handler.annotation.Payload;
+import org.springframework.messaging.simp.SimpMessagingTemplate;
+import org.springframework.stereotype.Controller;
+
+import java.util.Map;
+
+@Controller
+@RequiredArgsConstructor
+public class ChatStompController {
+    private final SimpMessagingTemplate messagingTemplate;
+    private final ChatMessageService chatMessageService;
+
+    @MessageMapping("/chat/send")
+    public void send(@Payload Map<String, Object> payload) {
+        Long sessionId = toLong(payload.get("sessionId"));
+        Long userId = toLong(payload.get("userId"));
+        String content = String.valueOf(payload.get("content"));
+        ChatMessageBo bo = new ChatMessageBo();
+        bo.setSessionId(sessionId);
+        bo.setUserId(userId);
+        bo.setContent(content);
+        bo.setRole("user");
+        chatMessageService.insertByBo(bo);
+        messagingTemplate.convertAndSend("/topic/session/" + sessionId, Map.of(
+                "sessionId", sessionId, "userId", userId, "content", content));
+    }
+
+    private Long toLong(Object o) {
+        if (o == null) return null;
+        if (o instanceof Number) return ((Number) o).longValue();
+        try {
+            return Long.parseLong(String.valueOf(o));
+        } catch (Exception e) {
+            return null;
+        }
+    }
+}
diff --git a/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/controller/ChatUsageTokenController.java b/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/controller/ChatUsageTokenController.java
new file mode 100644
index 0000000..de2729a
--- /dev/null
+++ b/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/controller/ChatUsageTokenController.java
@@ -0,0 +1,129 @@
+package org.dromara.chat.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
+import org.dromara.chat.domain.bo.ChatUsageTokenBo;
+import org.dromara.chat.domain.vo.ChatUsageTokenVo;
+import org.dromara.chat.service.ChatUsageTokenService;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 聊天Token使用记录控制器
+ *
+ * @author pengles
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/chat/token")
+public class ChatUsageTokenController extends BaseController {
+
+    private final ChatUsageTokenService chatUsageTokenService;
+
+    /**
+     * 查询聊天Token使用记录列表
+     */
+    @SaCheckPermission("chat:token:list")
+    @GetMapping("/list")
+    public TableDataInfo<ChatUsageTokenVo> list(ChatUsageTokenBo bo, PageQuery pageQuery) {
+        return chatUsageTokenService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出聊天Token使用记录列表
+     */
+    @SaCheckPermission("chat:token:export")
+    @Log(title = "聊天Token使用记录", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(ChatUsageTokenBo bo, HttpServletResponse response) {
+        List<ChatUsageTokenVo> list = chatUsageTokenService.queryList(bo);
+        ExcelUtil.exportExcel(list, "聊天Token使用记录", ChatUsageTokenVo.class, response);
+    }
+
+    /**
+     * 获取聊天Token使用记录详细信息
+     */
+    @SaCheckPermission("chat:token:query")
+    @GetMapping("/{id}")
+    public R<ChatUsageTokenVo> getInfo(@PathVariable Long id) {
+        return R.ok(chatUsageTokenService.queryById(id));
+    }
+
+    /**
+     * 新增聊天Token使用记录
+     */
+    @SaCheckPermission("chat:token:add")
+    @Log(title = "聊天Token使用记录", businessType = BusinessType.INSERT)
+    @PostMapping
+    public R<Void> add(@Validated @RequestBody ChatUsageTokenBo bo) {
+        return toAjax(chatUsageTokenService.insertByBo(bo));
+    }
+
+    /**
+     * 修改聊天Token使用记录
+     */
+    @SaCheckPermission("chat:token:edit")
+    @Log(title = "聊天Token使用记录", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public R<Void> edit(@Validated @RequestBody ChatUsageTokenBo bo) {
+        return toAjax(chatUsageTokenService.updateByBo(bo));
+    }
+
+    /**
+     * 删除聊天Token使用记录
+     */
+    @SaCheckPermission("chat:token:remove")
+    @Log(title = "聊天Token使用记录", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@PathVariable Long[] ids) {
+        return toAjax(chatUsageTokenService.deleteWithValidByIds(List.of(ids), true));
+    }
+
+    /**
+     * 根据用户ID查询Token使用记录列表
+     */
+    @SaCheckPermission("chat:token:query")
+    @GetMapping("/user/{userId}")
+    public R<List<ChatUsageTokenVo>> getByUserId(@PathVariable Long userId) {
+        return R.ok(chatUsageTokenService.queryListByUserId(userId));
+    }
+
+    /**
+     * 根据模型名称查询Token使用记录列表
+     */
+    @SaCheckPermission("chat:token:query")
+    @GetMapping("/model/{modelName}")
+    public R<List<ChatUsageTokenVo>> getByModelName(@PathVariable String modelName) {
+        return R.ok(chatUsageTokenService.queryListByModelName(modelName));
+    }
+
+    /**
+     * 获取用户总Token使用量
+     */
+    @SaCheckPermission("chat:token:query")
+    @GetMapping("/total/user/{userId}")
+    public R<Long> getTotalTokenByUserId(@PathVariable Long userId) {
+        return R.ok(chatUsageTokenService.getTotalTokenByUserId(userId));
+    }
+
+    /**
+     * 获取模型总Token使用量
+     */
+    @SaCheckPermission("chat:token:query")
+    @GetMapping("/total/model/{modelName}")
+    public R<Long> getTotalTokenByModelName(@PathVariable String modelName) {
+        return R.ok(chatUsageTokenService.getTotalTokenByModelName(modelName));
+    }
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/domain/ChatConfig.java b/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/domain/ChatConfig.java
new file mode 100644
index 0000000..c18466e
--- /dev/null
+++ b/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/domain/ChatConfig.java
@@ -0,0 +1,88 @@
+package org.dromara.chat.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 聊天配置对象 chat_config
+ *
+ * @author pengles
+ */
+@Data
+@TableName("chat_config")
+public class ChatConfig implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 配置分类
+     */
+    private String category;
+
+    /**
+     * 配置名称
+     */
+    private String configName;
+
+    /**
+     * 配置值
+     */
+    private String configValue;
+
+    /**
+     * 配置字典
+     */
+    private String configDict;
+
+    /**
+     * 版本号
+     */
+    private String version;
+
+    /**
+     * 删除标志（0代表存在 2代表删除）
+     */
+    @TableLogic
+    private String delFlag;
+
+    /**
+     * 更新IP
+     */
+    private String updateIp;
+
+    /**
+     * 创建者
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createBy;
+
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 更新者
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateBy;
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/domain/ChatMessage.java b/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/domain/ChatMessage.java
new file mode 100644
index 0000000..0177a2e
--- /dev/null
+++ b/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/domain/ChatMessage.java
@@ -0,0 +1,91 @@
+package org.dromara.chat.domain;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 聊天消息对象 chat_message
+ *
+ * @author pengles
+ */
+@Data
+@TableName("chat_message")
+public class ChatMessage implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 会话ID
+     */
+    private Long sessionId;
+
+    /**
+     * 用户ID
+     */
+    private Long userId;
+
+    /**
+     * 消息内容
+     */
+    private String content;
+
+    /**
+     * 角色（user/assistant/system）
+     */
+    private String role;
+
+    /**
+     * 扣费成本
+     */
+    private BigDecimal deductCost;
+
+    /**
+     * 总token数
+     */
+    private Long totalTokens;
+
+    /**
+     * 模型名称
+     */
+    private String modelName;
+
+    /**
+     * 创建者
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createBy;
+
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 更新者
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateBy;
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/domain/ChatModel.java b/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/domain/ChatModel.java
new file mode 100644
index 0000000..829d931
--- /dev/null
+++ b/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/domain/ChatModel.java
@@ -0,0 +1,100 @@
+package org.dromara.chat.domain;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 聊天模型对象 chat_model
+ *
+ * @author pengles
+ */
+@Data
+@TableName("chat_model")
+public class ChatModel implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 模型分类
+     */
+    private String category;
+
+    /**
+     * 模型名称
+     */
+    private String modelName;
+
+    /**
+     * 模型描述
+     */
+    private String modelDescribe;
+
+    /**
+     * 模型价格
+     */
+    private BigDecimal modelPrice;
+
+    /**
+     * 模型类型
+     */
+    private String modelType;
+
+    /**
+     * 是否显示（0隐藏 1显示）
+     */
+    private String modelShow;
+
+    /**
+     * 系统提示词
+     */
+    private String systemPrompt;
+
+    /**
+     * API主机地址
+     */
+    private String apiHost;
+
+    /**
+     * API密钥
+     */
+    private String apiKey;
+
+    /**
+     * 创建者
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createBy;
+
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 更新者
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateBy;
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/domain/ChatSession.java b/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/domain/ChatSession.java
new file mode 100644
index 0000000..a2ea2f2
--- /dev/null
+++ b/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/domain/ChatSession.java
@@ -0,0 +1,70 @@
+package org.dromara.chat.domain;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 聊天会话对象 chat_session
+ *
+ * @author pengles
+ */
+@Data
+@TableName("chat_session")
+public class ChatSession implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 用户ID
+     */
+    private Long userId;
+
+    /**
+     * 会话标题
+     */
+    private String sessionTitle;
+
+    /**
+     * 会话内容
+     */
+    private String sessionContent;
+
+    /**
+     * 创建者
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createBy;
+
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 更新者
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateBy;
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/domain/ChatUsageToken.java b/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/domain/ChatUsageToken.java
new file mode 100644
index 0000000..abe415b
--- /dev/null
+++ b/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/domain/ChatUsageToken.java
@@ -0,0 +1,48 @@
+package org.dromara.chat.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 聊天使用令牌对象 chat_usage_token
+ *
+ * @author pengles
+ */
+@Data
+@TableName("chat_usage_token")
+public class ChatUsageToken implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 用户ID
+     */
+    private Long userId;
+
+    /**
+     * 令牌数量
+     */
+    private Long token;
+
+    /**
+     * 模型名称
+     */
+    private String modelName;
+
+    /**
+     * 总令牌数
+     */
+    private Long totalToken;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/domain/bo/ChatConfigBo.java b/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/domain/bo/ChatConfigBo.java
new file mode 100644
index 0000000..ec23c18
--- /dev/null
+++ b/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/domain/bo/ChatConfigBo.java
@@ -0,0 +1,62 @@
+package org.dromara.chat.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.dromara.chat.domain.ChatConfig;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+
+/**
+ * 聊天配置业务对象 chat_config
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = ChatConfig.class, reverseConvertGenerate = false)
+public class ChatConfigBo extends BaseEntity {
+
+    /**
+     * 主键ID
+     */
+    @NotNull(message = "主键ID不能为空", groups = {EditGroup.class})
+    private Long id;
+
+    /**
+     * 配置分类
+     */
+    @NotBlank(message = "配置分类不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String category;
+
+    /**
+     * 配置名称
+     */
+    @NotBlank(message = "配置名称不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String configName;
+
+    /**
+     * 配置值
+     */
+    @NotBlank(message = "配置值不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String configValue;
+
+    /**
+     * 配置字典
+     */
+    private String configDict;
+
+    /**
+     * 版本号
+     */
+    private String version;
+
+    /**
+     * 更新IP
+     */
+    private String updateIp;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/domain/bo/ChatMessageBo.java b/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/domain/bo/ChatMessageBo.java
new file mode 100644
index 0000000..ddbd973
--- /dev/null
+++ b/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/domain/bo/ChatMessageBo.java
@@ -0,0 +1,76 @@
+package org.dromara.chat.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.dromara.chat.domain.ChatMessage;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+
+import java.math.BigDecimal;
+
+/**
+ * 聊天消息业务对象 chat_message
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = ChatMessage.class, reverseConvertGenerate = false)
+public class ChatMessageBo extends BaseEntity {
+
+    /**
+     * 主键ID
+     */
+    @NotNull(message = "主键ID不能为空", groups = {EditGroup.class})
+    private Long id;
+
+    /**
+     * 会话ID
+     */
+    @NotNull(message = "会话ID不能为空", groups = {AddGroup.class, EditGroup.class})
+    private Long sessionId;
+
+    /**
+     * 用户ID
+     */
+    @NotNull(message = "用户ID不能为空", groups = {AddGroup.class, EditGroup.class})
+    private Long userId;
+
+    /**
+     * 消息类型（text/image/file）
+     */
+    @NotBlank(message = "消息类型不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String messageType;
+
+    /**
+     * 消息内容
+     */
+    @NotBlank(message = "消息内容不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String content;
+
+    /**
+     * 角色（user/assistant/system）
+     */
+    @NotBlank(message = "角色不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String role;
+
+    /**
+     * 扣费成本
+     */
+    private BigDecimal deductCost;
+
+    /**
+     * 总token数
+     */
+    private Long totalTokens;
+
+    /**
+     * 模型名称
+     */
+    private String modelName;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/domain/bo/ChatModelBo.java b/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/domain/bo/ChatModelBo.java
new file mode 100644
index 0000000..7f1a7df
--- /dev/null
+++ b/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/domain/bo/ChatModelBo.java
@@ -0,0 +1,78 @@
+package org.dromara.chat.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.dromara.chat.domain.ChatModel;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+
+import java.math.BigDecimal;
+
+/**
+ * 聊天模型业务对象 chat_model
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = ChatModel.class, reverseConvertGenerate = false)
+public class ChatModelBo extends BaseEntity {
+
+    /**
+     * 主键ID
+     */
+    @NotNull(message = "主键ID不能为空", groups = {EditGroup.class})
+    private Long id;
+
+    /**
+     * 模型分类
+     */
+    @NotBlank(message = "模型分类不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String category;
+
+    /**
+     * 模型名称
+     */
+    @NotBlank(message = "模型名称不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String modelName;
+
+    /**
+     * 模型描述
+     */
+    private String modelDescribe;
+
+    /**
+     * 模型价格
+     */
+    private BigDecimal modelPrice;
+
+    /**
+     * 模型类型
+     */
+    private String modelType;
+
+    /**
+     * 是否显示（0隐藏 1显示）
+     */
+    private String modelShow;
+
+    /**
+     * 系统提示词
+     */
+    private String systemPrompt;
+
+    /**
+     * API主机地址
+     */
+    private String apiHost;
+
+    /**
+     * API密钥
+     */
+    private String apiKey;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/domain/bo/ChatSessionBo.java b/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/domain/bo/ChatSessionBo.java
new file mode 100644
index 0000000..015ea69
--- /dev/null
+++ b/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/domain/bo/ChatSessionBo.java
@@ -0,0 +1,46 @@
+package org.dromara.chat.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.dromara.chat.domain.ChatSession;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+
+/**
+ * 聊天会话业务对象 chat_session
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = ChatSession.class, reverseConvertGenerate = false)
+public class ChatSessionBo extends BaseEntity {
+
+    /**
+     * 主键ID
+     */
+    @NotNull(message = "主键ID不能为空", groups = {EditGroup.class})
+    private Long id;
+
+    /**
+     * 用户ID
+     */
+    @NotNull(message = "用户ID不能为空", groups = {AddGroup.class, EditGroup.class})
+    private Long userId;
+
+    /**
+     * 会话标题
+     */
+    @NotBlank(message = "会话标题不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String sessionTitle;
+
+    /**
+     * 会话内容
+     */
+    private String sessionContent;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/domain/bo/ChatUsageTokenBo.java b/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/domain/bo/ChatUsageTokenBo.java
new file mode 100644
index 0000000..34e5d4a
--- /dev/null
+++ b/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/domain/bo/ChatUsageTokenBo.java
@@ -0,0 +1,53 @@
+package org.dromara.chat.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+import org.dromara.chat.domain.ChatUsageToken;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 聊天使用令牌业务对象 chat_usage_token
+ *
+ * @author pengles
+ */
+@Data
+@AutoMapper(target = ChatUsageToken.class, reverseConvertGenerate = false)
+public class ChatUsageTokenBo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @NotNull(message = "主键ID不能为空", groups = {EditGroup.class})
+    private Long id;
+
+    /**
+     * 用户ID
+     */
+    @NotNull(message = "用户ID不能为空", groups = {AddGroup.class, EditGroup.class})
+    private Long userId;
+
+    /**
+     * 令牌数量
+     */
+    @NotNull(message = "令牌数量不能为空", groups = {AddGroup.class, EditGroup.class})
+    private Long token;
+
+    /**
+     * 模型名称
+     */
+    private String modelName;
+
+    /**
+     * 总令牌数
+     */
+    private Long totalToken;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/domain/request/ChatRequest.java b/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/domain/request/ChatRequest.java
new file mode 100644
index 0000000..47f8640
--- /dev/null
+++ b/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/domain/request/ChatRequest.java
@@ -0,0 +1,31 @@
+package org.dromara.chat.domain.request;
+
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+
+/**
+ * 聊天请求基础类
+ *
+ * @author pengles
+ */
+@Data
+public class ChatRequest {
+
+    /**
+     * 会话ID
+     */
+    @NotBlank(message = "会话ID不能为空")
+    private String sessionId;
+
+    /**
+     * 消息内容
+     */
+    @NotBlank(message = "消息内容不能为空")
+    private String message;
+
+    /**
+     * 模型名称
+     */
+    private String modelName;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/domain/request/MultiProviderChatRequest.java b/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/domain/request/MultiProviderChatRequest.java
new file mode 100644
index 0000000..685872e
--- /dev/null
+++ b/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/domain/request/MultiProviderChatRequest.java
@@ -0,0 +1,40 @@
+package org.dromara.chat.domain.request;
+
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+
+/**
+ * 多Provider聊天请求
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class MultiProviderChatRequest extends ChatRequest {
+
+    /**
+     * Provider名称列表
+     */
+    @NotNull(message = "Provider列表不能为空")
+    @NotEmpty(message = "Provider列表不能为空")
+    private List<String> providerNames;
+
+    /**
+     * 是否合并结果
+     */
+    private Boolean mergeResults = true;
+
+    /**
+     * 最大并发数
+     */
+    private Integer maxConcurrency = 3;
+
+    /**
+     * 超时时间（秒）
+     */
+    private Integer timeoutSeconds = 30;
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/domain/request/RateRequest.java b/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/domain/request/RateRequest.java
new file mode 100644
index 0000000..3cca552
--- /dev/null
+++ b/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/domain/request/RateRequest.java
@@ -0,0 +1,46 @@
+package org.dromara.chat.domain.request;
+
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+/**
+ * 回答质量评估请求
+ *
+ * @author pengles
+ * @date 2024-01-01
+ */
+@Data
+public class RateRequest {
+
+    /**
+     * 消息ID
+     */
+    @NotBlank(message = "消息ID不能为空")
+    private String messageId;
+
+    /**
+     * 评分（1-5分）
+     */
+    @NotNull(message = "评分不能为空")
+    @Min(value = 1, message = "评分不能小于1")
+    @Max(value = 5, message = "评分不能大于5")
+    private Integer rating;
+
+    /**
+     * 反馈内容
+     */
+    private String feedback;
+
+    /**
+     * 评估维度
+     */
+    private String dimension;
+
+    /**
+     * 是否匿名
+     */
+    private Boolean anonymous = false;
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/domain/vo/ChatConfigVo.java b/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/domain/vo/ChatConfigVo.java
new file mode 100644
index 0000000..1cca656
--- /dev/null
+++ b/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/domain/vo/ChatConfigVo.java
@@ -0,0 +1,89 @@
+package org.dromara.chat.domain.vo;
+
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.chat.domain.ChatConfig;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 聊天配置视图对象 chat_config
+ *
+ * @author pengles
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = ChatConfig.class)
+public class ChatConfigVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @ExcelProperty(value = "主键ID")
+    private Long id;
+
+    /**
+     * 配置分类
+     */
+    @ExcelProperty(value = "配置分类")
+    private String category;
+
+    /**
+     * 配置名称
+     */
+    @ExcelProperty(value = "配置名称")
+    private String configName;
+
+    /**
+     * 配置值
+     */
+    @ExcelProperty(value = "配置值")
+    private String configValue;
+
+    /**
+     * 配置字典
+     */
+    @ExcelProperty(value = "配置字典")
+    private String configDict;
+
+    /**
+     * 版本号
+     */
+    @ExcelProperty(value = "版本号")
+    private String version;
+
+    /**
+     * 删除标志
+     */
+    @ExcelProperty(value = "删除标志", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "0=正常,2=删除")
+    private String delFlag;
+
+    /**
+     * 更新IP
+     */
+    @ExcelProperty(value = "更新IP")
+    private String updateIp;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "创建时间")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @ExcelProperty(value = "更新时间")
+    private Date updateTime;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/domain/vo/ChatMessageVo.java b/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/domain/vo/ChatMessageVo.java
new file mode 100644
index 0000000..96720c7
--- /dev/null
+++ b/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/domain/vo/ChatMessageVo.java
@@ -0,0 +1,87 @@
+package org.dromara.chat.domain.vo;
+
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.chat.domain.ChatMessage;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 聊天消息视图对象 chat_message
+ *
+ * @author pengles
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = ChatMessage.class)
+public class ChatMessageVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @ExcelProperty(value = "主键ID")
+    private Long id;
+
+    /**
+     * 会话ID
+     */
+    @ExcelProperty(value = "会话ID")
+    private Long sessionId;
+
+    /**
+     * 用户ID
+     */
+    @ExcelProperty(value = "用户ID")
+    private Long userId;
+
+    /**
+     * 消息内容
+     */
+    @ExcelProperty(value = "消息内容")
+    private String content;
+
+    /**
+     * 角色（user/assistant/system）
+     */
+    @ExcelProperty(value = "角色")
+    private String role;
+
+    /**
+     * 扣费成本
+     */
+    @ExcelProperty(value = "扣费成本")
+    private BigDecimal deductCost;
+
+    /**
+     * 总token数
+     */
+    @ExcelProperty(value = "总token数")
+    private Long totalTokens;
+
+    /**
+     * 模型名称
+     */
+    @ExcelProperty(value = "模型名称")
+    private String modelName;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "创建时间")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @ExcelProperty(value = "更新时间")
+    private Date updateTime;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/domain/vo/ChatModelVo.java b/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/domain/vo/ChatModelVo.java
new file mode 100644
index 0000000..ba939b9
--- /dev/null
+++ b/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/domain/vo/ChatModelVo.java
@@ -0,0 +1,102 @@
+package org.dromara.chat.domain.vo;
+
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.chat.domain.ChatModel;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 聊天模型视图对象 chat_model
+ *
+ * @author pengles
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = ChatModel.class)
+public class ChatModelVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @ExcelProperty(value = "主键ID")
+    private Long id;
+
+    /**
+     * 模型分类
+     */
+    @ExcelProperty(value = "模型分类")
+    private String category;
+
+    /**
+     * 模型名称
+     */
+    @ExcelProperty(value = "模型名称")
+    private String modelName;
+
+    /**
+     * 模型描述
+     */
+    @ExcelProperty(value = "模型描述")
+    private String modelDescribe;
+
+    /**
+     * 模型价格
+     */
+    @ExcelProperty(value = "模型价格")
+    private BigDecimal modelPrice;
+
+    /**
+     * 模型类型
+     */
+    @ExcelProperty(value = "模型类型")
+    private String modelType;
+
+    /**
+     * 是否显示（0隐藏 1显示）
+     */
+    @ExcelProperty(value = "是否显示", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "0=隐藏,1=显示")
+    private String modelShow;
+
+    /**
+     * 系统提示词
+     */
+    @ExcelProperty(value = "系统提示词")
+    private String systemPrompt;
+
+    /**
+     * API主机地址
+     */
+    @ExcelProperty(value = "API主机地址")
+    private String apiHost;
+
+    /**
+     * API密钥
+     */
+    @ExcelProperty(value = "API密钥")
+    private String apiKey;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "创建时间")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @ExcelProperty(value = "更新时间")
+    private Date updateTime;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/domain/vo/ChatSessionVo.java b/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/domain/vo/ChatSessionVo.java
new file mode 100644
index 0000000..9a9f6f2
--- /dev/null
+++ b/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/domain/vo/ChatSessionVo.java
@@ -0,0 +1,62 @@
+package org.dromara.chat.domain.vo;
+
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.chat.domain.ChatSession;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 聊天会话视图对象 chat_session
+ *
+ * @author pengles
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = ChatSession.class)
+public class ChatSessionVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @ExcelProperty(value = "主键ID")
+    private Long id;
+
+    /**
+     * 用户ID
+     */
+    @ExcelProperty(value = "用户ID")
+    private Long userId;
+
+    /**
+     * 会话标题
+     */
+    @ExcelProperty(value = "会话标题")
+    private String sessionTitle;
+
+    /**
+     * 会话内容
+     */
+    @ExcelProperty(value = "会话内容")
+    private String sessionContent;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "创建时间")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @ExcelProperty(value = "更新时间")
+    private Date updateTime;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/domain/vo/ChatUsageTokenVo.java b/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/domain/vo/ChatUsageTokenVo.java
new file mode 100644
index 0000000..5ec6c90
--- /dev/null
+++ b/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/domain/vo/ChatUsageTokenVo.java
@@ -0,0 +1,68 @@
+package org.dromara.chat.domain.vo;
+
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.chat.domain.ChatUsageToken;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 聊天Token使用记录视图对象 chat_usage_token
+ *
+ * @author pengles
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = ChatUsageToken.class)
+public class ChatUsageTokenVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @ExcelProperty(value = "主键ID")
+    private Long id;
+
+    /**
+     * 用户ID
+     */
+    @ExcelProperty(value = "用户ID")
+    private Long userId;
+
+    /**
+     * 使用token数
+     */
+    @ExcelProperty(value = "使用token数")
+    private Long token;
+
+    /**
+     * 模型名称
+     */
+    @ExcelProperty(value = "模型名称")
+    private String modelName;
+
+    /**
+     * 总token数
+     */
+    @ExcelProperty(value = "总token数")
+    private Long totalToken;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "创建时间")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @ExcelProperty(value = "更新时间")
+    private Date updateTime;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/mapper/ChatConfigMapper.java b/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/mapper/ChatConfigMapper.java
new file mode 100644
index 0000000..7a4d263
--- /dev/null
+++ b/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/mapper/ChatConfigMapper.java
@@ -0,0 +1,14 @@
+package org.dromara.chat.mapper;
+
+import org.dromara.chat.domain.ChatConfig;
+import org.dromara.chat.domain.vo.ChatConfigVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 聊天配置Mapper接口
+ *
+ * @author pengles
+ */
+public interface ChatConfigMapper extends BaseMapperPlus<ChatConfig, ChatConfigVo> {
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/mapper/ChatMessageMapper.java b/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/mapper/ChatMessageMapper.java
new file mode 100644
index 0000000..4d07ac0
--- /dev/null
+++ b/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/mapper/ChatMessageMapper.java
@@ -0,0 +1,14 @@
+package org.dromara.chat.mapper;
+
+import org.dromara.chat.domain.ChatMessage;
+import org.dromara.chat.domain.vo.ChatMessageVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 聊天消息Mapper接口
+ *
+ * @author pengles
+ */
+public interface ChatMessageMapper extends BaseMapperPlus<ChatMessage, ChatMessageVo> {
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/mapper/ChatModelMapper.java b/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/mapper/ChatModelMapper.java
new file mode 100644
index 0000000..8ecccd7
--- /dev/null
+++ b/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/mapper/ChatModelMapper.java
@@ -0,0 +1,14 @@
+package org.dromara.chat.mapper;
+
+import org.dromara.chat.domain.ChatModel;
+import org.dromara.chat.domain.vo.ChatModelVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 聊天模型Mapper接口
+ *
+ * @author pengles
+ */
+public interface ChatModelMapper extends BaseMapperPlus<ChatModel, ChatModelVo> {
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/mapper/ChatSessionMapper.java b/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/mapper/ChatSessionMapper.java
new file mode 100644
index 0000000..1d08f2c
--- /dev/null
+++ b/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/mapper/ChatSessionMapper.java
@@ -0,0 +1,14 @@
+package org.dromara.chat.mapper;
+
+import org.dromara.chat.domain.ChatSession;
+import org.dromara.chat.domain.vo.ChatSessionVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 聊天会话Mapper接口
+ *
+ * @author pengles
+ */
+public interface ChatSessionMapper extends BaseMapperPlus<ChatSession, ChatSessionVo> {
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/mapper/ChatUsageTokenMapper.java b/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/mapper/ChatUsageTokenMapper.java
new file mode 100644
index 0000000..bebee88
--- /dev/null
+++ b/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/mapper/ChatUsageTokenMapper.java
@@ -0,0 +1,14 @@
+package org.dromara.chat.mapper;
+
+import org.dromara.chat.domain.ChatUsageToken;
+import org.dromara.chat.domain.vo.ChatUsageTokenVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 聊天Token使用记录Mapper接口
+ *
+ * @author pengles
+ */
+public interface ChatUsageTokenMapper extends BaseMapperPlus<ChatUsageToken, ChatUsageTokenVo> {
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/service/AiKnowledgeChatService.java b/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/service/AiKnowledgeChatService.java
new file mode 100644
index 0000000..4d76398
--- /dev/null
+++ b/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/service/AiKnowledgeChatService.java
@@ -0,0 +1,65 @@
+package org.dromara.chat.service;
+
+import org.dromara.chat.domain.vo.ChatMessageVo;
+import org.dromara.chat.domain.vo.ChatSessionVo;
+
+import java.util.List;
+
+/**
+ * 知识库聊天服务接口
+ *
+ * @author pengles
+ */
+public interface AiKnowledgeChatService {
+
+    /**
+     * 基于知识库进行智能问答
+     *
+     * @param sessionId   会话ID
+     * @param userId      用户ID
+     * @param question    用户问题
+     * @param knowledgeId 知识库ID
+     * @param modelName   使用的模型名称
+     * @return 聊天回复消息
+     */
+    ChatMessageVo chatWithKnowledge(Long sessionId, Long userId, String question, Long knowledgeId, String modelName);
+
+    /**
+     * 创建知识库聊天会话
+     *
+     * @param userId       用户ID
+     * @param knowledgeId  知识库ID
+     * @param sessionTitle 会话标题
+     * @return 聊天会话
+     */
+    ChatSessionVo createKnowledgeSession(Long userId, Long knowledgeId, String sessionTitle);
+
+    /**
+     * 搜索相关知识库内容
+     *
+     * @param knowledgeId 知识库ID
+     * @param query       查询内容
+     * @param limit       返回数量限制
+     * @return 相关知识库内容列表
+     */
+    List<String> searchKnowledgeContent(Long knowledgeId, String query, Integer limit);
+
+    /**
+     * 构建知识库上下文
+     *
+     * @param knowledgeId 知识库ID
+     * @param question    用户问题
+     * @return 构建的上下文内容
+     */
+    String buildKnowledgeContext(Long knowledgeId, String question);
+
+    /**
+     * 获取知识库聊天历史
+     *
+     * @param sessionId 会话ID
+     * @param limit     返回数量限制
+     * @return 聊天历史消息列表
+     */
+    List<ChatMessageVo> getKnowledgeChatHistory(Long sessionId, Integer limit);
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/service/ChatConfigService.java b/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/service/ChatConfigService.java
new file mode 100644
index 0000000..b390133
--- /dev/null
+++ b/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/service/ChatConfigService.java
@@ -0,0 +1,60 @@
+package org.dromara.chat.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.dromara.chat.domain.ChatConfig;
+import org.dromara.chat.domain.bo.ChatConfigBo;
+import org.dromara.chat.domain.vo.ChatConfigVo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 聊天配置Service接口
+ *
+ * @author pengles
+ */
+public interface ChatConfigService extends IService<ChatConfig> {
+
+    /**
+     * 查询聊天配置
+     */
+    ChatConfigVo queryById(Long id);
+
+    /**
+     * 查询聊天配置列表
+     */
+    TableDataInfo<ChatConfigVo> queryPageList(ChatConfigBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询聊天配置列表
+     */
+    List<ChatConfigVo> queryList(ChatConfigBo bo);
+
+    /**
+     * 新增聊天配置
+     */
+    Boolean insertByBo(ChatConfigBo bo);
+
+    /**
+     * 修改聊天配置
+     */
+    Boolean updateByBo(ChatConfigBo bo);
+
+    /**
+     * 校验并批量删除聊天配置
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    /**
+     * 根据配置分类查询配置列表
+     */
+    List<ChatConfigVo> queryListByCategory(String category);
+
+    /**
+     * 根据配置名称查询配置
+     */
+    ChatConfigVo queryByConfigName(String configName);
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/service/ChatMessageService.java b/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/service/ChatMessageService.java
new file mode 100644
index 0000000..552f6cd
--- /dev/null
+++ b/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/service/ChatMessageService.java
@@ -0,0 +1,65 @@
+package org.dromara.chat.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.dromara.chat.domain.ChatMessage;
+import org.dromara.chat.domain.bo.ChatMessageBo;
+import org.dromara.chat.domain.vo.ChatMessageVo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 聊天消息Service接口
+ *
+ * @author pengles
+ */
+public interface ChatMessageService extends IService<ChatMessage> {
+
+    /**
+     * 查询聊天消息
+     */
+    ChatMessageVo queryById(Long id);
+
+    /**
+     * 查询聊天消息列表
+     */
+    TableDataInfo<ChatMessageVo> queryPageList(ChatMessageBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询聊天消息列表
+     */
+    List<ChatMessageVo> queryList(ChatMessageBo bo);
+
+    /**
+     * 新增聊天消息
+     */
+    Boolean insertByBo(ChatMessageBo bo);
+
+    /**
+     * 修改聊天消息
+     */
+    Boolean updateByBo(ChatMessageBo bo);
+
+    /**
+     * 校验并批量删除聊天消息
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    /**
+     * 根据会话ID查询消息列表
+     */
+    List<ChatMessageVo> queryListBySessionId(Long sessionId);
+
+    /**
+     * 根据用户ID查询消息列表
+     */
+    List<ChatMessageVo> queryListByUserId(Long userId);
+
+    /**
+     * 根据会话ID和用户ID查询消息列表
+     */
+    List<ChatMessageVo> queryListBySessionIdAndUserId(Long sessionId, Long userId);
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/service/ChatModelService.java b/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/service/ChatModelService.java
new file mode 100644
index 0000000..9c9e25e
--- /dev/null
+++ b/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/service/ChatModelService.java
@@ -0,0 +1,70 @@
+package org.dromara.chat.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.dromara.chat.domain.ChatModel;
+import org.dromara.chat.domain.bo.ChatModelBo;
+import org.dromara.chat.domain.vo.ChatModelVo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 聊天模型Service接口
+ *
+ * @author pengles
+ */
+public interface ChatModelService extends IService<ChatModel> {
+
+    /**
+     * 查询聊天模型
+     */
+    ChatModelVo queryById(Long id);
+
+    /**
+     * 查询聊天模型列表
+     */
+    TableDataInfo<ChatModelVo> queryPageList(ChatModelBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询聊天模型列表
+     */
+    List<ChatModelVo> queryList(ChatModelBo bo);
+
+    /**
+     * 新增聊天模型
+     */
+    Boolean insertByBo(ChatModelBo bo);
+
+    /**
+     * 修改聊天模型
+     */
+    Boolean updateByBo(ChatModelBo bo);
+
+    /**
+     * 校验并批量删除聊天模型
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    /**
+     * 根据模型分类查询模型列表
+     */
+    List<ChatModelVo> queryListByCategory(String category);
+
+    /**
+     * 根据模型名称查询模型
+     */
+    ChatModelVo queryByModelName(String modelName);
+
+    /**
+     * 查询显示的模型列表
+     */
+    List<ChatModelVo> queryShowModelList();
+
+    /**
+     * 根据模型类型查询模型列表
+     */
+    List<ChatModelVo> queryListByModelType(String modelType);
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/service/ChatSessionService.java b/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/service/ChatSessionService.java
new file mode 100644
index 0000000..a16202a
--- /dev/null
+++ b/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/service/ChatSessionService.java
@@ -0,0 +1,65 @@
+package org.dromara.chat.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.dromara.chat.domain.ChatSession;
+import org.dromara.chat.domain.bo.ChatSessionBo;
+import org.dromara.chat.domain.vo.ChatSessionVo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 聊天会话Service接口
+ *
+ * @author pengles
+ */
+public interface ChatSessionService extends IService<ChatSession> {
+
+    /**
+     * 查询聊天会话
+     */
+    ChatSessionVo queryById(Long id);
+
+    /**
+     * 查询聊天会话列表
+     */
+    TableDataInfo<ChatSessionVo> queryPageList(ChatSessionBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询聊天会话列表
+     */
+    List<ChatSessionVo> queryList(ChatSessionBo bo);
+
+    /**
+     * 新增聊天会话
+     */
+    Boolean insertByBo(ChatSessionBo bo);
+
+    /**
+     * 修改聊天会话
+     */
+    Boolean updateByBo(ChatSessionBo bo);
+
+    /**
+     * 校验并批量删除聊天会话
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    /**
+     * 根据用户ID查询会话列表
+     */
+    List<ChatSessionVo> queryListByUserId(Long userId);
+
+    /**
+     * 创建新会话
+     */
+    ChatSessionVo createNewSession(Long userId, String sessionTitle);
+
+    /**
+     * 更新会话标题
+     */
+    Boolean updateSessionTitle(Long sessionId, String sessionTitle);
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/service/ChatUsageTokenService.java b/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/service/ChatUsageTokenService.java
new file mode 100644
index 0000000..2f23f6e
--- /dev/null
+++ b/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/service/ChatUsageTokenService.java
@@ -0,0 +1,70 @@
+package org.dromara.chat.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.dromara.chat.domain.ChatUsageToken;
+import org.dromara.chat.domain.bo.ChatUsageTokenBo;
+import org.dromara.chat.domain.vo.ChatUsageTokenVo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 聊天Token使用记录Service接口
+ *
+ * @author pengles
+ */
+public interface ChatUsageTokenService extends IService<ChatUsageToken> {
+
+    /**
+     * 查询聊天Token使用记录
+     */
+    ChatUsageTokenVo queryById(Long id);
+
+    /**
+     * 查询聊天Token使用记录列表
+     */
+    TableDataInfo<ChatUsageTokenVo> queryPageList(ChatUsageTokenBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询聊天Token使用记录列表
+     */
+    List<ChatUsageTokenVo> queryList(ChatUsageTokenBo bo);
+
+    /**
+     * 新增聊天Token使用记录
+     */
+    Boolean insertByBo(ChatUsageTokenBo bo);
+
+    /**
+     * 修改聊天Token使用记录
+     */
+    Boolean updateByBo(ChatUsageTokenBo bo);
+
+    /**
+     * 校验并批量删除聊天Token使用记录
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    /**
+     * 根据用户ID查询Token使用记录列表
+     */
+    List<ChatUsageTokenVo> queryListByUserId(Long userId);
+
+    /**
+     * 根据模型名称查询Token使用记录列表
+     */
+    List<ChatUsageTokenVo> queryListByModelName(String modelName);
+
+    /**
+     * 统计用户总Token使用量
+     */
+    Long getTotalTokenByUserId(Long userId);
+
+    /**
+     * 统计模型总Token使用量
+     */
+    Long getTotalTokenByModelName(String modelName);
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/service/impl/AiKnowledgeChatServiceImpl.java b/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/service/impl/AiKnowledgeChatServiceImpl.java
new file mode 100644
index 0000000..d98cc4f
--- /dev/null
+++ b/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/service/impl/AiKnowledgeChatServiceImpl.java
@@ -0,0 +1,198 @@
+package org.dromara.chat.service.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.ai.domain.dto.AiChatRequest;
+import org.dromara.ai.domain.dto.AiChatResponse;
+import org.dromara.ai.service.AiChatService;
+import org.dromara.chat.domain.bo.ChatMessageBo;
+import org.dromara.chat.domain.bo.ChatSessionBo;
+import org.dromara.chat.domain.vo.ChatMessageVo;
+import org.dromara.chat.domain.vo.ChatSessionVo;
+import org.dromara.chat.service.AiKnowledgeChatService;
+import org.dromara.chat.service.ChatMessageService;
+import org.dromara.chat.service.ChatSessionService;
+import org.dromara.knowledge.domain.vo.KnowledgeInfoVo;
+import org.dromara.knowledge.domain.vo.KnowledgeSearchResultVo;
+import org.dromara.knowledge.service.KnowledgeInfoService;
+import org.dromara.knowledge.service.KnowledgeVectorService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.math.BigDecimal;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 知识库聊天服务实现
+ *
+ * @author pengles
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class AiKnowledgeChatServiceImpl implements AiKnowledgeChatService {
+
+    private final ChatSessionService chatSessionService;
+    private final ChatMessageService chatMessageService;
+    private final KnowledgeInfoService knowledgeInfoService;
+    private final KnowledgeVectorService knowledgeVectorService;
+    private final AiChatService aiChatService;
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public ChatMessageVo chatWithKnowledge(Long sessionId, Long userId, String question, Long knowledgeId, String modelName) {
+        // 验证会话是否存在
+        ChatSessionVo session = chatSessionService.queryById(sessionId);
+        if (ObjectUtil.isNull(session)) {
+            throw new RuntimeException("会话不存在");
+        }
+
+        // 验证知识库是否存在
+        KnowledgeInfoVo knowledge = knowledgeInfoService.queryById(knowledgeId);
+        if (ObjectUtil.isNull(knowledge)) {
+            throw new RuntimeException("知识库不存在");
+        }
+
+        // 保存用户问题
+        ChatMessageBo userMessageBo = new ChatMessageBo();
+        userMessageBo.setSessionId(sessionId);
+        userMessageBo.setUserId(userId);
+        userMessageBo.setMessageType("text");
+        userMessageBo.setContent(question);
+        userMessageBo.setRole("user");
+        userMessageBo.setModelName(modelName);
+        userMessageBo.setCreateTime(new Date());
+        chatMessageService.insertByBo(userMessageBo);
+
+        try {
+            AiChatRequest req = new AiChatRequest()
+                .setUserId(String.valueOf(userId))
+                .setSessionId(String.valueOf(sessionId))
+                .setModel(modelName)
+                .setEnableKnowledge(true)
+                .setKnowledgeId(String.valueOf(knowledgeId))
+                .setKnowledgeLimit(5)
+                .setKnowledgeThreshold(0.7)
+                .setMessages(java.util.List.of(
+                    new AiChatRequest.AiMessage().setRole("user").setContent(question)
+                ));
+
+            AiChatResponse resp = aiChatService.chat(req);
+            String aiAnswer = "";
+            if (resp != null && resp.getChoices() != null && !resp.getChoices().isEmpty()) {
+                AiChatRequest.AiMessage msg = resp.getChoices().get(0).getMessage();
+                if (msg != null && StrUtil.isNotBlank(msg.getContent())) {
+                    aiAnswer = msg.getContent();
+                }
+            }
+            if (StrUtil.isBlank(aiAnswer)) {
+                throw new RuntimeException("AI服务返回空回答");
+            }
+
+            // 保存AI回复
+            ChatMessageBo aiMessageBo = new ChatMessageBo();
+            aiMessageBo.setSessionId(sessionId);
+            aiMessageBo.setUserId(userId);
+            aiMessageBo.setMessageType("text");
+            aiMessageBo.setContent(aiAnswer);
+            aiMessageBo.setRole("assistant");
+            aiMessageBo.setModelName(modelName);
+            aiMessageBo.setTotalTokens(0L); // 简化版本不统计token
+            aiMessageBo.setDeductCost(BigDecimal.ZERO); // 简化版本不计费
+            aiMessageBo.setCreateTime(new Date());
+            chatMessageService.insertByBo(aiMessageBo);
+
+            return chatMessageService.queryById(aiMessageBo.getId());
+
+        } catch (Exception e) {
+            log.error("知识库聊天失败 - 用户: {}, 会话: {}, 知识库: {}", userId, sessionId, knowledgeId, e);
+
+            // 保存错误回复
+            ChatMessageBo errorMessageBo = new ChatMessageBo();
+            errorMessageBo.setSessionId(sessionId);
+            errorMessageBo.setUserId(userId);
+            errorMessageBo.setMessageType("text");
+            errorMessageBo.setContent("抱歉，AI服务暂时不可用，请稍后重试。");
+            errorMessageBo.setRole("assistant");
+            errorMessageBo.setModelName(modelName);
+            errorMessageBo.setCreateTime(new Date());
+            chatMessageService.insertByBo(errorMessageBo);
+
+            return chatMessageService.queryById(errorMessageBo.getId());
+        }
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public ChatSessionVo createKnowledgeSession(Long userId, Long knowledgeId, String sessionTitle) {
+        // 验证知识库是否存在
+        KnowledgeInfoVo knowledge = knowledgeInfoService.queryById(knowledgeId);
+        if (ObjectUtil.isNull(knowledge)) {
+            throw new RuntimeException("知识库不存在");
+        }
+
+        // 如果没有提供标题，使用知识库名称作为默认标题
+        if (StrUtil.isBlank(sessionTitle)) {
+            sessionTitle = "基于" + knowledge.getKnowledgeName() + "的对话";
+        }
+
+        // 创建会话
+        ChatSessionBo sessionBo = new ChatSessionBo();
+        sessionBo.setUserId(userId);
+        sessionBo.setSessionTitle(sessionTitle);
+        sessionBo.setSessionContent("知识库ID: " + knowledgeId);
+        sessionBo.setCreateTime(new Date());
+        chatSessionService.insertByBo(sessionBo);
+
+        return chatSessionService.queryById(sessionBo.getId());
+    }
+
+    @Override
+    public List<String> searchKnowledgeContent(Long knowledgeId, String query, Integer limit) {
+        try {
+            log.info("搜索知识库内容 - 知识库: {}, 查询: {}, 限制: {}", knowledgeId, query, limit);
+            List<KnowledgeSearchResultVo> searchResults = knowledgeVectorService.vectorSimilaritySearch(
+                    String.valueOf(knowledgeId), query, "default", limit != null ? limit : 5, 0.7
+            );
+            return searchResults.stream().map(KnowledgeSearchResultVo::getContent).toList();
+        } catch (Exception e) {
+            log.error("搜索知识库内容失败 - 知识库: {}, 查询: {}", knowledgeId, query, e);
+            return Collections.emptyList();
+        }
+    }
+
+    @Override
+    public String buildKnowledgeContext(Long knowledgeId, String question) {
+        // 搜索相关知识库内容
+        List<String> relevantContent = searchKnowledgeContent(knowledgeId, question, 3);
+
+        StringBuilder context = new StringBuilder();
+        context.append("以下是相关的知识库内容:\n\n");
+
+        for (int i = 0; i < relevantContent.size(); i++) {
+            context.append("参考资料 ").append(i + 1).append(": ");
+            context.append(relevantContent.get(i)).append("\n\n");
+        }
+
+        return context.toString();
+    }
+
+    @Override
+    public List<ChatMessageVo> getKnowledgeChatHistory(Long sessionId, Integer limit) {
+        // 获取会话的聊天历史
+        List<ChatMessageVo> messages = chatMessageService.queryListBySessionId(sessionId);
+
+        // 如果指定了限制数量，返回最近的消息
+        if (limit != null && limit > 0 && messages.size() > limit) {
+            return messages.subList(Math.max(0, messages.size() - limit), messages.size());
+        }
+
+        return messages;
+    }
+
+
+}
diff --git a/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/service/impl/ChatConfigServiceImpl.java b/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/service/impl/ChatConfigServiceImpl.java
new file mode 100644
index 0000000..938ffe0
--- /dev/null
+++ b/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/service/impl/ChatConfigServiceImpl.java
@@ -0,0 +1,129 @@
+package org.dromara.chat.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.RequiredArgsConstructor;
+import org.dromara.chat.domain.ChatConfig;
+import org.dromara.chat.domain.bo.ChatConfigBo;
+import org.dromara.chat.domain.vo.ChatConfigVo;
+import org.dromara.chat.mapper.ChatConfigMapper;
+import org.dromara.chat.service.ChatConfigService;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.springframework.stereotype.Service;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 聊天配置Service业务层处理
+ *
+ * @author pengles
+ */
+@RequiredArgsConstructor
+@Service
+public class ChatConfigServiceImpl extends ServiceImpl<ChatConfigMapper, ChatConfig> implements ChatConfigService {
+
+    /**
+     * 查询聊天配置
+     */
+    @Override
+    public ChatConfigVo queryById(Long id) {
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 查询聊天配置列表
+     */
+    @Override
+    public TableDataInfo<ChatConfigVo> queryPageList(ChatConfigBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<ChatConfig> lqw = buildQueryWrapper(bo);
+        Page<ChatConfigVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询聊天配置列表
+     */
+    @Override
+    public List<ChatConfigVo> queryList(ChatConfigBo bo) {
+        LambdaQueryWrapper<ChatConfig> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<ChatConfig> buildQueryWrapper(ChatConfigBo bo) {
+        LambdaQueryWrapper<ChatConfig> lqw = Wrappers.lambdaQuery();
+        lqw.like(StringUtils.isNotBlank(bo.getCategory()), ChatConfig::getCategory, bo.getCategory());
+        lqw.like(StringUtils.isNotBlank(bo.getConfigName()), ChatConfig::getConfigName, bo.getConfigName());
+        lqw.like(StringUtils.isNotBlank(bo.getConfigValue()), ChatConfig::getConfigValue, bo.getConfigValue());
+        lqw.eq(StringUtils.isNotBlank(bo.getVersion()), ChatConfig::getVersion, bo.getVersion());
+        return lqw;
+    }
+
+    /**
+     * 新增聊天配置
+     */
+    @Override
+    public Boolean insertByBo(ChatConfigBo bo) {
+        ChatConfig add = MapstructUtils.convert(bo, ChatConfig.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改聊天配置
+     */
+    @Override
+    public Boolean updateByBo(ChatConfigBo bo) {
+        ChatConfig update = MapstructUtils.convert(bo, ChatConfig.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(ChatConfig entity) {
+        // TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除聊天配置
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if (isValid) {
+            // TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+
+    /**
+     * 根据配置分类查询配置列表
+     */
+    @Override
+    public List<ChatConfigVo> queryListByCategory(String category) {
+        LambdaQueryWrapper<ChatConfig> lqw = Wrappers.lambdaQuery();
+        lqw.eq(ChatConfig::getCategory, category);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    /**
+     * 根据配置名称查询配置
+     */
+    @Override
+    public ChatConfigVo queryByConfigName(String configName) {
+        LambdaQueryWrapper<ChatConfig> lqw = Wrappers.lambdaQuery();
+        lqw.eq(ChatConfig::getConfigName, configName);
+        return baseMapper.selectVoOne(lqw);
+    }
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/service/impl/ChatMessageServiceImpl.java b/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/service/impl/ChatMessageServiceImpl.java
new file mode 100644
index 0000000..b195366
--- /dev/null
+++ b/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/service/impl/ChatMessageServiceImpl.java
@@ -0,0 +1,151 @@
+package org.dromara.chat.service.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.RequiredArgsConstructor;
+import org.dromara.chat.domain.ChatMessage;
+import org.dromara.chat.domain.bo.ChatMessageBo;
+import org.dromara.chat.domain.vo.ChatMessageVo;
+import org.dromara.chat.mapper.ChatMessageMapper;
+import org.dromara.chat.service.ChatMessageService;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.springframework.stereotype.Service;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 聊天消息Service业务层处理
+ *
+ * @author pengles
+ */
+@RequiredArgsConstructor
+@Service
+public class ChatMessageServiceImpl extends ServiceImpl<ChatMessageMapper, ChatMessage> implements ChatMessageService {
+
+    /**
+     * 查询聊天消息
+     */
+    @Override
+    public ChatMessageVo queryById(Long id) {
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 查询聊天消息列表
+     */
+    @Override
+    public TableDataInfo<ChatMessageVo> queryPageList(ChatMessageBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<ChatMessage> lqw = buildQueryWrapper(bo);
+        Page<ChatMessageVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询聊天消息列表
+     */
+    @Override
+    public List<ChatMessageVo> queryList(ChatMessageBo bo) {
+        LambdaQueryWrapper<ChatMessage> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<ChatMessage> buildQueryWrapper(ChatMessageBo bo) {
+        LambdaQueryWrapper<ChatMessage> lqw = Wrappers.lambdaQuery();
+        lqw.eq(ObjectUtil.isNotNull(bo.getSessionId()), ChatMessage::getSessionId, bo.getSessionId());
+        lqw.eq(ObjectUtil.isNotNull(bo.getUserId()), ChatMessage::getUserId, bo.getUserId());
+        lqw.like(StringUtils.isNotBlank(bo.getContent()), ChatMessage::getContent, bo.getContent());
+        lqw.eq(StringUtils.isNotBlank(bo.getRole()), ChatMessage::getRole, bo.getRole());
+        lqw.eq(StringUtils.isNotBlank(bo.getModelName()), ChatMessage::getModelName, bo.getModelName());
+        lqw.orderByDesc(ChatMessage::getCreateTime);
+        return lqw;
+    }
+
+    /**
+     * 新增聊天消息
+     */
+    @Override
+    public Boolean insertByBo(ChatMessageBo bo) {
+        ChatMessage add = MapstructUtils.convert(bo, ChatMessage.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改聊天消息
+     */
+    @Override
+    public Boolean updateByBo(ChatMessageBo bo) {
+        ChatMessage update = MapstructUtils.convert(bo, ChatMessage.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(ChatMessage entity) {
+        if (StringUtils.isBlank(entity.getContent())) {
+            throw new IllegalArgumentException("消息内容不能为空");
+        }
+        if (StringUtils.isBlank(entity.getRole())) {
+            entity.setRole("user");
+        }
+    }
+
+    /**
+     * 校验并批量删除聊天消息
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if (isValid) {
+            // 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+
+    /**
+     * 根据会话ID查询消息列表
+     */
+    @Override
+    public List<ChatMessageVo> queryListBySessionId(Long sessionId) {
+        LambdaQueryWrapper<ChatMessage> lqw = Wrappers.lambdaQuery();
+        lqw.eq(ChatMessage::getSessionId, sessionId);
+        lqw.orderByAsc(ChatMessage::getCreateTime);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    /**
+     * 根据用户ID查询消息列表
+     */
+    @Override
+    public List<ChatMessageVo> queryListByUserId(Long userId) {
+        LambdaQueryWrapper<ChatMessage> lqw = Wrappers.lambdaQuery();
+        lqw.eq(ChatMessage::getUserId, userId);
+        lqw.orderByDesc(ChatMessage::getCreateTime);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    /**
+     * 根据会话ID和用户ID查询消息列表
+     */
+    @Override
+    public List<ChatMessageVo> queryListBySessionIdAndUserId(Long sessionId, Long userId) {
+        LambdaQueryWrapper<ChatMessage> lqw = Wrappers.lambdaQuery();
+        lqw.eq(ChatMessage::getSessionId, sessionId);
+        lqw.eq(ChatMessage::getUserId, userId);
+        lqw.orderByAsc(ChatMessage::getCreateTime);
+        return baseMapper.selectVoList(lqw);
+    }
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/service/impl/ChatModelServiceImpl.java b/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/service/impl/ChatModelServiceImpl.java
new file mode 100644
index 0000000..1694ae0
--- /dev/null
+++ b/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/service/impl/ChatModelServiceImpl.java
@@ -0,0 +1,150 @@
+package org.dromara.chat.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.RequiredArgsConstructor;
+import org.dromara.chat.domain.ChatModel;
+import org.dromara.chat.domain.bo.ChatModelBo;
+import org.dromara.chat.domain.vo.ChatModelVo;
+import org.dromara.chat.mapper.ChatModelMapper;
+import org.dromara.chat.service.ChatModelService;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.springframework.stereotype.Service;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 聊天模型Service业务层处理
+ *
+ * @author pengles
+ */
+@RequiredArgsConstructor
+@Service
+public class ChatModelServiceImpl extends ServiceImpl<ChatModelMapper, ChatModel> implements ChatModelService {
+
+    /**
+     * 查询聊天模型
+     */
+    @Override
+    public ChatModelVo queryById(Long id) {
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 查询聊天模型列表
+     */
+    @Override
+    public TableDataInfo<ChatModelVo> queryPageList(ChatModelBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<ChatModel> lqw = buildQueryWrapper(bo);
+        Page<ChatModelVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询聊天模型列表
+     */
+    @Override
+    public List<ChatModelVo> queryList(ChatModelBo bo) {
+        LambdaQueryWrapper<ChatModel> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<ChatModel> buildQueryWrapper(ChatModelBo bo) {
+        LambdaQueryWrapper<ChatModel> lqw = Wrappers.lambdaQuery();
+        lqw.like(StringUtils.isNotBlank(bo.getCategory()), ChatModel::getCategory, bo.getCategory());
+        lqw.like(StringUtils.isNotBlank(bo.getModelName()), ChatModel::getModelName, bo.getModelName());
+        lqw.like(StringUtils.isNotBlank(bo.getModelDescribe()), ChatModel::getModelDescribe, bo.getModelDescribe());
+        lqw.eq(StringUtils.isNotBlank(bo.getModelType()), ChatModel::getModelType, bo.getModelType());
+        lqw.eq(StringUtils.isNotBlank(bo.getModelShow()), ChatModel::getModelShow, bo.getModelShow());
+        return lqw;
+    }
+
+    /**
+     * 新增聊天模型
+     */
+    @Override
+    public Boolean insertByBo(ChatModelBo bo) {
+        ChatModel add = MapstructUtils.convert(bo, ChatModel.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改聊天模型
+     */
+    @Override
+    public Boolean updateByBo(ChatModelBo bo) {
+        ChatModel update = MapstructUtils.convert(bo, ChatModel.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(ChatModel entity) {
+        // TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除聊天模型
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if (isValid) {
+            // TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+
+    /**
+     * 根据模型分类查询模型列表
+     */
+    @Override
+    public List<ChatModelVo> queryListByCategory(String category) {
+        LambdaQueryWrapper<ChatModel> lqw = Wrappers.lambdaQuery();
+        lqw.eq(ChatModel::getCategory, category);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    /**
+     * 根据模型名称查询模型
+     */
+    @Override
+    public ChatModelVo queryByModelName(String modelName) {
+        LambdaQueryWrapper<ChatModel> lqw = Wrappers.lambdaQuery();
+        lqw.eq(ChatModel::getModelName, modelName);
+        return baseMapper.selectVoOne(lqw);
+    }
+
+    /**
+     * 查询显示的模型列表
+     */
+    @Override
+    public List<ChatModelVo> queryShowModelList() {
+        LambdaQueryWrapper<ChatModel> lqw = Wrappers.lambdaQuery();
+        lqw.eq(ChatModel::getModelShow, "1");
+        return baseMapper.selectVoList(lqw);
+    }
+
+    /**
+     * 根据模型类型查询模型列表
+     */
+    @Override
+    public List<ChatModelVo> queryListByModelType(String modelType) {
+        LambdaQueryWrapper<ChatModel> lqw = Wrappers.lambdaQuery();
+        lqw.eq(ChatModel::getModelType, modelType);
+        return baseMapper.selectVoList(lqw);
+    }
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/service/impl/ChatSessionServiceImpl.java b/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/service/impl/ChatSessionServiceImpl.java
new file mode 100644
index 0000000..b772ca6
--- /dev/null
+++ b/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/service/impl/ChatSessionServiceImpl.java
@@ -0,0 +1,157 @@
+package org.dromara.chat.service.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.RequiredArgsConstructor;
+import org.dromara.chat.domain.ChatMessage;
+import org.dromara.chat.domain.ChatSession;
+import org.dromara.chat.domain.bo.ChatSessionBo;
+import org.dromara.chat.domain.vo.ChatSessionVo;
+import org.dromara.chat.mapper.ChatMessageMapper;
+import org.dromara.chat.mapper.ChatSessionMapper;
+import org.dromara.chat.service.ChatSessionService;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 聊天会话Service业务层处理
+ *
+ * @author pengles
+ */
+@RequiredArgsConstructor
+@Service
+public class ChatSessionServiceImpl extends ServiceImpl<ChatSessionMapper, ChatSession> implements ChatSessionService {
+
+    private final ChatMessageMapper chatMessageMapper;
+
+    /**
+     * 查询聊天会话
+     */
+    @Override
+    public ChatSessionVo queryById(Long id) {
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 查询聊天会话列表
+     */
+    @Override
+    public TableDataInfo<ChatSessionVo> queryPageList(ChatSessionBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<ChatSession> lqw = buildQueryWrapper(bo);
+        Page<ChatSessionVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询聊天会话列表
+     */
+    @Override
+    public List<ChatSessionVo> queryList(ChatSessionBo bo) {
+        LambdaQueryWrapper<ChatSession> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<ChatSession> buildQueryWrapper(ChatSessionBo bo) {
+        LambdaQueryWrapper<ChatSession> lqw = Wrappers.lambdaQuery();
+        lqw.eq(ObjectUtil.isNotNull(bo.getUserId()), ChatSession::getUserId, bo.getUserId());
+        lqw.like(StringUtils.isNotBlank(bo.getSessionTitle()), ChatSession::getSessionTitle, bo.getSessionTitle());
+        lqw.orderByDesc(ChatSession::getUpdateTime);
+        return lqw;
+    }
+
+    /**
+     * 新增聊天会话
+     */
+    @Override
+    public Boolean insertByBo(ChatSessionBo bo) {
+        ChatSession add = MapstructUtils.convert(bo, ChatSession.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改聊天会话
+     */
+    @Override
+    public Boolean updateByBo(ChatSessionBo bo) {
+        ChatSession update = MapstructUtils.convert(bo, ChatSession.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(ChatSession entity) {
+        if (StringUtils.isBlank(entity.getSessionTitle())) {
+            entity.setSessionTitle("新会话");
+        }
+        if (entity.getSessionTitle().length() > 50) {
+            entity.setSessionTitle(entity.getSessionTitle().substring(0, 50));
+        }
+    }
+
+    /**
+     * 校验并批量删除聊天会话
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if (isValid) {
+            // 删除关联的消息
+            LambdaQueryWrapper<ChatMessage> lqw = Wrappers.lambdaQuery();
+            lqw.in(ChatMessage::getSessionId, ids);
+            chatMessageMapper.delete(lqw);
+        }
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+
+    /**
+     * 根据用户ID查询会话列表
+     */
+    @Override
+    public List<ChatSessionVo> queryListByUserId(Long userId) {
+        LambdaQueryWrapper<ChatSession> lqw = Wrappers.lambdaQuery();
+        lqw.eq(ChatSession::getUserId, userId);
+        lqw.orderByDesc(ChatSession::getUpdateTime);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    /**
+     * 创建新会话
+     */
+    @Override
+    public ChatSessionVo createNewSession(Long userId, String sessionTitle) {
+        ChatSession session = new ChatSession();
+        session.setUserId(userId);
+        session.setSessionTitle(sessionTitle);
+        baseMapper.insert(session);
+        return baseMapper.selectVoById(session.getId());
+    }
+
+    /**
+     * 更新会话标题
+     */
+    @Override
+    public Boolean updateSessionTitle(Long sessionId, String sessionTitle) {
+        ChatSession session = new ChatSession();
+        session.setId(sessionId);
+        session.setSessionTitle(sessionTitle);
+        return baseMapper.updateById(session) > 0;
+    }
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/service/impl/ChatUsageTokenServiceImpl.java b/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/service/impl/ChatUsageTokenServiceImpl.java
new file mode 100644
index 0000000..0d22f22
--- /dev/null
+++ b/ruoyi-modules/ruoyi-face/src/main/java/org/dromara/chat/service/impl/ChatUsageTokenServiceImpl.java
@@ -0,0 +1,152 @@
+package org.dromara.chat.service.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.RequiredArgsConstructor;
+import org.dromara.chat.domain.ChatUsageToken;
+import org.dromara.chat.domain.bo.ChatUsageTokenBo;
+import org.dromara.chat.domain.vo.ChatUsageTokenVo;
+import org.dromara.chat.mapper.ChatUsageTokenMapper;
+import org.dromara.chat.service.ChatUsageTokenService;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.springframework.stereotype.Service;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 聊天Token使用记录Service业务层处理
+ *
+ * @author pengles
+ */
+@RequiredArgsConstructor
+@Service
+public class ChatUsageTokenServiceImpl extends ServiceImpl<ChatUsageTokenMapper, ChatUsageToken> implements ChatUsageTokenService {
+
+    /**
+     * 查询聊天Token使用记录
+     */
+    @Override
+    public ChatUsageTokenVo queryById(Long id) {
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 查询聊天Token使用记录列表
+     */
+    @Override
+    public TableDataInfo<ChatUsageTokenVo> queryPageList(ChatUsageTokenBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<ChatUsageToken> lqw = buildQueryWrapper(bo);
+        Page<ChatUsageTokenVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询聊天Token使用记录列表
+     */
+    @Override
+    public List<ChatUsageTokenVo> queryList(ChatUsageTokenBo bo) {
+        LambdaQueryWrapper<ChatUsageToken> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<ChatUsageToken> buildQueryWrapper(ChatUsageTokenBo bo) {
+        LambdaQueryWrapper<ChatUsageToken> lqw = Wrappers.lambdaQuery();
+        lqw.eq(ObjectUtil.isNotNull(bo.getUserId()), ChatUsageToken::getUserId, bo.getUserId());
+        lqw.eq(StringUtils.isNotBlank(bo.getModelName()), ChatUsageToken::getModelName, bo.getModelName());
+        return lqw;
+    }
+
+    /**
+     * 新增聊天Token使用记录
+     */
+    @Override
+    public Boolean insertByBo(ChatUsageTokenBo bo) {
+        ChatUsageToken add = MapstructUtils.convert(bo, ChatUsageToken.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改聊天Token使用记录
+     */
+    @Override
+    public Boolean updateByBo(ChatUsageTokenBo bo) {
+        ChatUsageToken update = MapstructUtils.convert(bo, ChatUsageToken.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(ChatUsageToken entity) {
+        // TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除聊天Token使用记录
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if (isValid) {
+            // TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+
+    /**
+     * 根据用户ID查询Token使用记录列表
+     */
+    @Override
+    public List<ChatUsageTokenVo> queryListByUserId(Long userId) {
+        LambdaQueryWrapper<ChatUsageToken> lqw = Wrappers.lambdaQuery();
+        lqw.eq(ChatUsageToken::getUserId, userId);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    /**
+     * 根据模型名称查询Token使用记录列表
+     */
+    @Override
+    public List<ChatUsageTokenVo> queryListByModelName(String modelName) {
+        LambdaQueryWrapper<ChatUsageToken> lqw = Wrappers.lambdaQuery();
+        lqw.eq(ChatUsageToken::getModelName, modelName);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    /**
+     * 统计用户总Token使用量
+     */
+    @Override
+    public Long getTotalTokenByUserId(Long userId) {
+        LambdaQueryWrapper<ChatUsageToken> lqw = Wrappers.lambdaQuery();
+        lqw.eq(ChatUsageToken::getUserId, userId);
+        lqw.select(ChatUsageToken::getToken);
+        List<ChatUsageToken> list = baseMapper.selectList(lqw);
+        return list.stream().mapToLong(ChatUsageToken::getToken).sum();
+    }
+
+    /**
+     * 统计模型总Token使用量
+     */
+    @Override
+    public Long getTotalTokenByModelName(String modelName) {
+        LambdaQueryWrapper<ChatUsageToken> lqw = Wrappers.lambdaQuery();
+        lqw.eq(ChatUsageToken::getModelName, modelName);
+        lqw.select(ChatUsageToken::getToken);
+        List<ChatUsageToken> list = baseMapper.selectList(lqw);
+        return list.stream().mapToLong(ChatUsageToken::getToken).sum();
+    }
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-face/src/test/java/org/dromara/chat/service/ChatSessionServiceTest.java b/ruoyi-modules/ruoyi-face/src/test/java/org/dromara/chat/service/ChatSessionServiceTest.java
new file mode 100644
index 0000000..56f50f2
--- /dev/null
+++ b/ruoyi-modules/ruoyi-face/src/test/java/org/dromara/chat/service/ChatSessionServiceTest.java
@@ -0,0 +1,56 @@
+package org.dromara.chat.service;
+
+import org.dromara.chat.domain.ChatSession;
+import org.dromara.chat.domain.bo.ChatSessionBo;
+import org.dromara.chat.mapper.ChatSessionMapper;
+import org.dromara.chat.service.impl.ChatSessionServiceImpl;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+/**
+ * ChatSessionService单元测试
+ */
+@ExtendWith(MockitoExtension.class)
+public class ChatSessionServiceTest {
+
+    @Mock
+    private ChatSessionMapper chatSessionMapper;
+
+    @InjectMocks
+    private ChatSessionServiceImpl chatSessionService;
+
+    @BeforeEach
+    public void setUp() {
+    }
+
+    @Test
+    public void testInsertByBo() {
+        ChatSessionBo bo = new ChatSessionBo();
+        bo.setUserId(1L);
+        bo.setSessionTitle("Test Session");
+
+        Mockito.when(chatSessionMapper.insert(Mockito.any(ChatSession.class))).thenReturn(1);
+
+        Boolean result = chatSessionService.insertByBo(bo);
+        Assertions.assertTrue(result);
+        Mockito.verify(chatSessionMapper).insert(Mockito.any(ChatSession.class));
+    }
+
+    @Test
+    public void testUpdateSessionTitle() {
+        Long sessionId = 1L;
+        String newTitle = "Updated Title";
+
+        Mockito.when(chatSessionMapper.updateById(Mockito.any(ChatSession.class))).thenReturn(1);
+
+        Boolean result = chatSessionService.updateSessionTitle(sessionId, newTitle);
+        Assertions.assertTrue(result);
+        Mockito.verify(chatSessionMapper).updateById(Mockito.any(ChatSession.class));
+    }
+}
diff --git a/ruoyi-modules/ruoyi-generator/pom.xml b/ruoyi-modules/ruoyi-generator/pom.xml
new file mode 100644
index 0000000..e0aea04
--- /dev/null
+++ b/ruoyi-modules/ruoyi-generator/pom.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>org.dromara</groupId>
+        <artifactId>ruoyi-modules</artifactId>
+        <version>${revision}</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>ruoyi-generator</artifactId>
+
+    <description>
+        generator 代码生成
+    </description>
+
+    <dependencies>
+        <!-- 通用工具-->
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-core</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-doc</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-mybatis</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-web</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-log</artifactId>
+        </dependency>
+
+        <!--velocity代码生成使用模板 -->
+        <dependency>
+            <groupId>org.apache.velocity</groupId>
+            <artifactId>velocity-engine-core</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.anyline</groupId>
+            <artifactId>anyline-environment-spring-data-jdbc</artifactId>
+            <version>${anyline.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.anyline</groupId>
+            <artifactId>anyline-data-jdbc-mysql</artifactId>
+            <version>${anyline.version}</version>
+        </dependency>
+
+        <!-- anyline支持100+种类型数据库 添加对应的jdbc依赖与anyline对应数据库依赖包即可 -->
+        <!--        <dependency>-->
+        <!--            <groupId>org.anyline</groupId>-->
+        <!--            <artifactId>anyline-data-jdbc-oracle</artifactId>-->
+        <!--            <version>${anyline.version}</version>-->
+        <!--        </dependency>-->
+
+        <!--        <dependency>-->
+        <!--            <groupId>org.anyline</groupId>-->
+        <!--            <artifactId>anyline-data-jdbc-postgresql</artifactId>-->
+        <!--            <version>${anyline.version}</version>-->
+        <!--        </dependency>-->
+
+        <!--        <dependency>-->
+        <!--            <groupId>org.anyline</groupId>-->
+        <!--            <artifactId>anyline-data-jdbc-mssql</artifactId>-->
+        <!--            <version>${anyline.version}</version>-->
+        <!--        </dependency>-->
+
+    </dependencies>
+
+</project>
diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/config/GenConfig.java b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/config/GenConfig.java
new file mode 100644
index 0000000..7d96d75
--- /dev/null
+++ b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/config/GenConfig.java
@@ -0,0 +1,73 @@
+package org.dromara.generator.config;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.PropertySource;
+import org.springframework.stereotype.Component;
+
+/**
+ * 读取代码生成相关配置
+ *
+ * @author pengles
+ */
+@Component
+@ConfigurationProperties(prefix = "gen")
+@PropertySource(value = {"classpath:generator.yml"}, encoding = "UTF-8")
+public class GenConfig {
+
+    /**
+     * 作者
+     */
+    public static String author;
+
+    /**
+     * 生成包路径
+     */
+    public static String packageName;
+
+    /**
+     * 自动去除表前缀，默认是false
+     */
+    public static boolean autoRemovePre;
+
+    /**
+     * 表前缀(类名不会包含表前缀)
+     */
+    public static String tablePrefix;
+
+    public static String getAuthor() {
+        return author;
+    }
+
+    @Value("${author}")
+    public void setAuthor(String author) {
+        GenConfig.author = author;
+    }
+
+    public static String getPackageName() {
+        return packageName;
+    }
+
+    @Value("${packageName}")
+    public void setPackageName(String packageName) {
+        GenConfig.packageName = packageName;
+    }
+
+    public static boolean getAutoRemovePre() {
+        return autoRemovePre;
+    }
+
+    @Value("${autoRemovePre}")
+    public void setAutoRemovePre(boolean autoRemovePre) {
+        GenConfig.autoRemovePre = autoRemovePre;
+    }
+
+    public static String getTablePrefix() {
+        return tablePrefix;
+    }
+
+    @Value("${tablePrefix}")
+    public void setTablePrefix(String tablePrefix) {
+        GenConfig.tablePrefix = tablePrefix;
+    }
+}
diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/config/MyBatisDataSourceMonitor.java b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/config/MyBatisDataSourceMonitor.java
new file mode 100644
index 0000000..d25840d
--- /dev/null
+++ b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/config/MyBatisDataSourceMonitor.java
@@ -0,0 +1,106 @@
+package org.dromara.generator.config;
+
+import com.baomidou.dynamic.datasource.DynamicRoutingDataSource;
+import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
+import lombok.extern.slf4j.Slf4j;
+import org.anyline.data.datasource.DataSourceMonitor;
+import org.anyline.data.runtime.DataRuntime;
+import org.anyline.util.ConfigTable;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.datasource.DataSourceUtils;
+import org.springframework.stereotype.Component;
+
+import javax.sql.DataSource;
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * anyline 适配 动态数据源改造
+ *
+ * @author pengles
+ */
+@Slf4j
+@Component
+public class MyBatisDataSourceMonitor implements DataSourceMonitor {
+
+    private final Map<String, String> features = new HashMap<>();
+
+    public MyBatisDataSourceMonitor() {
+        // 调整执行模式为自定义
+        ConfigTable.KEEP_ADAPTER = 2;
+        // 禁用缓存
+        ConfigTable.METADATA_CACHE_SCOPE = 0;
+    }
+
+    /**
+     * 数据源特征 用来定准 adapter 包含数据库或JDBC协议关键字<br/>
+     * 一般会通过 产品名_url 合成 如果返回null 上层方法会通过driver_产品名_url合成
+     *
+     * @param datasource 数据源
+     * @return String 返回null由上层自动提取
+     */
+    @Override
+    public String feature(DataRuntime runtime, Object datasource) {
+        String feature = null;
+        if (datasource instanceof JdbcTemplate jdbc) {
+            DataSource ds = jdbc.getDataSource();
+            if (ds instanceof DynamicRoutingDataSource) {
+                String key = DynamicDataSourceContextHolder.peek();
+                feature = features.get(key);
+                if (null == feature) {
+                    Connection con = null;
+                    try {
+                        con = DataSourceUtils.getConnection(ds);
+                        DatabaseMetaData meta = con.getMetaData();
+                        String url = meta.getURL();
+                        feature = meta.getDatabaseProductName().toLowerCase().replace(" ", "") + "_" + url;
+                        features.put(key, feature);
+                    } catch (Exception e) {
+                        log.error(e.getMessage(), e);
+                    } finally {
+                        if (null != con && !DataSourceUtils.isConnectionTransactional(con, ds)) {
+                            DataSourceUtils.releaseConnection(con, ds);
+                        }
+                    }
+                }
+            }
+        }
+        return feature;
+    }
+
+    /**
+     * 数据源唯一标识 如果不实现则默认feature
+     *
+     * @param datasource 数据源
+     * @return String 返回null由上层自动提取
+     */
+    @Override
+    public String key(DataRuntime runtime, Object datasource) {
+        if (datasource instanceof JdbcTemplate jdbc) {
+            DataSource ds = jdbc.getDataSource();
+            if (ds instanceof DynamicRoutingDataSource) {
+                return DynamicDataSourceContextHolder.peek();
+            }
+        }
+        return runtime.getKey();
+    }
+
+    /**
+     * ConfigTable.KEEP_ADAPTER=2 : 根据当前接口判断是否保持同一个数据源绑定同一个adapter<br/>
+     * DynamicRoutingDataSource类型的返回false,因为同一个DynamicRoutingDataSource可能对应多类数据库, 如果项目中只有一种数据库 应该直接返回true
+     *
+     * @param datasource 数据源
+     * @return boolean
+     */
+    @Override
+    public boolean keepAdapter(DataRuntime runtime, Object datasource) {
+        if (datasource instanceof JdbcTemplate jdbc) {
+            DataSource ds = jdbc.getDataSource();
+            return !(ds instanceof DynamicRoutingDataSource);
+        }
+        return true;
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/constant/GenConstants.java b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/constant/GenConstants.java
new file mode 100644
index 0000000..9a808a3
--- /dev/null
+++ b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/constant/GenConstants.java
@@ -0,0 +1,186 @@
+package org.dromara.generator.constant;
+
+/**
+ * 代码生成通用常量
+ *
+ * @author pengles
+ */
+public interface GenConstants {
+    /**
+     * 单表（增删改查）
+     */
+    String TPL_CRUD = "crud";
+
+    /**
+     * 树表（增删改查）
+     */
+    String TPL_TREE = "tree";
+
+    /**
+     * 树编码字段
+     */
+    String TREE_CODE = "treeCode";
+
+    /**
+     * 树父编码字段
+     */
+    String TREE_PARENT_CODE = "treeParentCode";
+
+    /**
+     * 树名称字段
+     */
+    String TREE_NAME = "treeName";
+
+    /**
+     * 上级菜单ID字段
+     */
+    String PARENT_MENU_ID = "parentMenuId";
+
+    /**
+     * 上级菜单名称字段
+     */
+    String PARENT_MENU_NAME = "parentMenuName";
+
+    /**
+     * 数据库字符串类型
+     */
+    String[] COLUMNTYPE_STR = {"char", "varchar", "enum", "set", "nchar", "nvarchar", "varchar2", "nvarchar2"};
+
+    /**
+     * 数据库文本类型
+     */
+    String[] COLUMNTYPE_TEXT = {"tinytext", "text", "mediumtext", "longtext", "binary", "varbinary", "blob",
+            "ntext", "image", "bytea"};
+
+    /**
+     * 数据库时间类型
+     */
+    String[] COLUMNTYPE_TIME = {"datetime", "time", "date", "timestamp", "year", "interval",
+            "smalldatetime", "datetime2", "datetimeoffset", "timestamptz"};
+
+    /**
+     * 数据库数字类型
+     */
+    String[] COLUMNTYPE_NUMBER = {"tinyint", "smallint", "mediumint", "int", "int2", "int4", "int8", "number", "integer",
+            "bit", "bigint", "float", "float4", "float8", "double", "decimal", "numeric", "real", "double precision",
+            "smallserial", "serial", "bigserial", "money", "smallmoney"};
+
+    /**
+     * BO对象 不需要添加字段
+     */
+    String[] COLUMNNAME_NOT_ADD = {"create_dept", "create_by", "create_time", "del_flag", "update_by",
+            "update_time", "version"};
+
+    /**
+     * BO对象 不需要编辑字段
+     */
+    String[] COLUMNNAME_NOT_EDIT = {"create_dept", "create_by", "create_time", "del_flag", "update_by",
+            "update_time", "version"};
+
+    /**
+     * VO对象 不需要返回字段
+     */
+    String[] COLUMNNAME_NOT_LIST = {"create_dept", "create_by", "create_time", "del_flag", "update_by",
+            "update_time", "version"};
+
+    /**
+     * BO对象 不需要查询字段
+     */
+    String[] COLUMNNAME_NOT_QUERY = {"id", "create_dept", "create_by", "create_time", "del_flag", "update_by",
+            "update_time", "remark", "version"};
+
+    /**
+     * Entity基类字段
+     */
+    String[] BASE_ENTITY = {"createDept", "createBy", "createTime", "updateBy", "updateTime"};
+
+    /**
+     * 文本框
+     */
+    String HTML_INPUT = "input";
+
+    /**
+     * 文本域
+     */
+    String HTML_TEXTAREA = "textarea";
+
+    /**
+     * 下拉框
+     */
+    String HTML_SELECT = "select";
+
+    /**
+     * 单选框
+     */
+    String HTML_RADIO = "radio";
+
+    /**
+     * 复选框
+     */
+    String HTML_CHECKBOX = "checkbox";
+
+    /**
+     * 日期控件
+     */
+    String HTML_DATETIME = "datetime";
+
+    /**
+     * 图片上传控件
+     */
+    String HTML_IMAGE_UPLOAD = "imageUpload";
+
+    /**
+     * 文件上传控件
+     */
+    String HTML_FILE_UPLOAD = "fileUpload";
+
+    /**
+     * 富文本控件
+     */
+    String HTML_EDITOR = "editor";
+
+    /**
+     * 字符串类型
+     */
+    String TYPE_STRING = "String";
+
+    /**
+     * 整型
+     */
+    String TYPE_INTEGER = "Integer";
+
+    /**
+     * 长整型
+     */
+    String TYPE_LONG = "Long";
+
+    /**
+     * 浮点型
+     */
+    String TYPE_DOUBLE = "Double";
+
+    /**
+     * 高精度计算类型
+     */
+    String TYPE_BIGDECIMAL = "BigDecimal";
+
+    /**
+     * 时间类型
+     */
+    String TYPE_DATE = "Date";
+
+    /**
+     * 模糊查询
+     */
+    String QUERY_LIKE = "LIKE";
+
+    /**
+     * 相等查询
+     */
+    String QUERY_EQ = "EQ";
+
+    /**
+     * 需要
+     */
+    String REQUIRE = "1";
+}
diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/controller/GenController.java b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/controller/GenController.java
new file mode 100644
index 0000000..231539f
--- /dev/null
+++ b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/controller/GenController.java
@@ -0,0 +1,214 @@
+package org.dromara.generator.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.convert.Convert;
+import cn.hutool.core.io.IoUtil;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.helper.DataBaseHelper;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.generator.domain.GenTable;
+import org.dromara.generator.domain.GenTableColumn;
+import org.dromara.generator.service.IGenTableService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 代码生成 操作处理
+ *
+ * @author pengles
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/tool/gen")
+public class GenController extends BaseController {
+
+    private final IGenTableService genTableService;
+
+    /**
+     * 查询代码生成列表
+     */
+    @SaCheckPermission("tool:gen:list")
+    @GetMapping("/list")
+    public TableDataInfo<GenTable> genList(GenTable genTable, PageQuery pageQuery) {
+        return genTableService.selectPageGenTableList(genTable, pageQuery);
+    }
+
+    /**
+     * 修改代码生成业务
+     *
+     * @param tableId 表ID
+     */
+    @SaCheckPermission("tool:gen:query")
+    @GetMapping(value = "/{tableId}")
+    public R<Map<String, Object>> getInfo(@PathVariable Long tableId) {
+        GenTable table = genTableService.selectGenTableById(tableId);
+        List<GenTable> tables = genTableService.selectGenTableAll();
+        List<GenTableColumn> list = genTableService.selectGenTableColumnListByTableId(tableId);
+        Map<String, Object> map = new HashMap<>(3);
+        map.put("info", table);
+        map.put("rows", list);
+        map.put("tables", tables);
+        return R.ok(map);
+    }
+
+    /**
+     * 查询数据库列表
+     */
+    @SaCheckPermission("tool:gen:list")
+    @GetMapping("/db/list")
+    public TableDataInfo<GenTable> dataList(GenTable genTable, PageQuery pageQuery) {
+        return genTableService.selectPageDbTableList(genTable, pageQuery);
+    }
+
+    /**
+     * 查询数据表字段列表
+     *
+     * @param tableId 表ID
+     */
+    @SaCheckPermission("tool:gen:list")
+    @GetMapping(value = "/column/{tableId}")
+    public TableDataInfo<GenTableColumn> columnList(@PathVariable("tableId") Long tableId) {
+        List<GenTableColumn> list = genTableService.selectGenTableColumnListByTableId(tableId);
+        return TableDataInfo.build(list);
+    }
+
+    /**
+     * 导入表结构（保存）
+     *
+     * @param tables 表名串
+     */
+    @SaCheckPermission("tool:gen:import")
+    @Log(title = "代码生成", businessType = BusinessType.IMPORT)
+    @PostMapping("/importTable")
+    public R<Void> importTableSave(String tables, String dataName) {
+        String[] tableNames = Convert.toStrArray(tables);
+        // 查询表信息
+        List<GenTable> tableList = genTableService.selectDbTableListByNames(tableNames, dataName);
+        genTableService.importGenTable(tableList, dataName);
+        return R.ok();
+    }
+
+    /**
+     * 修改保存代码生成业务
+     */
+    @SaCheckPermission("tool:gen:edit")
+    @Log(title = "代码生成", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public R<Void> editSave(@Validated @RequestBody GenTable genTable) {
+        genTableService.validateEdit(genTable);
+        genTableService.updateGenTable(genTable);
+        return R.ok();
+    }
+
+    /**
+     * 删除代码生成
+     *
+     * @param tableIds 表ID串
+     */
+    @SaCheckPermission("tool:gen:remove")
+    @Log(title = "代码生成", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{tableIds}")
+    public R<Void> remove(@PathVariable Long[] tableIds) {
+        genTableService.deleteGenTableByIds(tableIds);
+        return R.ok();
+    }
+
+    /**
+     * 预览代码
+     *
+     * @param tableId 表ID
+     */
+    @SaCheckPermission("tool:gen:preview")
+    @GetMapping("/preview/{tableId}")
+    public R<Map<String, String>> preview(@PathVariable("tableId") Long tableId) throws IOException {
+        Map<String, String> dataMap = genTableService.previewCode(tableId);
+        return R.ok(dataMap);
+    }
+
+    /**
+     * 生成代码（下载方式）
+     *
+     * @param tableId 表ID
+     */
+    @SaCheckPermission("tool:gen:code")
+    @Log(title = "代码生成", businessType = BusinessType.GENCODE)
+    @GetMapping("/download/{tableId}")
+    public void download(HttpServletResponse response, @PathVariable("tableId") Long tableId) throws IOException {
+        byte[] data = genTableService.downloadCode(tableId);
+        genCode(response, data);
+    }
+
+    /**
+     * 生成代码（自定义路径）
+     *
+     * @param tableId 表ID
+     */
+    @SaCheckPermission("tool:gen:code")
+    @Log(title = "代码生成", businessType = BusinessType.GENCODE)
+    @GetMapping("/genCode/{tableId}")
+    public R<Void> genCode(@PathVariable("tableId") Long tableId) {
+        genTableService.generatorCode(tableId);
+        return R.ok();
+    }
+
+    /**
+     * 同步数据库
+     *
+     * @param tableId 表ID
+     */
+    @SaCheckPermission("tool:gen:edit")
+    @Log(title = "代码生成", businessType = BusinessType.UPDATE)
+    @GetMapping("/synchDb/{tableId}")
+    public R<Void> synchDb(@PathVariable("tableId") Long tableId) {
+        genTableService.synchDb(tableId);
+        return R.ok();
+    }
+
+    /**
+     * 批量生成代码
+     *
+     * @param tableIdStr 表ID串
+     */
+    @SaCheckPermission("tool:gen:code")
+    @Log(title = "代码生成", businessType = BusinessType.GENCODE)
+    @GetMapping("/batchGenCode")
+    public void batchGenCode(HttpServletResponse response, String tableIdStr) throws IOException {
+        String[] tableIds = Convert.toStrArray(tableIdStr);
+        byte[] data = genTableService.downloadCode(tableIds);
+        genCode(response, data);
+    }
+
+    /**
+     * 生成zip文件
+     */
+    private void genCode(HttpServletResponse response, byte[] data) throws IOException {
+        response.reset();
+        response.addHeader("Access-Control-Allow-Origin", "*");
+        response.addHeader("Access-Control-Expose-Headers", "Content-Disposition");
+        response.setHeader("Content-Disposition", "attachment; filename=\"ruoyi.zip\"");
+        response.addHeader("Content-Length", "" + data.length);
+        response.setContentType("application/octet-stream; charset=UTF-8");
+        IoUtil.write(response.getOutputStream(), false, data);
+    }
+
+    /**
+     * 查询数据源名称列表
+     */
+    @SaCheckPermission("tool:gen:list")
+    @GetMapping(value = "/getDataNames")
+    public R<Object> getCurrentDataSourceNameList() {
+        return R.ok(DataBaseHelper.getDataSourceNameList());
+    }
+}
diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/domain/GenTable.java b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/domain/GenTable.java
new file mode 100644
index 0000000..6c710f7
--- /dev/null
+++ b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/domain/GenTable.java
@@ -0,0 +1,195 @@
+package org.dromara.generator.domain;
+
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.generator.constant.GenConstants;
+
+import java.util.List;
+
+/**
+ * 业务表 gen_table
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("gen_table")
+public class GenTable extends BaseEntity {
+
+    /**
+     * 编号
+     */
+    @TableId(value = "table_id")
+    private Long tableId;
+
+    /**
+     * 数据源名称
+     */
+    @NotBlank(message = "数据源名称不能为空")
+    private String dataName;
+
+    /**
+     * 表名称
+     */
+    @NotBlank(message = "表名称不能为空")
+    private String tableName;
+
+    /**
+     * 表描述
+     */
+    @NotBlank(message = "表描述不能为空")
+    private String tableComment;
+
+    /**
+     * 关联父表的表名
+     */
+    private String subTableName;
+
+    /**
+     * 本表关联父表的外键名
+     */
+    private String subTableFkName;
+
+    /**
+     * 实体类名称(首字母大写)
+     */
+    @NotBlank(message = "实体类名称不能为空")
+    private String className;
+
+    /**
+     * 使用的模板（crud单表操作 tree树表操作 sub主子表操作）
+     */
+    private String tplCategory;
+
+    /**
+     * 生成包路径
+     */
+    @NotBlank(message = "生成包路径不能为空")
+    private String packageName;
+
+    /**
+     * 生成模块名
+     */
+    @NotBlank(message = "生成模块名不能为空")
+    private String moduleName;
+
+    /**
+     * 生成业务名
+     */
+    @NotBlank(message = "生成业务名不能为空")
+    private String businessName;
+
+    /**
+     * 生成功能名
+     */
+    @NotBlank(message = "生成功能名不能为空")
+    private String functionName;
+
+    /**
+     * 生成作者
+     */
+    @NotBlank(message = "作者不能为空")
+    private String functionAuthor;
+
+    /**
+     * 生成代码方式（0zip压缩包 1自定义路径）
+     */
+    private String genType;
+
+    /**
+     * 生成路径（不填默认项目路径）
+     */
+    @TableField(updateStrategy = FieldStrategy.NOT_EMPTY)
+    private String genPath;
+
+    /**
+     * 主键信息
+     */
+    @TableField(exist = false)
+    private GenTableColumn pkColumn;
+
+    /**
+     * 表列信息
+     */
+    @Valid
+    @TableField(exist = false)
+    private List<GenTableColumn> columns;
+
+    /**
+     * 其它生成选项
+     */
+    private String options;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 树编码字段
+     */
+    @TableField(exist = false)
+    private String treeCode;
+
+    /**
+     * 树父编码字段
+     */
+    @TableField(exist = false)
+    private String treeParentCode;
+
+    /**
+     * 树名称字段
+     */
+    @TableField(exist = false)
+    private String treeName;
+
+    /*
+     * 菜单id列表
+     */
+    @TableField(exist = false)
+    private List<Long> menuIds;
+
+    /**
+     * 上级菜单ID字段
+     */
+    @TableField(exist = false)
+    private Long parentMenuId;
+
+    /**
+     * 上级菜单名称字段
+     */
+    @TableField(exist = false)
+    private String parentMenuName;
+
+    public static boolean isTree(String tplCategory) {
+        return tplCategory != null && StringUtils.equals(GenConstants.TPL_TREE, tplCategory);
+    }
+
+    public static boolean isCrud(String tplCategory) {
+        return tplCategory != null && StringUtils.equals(GenConstants.TPL_CRUD, tplCategory);
+    }
+
+    public static boolean isSuperColumn(String tplCategory, String javaField) {
+        return StringUtils.equalsAnyIgnoreCase(javaField, GenConstants.BASE_ENTITY);
+    }
+
+    public boolean isTree() {
+        return isTree(this.tplCategory);
+    }
+
+    public boolean isCrud() {
+        return isCrud(this.tplCategory);
+    }
+
+    public boolean isSuperColumn(String javaField) {
+        return isSuperColumn(this.tplCategory, javaField);
+    }
+}
diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/domain/GenTableColumn.java b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/domain/GenTableColumn.java
new file mode 100644
index 0000000..cdf805f
--- /dev/null
+++ b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/domain/GenTableColumn.java
@@ -0,0 +1,221 @@
+package org.dromara.generator.domain;
+
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.apache.ibatis.type.JdbcType;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+
+/**
+ * 代码生成业务字段表 gen_table_column
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("gen_table_column")
+public class GenTableColumn extends BaseEntity {
+
+    /**
+     * 编号
+     */
+    @TableId(value = "column_id")
+    private Long columnId;
+
+    /**
+     * 归属表编号
+     */
+    private Long tableId;
+
+    /**
+     * 列名称
+     */
+    private String columnName;
+
+    /**
+     * 列描述
+     */
+    @TableField(updateStrategy = FieldStrategy.ALWAYS, jdbcType = JdbcType.VARCHAR)
+    private String columnComment;
+
+    /**
+     * 列类型
+     */
+    private String columnType;
+
+    /**
+     * JAVA类型
+     */
+    private String javaType;
+
+    /**
+     * JAVA字段名
+     */
+    @NotBlank(message = "Java属性不能为空")
+    private String javaField;
+
+    /**
+     * 是否主键（1是）
+     */
+    @TableField(updateStrategy = FieldStrategy.ALWAYS, jdbcType = JdbcType.VARCHAR)
+    private String isPk;
+
+    /**
+     * 是否自增（1是）
+     */
+    @TableField(updateStrategy = FieldStrategy.ALWAYS, jdbcType = JdbcType.VARCHAR)
+    private String isIncrement;
+
+    /**
+     * 是否必填（1是）
+     */
+    @TableField(updateStrategy = FieldStrategy.ALWAYS, jdbcType = JdbcType.VARCHAR)
+    private String isRequired;
+
+    /**
+     * 是否为插入字段（1是）
+     */
+    @TableField(updateStrategy = FieldStrategy.ALWAYS, jdbcType = JdbcType.VARCHAR)
+    private String isInsert;
+
+    /**
+     * 是否编辑字段（1是）
+     */
+    @TableField(updateStrategy = FieldStrategy.ALWAYS, jdbcType = JdbcType.VARCHAR)
+    private String isEdit;
+
+    /**
+     * 是否列表字段（1是）
+     */
+    @TableField(updateStrategy = FieldStrategy.ALWAYS, jdbcType = JdbcType.VARCHAR)
+    private String isList;
+
+    /**
+     * 是否查询字段（1是）
+     */
+    @TableField(updateStrategy = FieldStrategy.ALWAYS, jdbcType = JdbcType.VARCHAR)
+    private String isQuery;
+
+    /**
+     * 查询方式（EQ等于、NE不等于、GT大于、LT小于、LIKE模糊、BETWEEN范围）
+     */
+    private String queryType;
+
+    /**
+     * 显示类型（input文本框、textarea文本域、select下拉框、checkbox复选框、radio单选框、datetime日期控件、image图片上传控件、upload文件上传控件、editor富文本控件）
+     */
+    private String htmlType;
+
+    /**
+     * 字典类型
+     */
+    private String dictType;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    public static boolean isSuperColumn(String javaField) {
+        return StringUtils.equalsAnyIgnoreCase(javaField,
+                // BaseEntity
+                "createBy", "createTime", "updateBy", "updateTime",
+                // TreeEntity
+                "parentName", "parentId");
+    }
+
+    public static boolean isUsableColumn(String javaField) {
+        // isSuperColumn()中的名单用于避免生成多余Domain属性，若某些属性在生成页面时需要用到不能忽略，则放在此处白名单
+        return StringUtils.equalsAnyIgnoreCase(javaField, "parentId", "orderNum", "remark");
+    }
+
+    public String getCapJavaField() {
+        return StringUtils.capitalize(javaField);
+    }
+
+    public boolean isPk() {
+        return isPk(this.isPk);
+    }
+
+    public boolean isPk(String isPk) {
+        return isPk != null && StringUtils.equals("1", isPk);
+    }
+
+    public boolean isIncrement() {
+        return isIncrement(this.isIncrement);
+    }
+
+    public boolean isIncrement(String isIncrement) {
+        return isIncrement != null && StringUtils.equals("1", isIncrement);
+    }
+
+    public boolean isRequired() {
+        return isRequired(this.isRequired);
+    }
+
+    public boolean isRequired(String isRequired) {
+        return isRequired != null && StringUtils.equals("1", isRequired);
+    }
+
+    public boolean isInsert() {
+        return isInsert(this.isInsert);
+    }
+
+    public boolean isInsert(String isInsert) {
+        return isInsert != null && StringUtils.equals("1", isInsert);
+    }
+
+    public boolean isEdit() {
+        return isEdit(this.isEdit);
+    }
+
+    public boolean isEdit(String isEdit) {
+        return isEdit != null && StringUtils.equals("1", isEdit);
+    }
+
+    public boolean isList() {
+        return isList(this.isList);
+    }
+
+    public boolean isList(String isList) {
+        return isList != null && StringUtils.equals("1", isList);
+    }
+
+    public boolean isQuery() {
+        return isQuery(this.isQuery);
+    }
+
+    public boolean isQuery(String isQuery) {
+        return isQuery != null && StringUtils.equals("1", isQuery);
+    }
+
+    public boolean isSuperColumn() {
+        return isSuperColumn(this.javaField);
+    }
+
+    public boolean isUsableColumn() {
+        return isUsableColumn(javaField);
+    }
+
+    public String readConverterExp() {
+        String remarks = StringUtils.substringBetween(this.columnComment, "（", "）");
+        StringBuffer sb = new StringBuffer();
+        if (StringUtils.isNotEmpty(remarks)) {
+            for (String value : remarks.split(" ")) {
+                if (StringUtils.isNotEmpty(value)) {
+                    Object startStr = value.subSequence(0, 1);
+                    String endStr = value.substring(1);
+                    sb.append(StringUtils.EMPTY).append(startStr).append("=").append(endStr).append(StringUtils.SEPARATOR);
+                }
+            }
+            return sb.deleteCharAt(sb.length() - 1).toString();
+        } else {
+            return this.columnComment;
+        }
+    }
+}
diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/mapper/GenTableColumnMapper.java b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/mapper/GenTableColumnMapper.java
new file mode 100644
index 0000000..a03252c
--- /dev/null
+++ b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/mapper/GenTableColumnMapper.java
@@ -0,0 +1,15 @@
+package org.dromara.generator.mapper;
+
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.generator.domain.GenTableColumn;
+
+/**
+ * 业务字段 数据层
+ *
+ * @author pengles
+ */
+@InterceptorIgnore(dataPermission = "true")
+public interface GenTableColumnMapper extends BaseMapperPlus<GenTableColumn, GenTableColumn> {
+
+}
diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/mapper/GenTableMapper.java b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/mapper/GenTableMapper.java
new file mode 100644
index 0000000..523b46e
--- /dev/null
+++ b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/mapper/GenTableMapper.java
@@ -0,0 +1,50 @@
+package org.dromara.generator.mapper;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.generator.domain.GenTable;
+
+import java.util.List;
+
+/**
+ * 业务 数据层
+ *
+ * @author pengles
+ */
+@InterceptorIgnore(dataPermission = "true")
+public interface GenTableMapper extends BaseMapperPlus<GenTable, GenTable> {
+
+    /**
+     * 查询所有表信息
+     *
+     * @return 表信息集合
+     */
+    List<GenTable> selectGenTableAll();
+
+    /**
+     * 查询表ID业务信息
+     *
+     * @param id 业务ID
+     * @return 业务信息
+     */
+    GenTable selectGenTableById(Long id);
+
+    /**
+     * 查询表名称业务信息
+     *
+     * @param tableName 表名称
+     * @return 业务信息
+     */
+    GenTable selectGenTableByName(String tableName);
+
+    /**
+     * 查询指定数据源下的所有表名列表
+     *
+     * @param dataName 数据源名称，用于选择不同的数据源
+     * @return 当前数据库中的表名列表
+     * @DS("") 使用默认数据源执行查询操作
+     */
+    @DS("")
+    List<String> selectTableNameList(String dataName);
+}
diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/GenTableServiceImpl.java b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/GenTableServiceImpl.java
new file mode 100644
index 0000000..0140d95
--- /dev/null
+++ b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/GenTableServiceImpl.java
@@ -0,0 +1,575 @@
+package org.dromara.generator.service;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.io.IoUtil;
+import cn.hutool.core.lang.Dict;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.dynamic.datasource.annotation.DSTransactional;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.incrementer.IdentifierGenerator;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.anyline.metadata.Column;
+import org.anyline.metadata.Table;
+import org.anyline.proxy.ServiceProxy;
+import org.apache.velocity.Template;
+import org.apache.velocity.VelocityContext;
+import org.apache.velocity.app.Velocity;
+import org.dromara.common.core.constant.Constants;
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.utils.SpringUtils;
+import org.dromara.common.core.utils.StreamUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.core.utils.file.FileUtils;
+import org.dromara.common.json.utils.JsonUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.generator.constant.GenConstants;
+import org.dromara.generator.domain.GenTable;
+import org.dromara.generator.domain.GenTableColumn;
+import org.dromara.generator.mapper.GenTableColumnMapper;
+import org.dromara.generator.mapper.GenTableMapper;
+import org.dromara.generator.util.GenUtils;
+import org.dromara.generator.util.VelocityInitializer;
+import org.dromara.generator.util.VelocityUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.StringWriter;
+import java.nio.charset.StandardCharsets;
+import java.util.*;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
+
+/**
+ * 业务 服务层实现
+ *
+ * @author pengles
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class GenTableServiceImpl implements IGenTableService {
+
+    private static final String[] TABLE_IGNORE = new String[]{"sj_", "flow_", "gen_"};
+    private final GenTableMapper baseMapper;
+    private final GenTableColumnMapper genTableColumnMapper;
+    private final IdentifierGenerator identifierGenerator;
+
+    /**
+     * 获取代码生成地址
+     *
+     * @param table    业务表信息
+     * @param template 模板文件路径
+     * @return 生成地址
+     */
+    public static String getGenPath(GenTable table, String template) {
+        String genPath = table.getGenPath();
+        if (StringUtils.equals(genPath, "/")) {
+            return System.getProperty("user.dir") + File.separator + "src" + File.separator + VelocityUtils.getFileName(template, table);
+        }
+        return genPath + File.separator + VelocityUtils.getFileName(template, table);
+    }
+
+    /**
+     * 查询业务字段列表
+     *
+     * @param tableId 业务字段编号
+     * @return 业务字段集合
+     */
+    @Override
+    public List<GenTableColumn> selectGenTableColumnListByTableId(Long tableId) {
+        return genTableColumnMapper.selectList(new LambdaQueryWrapper<GenTableColumn>()
+                .eq(GenTableColumn::getTableId, tableId)
+                .orderByAsc(GenTableColumn::getSort));
+    }
+
+    /**
+     * 查询业务信息
+     *
+     * @param id 业务ID
+     * @return 业务信息
+     */
+    @Override
+    public GenTable selectGenTableById(Long id) {
+        GenTable genTable = baseMapper.selectGenTableById(id);
+        setTableFromOptions(genTable);
+        return genTable;
+    }
+
+    @Override
+    public TableDataInfo<GenTable> selectPageGenTableList(GenTable genTable, PageQuery pageQuery) {
+        Page<GenTable> page = baseMapper.selectPage(pageQuery.build(), this.buildGenTableQueryWrapper(genTable));
+        return TableDataInfo.build(page);
+    }
+
+    private QueryWrapper<GenTable> buildGenTableQueryWrapper(GenTable genTable) {
+        Map<String, Object> params = genTable.getParams();
+        QueryWrapper<GenTable> wrapper = Wrappers.query();
+        wrapper
+                .eq(StringUtils.isNotEmpty(genTable.getDataName()), "data_name", genTable.getDataName())
+                .like(StringUtils.isNotBlank(genTable.getTableName()), "lower(table_name)", StringUtils.lowerCase(genTable.getTableName()))
+                .like(StringUtils.isNotBlank(genTable.getTableComment()), "lower(table_comment)", StringUtils.lowerCase(genTable.getTableComment()))
+                .between(params.get("beginTime") != null && params.get("endTime") != null,
+                        "create_time", params.get("beginTime"), params.get("endTime"))
+                .orderByDesc("update_time");
+        return wrapper;
+    }
+
+    /**
+     * 查询数据库列表
+     *
+     * @param genTable  包含查询条件的GenTable对象
+     * @param pageQuery 包含分页信息的PageQuery对象
+     * @return 包含分页结果的TableDataInfo对象
+     */
+    @DS("#genTable.dataName")
+    @Override
+    public TableDataInfo<GenTable> selectPageDbTableList(GenTable genTable, PageQuery pageQuery) {
+        // 获取查询条件
+        String tableName = genTable.getTableName();
+        String tableComment = genTable.getTableComment();
+
+        LinkedHashMap<String, Table<?>> tablesMap = ServiceProxy.metadata().tables();
+        if (CollUtil.isEmpty(tablesMap)) {
+            return TableDataInfo.build();
+        }
+        List<String> tableNames = baseMapper.selectTableNameList(genTable.getDataName());
+        String[] tableArrays;
+        if (CollUtil.isNotEmpty(tableNames)) {
+            tableArrays = tableNames.toArray(new String[0]);
+        } else {
+            tableArrays = new String[0];
+        }
+        // 过滤并转换表格数据
+        List<GenTable> tables = tablesMap.values().stream()
+                .filter(x -> !StringUtils.startWithAnyIgnoreCase(x.getName(), TABLE_IGNORE))
+                .filter(x -> {
+                    if (CollUtil.isEmpty(tableNames)) {
+                        return true;
+                    }
+                    return !StringUtils.equalsAnyIgnoreCase(x.getName(), tableArrays);
+                })
+                .filter(x -> {
+                    boolean nameMatches = true;
+                    boolean commentMatches = true;
+                    // 进行表名称的模糊查询
+                    if (StringUtils.isNotBlank(tableName)) {
+                        nameMatches = StringUtils.containsIgnoreCase(x.getName(), tableName);
+                    }
+                    // 进行表描述的模糊查询
+                    if (StringUtils.isNotBlank(tableComment)) {
+                        commentMatches = StringUtils.containsIgnoreCase(x.getComment(), tableComment);
+                    }
+                    // 同时匹配名称和描述
+                    return nameMatches && commentMatches;
+                })
+                .map(x -> {
+                    GenTable gen = new GenTable();
+                    gen.setTableName(x.getName());
+                    gen.setTableComment(x.getComment());
+                    // postgresql的表元数据没有创建时间这个东西(好奇葩) 只能new Date代替
+                    gen.setCreateTime(ObjectUtil.defaultIfNull(x.getCreateTime(), new Date()));
+                    gen.setUpdateTime(x.getUpdateTime());
+                    return gen;
+                }).sorted(Comparator.comparing(GenTable::getCreateTime).reversed())
+                .toList();
+        return TableDataInfo.build(tables, pageQuery.build());
+    }
+
+    /**
+     * 查询据库列表
+     *
+     * @param tableNames 表名称组
+     * @param dataName   数据源名称
+     * @return 数据库表集合
+     */
+    @DS("#dataName")
+    @Override
+    public List<GenTable> selectDbTableListByNames(String[] tableNames, String dataName) {
+        Set<String> tableNameSet = new HashSet<>(List.of(tableNames));
+        LinkedHashMap<String, Table<?>> tablesMap = ServiceProxy.metadata().tables();
+
+        if (CollUtil.isEmpty(tablesMap)) {
+            return new ArrayList<>();
+        }
+
+        List<Table<?>> tableList = tablesMap.values().stream()
+                .filter(x -> !StringUtils.startWithAnyIgnoreCase(x.getName(), TABLE_IGNORE))
+                .filter(x -> tableNameSet.contains(x.getName())).toList();
+
+        if (CollUtil.isEmpty(tableList)) {
+            return new ArrayList<>();
+        }
+        return tableList.stream().map(x -> {
+            GenTable gen = new GenTable();
+            gen.setDataName(dataName);
+            gen.setTableName(x.getName());
+            gen.setTableComment(x.getComment());
+            gen.setCreateTime(x.getCreateTime());
+            gen.setUpdateTime(x.getUpdateTime());
+            return gen;
+        }).toList();
+    }
+
+    /**
+     * 查询所有表信息
+     *
+     * @return 表信息集合
+     */
+    @Override
+    public List<GenTable> selectGenTableAll() {
+        return baseMapper.selectGenTableAll();
+    }
+
+    /**
+     * 修改业务
+     *
+     * @param genTable 业务信息
+     */
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void updateGenTable(GenTable genTable) {
+        String options = JsonUtils.toJsonString(genTable.getParams());
+        genTable.setOptions(options);
+        int row = baseMapper.updateById(genTable);
+        if (row > 0) {
+            for (GenTableColumn cenTableColumn : genTable.getColumns()) {
+                genTableColumnMapper.updateById(cenTableColumn);
+            }
+        }
+    }
+
+    /**
+     * 删除业务对象
+     *
+     * @param tableIds 需要删除的数据ID
+     */
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void deleteGenTableByIds(Long[] tableIds) {
+        List<Long> ids = Arrays.asList(tableIds);
+        baseMapper.deleteByIds(ids);
+        genTableColumnMapper.delete(new LambdaQueryWrapper<GenTableColumn>().in(GenTableColumn::getTableId, ids));
+    }
+
+    /**
+     * 导入表结构
+     *
+     * @param tableList 导入表列表
+     * @param dataName  数据源名称
+     */
+    @DSTransactional
+    @Override
+    public void importGenTable(List<GenTable> tableList, String dataName) {
+        try {
+            for (GenTable table : tableList) {
+                String tableName = table.getTableName();
+                GenUtils.initTable(table);
+                table.setDataName(dataName);
+                int row = baseMapper.insert(table);
+                if (row > 0) {
+                    // 保存列信息
+                    List<GenTableColumn> genTableColumns = SpringUtils.getAopProxy(this).selectDbTableColumnsByName(tableName, dataName);
+                    List<GenTableColumn> saveColumns = new ArrayList<>();
+                    for (GenTableColumn column : genTableColumns) {
+                        GenUtils.initColumnField(column, table);
+                        saveColumns.add(column);
+                    }
+                    if (CollUtil.isNotEmpty(saveColumns)) {
+                        genTableColumnMapper.insertBatch(saveColumns);
+                    }
+                }
+            }
+        } catch (Exception e) {
+            throw new ServiceException("导入失败：" + e.getMessage());
+        }
+    }
+
+    /**
+     * 根据表名称查询列信息
+     *
+     * @param tableName 表名称
+     * @param dataName  数据源名称
+     * @return 列信息
+     */
+    @DS("#dataName")
+    @Override
+    public List<GenTableColumn> selectDbTableColumnsByName(String tableName, String dataName) {
+        Table<?> table = ServiceProxy.metadata().table(tableName);
+        if (ObjectUtil.isNull(table)) {
+            return new ArrayList<>();
+        }
+        LinkedHashMap<String, Column> columns = table.getColumns();
+        List<GenTableColumn> tableColumns = new ArrayList<>();
+        columns.forEach((columnName, column) -> {
+            GenTableColumn tableColumn = new GenTableColumn();
+            tableColumn.setIsPk(column.isPrimaryKey() ? "1" : "0");
+            tableColumn.setColumnName(column.getName());
+            tableColumn.setColumnComment(column.getComment());
+            tableColumn.setColumnType(column.getOriginType().toLowerCase());
+            tableColumn.setSort(column.getPosition());
+            tableColumn.setIsRequired(column.isNullable() ? "1" : "0");
+            tableColumn.setIsIncrement(column.isAutoIncrement() ? "1" : "0");
+            tableColumns.add(tableColumn);
+        });
+        return tableColumns;
+    }
+
+    /**
+     * 预览代码
+     *
+     * @param tableId 表编号
+     * @return 预览数据列表
+     */
+    @Override
+    public Map<String, String> previewCode(Long tableId) {
+        Map<String, String> dataMap = new LinkedHashMap<>();
+        // 查询表信息
+        GenTable table = baseMapper.selectGenTableById(tableId);
+        List<Long> menuIds = new ArrayList<>();
+        for (int i = 0; i < 6; i++) {
+            menuIds.add(identifierGenerator.nextId(null).longValue());
+        }
+        table.setMenuIds(menuIds);
+        // 设置主键列信息
+        setPkColumn(table);
+        VelocityInitializer.initVelocity();
+
+        VelocityContext context = VelocityUtils.prepareContext(table);
+
+        // 获取模板列表
+        List<String> templates = VelocityUtils.getTemplateList(table.getTplCategory());
+        for (String template : templates) {
+            // 渲染模板
+            StringWriter sw = new StringWriter();
+            Template tpl = Velocity.getTemplate(template, Constants.UTF8);
+            tpl.merge(context, sw);
+            dataMap.put(template, sw.toString());
+        }
+        return dataMap;
+    }
+
+    /**
+     * 生成代码（下载方式）
+     *
+     * @param tableId 表名称
+     * @return 数据
+     */
+    @Override
+    public byte[] downloadCode(Long tableId) {
+        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+        ZipOutputStream zip = new ZipOutputStream(outputStream);
+        generatorCode(tableId, zip);
+        IoUtil.close(zip);
+        return outputStream.toByteArray();
+    }
+
+    /**
+     * 生成代码（自定义路径）
+     *
+     * @param tableId 表名称
+     */
+    @Override
+    public void generatorCode(Long tableId) {
+        // 查询表信息
+        GenTable table = baseMapper.selectGenTableById(tableId);
+        // 设置主键列信息
+        setPkColumn(table);
+
+        VelocityInitializer.initVelocity();
+
+        VelocityContext context = VelocityUtils.prepareContext(table);
+
+        // 获取模板列表
+        List<String> templates = VelocityUtils.getTemplateList(table.getTplCategory());
+        for (String template : templates) {
+            if (!StringUtils.containsAny(template, "sql.vm", "api.ts.vm", "types.ts.vm", "index.vue.vm", "index-tree.vue.vm")) {
+                // 渲染模板
+                StringWriter sw = new StringWriter();
+                Template tpl = Velocity.getTemplate(template, Constants.UTF8);
+                tpl.merge(context, sw);
+                try {
+                    String path = getGenPath(table, template);
+                    FileUtils.writeUtf8String(sw.toString(), path);
+                } catch (Exception e) {
+                    throw new ServiceException("渲染模板失败，表名：" + table.getTableName());
+                }
+            }
+        }
+    }
+
+    /**
+     * 同步数据库
+     *
+     * @param tableId 表名称
+     */
+    @DSTransactional
+    @Override
+    public void synchDb(Long tableId) {
+        GenTable table = baseMapper.selectGenTableById(tableId);
+        List<GenTableColumn> tableColumns = table.getColumns();
+        Map<String, GenTableColumn> tableColumnMap = StreamUtils.toIdentityMap(tableColumns, GenTableColumn::getColumnName);
+
+        List<GenTableColumn> dbTableColumns = SpringUtils.getAopProxy(this).selectDbTableColumnsByName(table.getTableName(), table.getDataName());
+        if (CollUtil.isEmpty(dbTableColumns)) {
+            throw new ServiceException("同步数据失败，原表结构不存在");
+        }
+        List<String> dbTableColumnNames = StreamUtils.toList(dbTableColumns, GenTableColumn::getColumnName);
+
+        List<GenTableColumn> saveColumns = new ArrayList<>();
+        dbTableColumns.forEach(column -> {
+            GenUtils.initColumnField(column, table);
+            if (tableColumnMap.containsKey(column.getColumnName())) {
+                GenTableColumn prevColumn = tableColumnMap.get(column.getColumnName());
+                column.setColumnId(prevColumn.getColumnId());
+                if (column.isList()) {
+                    // 如果是列表，继续保留查询方式/字典类型选项
+                    column.setDictType(prevColumn.getDictType());
+                    column.setQueryType(prevColumn.getQueryType());
+                }
+                if (StringUtils.isNotEmpty(prevColumn.getIsRequired()) && !column.isPk()
+                        && (column.isInsert() || column.isEdit())
+                        && ((column.isUsableColumn()) || (!column.isSuperColumn()))) {
+                    // 如果是(新增/修改&非主键/非忽略及父属性)，继续保留必填/显示类型选项
+                    column.setIsRequired(prevColumn.getIsRequired());
+                    column.setHtmlType(prevColumn.getHtmlType());
+                }
+            }
+            saveColumns.add(column);
+        });
+        if (CollUtil.isNotEmpty(saveColumns)) {
+            genTableColumnMapper.insertOrUpdateBatch(saveColumns);
+        }
+        List<GenTableColumn> delColumns = StreamUtils.filter(tableColumns, column -> !dbTableColumnNames.contains(column.getColumnName()));
+        if (CollUtil.isNotEmpty(delColumns)) {
+            List<Long> ids = StreamUtils.toList(delColumns, GenTableColumn::getColumnId);
+            if (CollUtil.isNotEmpty(ids)) {
+                genTableColumnMapper.deleteByIds(ids);
+            }
+        }
+    }
+
+    /**
+     * 批量生成代码（下载方式）
+     *
+     * @param tableIds 表ID数组
+     * @return 数据
+     */
+    @Override
+    public byte[] downloadCode(String[] tableIds) {
+        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+        ZipOutputStream zip = new ZipOutputStream(outputStream);
+        for (String tableId : tableIds) {
+            generatorCode(Long.parseLong(tableId), zip);
+        }
+        IoUtil.close(zip);
+        return outputStream.toByteArray();
+    }
+
+    /**
+     * 查询表信息并生成代码
+     */
+    private void generatorCode(Long tableId, ZipOutputStream zip) {
+        // 查询表信息
+        GenTable table = baseMapper.selectGenTableById(tableId);
+        List<Long> menuIds = new ArrayList<>();
+        for (int i = 0; i < 6; i++) {
+            menuIds.add(identifierGenerator.nextId(null).longValue());
+        }
+        table.setMenuIds(menuIds);
+        // 设置主键列信息
+        setPkColumn(table);
+
+        VelocityInitializer.initVelocity();
+
+        VelocityContext context = VelocityUtils.prepareContext(table);
+
+        // 获取模板列表
+        List<String> templates = VelocityUtils.getTemplateList(table.getTplCategory());
+        for (String template : templates) {
+            // 渲染模板
+            StringWriter sw = new StringWriter();
+            Template tpl = Velocity.getTemplate(template, Constants.UTF8);
+            tpl.merge(context, sw);
+            try {
+                // 添加到zip
+                zip.putNextEntry(new ZipEntry(VelocityUtils.getFileName(template, table)));
+                IoUtil.write(zip, StandardCharsets.UTF_8, false, sw.toString());
+                IoUtil.close(sw);
+                zip.flush();
+                zip.closeEntry();
+            } catch (IOException e) {
+                log.error("渲染模板失败，表名：" + table.getTableName(), e);
+            }
+        }
+    }
+
+    /**
+     * 修改保存参数校验
+     *
+     * @param genTable 业务信息
+     */
+    @Override
+    public void validateEdit(GenTable genTable) {
+        if (GenConstants.TPL_TREE.equals(genTable.getTplCategory())) {
+            String options = JsonUtils.toJsonString(genTable.getParams());
+            Dict paramsObj = JsonUtils.parseMap(options);
+            if (StringUtils.isEmpty(paramsObj.getStr(GenConstants.TREE_CODE))) {
+                throw new ServiceException("树编码字段不能为空");
+            } else if (StringUtils.isEmpty(paramsObj.getStr(GenConstants.TREE_PARENT_CODE))) {
+                throw new ServiceException("树父编码字段不能为空");
+            } else if (StringUtils.isEmpty(paramsObj.getStr(GenConstants.TREE_NAME))) {
+                throw new ServiceException("树名称字段不能为空");
+            }
+        }
+    }
+
+    /**
+     * 设置主键列信息
+     *
+     * @param table 业务表信息
+     */
+    public void setPkColumn(GenTable table) {
+        for (GenTableColumn column : table.getColumns()) {
+            if (column.isPk()) {
+                table.setPkColumn(column);
+                break;
+            }
+        }
+        if (ObjectUtil.isNull(table.getPkColumn())) {
+            table.setPkColumn(table.getColumns().get(0));
+        }
+
+    }
+
+    /**
+     * 设置代码生成其他选项值
+     *
+     * @param genTable 设置后的生成对象
+     */
+    public void setTableFromOptions(GenTable genTable) {
+        Dict paramsObj = JsonUtils.parseMap(genTable.getOptions());
+        if (ObjectUtil.isNotNull(paramsObj)) {
+            String treeCode = paramsObj.getStr(GenConstants.TREE_CODE);
+            String treeParentCode = paramsObj.getStr(GenConstants.TREE_PARENT_CODE);
+            String treeName = paramsObj.getStr(GenConstants.TREE_NAME);
+            Long parentMenuId = paramsObj.getLong(GenConstants.PARENT_MENU_ID);
+            String parentMenuName = paramsObj.getStr(GenConstants.PARENT_MENU_NAME);
+
+            genTable.setTreeCode(treeCode);
+            genTable.setTreeParentCode(treeParentCode);
+            genTable.setTreeName(treeName);
+            genTable.setParentMenuId(parentMenuId);
+            genTable.setParentMenuName(parentMenuName);
+        }
+    }
+}
+
diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/IGenTableService.java b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/IGenTableService.java
new file mode 100644
index 0000000..8a28d40
--- /dev/null
+++ b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/IGenTableService.java
@@ -0,0 +1,141 @@
+package org.dromara.generator.service;
+
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.generator.domain.GenTable;
+import org.dromara.generator.domain.GenTableColumn;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 业务 服务层
+ *
+ * @author pengles
+ */
+public interface IGenTableService {
+
+    /**
+     * 查询业务字段列表
+     *
+     * @param tableId 业务字段编号
+     * @return 业务字段集合
+     */
+    List<GenTableColumn> selectGenTableColumnListByTableId(Long tableId);
+
+    /**
+     * 查询业务列表
+     *
+     * @param genTable 业务信息
+     * @return 业务集合
+     */
+    TableDataInfo<GenTable> selectPageGenTableList(GenTable genTable, PageQuery pageQuery);
+
+    /**
+     * 查询据库列表
+     *
+     * @param genTable 业务信息
+     * @return 数据库表集合
+     */
+    TableDataInfo<GenTable> selectPageDbTableList(GenTable genTable, PageQuery pageQuery);
+
+    /**
+     * 查询据库列表
+     *
+     * @param tableNames 表名称组
+     * @param dataName   数据源名称
+     * @return 数据库表集合
+     */
+    List<GenTable> selectDbTableListByNames(String[] tableNames, String dataName);
+
+    /**
+     * 查询所有表信息
+     *
+     * @return 表信息集合
+     */
+    List<GenTable> selectGenTableAll();
+
+    /**
+     * 查询业务信息
+     *
+     * @param id 业务ID
+     * @return 业务信息
+     */
+    GenTable selectGenTableById(Long id);
+
+    /**
+     * 修改业务
+     *
+     * @param genTable 业务信息
+     */
+    void updateGenTable(GenTable genTable);
+
+    /**
+     * 删除业务信息
+     *
+     * @param tableIds 需要删除的表数据ID
+     */
+    void deleteGenTableByIds(Long[] tableIds);
+
+    /**
+     * 导入表结构
+     *
+     * @param tableList 导入表列表
+     * @param dataName  数据源名称
+     */
+    void importGenTable(List<GenTable> tableList, String dataName);
+
+    /**
+     * 根据表名称查询列信息
+     *
+     * @param tableName 表名称
+     * @param dataName  数据源名称
+     * @return 列信息
+     */
+    List<GenTableColumn> selectDbTableColumnsByName(String tableName, String dataName);
+
+    /**
+     * 预览代码
+     *
+     * @param tableId 表编号
+     * @return 预览数据列表
+     */
+    Map<String, String> previewCode(Long tableId);
+
+    /**
+     * 生成代码（下载方式）
+     *
+     * @param tableId 表名称
+     * @return 数据
+     */
+    byte[] downloadCode(Long tableId);
+
+    /**
+     * 生成代码（自定义路径）
+     *
+     * @param tableId 表名称
+     */
+    void generatorCode(Long tableId);
+
+    /**
+     * 同步数据库
+     *
+     * @param tableId 表名称
+     */
+    void synchDb(Long tableId);
+
+    /**
+     * 批量生成代码（下载方式）
+     *
+     * @param tableIds 表ID数组
+     * @return 数据
+     */
+    byte[] downloadCode(String[] tableIds);
+
+    /**
+     * 修改保存参数校验
+     *
+     * @param genTable 业务信息
+     */
+    void validateEdit(GenTable genTable);
+}
diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/util/GenUtils.java b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/util/GenUtils.java
new file mode 100644
index 0000000..55003c3
--- /dev/null
+++ b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/util/GenUtils.java
@@ -0,0 +1,219 @@
+package org.dromara.generator.util;
+
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+import org.apache.commons.lang3.RegExUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.generator.config.GenConfig;
+import org.dromara.generator.constant.GenConstants;
+import org.dromara.generator.domain.GenTable;
+import org.dromara.generator.domain.GenTableColumn;
+
+import java.util.Arrays;
+
+/**
+ * 代码生成器 工具类
+ *
+ * @author pengles
+ */
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public class GenUtils {
+
+    /**
+     * 初始化表信息
+     */
+    public static void initTable(GenTable genTable) {
+        genTable.setClassName(convertClassName(genTable.getTableName()));
+        genTable.setPackageName(GenConfig.getPackageName());
+        genTable.setModuleName(getModuleName(GenConfig.getPackageName()));
+        genTable.setBusinessName(getBusinessName(genTable.getTableName()));
+        genTable.setFunctionName(replaceText(genTable.getTableComment()));
+        genTable.setFunctionAuthor(GenConfig.getAuthor());
+        genTable.setCreateTime(null);
+        genTable.setUpdateTime(null);
+    }
+
+    /**
+     * 初始化列属性字段
+     */
+    public static void initColumnField(GenTableColumn column, GenTable table) {
+        String dataType = getDbType(column.getColumnType());
+        // 统一转小写 避免有些数据库默认大写问题 如果需要特别书写方式 请在实体类增加注解标注别名
+        String columnName = column.getColumnName().toLowerCase();
+        column.setTableId(table.getTableId());
+        column.setCreateTime(null);
+        column.setUpdateTime(null);
+        // 设置java字段名
+        column.setJavaField(StringUtils.toCamelCase(columnName));
+        // 设置默认类型
+        column.setJavaType(GenConstants.TYPE_STRING);
+        column.setQueryType(GenConstants.QUERY_EQ);
+
+        if (arraysContains(GenConstants.COLUMNTYPE_STR, dataType) || arraysContains(GenConstants.COLUMNTYPE_TEXT, dataType)) {
+            // 字符串长度超过500设置为文本域
+            Integer columnLength = getColumnLength(column.getColumnType());
+            String htmlType = columnLength >= 500 || arraysContains(GenConstants.COLUMNTYPE_TEXT, dataType) ? GenConstants.HTML_TEXTAREA : GenConstants.HTML_INPUT;
+            column.setHtmlType(htmlType);
+        } else if (arraysContains(GenConstants.COLUMNTYPE_TIME, dataType)) {
+            column.setJavaType(GenConstants.TYPE_DATE);
+            column.setHtmlType(GenConstants.HTML_DATETIME);
+        } else if (arraysContains(GenConstants.COLUMNTYPE_NUMBER, dataType)) {
+            column.setHtmlType(GenConstants.HTML_INPUT);
+            // 数据库的数字字段与java不匹配 且很多数据库的数字字段很模糊 例如oracle只有number没有细分
+            // 所以默认数字类型全为Long可在界面上自行编辑想要的类型 有什么特殊需求也可以在这里特殊处理
+            column.setJavaType(GenConstants.TYPE_LONG);
+        }
+
+        // BO对象 默认插入勾选
+        if (!arraysContains(GenConstants.COLUMNNAME_NOT_ADD, columnName) && !column.isPk()) {
+            column.setIsInsert(GenConstants.REQUIRE);
+        }
+        // BO对象 默认编辑勾选
+        if (!arraysContains(GenConstants.COLUMNNAME_NOT_EDIT, columnName)) {
+            column.setIsEdit(GenConstants.REQUIRE);
+        }
+        // VO对象 默认返回勾选
+        if (!arraysContains(GenConstants.COLUMNNAME_NOT_LIST, columnName)) {
+            column.setIsList(GenConstants.REQUIRE);
+        }
+        // BO对象 默认查询勾选
+        if (!arraysContains(GenConstants.COLUMNNAME_NOT_QUERY, columnName) && !column.isPk()) {
+            column.setIsQuery(GenConstants.REQUIRE);
+        }
+
+        // 查询字段类型
+        if (StringUtils.endsWithIgnoreCase(columnName, "name")) {
+            column.setQueryType(GenConstants.QUERY_LIKE);
+        }
+        // 状态字段设置单选框
+        if (StringUtils.endsWithIgnoreCase(columnName, "status")) {
+            column.setHtmlType(GenConstants.HTML_RADIO);
+        }
+        // 类型&性别字段设置下拉框
+        else if (StringUtils.endsWithIgnoreCase(columnName, "type")
+                || StringUtils.endsWithIgnoreCase(columnName, "sex")) {
+            column.setHtmlType(GenConstants.HTML_SELECT);
+        }
+        // 图片字段设置图片上传控件
+        else if (StringUtils.endsWithIgnoreCase(columnName, "image")) {
+            column.setHtmlType(GenConstants.HTML_IMAGE_UPLOAD);
+        }
+        // 文件字段设置文件上传控件
+        else if (StringUtils.endsWithIgnoreCase(columnName, "file")) {
+            column.setHtmlType(GenConstants.HTML_FILE_UPLOAD);
+        }
+        // 内容字段设置富文本控件
+        else if (StringUtils.endsWithIgnoreCase(columnName, "content")) {
+            column.setHtmlType(GenConstants.HTML_EDITOR);
+        }
+    }
+
+    /**
+     * 校验数组是否包含指定值
+     *
+     * @param arr         数组
+     * @param targetValue 值
+     * @return 是否包含
+     */
+    public static boolean arraysContains(String[] arr, String targetValue) {
+        return Arrays.asList(arr).contains(targetValue);
+    }
+
+    /**
+     * 获取模块名
+     *
+     * @param packageName 包名
+     * @return 模块名
+     */
+    public static String getModuleName(String packageName) {
+        int lastIndex = packageName.lastIndexOf(".");
+        int nameLength = packageName.length();
+        return StringUtils.substring(packageName, lastIndex + 1, nameLength);
+    }
+
+    /**
+     * 获取业务名
+     *
+     * @param tableName 表名
+     * @return 业务名
+     */
+    public static String getBusinessName(String tableName) {
+        int firstIndex = tableName.indexOf("_");
+        int nameLength = tableName.length();
+        String businessName = StringUtils.substring(tableName, firstIndex + 1, nameLength);
+        businessName = StringUtils.toCamelCase(businessName);
+        return businessName;
+    }
+
+    /**
+     * 表名转换成Java类名
+     *
+     * @param tableName 表名称
+     * @return 类名
+     */
+    public static String convertClassName(String tableName) {
+        boolean autoRemovePre = GenConfig.getAutoRemovePre();
+        String tablePrefix = GenConfig.getTablePrefix();
+        if (autoRemovePre && StringUtils.isNotEmpty(tablePrefix)) {
+            String[] searchList = StringUtils.split(tablePrefix, StringUtils.SEPARATOR);
+            tableName = replaceFirst(tableName, searchList);
+        }
+        return StringUtils.convertToCamelCase(tableName);
+    }
+
+    /**
+     * 批量替换前缀
+     *
+     * @param replacementm 替换值
+     * @param searchList   替换列表
+     */
+    public static String replaceFirst(String replacementm, String[] searchList) {
+        String text = replacementm;
+        for (String searchString : searchList) {
+            if (replacementm.startsWith(searchString)) {
+                text = replacementm.replaceFirst(searchString, StringUtils.EMPTY);
+                break;
+            }
+        }
+        return text;
+    }
+
+    /**
+     * 关键字替换
+     *
+     * @param text 需要被替换的名字
+     * @return 替换后的名字
+     */
+    public static String replaceText(String text) {
+        return RegExUtils.replaceAll(text, "(?:表|若依)", "");
+    }
+
+    /**
+     * 获取数据库类型字段
+     *
+     * @param columnType 列类型
+     * @return 截取后的列类型
+     */
+    public static String getDbType(String columnType) {
+        if (StringUtils.indexOf(columnType, "(") > 0) {
+            return StringUtils.substringBefore(columnType, "(");
+        } else {
+            return columnType;
+        }
+    }
+
+    /**
+     * 获取字段长度
+     *
+     * @param columnType 列类型
+     * @return 截取后的列类型
+     */
+    public static Integer getColumnLength(String columnType) {
+        if (StringUtils.indexOf(columnType, "(") > 0) {
+            String length = StringUtils.substringBetween(columnType, "(", ")");
+            return Integer.valueOf(length);
+        } else {
+            return 0;
+        }
+    }
+}
diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/util/VelocityInitializer.java b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/util/VelocityInitializer.java
new file mode 100644
index 0000000..ada226d
--- /dev/null
+++ b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/util/VelocityInitializer.java
@@ -0,0 +1,35 @@
+package org.dromara.generator.util;
+
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+import org.apache.velocity.app.Velocity;
+import org.dromara.common.core.constant.Constants;
+
+import java.util.Properties;
+
+/**
+ * VelocityEngine工厂
+ *
+ * @author pengles
+ */
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public class VelocityInitializer {
+
+    /**
+     * 初始化vm方法
+     */
+    public static void initVelocity() {
+        Properties p = new Properties();
+        try {
+            // 加载classpath目录下的vm文件
+            p.setProperty("resource.loader.file.class", "org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader");
+            // 定义字符集
+            p.setProperty(Velocity.INPUT_ENCODING, Constants.UTF8);
+            // 初始化Velocity引擎，指定配置Properties
+            Velocity.init(p);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/util/VelocityUtils.java b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/util/VelocityUtils.java
new file mode 100644
index 0000000..77327b3
--- /dev/null
+++ b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/util/VelocityUtils.java
@@ -0,0 +1,341 @@
+package org.dromara.generator.util;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.convert.Convert;
+import cn.hutool.core.lang.Dict;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+import org.apache.velocity.VelocityContext;
+import org.dromara.common.core.utils.DateUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.json.utils.JsonUtils;
+import org.dromara.common.mybatis.helper.DataBaseHelper;
+import org.dromara.generator.constant.GenConstants;
+import org.dromara.generator.domain.GenTable;
+import org.dromara.generator.domain.GenTableColumn;
+
+import java.util.*;
+
+/**
+ * 模板处理工具类
+ *
+ * @author pengles
+ */
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public class VelocityUtils {
+
+    /**
+     * 项目空间路径
+     */
+    private static final String PROJECT_PATH = "main/java";
+
+    /**
+     * mybatis空间路径
+     */
+    private static final String MYBATIS_PATH = "main/resources/mapper";
+
+    /**
+     * 默认上级菜单，系统工具
+     */
+    private static final String DEFAULT_PARENT_MENU_ID = "3";
+
+    /**
+     * 设置模板变量信息
+     *
+     * @return 模板列表
+     */
+    public static VelocityContext prepareContext(GenTable genTable) {
+        String moduleName = genTable.getModuleName();
+        String businessName = genTable.getBusinessName();
+        String packageName = genTable.getPackageName();
+        String tplCategory = genTable.getTplCategory();
+        String functionName = genTable.getFunctionName();
+
+        VelocityContext velocityContext = new VelocityContext();
+        velocityContext.put("tplCategory", genTable.getTplCategory());
+        velocityContext.put("tableName", genTable.getTableName());
+        velocityContext.put("functionName", StringUtils.isNotEmpty(functionName) ? functionName : "【请填写功能名称】");
+        velocityContext.put("ClassName", genTable.getClassName());
+        velocityContext.put("className", StringUtils.uncapitalize(genTable.getClassName()));
+        velocityContext.put("moduleName", genTable.getModuleName());
+        velocityContext.put("BusinessName", StringUtils.capitalize(genTable.getBusinessName()));
+        velocityContext.put("businessName", genTable.getBusinessName());
+        velocityContext.put("basePackage", getPackagePrefix(packageName));
+        velocityContext.put("packageName", packageName);
+        velocityContext.put("author", genTable.getFunctionAuthor());
+        velocityContext.put("datetime", DateUtils.getDate());
+        velocityContext.put("pkColumn", genTable.getPkColumn());
+        velocityContext.put("importList", getImportList(genTable));
+        velocityContext.put("permissionPrefix", getPermissionPrefix(moduleName, businessName));
+        velocityContext.put("columns", genTable.getColumns());
+        velocityContext.put("table", genTable);
+        velocityContext.put("dicts", getDicts(genTable));
+        setMenuVelocityContext(velocityContext, genTable);
+        if (GenConstants.TPL_TREE.equals(tplCategory)) {
+            setTreeVelocityContext(velocityContext, genTable);
+        }
+        return velocityContext;
+    }
+
+    public static void setMenuVelocityContext(VelocityContext context, GenTable genTable) {
+        String options = genTable.getOptions();
+        Dict paramsObj = JsonUtils.parseMap(options);
+        String parentMenuId = getParentMenuId(paramsObj);
+        context.put("parentMenuId", parentMenuId);
+    }
+
+    public static void setTreeVelocityContext(VelocityContext context, GenTable genTable) {
+        String options = genTable.getOptions();
+        Dict paramsObj = JsonUtils.parseMap(options);
+        String treeCode = getTreecode(paramsObj);
+        String treeParentCode = getTreeParentCode(paramsObj);
+        String treeName = getTreeName(paramsObj);
+
+        context.put("treeCode", treeCode);
+        context.put("treeParentCode", treeParentCode);
+        context.put("treeName", treeName);
+        context.put("expandColumn", getExpandColumn(genTable));
+        if (paramsObj.containsKey(GenConstants.TREE_PARENT_CODE)) {
+            context.put("tree_parent_code", paramsObj.get(GenConstants.TREE_PARENT_CODE));
+        }
+        if (paramsObj.containsKey(GenConstants.TREE_NAME)) {
+            context.put("tree_name", paramsObj.get(GenConstants.TREE_NAME));
+        }
+    }
+
+    /**
+     * 获取模板信息
+     *
+     * @return 模板列表
+     */
+    public static List<String> getTemplateList(String tplCategory) {
+        List<String> templates = new ArrayList<>();
+        templates.add("vm/java/domain.java.vm");
+        templates.add("vm/java/vo.java.vm");
+        templates.add("vm/java/bo.java.vm");
+        templates.add("vm/java/mapper.java.vm");
+        templates.add("vm/java/service.java.vm");
+        templates.add("vm/java/serviceImpl.java.vm");
+        templates.add("vm/java/controller.java.vm");
+        templates.add("vm/xml/mapper.xml.vm");
+        if (DataBaseHelper.isOracle()) {
+            templates.add("vm/sql/oracle/sql.vm");
+        } else if (DataBaseHelper.isPostgerSql()) {
+            templates.add("vm/sql/postgres/sql.vm");
+        } else if (DataBaseHelper.isSqlServer()) {
+            templates.add("vm/sql/sqlserver/sql.vm");
+        } else {
+            templates.add("vm/sql/sql.vm");
+        }
+        templates.add("vm/ts/api.ts.vm");
+        templates.add("vm/ts/types.ts.vm");
+        if (GenConstants.TPL_CRUD.equals(tplCategory)) {
+            templates.add("vm/vue/index.vue.vm");
+        } else if (GenConstants.TPL_TREE.equals(tplCategory)) {
+            templates.add("vm/vue/index-tree.vue.vm");
+        }
+        return templates;
+    }
+
+    /**
+     * 获取文件名
+     */
+    public static String getFileName(String template, GenTable genTable) {
+        // 文件名称
+        String fileName = "";
+        // 包路径
+        String packageName = genTable.getPackageName();
+        // 模块名
+        String moduleName = genTable.getModuleName();
+        // 大写类名
+        String className = genTable.getClassName();
+        // 业务名称
+        String businessName = genTable.getBusinessName();
+
+        String javaPath = PROJECT_PATH + "/" + StringUtils.replace(packageName, ".", "/");
+        String mybatisPath = MYBATIS_PATH + "/" + moduleName;
+        String vuePath = "vue";
+
+        if (template.contains("domain.java.vm")) {
+            fileName = StringUtils.format("{}/domain/{}.java", javaPath, className);
+        }
+        if (template.contains("vo.java.vm")) {
+            fileName = StringUtils.format("{}/domain/vo/{}Vo.java", javaPath, className);
+        }
+        if (template.contains("bo.java.vm")) {
+            fileName = StringUtils.format("{}/domain/bo/{}Bo.java", javaPath, className);
+        }
+        if (template.contains("mapper.java.vm")) {
+            fileName = StringUtils.format("{}/mapper/{}Mapper.java", javaPath, className);
+        } else if (template.contains("service.java.vm")) {
+            fileName = StringUtils.format("{}/service/I{}Service.java", javaPath, className);
+        } else if (template.contains("serviceImpl.java.vm")) {
+            fileName = StringUtils.format("{}/service/impl/{}ServiceImpl.java", javaPath, className);
+        } else if (template.contains("controller.java.vm")) {
+            fileName = StringUtils.format("{}/controller/{}Controller.java", javaPath, className);
+        } else if (template.contains("mapper.xml.vm")) {
+            fileName = StringUtils.format("{}/{}Mapper.xml", mybatisPath, className);
+        } else if (template.contains("sql.vm")) {
+            fileName = businessName + "Menu.sql";
+        } else if (template.contains("api.ts.vm")) {
+            fileName = StringUtils.format("{}/api/{}/{}/index.ts", vuePath, moduleName, businessName);
+        } else if (template.contains("types.ts.vm")) {
+            fileName = StringUtils.format("{}/api/{}/{}/types.ts", vuePath, moduleName, businessName);
+        } else if (template.contains("index.vue.vm")) {
+            fileName = StringUtils.format("{}/views/{}/{}/index.vue", vuePath, moduleName, businessName);
+        } else if (template.contains("index-tree.vue.vm")) {
+            fileName = StringUtils.format("{}/views/{}/{}/index.vue", vuePath, moduleName, businessName);
+        }
+        return fileName;
+    }
+
+    /**
+     * 获取包前缀
+     *
+     * @param packageName 包名称
+     * @return 包前缀名称
+     */
+    public static String getPackagePrefix(String packageName) {
+        int lastIndex = packageName.lastIndexOf(".");
+        return StringUtils.substring(packageName, 0, lastIndex);
+    }
+
+    /**
+     * 根据列类型获取导入包
+     *
+     * @param genTable 业务表对象
+     * @return 返回需要导入的包列表
+     */
+    public static HashSet<String> getImportList(GenTable genTable) {
+        List<GenTableColumn> columns = genTable.getColumns();
+        HashSet<String> importList = new HashSet<>();
+        for (GenTableColumn column : columns) {
+            if (!column.isSuperColumn() && GenConstants.TYPE_DATE.equals(column.getJavaType())) {
+                importList.add("java.util.Date");
+                importList.add("com.fasterxml.jackson.annotation.JsonFormat");
+            } else if (!column.isSuperColumn() && GenConstants.TYPE_BIGDECIMAL.equals(column.getJavaType())) {
+                importList.add("java.math.BigDecimal");
+            } else if (!column.isSuperColumn() && "imageUpload".equals(column.getHtmlType())) {
+                importList.add("org.dromara.common.translation.annotation.Translation");
+                importList.add("org.dromara.common.translation.constant.TransConstant");
+            }
+        }
+        return importList;
+    }
+
+    /**
+     * 根据列类型获取字典组
+     *
+     * @param genTable 业务表对象
+     * @return 返回字典组
+     */
+    public static String getDicts(GenTable genTable) {
+        List<GenTableColumn> columns = genTable.getColumns();
+        Set<String> dicts = new HashSet<>();
+        addDicts(dicts, columns);
+        return StringUtils.join(dicts, ", ");
+    }
+
+    /**
+     * 添加字典列表
+     *
+     * @param dicts   字典列表
+     * @param columns 列集合
+     */
+    public static void addDicts(Set<String> dicts, List<GenTableColumn> columns) {
+        for (GenTableColumn column : columns) {
+            if (!column.isSuperColumn() && StringUtils.isNotEmpty(column.getDictType()) && StringUtils.equalsAny(
+                    column.getHtmlType(),
+                    new String[]{GenConstants.HTML_SELECT, GenConstants.HTML_RADIO, GenConstants.HTML_CHECKBOX})) {
+                dicts.add("'" + column.getDictType() + "'");
+            }
+        }
+    }
+
+    /**
+     * 获取权限前缀
+     *
+     * @param moduleName   模块名称
+     * @param businessName 业务名称
+     * @return 返回权限前缀
+     */
+    public static String getPermissionPrefix(String moduleName, String businessName) {
+        return StringUtils.format("{}:{}", moduleName, businessName);
+    }
+
+    /**
+     * 获取上级菜单ID字段
+     *
+     * @param paramsObj 生成其他选项
+     * @return 上级菜单ID字段
+     */
+    public static String getParentMenuId(Dict paramsObj) {
+        if (CollUtil.isNotEmpty(paramsObj) && paramsObj.containsKey(GenConstants.PARENT_MENU_ID)
+                && StringUtils.isNotEmpty(paramsObj.getStr(GenConstants.PARENT_MENU_ID))) {
+            return paramsObj.getStr(GenConstants.PARENT_MENU_ID);
+        }
+        return DEFAULT_PARENT_MENU_ID;
+    }
+
+    /**
+     * 获取树编码
+     *
+     * @param paramsObj 生成其他选项
+     * @return 树编码
+     */
+    public static String getTreecode(Map<String, Object> paramsObj) {
+        if (CollUtil.isNotEmpty(paramsObj) && paramsObj.containsKey(GenConstants.TREE_CODE)) {
+            return StringUtils.toCamelCase(Convert.toStr(paramsObj.get(GenConstants.TREE_CODE)));
+        }
+        return StringUtils.EMPTY;
+    }
+
+    /**
+     * 获取树父编码
+     *
+     * @param paramsObj 生成其他选项
+     * @return 树父编码
+     */
+    public static String getTreeParentCode(Dict paramsObj) {
+        if (CollUtil.isNotEmpty(paramsObj) && paramsObj.containsKey(GenConstants.TREE_PARENT_CODE)) {
+            return StringUtils.toCamelCase(paramsObj.getStr(GenConstants.TREE_PARENT_CODE));
+        }
+        return StringUtils.EMPTY;
+    }
+
+    /**
+     * 获取树名称
+     *
+     * @param paramsObj 生成其他选项
+     * @return 树名称
+     */
+    public static String getTreeName(Dict paramsObj) {
+        if (CollUtil.isNotEmpty(paramsObj) && paramsObj.containsKey(GenConstants.TREE_NAME)) {
+            return StringUtils.toCamelCase(paramsObj.getStr(GenConstants.TREE_NAME));
+        }
+        return StringUtils.EMPTY;
+    }
+
+    /**
+     * 获取需要在哪一列上面显示展开按钮
+     *
+     * @param genTable 业务表对象
+     * @return 展开按钮列序号
+     */
+    public static int getExpandColumn(GenTable genTable) {
+        String options = genTable.getOptions();
+        Dict paramsObj = JsonUtils.parseMap(options);
+        String treeName = paramsObj.getStr(GenConstants.TREE_NAME);
+        int num = 0;
+        for (GenTableColumn column : genTable.getColumns()) {
+            if (column.isList()) {
+                num++;
+                String columnName = column.getColumnName();
+                if (columnName.equals(treeName)) {
+                    break;
+                }
+            }
+        }
+        return num;
+    }
+}
diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/generator.yml b/ruoyi-modules/ruoyi-generator/src/main/resources/generator.yml
new file mode 100644
index 0000000..d779d97
--- /dev/null
+++ b/ruoyi-modules/ruoyi-generator/src/main/resources/generator.yml
@@ -0,0 +1,10 @@
+# 代码生成
+gen:
+  # 作者
+  author: Lion Li
+  # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool
+  packageName: org.dromara.system
+  # 自动去除表前缀，默认是false
+  autoRemovePre: false
+  # 表前缀（生成类名不会包含表前缀，多个用逗号分隔）
+  tablePrefix: sys_
diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml b/ruoyi-modules/ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml
new file mode 100644
index 0000000..9599836
--- /dev/null
+++ b/ruoyi-modules/ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.generator.mapper.GenTableColumnMapper">
+
+    <resultMap type="org.dromara.generator.domain.GenTableColumn" id="GenTableColumnResult">
+    </resultMap>
+
+</mapper>
diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml b/ruoyi-modules/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml
new file mode 100644
index 0000000..80c5ba3
--- /dev/null
+++ b/ruoyi-modules/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.generator.mapper.GenTableMapper">
+
+    <!-- 多结构嵌套自动映射需带上每个实体的主键id 否则映射会失败 -->
+    <resultMap type="org.dromara.generator.domain.GenTable" id="GenTableResult">
+        <id property="tableId" column="table_id"/>
+        <collection property="columns" javaType="java.util.List" resultMap="GenTableColumnResult"/>
+    </resultMap>
+
+    <resultMap type="org.dromara.generator.domain.GenTableColumn" id="GenTableColumnResult">
+        <id property="columnId" column="column_id"/>
+    </resultMap>
+
+    <sql id="genSelect">
+        SELECT t.table_id,
+               t.data_name,
+               t.table_name,
+               t.table_comment,
+               t.sub_table_name,
+               t.sub_table_fk_name,
+               t.class_name,
+               t.tpl_category,
+               t.package_name,
+               t.module_name,
+               t.business_name,
+               t.function_name,
+               t.function_author,
+               t.gen_type,
+               t.gen_path,
+               t.options,
+               t.remark,
+               c.column_id,
+               c.column_name,
+               c.column_comment,
+               c.column_type,
+               c.java_type,
+               c.java_field,
+               c.is_pk,
+               c.is_increment,
+               c.is_required,
+               c.is_insert,
+               c.is_edit,
+               c.is_list,
+               c.is_query,
+               c.query_type,
+               c.html_type,
+               c.dict_type,
+               c.sort
+        FROM gen_table t
+                 LEFT JOIN gen_table_column c ON t.table_id = c.table_id
+    </sql>
+
+    <select id="selectGenTableById" parameterType="Long" resultMap="GenTableResult">
+        <include refid="genSelect"/>
+        where t.table_id = #{tableId} order by c.sort
+    </select>
+
+    <select id="selectGenTableByName" parameterType="String" resultMap="GenTableResult">
+        <include refid="genSelect"/>
+        where t.table_name = #{tableName} order by c.sort
+    </select>
+
+    <select id="selectGenTableAll" parameterType="String" resultMap="GenTableResult">
+        <include refid="genSelect"/>
+        order by c.sort
+    </select>
+
+    <select id="selectTableNameList" resultType="java.lang.String">
+        select table_name
+        from gen_table
+        where data_name = #{dataName,jdbcType=VARCHAR}
+    </select>
+</mapper>
diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/mapper/package-info.md b/ruoyi-modules/ruoyi-generator/src/main/resources/mapper/package-info.md
new file mode 100644
index 0000000..c938b1e
--- /dev/null
+++ b/ruoyi-modules/ruoyi-generator/src/main/resources/mapper/package-info.md
@@ -0,0 +1,3 @@
+java包使用 `.` 分割 resource 目录使用 `/` 分割
+<br>
+此文件目的 防止文件夹粘连找不到 `xml` 文件
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/bo.java.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/bo.java.vm
new file mode 100644
index 0000000..e5b3fd3
--- /dev/null
+++ b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/bo.java.vm
@@ -0,0 +1,51 @@
+package ${packageName}.domain.bo;
+
+import ${packageName}.domain.${ClassName};
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+#foreach ($import in $importList)
+import ${import};
+#end
+
+/**
+ * ${functionName}业务对象 ${tableName}
+ *
+ * @author ${author}
+ * @date ${datetime}
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = ${ClassName}.class,reverseConvertGenerate =false)
+
+public class ${ClassName}Bo extends BaseEntity {
+
+    #foreach ($column in $columns)
+        #if(!$table.isSuperColumn($column.javaField) && ($column.query || $column.insert || $column.edit))
+            /**
+             * $column.columnComment
+             */
+            #if($column.insert && $column.edit)
+                #set($Group="AddGroup.class, EditGroup.class")
+            #elseif($column.insert)
+                #set($Group="AddGroup.class")
+            #elseif($column.edit)
+                #set($Group="EditGroup.class")
+            #end
+            #if($column.required)
+                #if($column.javaType == 'String')
+                @NotBlank(message = "$column.columnComment不能为空", groups = { $Group })
+                #else
+                @NotNull(message = "$column.columnComment不能为空", groups = { $Group })
+                #end
+            #end
+        private $column.javaType $column.javaField;
+
+        #end
+    #end
+
+}
diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/controller.java.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/controller.java.vm
new file mode 100644
index 0000000..fa16597
--- /dev/null
+++ b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/controller.java.vm
@@ -0,0 +1,115 @@
+package ${packageName}.controller;
+
+import java.util.List;
+
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.excel.utils.ExcelUtil;
+import ${packageName}.domain.vo.${ClassName}Vo;
+import ${packageName}.domain.bo.${ClassName}Bo;
+import ${packageName}.service.I${ClassName}Service;
+#if($table.crud)
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+#elseif($table.tree)
+#end
+
+/**
+ * ${functionName}
+ *
+ * @author ${author}
+ * @date ${datetime}
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/${moduleName}/${businessName}")
+public class ${ClassName}Controller extends BaseController {
+
+    private final I${ClassName}Service ${className}Service;
+
+/**
+ * 查询${functionName}列表
+ */
+@SaCheckPermission("${permissionPrefix}:list")
+@GetMapping("/list")
+    #if($table.crud)
+    public TableDataInfo<${ClassName}Vo> list(${ClassName}Bo bo, PageQuery pageQuery) {
+        return ${className}Service.queryPageList(bo, pageQuery);
+    }
+    #elseif($table.tree)
+        public R<List<${ClassName}Vo>> list(${ClassName}Bo bo) {
+            List<${ClassName}Vo> list = ${className}Service.queryList(bo);
+            return R.ok(list);
+        }
+    #end
+
+    /**
+     * 导出${functionName}列表
+     */
+    @SaCheckPermission("${permissionPrefix}:export")
+    @Log(title = "${functionName}", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(${ClassName}Bo bo, HttpServletResponse response) {
+        List<${ClassName}Vo> list = ${className}Service.queryList(bo);
+        ExcelUtil.exportExcel(list, "${functionName}", ${ClassName}Vo.class, response);
+    }
+
+    /**
+     * 获取${functionName}详细信息
+     *
+     * @param ${pkColumn.javaField} 主键
+     */
+    @SaCheckPermission("${permissionPrefix}:query")
+    @GetMapping("/{${pkColumn.javaField}}")
+    public R<${ClassName}Vo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable ${pkColumn.javaType} ${pkColumn.javaField}) {
+        return R.ok(${className}Service.queryById(${pkColumn.javaField}));
+    }
+
+    /**
+     * 新增${functionName}
+     */
+    @SaCheckPermission("${permissionPrefix}:add")
+    @Log(title = "${functionName}", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody ${ClassName}Bo bo) {
+        return toAjax(${className}Service.insertByBo(bo));
+    }
+
+    /**
+     * 修改${functionName}
+     */
+    @SaCheckPermission("${permissionPrefix}:edit")
+    @Log(title = "${functionName}", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody ${ClassName}Bo bo) {
+        return toAjax(${className}Service.updateByBo(bo));
+    }
+
+    /**
+     * 删除${functionName}
+     *
+     * @param ${pkColumn.javaField}s 主键串
+     */
+    @SaCheckPermission("${permissionPrefix}:remove")
+    @Log(title = "${functionName}", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{${pkColumn.javaField}s}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable ${pkColumn.javaType}[] ${pkColumn.javaField}s) {
+        return toAjax(${className}Service.deleteWithValidByIds(List.of(${pkColumn.javaField}s), true));
+    }
+}
diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/domain.java.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/domain.java.vm
new file mode 100644
index 0000000..e0330a4
--- /dev/null
+++ b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/domain.java.vm
@@ -0,0 +1,48 @@
+package ${packageName}.domain;
+
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+    #foreach ($import in $importList)
+    import ${import};
+    #end
+
+import java.io.Serial;
+
+/**
+ * ${functionName}对象 ${tableName}
+ *
+ * @author ${author}
+ * @date ${datetime}
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("${tableName}")
+public class ${ClassName} extends
+
+        BaseEntity {
+
+            @Serial
+            private static final long serialVersionUID = 1L;
+
+            #foreach ($column in $columns)
+                #if(!$table.isSuperColumn($column.javaField))
+                    /**
+                     * $column.columnComment
+                     */
+                    #if($column.javaField=='delFlag')
+                    @TableLogic
+                    #end
+                    #if($column.javaField=='version')
+                    @Version
+                    #end
+                    #if($column.isPk==1)
+                    @TableId(value = "$column.columnName")
+                    #end
+                private $column.javaType $column.javaField;
+
+                #end
+            #end
+
+        }
diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/mapper.java.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/mapper.java.vm
new file mode 100644
index 0000000..0922401
--- /dev/null
+++ b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/mapper.java.vm
@@ -0,0 +1,15 @@
+package ${packageName}.mapper;
+
+import ${packageName}.domain.${ClassName};
+import ${packageName}.domain.vo.${ClassName}Vo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * ${functionName}Mapper接口
+ *
+ * @author ${author}
+ * @date ${datetime}
+ */
+public interface ${ClassName}Mapper extends BaseMapperPlus<${ClassName}, ${ClassName}Vo> {
+
+}
diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/service.java.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/service.java.vm
new file mode 100644
index 0000000..753d42d
--- /dev/null
+++ b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/service.java.vm
@@ -0,0 +1,72 @@
+package ${packageName}.service;
+
+import ${packageName}.domain.vo.${ClassName}Vo;
+import ${packageName}.domain.bo.${ClassName}Bo;
+    #if($table.crud)
+    import org.dromara.common.mybatis.core.page.TableDataInfo;
+    import org.dromara.common.mybatis.core.page.PageQuery;
+    #end
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * ${functionName}Service接口
+ *
+ * @author ${author}
+ * @date ${datetime}
+ */
+public interface I${ClassName}Service {
+
+    /**
+     * 查询${functionName}
+     *
+     * @param ${pkColumn.javaField} 主键
+     * @return ${functionName}
+     */
+        ${ClassName}Vo queryById(${pkColumn.javaType} ${pkColumn.javaField});
+
+    #if($table.crud)
+        /**
+         * 分页查询${functionName}列表
+         *
+         * @param bo        查询条件
+         * @param pageQuery 分页参数
+         * @return ${functionName}分页列表
+         */
+        TableDataInfo<${ClassName}Vo> queryPageList(${ClassName}Bo bo, PageQuery pageQuery);
+    #end
+
+    /**
+     * 查询符合条件的${functionName}列表
+     *
+     * @param bo 查询条件
+     * @return ${functionName}列表
+     */
+    List<${ClassName}Vo> queryList(${ClassName}Bo bo);
+
+    /**
+     * 新增${functionName}
+     *
+     * @param bo ${functionName}
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(${ClassName}Bo bo);
+
+    /**
+     * 修改${functionName}
+     *
+     * @param bo ${functionName}
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(${ClassName}Bo bo);
+
+    /**
+     * 校验并批量删除${functionName}信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<${pkColumn.javaType}> ids, Boolean isValid);
+}
diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm
new file mode 100644
index 0000000..00cf3f4
--- /dev/null
+++ b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm
@@ -0,0 +1,160 @@
+package ${packageName}.service.impl;
+
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+    #if($table.crud)
+    import org.dromara.common.mybatis.core.page.TableDataInfo;
+    import org.dromara.common.mybatis.core.page.PageQuery;
+    import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+    #end
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import ${packageName}.domain.bo.${ClassName}Bo;
+import ${packageName}.domain.vo.${ClassName}Vo;
+import ${packageName}.domain.${ClassName};
+import ${packageName}.mapper.${ClassName}Mapper;
+import ${packageName}.service.I${ClassName}Service;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * ${functionName}Service业务层处理
+ *
+ * @author ${author}
+ * @date ${datetime}
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class ${ClassName}ServiceImpl implements I${ClassName}Service {
+
+    private final ${ClassName}Mapper baseMapper;
+
+    /**
+     * 查询${functionName}
+     *
+     * @param ${pkColumn.javaField} 主键
+     * @return ${functionName}
+     */
+    @Override
+    public ${ClassName}Vo queryById(${pkColumn.javaType} ${pkColumn.javaField}) {
+        return baseMapper.selectVoById(${pkColumn.javaField});
+    }
+
+    #if($table.crud)
+        /**
+         * 分页查询${functionName}列表
+         *
+         * @param bo        查询条件
+         * @param pageQuery 分页参数
+         * @return ${functionName}分页列表
+         */
+        @Override
+        public TableDataInfo<${ClassName}Vo> queryPageList(${ClassName}Bo bo, PageQuery pageQuery) {
+            LambdaQueryWrapper<${ClassName}> lqw = buildQueryWrapper(bo);
+            Page<${ClassName}Vo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+            return TableDataInfo.build(result);
+        }
+    #end
+
+    /**
+     * 查询符合条件的${functionName}列表
+     *
+     * @param bo 查询条件
+     * @return ${functionName}列表
+     */
+    @Override
+    public List<${ClassName}Vo> queryList(${ClassName}Bo bo) {
+        LambdaQueryWrapper<${ClassName}> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<${ClassName}> buildQueryWrapper(${ClassName}Bo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<${ClassName}> lqw = Wrappers.lambdaQuery();
+        #foreach($column in $columns)
+            #if($column.query)
+                #set($queryType=$column.queryType)
+                #set($javaField=$column.javaField)
+                #set($javaType=$column.javaType)
+                #set($columnName=$column.columnName)
+                #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+                #set($mpMethod=$column.queryType.toLowerCase())
+                #if($queryType != 'BETWEEN')
+                    #if($javaType == 'String')
+                        #set($condition='StringUtils.isNotBlank(bo.get'+$AttrName+'())')
+                    #else
+                        #set($condition='bo.get'+$AttrName+'() != null')
+                    #end
+                    lqw.$mpMethod($condition, ${ClassName}::get$AttrName, bo.get$AttrName());
+                #else
+                    lqw.between(params.get("begin$AttrName") != null && params.get("end$AttrName") != null,
+                        ${ClassName}::get$AttrName , params.get("begin$AttrName"), params.get("end$AttrName"));
+                #end
+            #end
+            #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+            #if($column.isPk==1)
+                lqw.orderByAsc(${ClassName}::get$AttrName);
+            #end
+        #end
+        return lqw;
+    }
+
+    /**
+     * 新增${functionName}
+     *
+     * @param bo ${functionName}
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(${ClassName}Bo bo) {
+        ${ClassName} add = MapstructUtils.convert(bo, ${ClassName}. class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        #set($pk=$pkColumn.javaField.substring(0,1).toUpperCase() + ${pkColumn.javaField.substring(1)})
+        if (flag) {
+            bo.set$pk(add.get$pk());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改${functionName}
+     *
+     * @param bo ${functionName}
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(${ClassName}Bo bo) {
+        ${ClassName} update = MapstructUtils.convert(bo, ${ClassName}. class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(${ClassName} entity) {
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除${functionName}信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<${pkColumn.javaType}> ids, Boolean isValid) {
+        if (isValid) {
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+}
diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/vo.java.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/vo.java.vm
new file mode 100644
index 0000000..af60f97
--- /dev/null
+++ b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/vo.java.vm
@@ -0,0 +1,66 @@
+package ${packageName}.domain.vo;
+
+    #foreach ($import in $importList)
+    import ${import};
+    #end
+import ${packageName}.domain.${ClassName};
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * ${functionName}视图对象 ${tableName}
+ *
+ * @author ${author}
+ * @date ${datetime}
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = ${ClassName}.class)
+
+public class ${ClassName}Vo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    #foreach ($column in $columns)
+        #if($column.list)
+            /**
+             * $column.columnComment
+             */
+            #set($parentheseIndex=$column.columnComment.indexOf("（"))
+            #if($parentheseIndex != -1)
+                #set($comment=$column.columnComment.substring(0, $parentheseIndex))
+            #else
+                #set($comment=$column.columnComment)
+            #end
+            #if(${column.dictType} && ${column.dictType} != '')
+            @ExcelProperty(value = "${comment}", converter = ExcelDictConvert.class)
+            @ExcelDictFormat(dictType = "${column.dictType}")
+            #elseif($parentheseIndex != -1)
+            @ExcelProperty(value = "${comment}", converter = ExcelDictConvert.class)
+            @ExcelDictFormat(readConverterExp = "$column.readConverterExp()")
+            #else
+            @ExcelProperty(value = "${comment}")
+            #end
+        private $column.javaType $column.javaField;
+
+            #if($column.htmlType == "imageUpload")
+                /**
+                 * ${column.columnComment}Url
+                 */
+                @Translation(type = TransConstant.OSS_ID_TO_URL, mapper = "${column.javaField}")
+                private String ${column.javaField}Url;
+            #end
+        #end
+    #end
+
+}
diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/sql/oracle/sql.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/sql/oracle/sql.vm
new file mode 100644
index 0000000..f6638be
--- /dev/null
+++ b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/sql/oracle/sql.vm
@@ -0,0 +1,19 @@
+-- 菜单 SQL
+insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark)
+values(${table.menuIds[0]}, '${functionName}', '${parentMenuId}', '1', '${businessName}', '${moduleName}/${businessName}/index', 1, 0, 'C', '0', '0', '${permissionPrefix}:list', '#', 103, 1, sysdate, null, null, '${functionName}菜单');
+
+-- 按钮 SQL
+insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark)
+values(${table.menuIds[1]}, '${functionName}查询', ${table.menuIds[0]}, '1',  '#', '', 1,  0, 'F', '0', '0', '${permissionPrefix}:query',        '#', 103, 1, sysdate, null, null, '');
+
+insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark)
+values(${table.menuIds[2]}, '${functionName}新增', ${table.menuIds[0]}, '2',  '#', '', 1,  0, 'F', '0', '0', '${permissionPrefix}:add',          '#', 103, 1, sysdate, null, null, '');
+
+insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark)
+values(${table.menuIds[3]}, '${functionName}修改', ${table.menuIds[0]}, '3',  '#', '', 1,  0, 'F', '0', '0', '${permissionPrefix}:edit',         '#', 103, 1, sysdate, null, null, '');
+
+insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark)
+values(${table.menuIds[4]}, '${functionName}删除', ${table.menuIds[0]}, '4',  '#', '', 1,  0, 'F', '0', '0', '${permissionPrefix}:remove',       '#', 103, 1, sysdate, null, null, '');
+
+insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark)
+values(${table.menuIds[5]}, '${functionName}导出', ${table.menuIds[0]}, '5',  '#', '', 1,  0, 'F', '0', '0', '${permissionPrefix}:export',       '#', 103, 1, sysdate, null, null, '');
diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/sql/postgres/sql.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/sql/postgres/sql.vm
new file mode 100644
index 0000000..0923392
--- /dev/null
+++ b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/sql/postgres/sql.vm
@@ -0,0 +1,20 @@
+-- 菜单 SQL
+insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark)
+values(${table.menuIds[0]}, '${functionName}', '${parentMenuId}', '1', '${businessName}', '${moduleName}/${businessName}/index', 1, 0, 'C', '0', '0', '${permissionPrefix}:list', '#', 103, 1, now(), null, null, '${functionName}菜单');
+
+-- 按钮 SQL
+insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark)
+values(${table.menuIds[1]}, '${functionName}查询', ${table.menuIds[0]}, '1',  '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:query',        '#', 103, 1, now(), null, null, '');
+
+insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark)
+values(${table.menuIds[2]}, '${functionName}新增', ${table.menuIds[0]}, '2',  '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:add',          '#', 103, 1, now(), null, null, '');
+
+insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark)
+values(${table.menuIds[3]}, '${functionName}修改', ${table.menuIds[0]}, '3',  '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:edit',         '#', 103, 1, now(), null, null, '');
+
+insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark)
+values(${table.menuIds[4]}, '${functionName}删除', ${table.menuIds[0]}, '4',  '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:remove',       '#', 103, 1, now(), null, null, '');
+
+insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark)
+values(${table.menuIds[5]}, '${functionName}导出', ${table.menuIds[0]}, '5',  '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:export',       '#', 103, 1, now(), null, null, '');
+
diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/sql/sql.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/sql/sql.vm
new file mode 100644
index 0000000..01824c2
--- /dev/null
+++ b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/sql/sql.vm
@@ -0,0 +1,19 @@
+-- 菜单 SQL
+insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark)
+values(${table.menuIds[0]}, '${functionName}', '${parentMenuId}', '1', '${businessName}', '${moduleName}/${businessName}/index', 1, 0, 'C', '0', '0', '${permissionPrefix}:list', '#', 103, 1, sysdate(), null, null, '${functionName}菜单');
+
+-- 按钮 SQL
+insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark)
+values(${table.menuIds[1]}, '${functionName}查询', ${table.menuIds[0]}, '1',  '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:query',        '#', 103, 1, sysdate(), null, null, '');
+
+insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark)
+values(${table.menuIds[2]}, '${functionName}新增', ${table.menuIds[0]}, '2',  '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:add',          '#', 103, 1, sysdate(), null, null, '');
+
+insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark)
+values(${table.menuIds[3]}, '${functionName}修改', ${table.menuIds[0]}, '3',  '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:edit',         '#', 103, 1, sysdate(), null, null, '');
+
+insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark)
+values(${table.menuIds[4]}, '${functionName}删除', ${table.menuIds[0]}, '4',  '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:remove',       '#', 103, 1, sysdate(), null, null, '');
+
+insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark)
+values(${table.menuIds[5]}, '${functionName}导出', ${table.menuIds[0]}, '5',  '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:export',       '#', 103, 1, sysdate(), null, null, '');
diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/sql/sqlserver/sql.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/sql/sqlserver/sql.vm
new file mode 100644
index 0000000..bdf166e
--- /dev/null
+++ b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/sql/sqlserver/sql.vm
@@ -0,0 +1,19 @@
+-- 菜单 SQL
+insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark)
+values(${table.menuIds[0]}, '${functionName}', '${parentMenuId}', '1', '${businessName}', '${moduleName}/${businessName}/index', 1, 0, 'C', '0', '0', '${permissionPrefix}:list', '#', 103, 1, getdate(), null, null, '${functionName}菜单');
+
+-- 按钮 SQL
+insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark)
+values(${table.menuIds[1]}, '${functionName}查询', ${table.menuIds[0]}, '1',  '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:query',        '#', 103, 1, getdate(), null, null, '');
+
+insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark)
+values(${table.menuIds[2]}, '${functionName}新增', ${table.menuIds[0]}, '2',  '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:add',          '#', 103, 1, getdate(), null, null, '');
+
+insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark)
+values(${table.menuIds[3]}, '${functionName}修改', ${table.menuIds[0]}, '3',  '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:edit',         '#', 103, 1, getdate(), null, null, '');
+
+insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark)
+values(${table.menuIds[4]}, '${functionName}删除', ${table.menuIds[0]}, '4',  '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:remove',       '#', 103, 1, getdate(), null, null, '');
+
+insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_dept, create_by, create_time, update_by, update_time, remark)
+values(${table.menuIds[5]}, '${functionName}导出', ${table.menuIds[0]}, '5',  '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:export',       '#', 103, 1, getdate(), null, null, '');
diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/ts/api.ts.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/ts/api.ts.vm
new file mode 100644
index 0000000..aa1e281
--- /dev/null
+++ b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/ts/api.ts.vm
@@ -0,0 +1,63 @@
+import request from '@/utils/request';
+import {AxiosPromise} from 'axios';
+import {${BusinessName}Form, ${BusinessName}Query, ${BusinessName}VO} from '@/api/';
+
+/**
+ * 查询${functionName}列表
+ * @param query
+ * @returns {*}
+ */
+
+export const list${BusinessName} = (query?: ${BusinessName}Query): AxiosPromise<${BusinessName}VO[]> => {
+    return request({
+        url: '/${moduleName}/${businessName}/list',
+        method: 'get',
+        params: query
+    });
+};
+
+/**
+ * 查询${functionName}详细
+ * @param ${pkColumn.javaField}
+ */
+export const get${BusinessName} = (${pkColumn.javaField}: string | number): AxiosPromise<${BusinessName}VO> => {
+    return request({
+        url: '/${moduleName}/${businessName}/' + ${pkColumn.javaField},
+        method: 'get'
+    });
+};
+
+/**
+ * 新增${functionName}
+ * @param data
+ */
+export const add${BusinessName} = (data: ${BusinessName}Form) => {
+    return request({
+        url: '/${moduleName}/${businessName}',
+        method: 'post',
+        data: data
+    });
+};
+
+/**
+ * 修改${functionName}
+ * @param data
+ */
+export const update${BusinessName} = (data: ${BusinessName}Form) => {
+    return request({
+        url: '/${moduleName}/${businessName}',
+        method: 'put',
+        data: data
+    });
+};
+
+/**
+ * 删除${functionName}
+ * @param ${pkColumn.javaField}
+ */
+export const del${BusinessName} = (${pkColumn.javaField}: string | number | Array<string | number>) => {
+    return request({
+        url: '/${moduleName}/${businessName}/' + ${pkColumn.javaField},
+        method: 'delete'
+    });
+};
diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/ts/types.ts.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/ts/types.ts.vm
new file mode 100644
index 0000000..c3e1de9
--- /dev/null
+++ b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/ts/types.ts.vm
@@ -0,0 +1,70 @@
+export interface ${BusinessName}VO {
+    #foreach ($column in $columns)
+        #if($column.list)
+        /**
+         * $column.columnComment
+         */
+            $column.javaField:#if($column.javaField.indexOf("id") != -1 || $column.javaField.indexOf(
+            "Id") != -1) string | number;
+        #elseif($column.javaType == 'Long' || $column.javaType == 'Integer' || $column.javaType ==
+            'Double' || $column.javaType == 'Float' || $column.javaType == 'BigDecimal') number;
+        #elseif($column.javaType == 'Boolean') boolean;
+        #else string;
+        #end
+            #if($column.htmlType == "imageUpload")
+                /**
+                 * ${column.columnComment}Url
+                 */
+                    ${column.javaField}Url: string;
+            #end
+        #end
+    #end
+    #if ($table.tree)
+        /**
+         * 子对象
+         */
+        children: ${BusinessName}VO[];
+    #end
+}
+
+export interface ${BusinessName}Form extends BaseEntity {
+    #foreach ($column in $columns)
+        #if($column.insert || $column.edit)
+        /**
+         * $column.columnComment
+         */
+            $column.javaField?:#if($column.javaField.indexOf("id") != -1 || $column.javaField.indexOf(
+            "Id") != -1) string | number;
+        #elseif($column.javaType == 'Long' || $column.javaType == 'Integer' || $column.javaType ==
+            'Double' || $column.javaType == 'Float' || $column.javaType == 'BigDecimal') number;
+        #elseif($column.javaType == 'Boolean') boolean;
+        #else string;
+        #end
+        #end
+    #end
+}
+
+export interface ${BusinessName}Query #if(!${treeCode})extends PageQuery #end{
+
+    #foreach ($column in $columns)
+        #if($column.query)
+        /**
+         * $column.columnComment
+         */
+            $column.javaField?:#if($column.javaField.indexOf("id") != -1 || $column.javaField.indexOf(
+            "Id") != -1) string | number;
+        #elseif($column.javaType == 'Long' || $column.javaType == 'Integer' || $column.javaType ==
+            'Double' || $column.javaType == 'Float' || $column.javaType == 'BigDecimal') number;
+        #elseif($column.javaType == 'Boolean') boolean;
+        #else string;
+        #end
+        #end
+    #end
+    /**
+     * 日期范围参数
+     */
+    params?: any;
+}
+
+
+
diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
new file mode 100644
index 0000000..5cd323e
--- /dev/null
+++ b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
@@ -0,0 +1,544 @@
+<template>
+  <div class="p-2">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter"
+                :leave-active-class="proxy?.animate.searchAnimate.leave">
+      <div v-show="showSearch" class="mb-[10px]">
+        <el-card shadow="hover">
+          <el-form ref="queryFormRef" :model="queryParams" :inline="true">
+              #foreach($column in $columns)
+                  #if($column.query)
+                      #set($dictType=$column.dictType)
+                      #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+                      #set($parentheseIndex=$column.columnComment.indexOf("（"))
+                      #if($parentheseIndex != -1)
+                          #set($comment=$column.columnComment.substring(0, $parentheseIndex))
+                      #else
+                          #set($comment=$column.columnComment)
+                      #end
+                      #if($column.htmlType == "input" || $column.htmlType == "textarea")
+                        <el-form-item label="${comment}" prop="${column.javaField}">
+                          <el-input v-model="queryParams.${column.javaField}" placeholder="请输入${comment}" clearable
+                                    @keyup.enter="handleQuery"/>
+                        </el-form-item>
+                      #elseif(($column.htmlType == "select" || $column.htmlType == "radio") && "" != $dictType)
+                        <el-form-item label="${comment}" prop="${column.javaField}">
+                          <el-select v-model="queryParams.${column.javaField}" placeholder="请选择${comment}" clearable>
+                            <el-option v-for="dict in ${dictType}" :key="dict.value" :label="dict.label"
+                                       :value="dict.value"/>
+                          </el-select>
+                        </el-form-item>
+                      #elseif(($column.htmlType == "select" || $column.htmlType == "radio") && $dictType)
+                        <el-form-item label="${comment}" prop="${column.javaField}">
+                          <el-select v-model="queryParams.${column.javaField}" placeholder="请选择${comment}" clearable>
+                            <el-option label="请选择字典生成" value=""/>
+                          </el-select>
+                        </el-form-item>
+                      #elseif($column.htmlType == "datetime" && $column.queryType != "BETWEEN")
+                        <el-form-item label="${comment}" prop="${column.javaField}">
+                          <el-date-picker clearable
+                                          v-model="queryParams.${column.javaField}"
+                                          type="date"
+                                          value-format="YYYY-MM-DD"
+                                          placeholder="选择${comment}"
+                          />
+                        </el-form-item>
+                      #elseif($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+                        <el-form-item label="${comment}" style="width: 308px">
+                          <el-date-picker
+                              v-model="dateRange${AttrName}"
+                              value-format="YYYY-MM-DD HH:mm:ss"
+                              type="daterange"
+                              range-separator="-"
+                              start-placeholder="开始日期"
+                              end-placeholder="结束日期"
+                              :default-time="[new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 1, 1, 23, 59, 59)]"
+                          />
+                        </el-form-item>
+                      #end
+                  #end
+              #end
+            <el-form-item>
+              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+            </el-form-item>
+          </el-form>
+        </el-card>
+      </div>
+    </transition>
+
+    <el-card shadow="never">
+      <template #header>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="Plus" @click="handleAdd()"
+                       v-hasPermi="['${moduleName}:${businessName}:add']">新增
+            </el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="info" plain icon="Sort" @click="handleToggleExpandAll">展开/折叠</el-button>
+          </el-col>
+          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+      </template>
+      <el-table
+          ref="${businessName}TableRef"
+          v-loading="loading"
+          :data="${businessName}List"
+          row-key="${treeCode}"
+          border
+          :default-expand-all="isExpandAll"
+          :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
+      >
+          #foreach($column in $columns)
+              #set($javaField=$column.javaField)
+              #set($parentheseIndex=$column.columnComment.indexOf("（"))
+              #if($parentheseIndex != -1)
+                  #set($comment=$column.columnComment.substring(0, $parentheseIndex))
+              #else
+                  #set($comment=$column.columnComment)
+              #end
+              #if($column.pk)
+              #elseif($column.list && $column.htmlType == "datetime")
+                <el-table-column label="${comment}" align="center" prop="${javaField}" width="180">
+                  <template #default="scope">
+                    <span>{{ parseTime(scope.row.${javaField}, '{y}-{m}-{d}') }}</span>
+                  </template>
+                </el-table-column>
+              #elseif($column.list && $column.htmlType == "imageUpload")
+                <el-table-column label="${comment}" align="center" prop="${javaField}Url" width="100">
+                  <template #default="scope">
+                    <image-preview :src="scope.row.${javaField}Url" :width="50" :height="50"/>
+                  </template>
+                </el-table-column>
+              #elseif($column.list && $column.dictType && "" != $column.dictType)
+                <el-table-column label="${comment}" align="center" prop="${javaField}">
+                  <template #default="scope">
+                      #if($column.htmlType == "checkbox")
+                        <dict-tag :options="${column.dictType}"
+                                  :value="scope.row.${javaField} ? scope.row.${javaField}.split(',') : []"/>
+                      #else
+                        <dict-tag :options="${column.dictType}" :value="scope.row.${javaField}"/>
+                      #end
+                  </template>
+                </el-table-column>
+              #elseif($column.list && "" != $javaField)
+                  #if(${foreach.index} == 1)
+                    <el-table-column label="${comment}" prop="${javaField}"/>
+                  #else
+                    <el-table-column label="${comment}" align="center" prop="${javaField}"/>
+                  #end
+              #end
+          #end
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template #default="scope">
+            <el-tooltip content="修改" placement="top">
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
+                         v-hasPermi="['${moduleName}:${businessName}:edit']"/>
+            </el-tooltip>
+            <el-tooltip content="新增" placement="top">
+              <el-button link type="primary" icon="Plus" @click="handleAdd(scope.row)"
+                         v-hasPermi="['${moduleName}:${businessName}:add']"/>
+            </el-tooltip>
+            <el-tooltip content="删除" placement="top">
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
+                         v-hasPermi="['${moduleName}:${businessName}:remove']"/>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
+    <!-- 添加或修改${functionName}对话框 -->
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
+      <el-form ref="${businessName}FormRef" :model="form" :rules="rules" label-width="80px">
+          #foreach($column in $columns)
+              #set($field=$column.javaField)
+              #if(($column.insert || $column.edit) && !$column.pk)
+                  #set($parentheseIndex=$column.columnComment.indexOf("（"))
+                  #if($parentheseIndex != -1)
+                      #set($comment=$column.columnComment.substring(0, $parentheseIndex))
+                  #else
+                      #set($comment=$column.columnComment)
+                  #end
+                  #set($dictType=$column.dictType)
+                  #if("" != $treeParentCode && $column.javaField == $treeParentCode)
+                    <el-form-item label="${comment}" prop="${treeParentCode}">
+                      <el-tree-select
+                          v-model="form.${treeParentCode}"
+                          :data="${businessName}Options"
+                          :props="{ value: '${treeCode}', label: '${treeName}', children: 'children' }"
+                          value-key="${treeCode}"
+                          placeholder="请选择${comment}"
+                          check-strictly
+                      />
+                    </el-form-item>
+                  #elseif($column.htmlType == "input")
+                    <el-form-item label="${comment}" prop="${field}">
+                      <el-input v-model="form.${field}" placeholder="请输入${comment}"/>
+                    </el-form-item>
+                  #elseif($column.htmlType == "imageUpload")
+                    <el-form-item label="${comment}" prop="${field}">
+                      <image-upload v-model="form.${field}"/>
+                    </el-form-item>
+                  #elseif($column.htmlType == "fileUpload")
+                    <el-form-item label="${comment}" prop="${field}">
+                      <file-upload v-model="form.${field}"/>
+                    </el-form-item>
+                  #elseif($column.htmlType == "editor")
+                    <el-form-item label="${comment}">
+                      <editor v-model="form.${field}" :min-height="192"/>
+                    </el-form-item>
+                  #elseif($column.htmlType == "select" && "" != $dictType)
+                    <el-form-item label="${comment}" prop="${field}">
+                      <el-select v-model="form.${field}" placeholder="请选择${comment}">
+                        <el-option
+                            v-for="dict in ${dictType}"
+                            :key="dict.value"
+                            :label="dict.label"
+                            #if($column.javaType == "Integer" || $column.javaType == "Long")
+                            :value="parseInt(dict.value)"
+                            #else
+                            :value="dict.value"
+                            #end
+                        ></el-option>
+                      </el-select>
+                    </el-form-item>
+                  #elseif($column.htmlType == "select" && $dictType)
+                    <el-form-item label="${comment}" prop="${field}">
+                      <el-select v-model="form.${field}" placeholder="请选择${comment}">
+                        <el-option label="请选择字典生成" value=""/>
+                      </el-select>
+                    </el-form-item>
+                  #elseif($column.htmlType == "checkbox" && "" != $dictType)
+                    <el-form-item label="${comment}" prop="${field}">
+                      <el-checkbox-group v-model="form.${field}">
+                        <el-checkbox
+                            v-for="dict in ${dictType}"
+                            :key="dict.value"
+                            :label="dict.value">
+                          {{dict.label}}
+                        </el-checkbox>
+                      </el-checkbox-group>
+                    </el-form-item>
+                  #elseif($column.htmlType == "checkbox" && $dictType)
+                    <el-form-item label="${comment}" prop="${field}">
+                      <el-checkbox-group v-model="form.${field}">
+                        <el-checkbox>请选择字典生成</el-checkbox>
+                      </el-checkbox-group>
+                    </el-form-item>
+                  #elseif($column.htmlType == "radio" && "" != $dictType)
+                    <el-form-item label="${comment}" prop="${field}">
+                      <el-radio-group v-model="form.${field}">
+                        <el-radio
+                            v-for="dict in ${dictType}"
+                            :key="dict.value"
+                            #if($column.javaType == "Integer" || $column.javaType == "Long")
+                            :value="parseInt(dict.value)"
+                            #else
+                            :value="dict.value"
+                            #end
+                        >{{dict.label}}
+                        </el-radio>
+                      </el-radio-group>
+                    </el-form-item>
+                  #elseif($column.htmlType == "radio" && $dictType)
+                    <el-form-item label="${comment}" prop="${field}">
+                      <el-radio-group v-model="form.${field}">
+                        <el-radio value="1">请选择字典生成</el-radio>
+                      </el-radio-group>
+                    </el-form-item>
+                  #elseif($column.htmlType == "datetime")
+                    <el-form-item label="${comment}" prop="${field}">
+                      <el-date-picker clearable
+                                      v-model="form.${field}"
+                                      type="datetime"
+                                      value-format="YYYY-MM-DD HH:mm:ss"
+                                      placeholder="选择${comment}"
+                      />
+                    </el-form-item>
+                  #elseif($column.htmlType == "textarea")
+                    <el-form-item label="${comment}" prop="${field}">
+                      <el-input v-model="form.${field}" type="textarea" placeholder="请输入内容"/>
+                    </el-form-item>
+                  #end
+              #end
+          #end
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="${BusinessName}" lang="ts">
+  import {add${BusinessName}, ${BusinessName}Form, get${BusinessName}, list${BusinessName}, ${BusinessName}Query, update${BusinessName}, ${BusinessName}VO} from "@/api/";
+
+  type ${BusinessName}Option = {
+          ${treeCode}: number;
+          ${treeName}: string;
+    children?: ${BusinessName}Option[];
+  }
+
+  const {proxy} = getCurrentInstance() as ComponentInternalInstance;
+  ;
+
+      #if(${dicts} != '')
+          #set($dictsNoSymbol=$dicts.replace("'", ""))
+      const { ${dictsNoSymbol} } = toRefs<any>(proxy?.useDict(${dicts}));
+      #end
+
+  const ${businessName}List = ref<${BusinessName}VO[]>([]);
+  const ${businessName}Options = ref<${BusinessName}Option[]>([]);
+  const buttonLoading = ref(false);
+  const showSearch = ref(true);
+  const isExpandAll = ref(true);
+  const loading = ref(false);
+
+  const queryFormRef = ref<ElFormInstance>();
+  const ${businessName}FormRef = ref<ElFormInstance>();
+  const ${businessName}TableRef = ref<ElTableInstance>()
+
+  const dialog = reactive<DialogOption>({
+    visible: false,
+    title: ''
+  });
+
+      #foreach ($column in $columns)
+          #if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+              #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+          const dateRange${AttrName} = ref<[DateModelType, DateModelType]>(['', '']);
+          #end
+      #end
+
+  const initFormData: ${BusinessName}Form = {
+      #foreach ($column in $columns)
+          #if($column.insert || $column.edit)
+              #if($column.htmlType == "checkbox")
+                      $column.javaField: []#if($foreach.count != $columns.size()),#end
+              #else
+                      $column.javaField: undefined#if($foreach.count != $columns.size()),#end
+              #end
+          #end
+      #end
+  }
+
+  const data = reactive<PageData<${BusinessName}Form, ${BusinessName}Query>>({
+    form: {...initFormData},
+    queryParams: {
+        #foreach ($column in $columns)
+            #if($column.query)
+                #if($column.htmlType != "datetime" || $column.queryType != "BETWEEN")
+                        $column.javaField: undefined,
+                #end
+            #end
+        #end
+      params: {
+          #foreach ($column in $columns)
+              #if($column.query)
+                  #if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+                          $column.javaField: undefined#if($foreach.count != $columns.size()),#end
+                  #end
+              #end
+          #end
+      }
+    },
+    rules: {
+        #foreach ($column in $columns)
+            #if($column.insert || $column.edit)
+                #if($column.required)
+                    #set($parentheseIndex=$column.columnComment.indexOf("（"))
+                    #if($parentheseIndex != -1)
+                        #set($comment=$column.columnComment.substring(0, $parentheseIndex))
+                    #else
+                        #set($comment=$column.columnComment)
+                    #end
+                        $column.javaField: [
+                    {
+                      required: true, message: "$comment不能为空", trigger: #if($column.htmlType ==
+                        "select" || $column.htmlType == "radio")"change"#else"blur"#end }
+                  ]#if($foreach.count != $columns.size()),#end
+                #end
+            #end
+        #end
+    }
+  });
+
+  const {queryParams, form, rules} = toRefs(data);
+
+  /** 查询${functionName}列表 */
+  const getList = async () => {
+    loading.value = true;
+      #foreach ($column in $columns)
+          #if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+            queryParams.value.params = {};
+              #break
+          #end
+      #end
+      #foreach ($column in $columns)
+          #if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+              #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+            proxy?.addDateRange(queryParams.value, dateRange${AttrName}.value, '${AttrName}');
+          #end
+      #end
+    const res = await list${BusinessName}(queryParams.value);
+    const data = proxy?.handleTree<${BusinessName}VO>(res.data, "${treeCode}", "${treeParentCode}");
+    if (data) {
+            ${businessName}List.value = data;
+      loading.value = false;
+    }
+  }
+
+  /** 查询${functionName}下拉树结构 */
+  const getTreeselect = async () => {
+    const res = await list${BusinessName}();
+          ${businessName}Options.value = [];
+    const data: ${BusinessName}Option = {${treeCode}: 0, ${treeName}: '顶级节点', children: []};
+    data.children = proxy?.handleTree<${BusinessName}Option>(res.data, "${treeCode}", "${treeParentCode}");
+          ${businessName}Options.value.push(data);
+  }
+
+  // 取消按钮
+  const cancel = () => {
+    reset();
+    dialog.visible = false;
+  }
+
+  // 表单重置
+  const reset = () => {
+    form.value = {...initFormData}
+          ${businessName}FormRef.value?.resetFields();
+  }
+
+  /** 搜索按钮操作 */
+  const handleQuery = () => {
+    getList();
+  }
+
+  /** 重置按钮操作 */
+  const resetQuery = () => {
+      #foreach ($column in $columns)
+          #if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+              #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+            dateRange${AttrName}.value = ['', ''];
+          #end
+      #end
+    queryFormRef.value?.resetFields();
+    handleQuery();
+  }
+
+  /** 新增按钮操作 */
+  const handleAdd = (row?: ${BusinessName}VO) => {
+    reset();
+    getTreeselect();
+    if (row != null && row.${treeCode}) {
+      form.value.${treeParentCode} = row.${treeCode};
+    } else {
+      form.value.${treeParentCode} = 0;
+    }
+    dialog.visible = true;
+    dialog.title = "添加${functionName}";
+  }
+
+  /** 展开/折叠操作 */
+  const handleToggleExpandAll = () => {
+    isExpandAll.value = !isExpandAll.value;
+    toggleExpandAll(${businessName}List.value, isExpandAll.value)
+  }
+
+  /** 展开/折叠操作 */
+  const toggleExpandAll = (data: ${BusinessName}VO[], status: boolean) => {
+    data.forEach((item) => {
+            ${businessName}TableRef.value?.toggleRowExpansion(item, status)
+      if (item.children && item.children.length > 0) toggleExpandAll(item.children, status)
+    })
+  }
+
+  /** 修改按钮操作 */
+  const handleUpdate = async (row: ${BusinessName}VO) => {
+    reset();
+    await getTreeselect();
+    if (row != null) {
+      form.value.${treeParentCode} = row.${treeParentCode};
+    }
+    const res = await get${BusinessName}(row.${pkColumn.javaField});
+    Object.assign(form.value, res.data);
+      #foreach ($column in $columns)
+          #if($column.htmlType == "checkbox")
+            form.value.$column.javaField = form.value.${column.javaField}.split(",");
+          #end
+      #end
+    dialog.visible = true;
+    dialog.title = "修改${functionName}";
+  }
+
+  /** 提交按钮 */
+  const submitForm = () => {
+          ${businessName}FormRef.value?.validate(async (valid: boolean) => {
+      if (valid) {
+        buttonLoading.value = true;
+          #foreach ($column in $columns)
+              #if($column.htmlType == "checkbox")
+                form.value.$column.javaField = form.value.${column.javaField}.join(",");
+              #end
+          #end
+        if (form.value.${pkColumn.javaField}) {
+          await update${BusinessName}(form.value).finally(() => buttonLoading.value = false);
+        } else {
+          await add${BusinessName}(form.value).finally(() => buttonLoading.value = false);
+        }
+        proxy?.
+      #
+        [[$modal]]
+      #.
+        msgSuccess("操作成功");
+        dialog.visible = false;
+        getList();
+      }
+    });
+  }
+
+  /** 删除按钮操作 */
+  const handleDelete = async (row: $
+  {
+    BusinessName
+  }
+  VO
+  ) =>
+  {
+    await proxy?.
+  #
+    [[$modal]]
+  #.
+    confirm('是否确认删除${functionName}编号为"' + row.$
+    {
+      pkColumn.javaField
+    }
+    +'"的数据项？'
+  )
+    ;
+    loading.value = true;
+    await del$
+    {
+      BusinessName
+    }
+    (row.$
+    {
+      pkColumn.javaField
+    }
+  ).
+    finally(() => loading.value = false);
+    await getList();
+    proxy?.
+  #
+    [[$modal]]
+  #.
+    msgSuccess("删除成功");
+  }
+
+  onMounted(() => {
+    getList();
+  });
+</script>
diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
new file mode 100644
index 0000000..cfc93c3
--- /dev/null
+++ b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
@@ -0,0 +1,519 @@
+<template>
+  <div class="p-2">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter"
+                :leave-active-class="proxy?.animate.searchAnimate.leave">
+      <div v-show="showSearch" class="mb-[10px]">
+        <el-card shadow="hover">
+          <el-form ref="queryFormRef" :model="queryParams" :inline="true">
+              #foreach($column in $columns)
+                  #if($column.query)
+                      #set($dictType=$column.dictType)
+                      #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+                      #set($parentheseIndex=$column.columnComment.indexOf("（"))
+                      #if($parentheseIndex != -1)
+                          #set($comment=$column.columnComment.substring(0, $parentheseIndex))
+                      #else
+                          #set($comment=$column.columnComment)
+                      #end
+                      #if($column.htmlType == "input" || $column.htmlType == "textarea")
+                        <el-form-item label="${comment}" prop="${column.javaField}">
+                          <el-input v-model="queryParams.${column.javaField}" placeholder="请输入${comment}" clearable
+                                    @keyup.enter="handleQuery"/>
+                        </el-form-item>
+                      #elseif(($column.htmlType == "select" || $column.htmlType == "radio") && "" != $dictType)
+                        <el-form-item label="${comment}" prop="${column.javaField}">
+                          <el-select v-model="queryParams.${column.javaField}" placeholder="请选择${comment}" clearable>
+                            <el-option v-for="dict in ${dictType}" :key="dict.value" :label="dict.label"
+                                       :value="dict.value"/>
+                          </el-select>
+                        </el-form-item>
+                      #elseif(($column.htmlType == "select" || $column.htmlType == "radio") && $dictType)
+                        <el-form-item label="${comment}" prop="${column.javaField}">
+                          <el-select v-model="queryParams.${column.javaField}" placeholder="请选择${comment}" clearable>
+                            <el-option label="请选择字典生成" value=""/>
+                          </el-select>
+                        </el-form-item>
+                      #elseif($column.htmlType == "datetime" && $column.queryType != "BETWEEN")
+                        <el-form-item label="${comment}" prop="${column.javaField}">
+                          <el-date-picker clearable
+                                          v-model="queryParams.${column.javaField}"
+                                          type="date"
+                                          value-format="YYYY-MM-DD"
+                                          placeholder="请选择${comment}"
+                          />
+                        </el-form-item>
+                      #elseif($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+                        <el-form-item label="${comment}" style="width: 308px">
+                          <el-date-picker
+                              v-model="dateRange${AttrName}"
+                              value-format="YYYY-MM-DD HH:mm:ss"
+                              type="daterange"
+                              range-separator="-"
+                              start-placeholder="开始日期"
+                              end-placeholder="结束日期"
+                              :default-time="[new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 1, 1, 23, 59, 59)]"
+                          />
+                        </el-form-item>
+                      #end
+                  #end
+              #end
+            <el-form-item>
+              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+            </el-form-item>
+          </el-form>
+        </el-card>
+      </div>
+    </transition>
+
+    <el-card shadow="never">
+      <template #header>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="Plus" @click="handleAdd"
+                       v-hasPermi="['${moduleName}:${businessName}:add']">新增
+            </el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()"
+                       v-hasPermi="['${moduleName}:${businessName}:edit']">修改
+            </el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()"
+                       v-hasPermi="['${moduleName}:${businessName}:remove']">删除
+            </el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="warning" plain icon="Download" @click="handleExport"
+                       v-hasPermi="['${moduleName}:${businessName}:export']">导出
+            </el-button>
+          </el-col>
+          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+      </template>
+
+      <el-table v-loading="loading" border :data="${businessName}List" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center"/>
+          #foreach($column in $columns)
+              #set($javaField=$column.javaField)
+              #set($parentheseIndex=$column.columnComment.indexOf("（"))
+              #if($parentheseIndex != -1)
+                  #set($comment=$column.columnComment.substring(0, $parentheseIndex))
+              #else
+                  #set($comment=$column.columnComment)
+              #end
+              #if($column.pk)
+                <el-table-column label="${comment}" align="center" prop="${javaField}" v-if="${column.list}"/>
+              #elseif($column.list && $column.htmlType == "datetime")
+                <el-table-column label="${comment}" align="center" prop="${javaField}" width="180">
+                  <template #default="scope">
+                    <span>{{ parseTime(scope.row.${javaField}, '{y}-{m}-{d}') }}</span>
+                  </template>
+                </el-table-column>
+              #elseif($column.list && $column.htmlType == "imageUpload")
+                <el-table-column label="${comment}" align="center" prop="${javaField}Url" width="100">
+                  <template #default="scope">
+                    <image-preview :src="scope.row.${javaField}Url" :width="50" :height="50"/>
+                  </template>
+                </el-table-column>
+              #elseif($column.list && $column.dictType && "" != $column.dictType)
+                <el-table-column label="${comment}" align="center" prop="${javaField}">
+                  <template #default="scope">
+                      #if($column.htmlType == "checkbox")
+                        <dict-tag :options="${column.dictType}"
+                                  :value="scope.row.${javaField} ? scope.row.${javaField}.split(',') : []"/>
+                      #else
+                        <dict-tag :options="${column.dictType}" :value="scope.row.${javaField}"/>
+                      #end
+                  </template>
+                </el-table-column>
+              #elseif($column.list && "" != $javaField)
+                <el-table-column label="${comment}" align="center" prop="${javaField}"/>
+              #end
+          #end
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template #default="scope">
+            <el-tooltip content="修改" placement="top">
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
+                         v-hasPermi="['${moduleName}:${businessName}:edit']"></el-button>
+            </el-tooltip>
+            <el-tooltip content="删除" placement="top">
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
+                         v-hasPermi="['${moduleName}:${businessName}:remove']"></el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+                  v-model:limit="queryParams.pageSize" @pagination="getList"/>
+    </el-card>
+    <!-- 添加或修改${functionName}对话框 -->
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
+      <el-form ref="${businessName}FormRef" :model="form" :rules="rules" label-width="80px">
+          #foreach($column in $columns)
+              #set($field=$column.javaField)
+              #if(($column.insert || $column.edit) && !$column.pk)
+                  #set($parentheseIndex=$column.columnComment.indexOf("（"))
+                  #if($parentheseIndex != -1)
+                      #set($comment=$column.columnComment.substring(0, $parentheseIndex))
+                  #else
+                      #set($comment=$column.columnComment)
+                  #end
+                  #set($dictType=$column.dictType)
+                  #if($column.htmlType == "input")
+                    <el-form-item label="${comment}" prop="${field}">
+                      <el-input v-model="form.${field}" placeholder="请输入${comment}"/>
+                    </el-form-item>
+                  #elseif($column.htmlType == "imageUpload")
+                    <el-form-item label="${comment}" prop="${field}">
+                      <image-upload v-model="form.${field}"/>
+                    </el-form-item>
+                  #elseif($column.htmlType == "fileUpload")
+                    <el-form-item label="${comment}" prop="${field}">
+                      <file-upload v-model="form.${field}"/>
+                    </el-form-item>
+                  #elseif($column.htmlType == "editor")
+                    <el-form-item label="${comment}">
+                      <editor v-model="form.${field}" :min-height="192"/>
+                    </el-form-item>
+                  #elseif($column.htmlType == "select" && "" != $dictType)
+                    <el-form-item label="${comment}" prop="${field}">
+                      <el-select v-model="form.${field}" placeholder="请选择${comment}">
+                        <el-option
+                            v-for="dict in ${dictType}"
+                            :key="dict.value"
+                            :label="dict.label"
+                            #if($column.javaType == "Integer" || $column.javaType == "Long")
+                            :value="parseInt(dict.value)"
+                            #else
+                            :value="dict.value"
+                            #end
+                        ></el-option>
+                      </el-select>
+                    </el-form-item>
+                  #elseif($column.htmlType == "select" && $dictType)
+                    <el-form-item label="${comment}" prop="${field}">
+                      <el-select v-model="form.${field}" placeholder="请选择${comment}">
+                        <el-option label="请选择字典生成" value=""/>
+                      </el-select>
+                    </el-form-item>
+                  #elseif($column.htmlType == "checkbox" && "" != $dictType)
+                    <el-form-item label="${comment}" prop="${field}">
+                      <el-checkbox-group v-model="form.${field}">
+                        <el-checkbox
+                            v-for="dict in ${dictType}"
+                            :key="dict.value"
+                            :label="dict.value">
+                          {{dict.label}}
+                        </el-checkbox>
+                      </el-checkbox-group>
+                    </el-form-item>
+                  #elseif($column.htmlType == "checkbox" && $dictType)
+                    <el-form-item label="${comment}" prop="${field}">
+                      <el-checkbox-group v-model="form.${field}">
+                        <el-checkbox>请选择字典生成</el-checkbox>
+                      </el-checkbox-group>
+                    </el-form-item>
+                  #elseif($column.htmlType == "radio" && "" != $dictType)
+                    <el-form-item label="${comment}" prop="${field}">
+                      <el-radio-group v-model="form.${field}">
+                        <el-radio
+                            v-for="dict in ${dictType}"
+                            :key="dict.value"
+                            #if($column.javaType == "Integer" || $column.javaType == "Long")
+                            :value="parseInt(dict.value)"
+                            #else
+                            :value="dict.value"
+                            #end
+                        >{{dict.label}}
+                        </el-radio>
+                      </el-radio-group>
+                    </el-form-item>
+                  #elseif($column.htmlType == "radio" && $dictType)
+                    <el-form-item label="${comment}" prop="${field}">
+                      <el-radio-group v-model="form.${field}">
+                        <el-radio value="1">请选择字典生成</el-radio>
+                      </el-radio-group>
+                    </el-form-item>
+                  #elseif($column.htmlType == "datetime")
+                    <el-form-item label="${comment}" prop="${field}">
+                      <el-date-picker clearable
+                                      v-model="form.${field}"
+                                      type="datetime"
+                                      value-format="YYYY-MM-DD HH:mm:ss"
+                                      placeholder="请选择${comment}">
+                      </el-date-picker>
+                    </el-form-item>
+                  #elseif($column.htmlType == "textarea")
+                    <el-form-item label="${comment}" prop="${field}">
+                      <el-input v-model="form.${field}" type="textarea" placeholder="请输入内容"/>
+                    </el-form-item>
+                  #end
+              #end
+          #end
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="${BusinessName}" lang="ts">
+  import {add${BusinessName}, ${BusinessName}Form, get${BusinessName}, list${BusinessName}, ${BusinessName}Query, update${BusinessName}, ${BusinessName}VO} from '@/api/';
+
+  const {proxy} = getCurrentInstance() as ComponentInternalInstance;
+      #if(${dicts} != '')
+          #set($dictsNoSymbol=$dicts.replace("'", ""))
+      const { ${dictsNoSymbol} } = toRefs<any>(proxy?.useDict(${dicts}));
+      #end
+
+  const ${businessName}List = ref<${BusinessName}VO[]>([]);
+  const buttonLoading = ref(false);
+  const loading = ref(true);
+  const showSearch = ref(true);
+  const ids = ref<Array<string | number>>([]);
+  const single = ref(true);
+  const multiple = ref(true);
+  const total = ref(0);
+      #foreach ($column in $columns)
+          #if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+              #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+          const dateRange${AttrName} = ref<[DateModelType, DateModelType]>(['', '']);
+          #end
+      #end
+
+  const queryFormRef = ref<ElFormInstance>();
+  const ${businessName}FormRef = ref<ElFormInstance>();
+
+  const dialog = reactive<DialogOption>({
+    visible: false,
+    title: ''
+  });
+
+  const initFormData: ${BusinessName}Form = {
+      #foreach ($column in $columns)
+          #if($column.insert || $column.edit)
+              #if($column.htmlType == "checkbox")
+                      $column.javaField: []#if($foreach.count != $columns.size()),#end
+              #else
+                      $column.javaField: undefined#if($foreach.count != $columns.size()),#end
+              #end
+          #end
+      #end
+  }
+  const data = reactive<PageData<${BusinessName}Form, ${BusinessName}Query>>({
+    form: {...initFormData},
+    queryParams: {
+      pageNum: 1,
+      pageSize: 10,
+        #foreach ($column in $columns)
+            #if($column.query)
+                #if($column.htmlType != "datetime" || $column.queryType != "BETWEEN")
+                        $column.javaField: undefined,
+                #end
+            #end
+        #end
+      params: {
+          #foreach ($column in $columns)
+              #if($column.query)
+                  #if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+                          $column.javaField: undefined#if($foreach.count != $columns.size()),#end
+                  #end
+              #end
+          #end
+      }
+    },
+    rules: {
+        #foreach ($column in $columns)
+            #if($column.insert || $column.edit)
+                #if($column.required)
+                    #set($parentheseIndex=$column.columnComment.indexOf("（"))
+                    #if($parentheseIndex != -1)
+                        #set($comment=$column.columnComment.substring(0, $parentheseIndex))
+                    #else
+                        #set($comment=$column.columnComment)
+                    #end
+                        $column.javaField: [
+                    {
+                      required: true, message: "$comment不能为空", trigger: #if($column.htmlType ==
+                        "select" || $column.htmlType == "radio")"change"#else"blur"#end }
+                  ]#if($foreach.count != $columns.size()),#end
+                #end
+            #end
+        #end
+    }
+  });
+
+  const {queryParams, form, rules} = toRefs(data);
+
+  /** 查询${functionName}列表 */
+  const getList = async () => {
+    loading.value = true;
+      #foreach ($column in $columns)
+          #if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+            queryParams.value.params = {};
+              #break
+          #end
+      #end
+      #foreach ($column in $columns)
+          #if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+              #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+            proxy?.addDateRange(queryParams.value, dateRange${AttrName}.value, '${AttrName}');
+          #end
+      #end
+    const res = await list${BusinessName}(queryParams.value);
+          ${businessName}List.value = res.rows;
+    total.value = res.total;
+    loading.value = false;
+  }
+
+  /** 取消按钮 */
+  const cancel = () => {
+    reset();
+    dialog.visible = false;
+  }
+
+  /** 表单重置 */
+  const reset = () => {
+    form.value = {...initFormData};
+          ${businessName}FormRef.value?.resetFields();
+  }
+
+  /** 搜索按钮操作 */
+  const handleQuery = () => {
+    queryParams.value.pageNum = 1;
+    getList();
+  }
+
+  /** 重置按钮操作 */
+  const resetQuery = () => {
+      #foreach ($column in $columns)
+          #if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+              #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+            dateRange${AttrName}.value = ['', ''];
+          #end
+      #end
+    queryFormRef.value?.resetFields();
+    handleQuery();
+  }
+
+  /** 多选框选中数据 */
+  const handleSelectionChange = (selection: ${BusinessName}VO[]) => {
+    ids.value = selection.map(item => item.${pkColumn.javaField});
+    single.value = selection.length != 1;
+    multiple.value = !selection.length;
+  }
+
+  /** 新增按钮操作 */
+  const handleAdd = () => {
+    reset();
+    dialog.visible = true;
+    dialog.title = "添加${functionName}";
+  }
+
+  /** 修改按钮操作 */
+  const handleUpdate = async (row?: ${BusinessName}VO) => {
+    reset();
+    const _${pkColumn.javaField} = row?.${pkColumn.javaField} || ids.value[0]
+    const res = await get${BusinessName}(_${pkColumn.javaField});
+    Object.assign(form.value, res.data);
+      #foreach ($column in $columns)
+          #if($column.htmlType == "checkbox")
+            form.value.$column.javaField = form.value.${column.javaField}.split(",");
+          #end
+      #end
+    dialog.visible = true;
+    dialog.title = "修改${functionName}";
+  }
+
+  /** 提交按钮 */
+  const submitForm = () => {
+          ${businessName}FormRef.value?.validate(async (valid: boolean) => {
+      if (valid) {
+        buttonLoading.value = true;
+          #foreach ($column in $columns)
+              #if($column.htmlType == "checkbox")
+                form.value.$column.javaField = form.value.${column.javaField}.join(",");
+              #end
+          #end
+        if (form.value.${pkColumn.javaField}) {
+          await update${BusinessName}(form.value).finally(() => buttonLoading.value = false);
+        } else {
+          await add${BusinessName}(form.value).finally(() => buttonLoading.value = false);
+        }
+        proxy?.
+      #
+        [[$modal]]
+      #.
+        msgSuccess("操作成功");
+        dialog.visible = false;
+        await getList();
+      }
+    });
+  }
+
+  /** 删除按钮操作 */
+  const handleDelete = async (row?: $
+  {
+    BusinessName
+  }
+  VO
+  ) =>
+  {
+    const _$
+    {
+      pkColumn.javaField
+    }
+    s = row?.$
+    {
+      pkColumn.javaField
+    }
+  ||
+    ids.value;
+    await proxy?.
+  #
+    [[$modal]]
+  #.
+    confirm('是否确认删除${functionName}编号为"' + _$
+    {
+      pkColumn.javaField
+    }
+    s + '"的数据项？'
+  ).
+    finally(() => loading.value = false);
+    await del$
+    {
+      BusinessName
+    }
+    (_$
+    {
+      pkColumn.javaField
+    }
+    s
+  )
+    ;
+    proxy?.
+  #
+    [[$modal]]
+  #.
+    msgSuccess("删除成功");
+    await getList();
+  }
+
+  /** 导出按钮操作 */
+  const handleExport = () => {
+    proxy?.download('${moduleName}/${businessName}/export', {
+      ...queryParams.value
+    }, `${businessName}_#[[${new Date().getTime()}]]#.xlsx`)
+  }
+
+  onMounted(() => {
+    getList();
+  });
+</script>
diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm
new file mode 100644
index 0000000..473e757
--- /dev/null
+++ b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="${packageName}.mapper.${ClassName}Mapper">
+
+</mapper>
diff --git a/ruoyi-modules/ruoyi-job/pom.xml b/ruoyi-modules/ruoyi-job/pom.xml
new file mode 100644
index 0000000..6865b1a
--- /dev/null
+++ b/ruoyi-modules/ruoyi-job/pom.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>org.dromara</groupId>
+        <artifactId>ruoyi-modules</artifactId>
+        <version>${revision}</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <packaging>jar</packaging>
+    <artifactId>ruoyi-job</artifactId>
+
+    <description>
+        任务调度
+    </description>
+
+    <dependencies>
+
+        <!-- 通用工具-->
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-json</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-job</artifactId>
+        </dependency>
+
+    </dependencies>
+
+</project>
+
diff --git a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/entity/BillDto.java b/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/entity/BillDto.java
new file mode 100644
index 0000000..2661e34
--- /dev/null
+++ b/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/entity/BillDto.java
@@ -0,0 +1,30 @@
+package org.dromara.job.entity;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class BillDto {
+
+    /**
+     * 账单ID
+     */
+    private Long billId;
+
+    /**
+     * 账单渠道
+     */
+    private String billChannel;
+
+    /**
+     * 账单日期
+     */
+    private String billDate;
+
+    /**
+     * 账单金额
+     */
+    private BigDecimal billAmount;
+
+}
diff --git a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/package-info.java b/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/package-info.java
new file mode 100644
index 0000000..2f118b0
--- /dev/null
+++ b/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/package-info.java
@@ -0,0 +1 @@
+package org.dromara.job;
diff --git a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/AlipayBillTask.java b/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/AlipayBillTask.java
new file mode 100644
index 0000000..b6f8530
--- /dev/null
+++ b/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/AlipayBillTask.java
@@ -0,0 +1,42 @@
+package org.dromara.job.snailjob;
+
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
+import com.aizuda.snailjob.client.job.core.annotation.JobExecutor;
+import com.aizuda.snailjob.client.job.core.dto.JobArgs;
+import com.aizuda.snailjob.client.model.ExecuteResult;
+import com.aizuda.snailjob.common.log.SnailJobLog;
+import org.dromara.common.json.utils.JsonUtils;
+import org.dromara.job.entity.BillDto;
+import org.springframework.stereotype.Component;
+
+import java.math.BigDecimal;
+
+/**
+ * DAG工作流任务-模拟支付宝账单任务
+ * <a href="https://juejin.cn/post/7487860254114644019"></a>
+ *
+ * @author pengles
+ */
+@Component
+@JobExecutor(name = "alipayBillTask")
+public class AlipayBillTask {
+
+    public ExecuteResult jobExecute(JobArgs jobArgs) throws InterruptedException {
+        BillDto billDto = new BillDto();
+        billDto.setBillId(23456789L);
+        billDto.setBillChannel("alipay");
+        // 设置清算日期
+        String settlementDate = (String) jobArgs.getWfContext().get("settlementDate");
+        if (StrUtil.equals(settlementDate, "sysdate")) {
+            settlementDate = DateUtil.today();
+        }
+        billDto.setBillDate(settlementDate);
+        billDto.setBillAmount(new BigDecimal("2345.67"));
+        // 把billDto对象放入上下文进行传递
+        jobArgs.appendContext("alipay", JsonUtils.toJsonString(billDto));
+        SnailJobLog.REMOTE.info("上下文: {}", jobArgs.getWfContext());
+        return ExecuteResult.success(billDto);
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/SummaryBillTask.java b/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/SummaryBillTask.java
new file mode 100644
index 0000000..fc188fd
--- /dev/null
+++ b/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/SummaryBillTask.java
@@ -0,0 +1,45 @@
+package org.dromara.job.snailjob;
+
+import cn.hutool.core.util.StrUtil;
+import com.aizuda.snailjob.client.job.core.annotation.JobExecutor;
+import com.aizuda.snailjob.client.job.core.dto.JobArgs;
+import com.aizuda.snailjob.client.model.ExecuteResult;
+import com.aizuda.snailjob.common.log.SnailJobLog;
+import org.dromara.common.json.utils.JsonUtils;
+import org.dromara.job.entity.BillDto;
+import org.springframework.stereotype.Component;
+
+import java.math.BigDecimal;
+
+/**
+ * DAG工作流任务-模拟汇总账单任务
+ * <a href="https://juejin.cn/post/7487860254114644019"></a>
+ *
+ * @author pengles
+ */
+@Component
+@JobExecutor(name = "summaryBillTask")
+public class SummaryBillTask {
+
+    public ExecuteResult jobExecute(JobArgs jobArgs) throws InterruptedException {
+        // 获得微信账单
+        BigDecimal wechatAmount = BigDecimal.valueOf(0);
+        String wechat = (String) jobArgs.getWfContext("wechat");
+        if (StrUtil.isNotBlank(wechat)) {
+            BillDto wechatBillDto = JsonUtils.parseObject(wechat, BillDto.class);
+            wechatAmount = wechatBillDto.getBillAmount();
+        }
+        // 获得支付宝账单
+        BigDecimal alipayAmount = BigDecimal.valueOf(0);
+        String alipay = (String) jobArgs.getWfContext("alipay");
+        if (StrUtil.isNotBlank(alipay)) {
+            BillDto alipayBillDto = JsonUtils.parseObject(alipay, BillDto.class);
+            alipayAmount = alipayBillDto.getBillAmount();
+        }
+        // 汇总账单
+        BigDecimal totalAmount = wechatAmount.add(alipayAmount);
+        SnailJobLog.REMOTE.info("总金额: {}", totalAmount);
+        return ExecuteResult.success(totalAmount);
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/TestAnnoJobExecutor.java b/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/TestAnnoJobExecutor.java
new file mode 100644
index 0000000..fe3b53a
--- /dev/null
+++ b/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/TestAnnoJobExecutor.java
@@ -0,0 +1,25 @@
+package org.dromara.job.snailjob;
+
+import com.aizuda.snailjob.client.job.core.annotation.JobExecutor;
+import com.aizuda.snailjob.client.job.core.dto.JobArgs;
+import com.aizuda.snailjob.client.model.ExecuteResult;
+import com.aizuda.snailjob.common.core.util.JsonUtil;
+import com.aizuda.snailjob.common.log.SnailJobLog;
+import org.springframework.stereotype.Component;
+
+/**
+ * 正常任务
+ * <a href="https://juejin.cn/post/7418074037392293914"></a>
+ *
+ * @author pengles
+ */
+@Component
+@JobExecutor(name = "testJobExecutor")
+public class TestAnnoJobExecutor {
+
+    public ExecuteResult jobExecute(JobArgs jobArgs) {
+        SnailJobLog.LOCAL.info("testJobExecutor. jobArgs:{}", JsonUtil.toJsonString(jobArgs));
+        SnailJobLog.REMOTE.info("testJobExecutor. jobArgs:{}", JsonUtil.toJsonString(jobArgs));
+        return ExecuteResult.success("测试成功");
+    }
+}
diff --git a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/TestBroadcastJob.java b/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/TestBroadcastJob.java
new file mode 100644
index 0000000..6526566
--- /dev/null
+++ b/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/TestBroadcastJob.java
@@ -0,0 +1,37 @@
+package org.dromara.job.snailjob;
+
+import cn.hutool.core.util.RandomUtil;
+import com.aizuda.snailjob.client.job.core.annotation.JobExecutor;
+import com.aizuda.snailjob.client.job.core.dto.JobArgs;
+import com.aizuda.snailjob.client.model.ExecuteResult;
+import com.aizuda.snailjob.common.log.SnailJobLog;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+/**
+ * 广播任务
+ * <a href="https://juejin.cn/post/7422948006150438950"></a>
+ *
+ * @author pengles
+ */
+@Slf4j
+@Component
+@JobExecutor(name = "testBroadcastJob")
+public class TestBroadcastJob {
+
+    @Value("${snail-job.port}")
+    private int clientPort;
+
+    public ExecuteResult jobExecute(JobArgs jobArgs) {
+        int randomInt = RandomUtil.randomInt(100);
+        log.info("随机数: {}", randomInt);
+        SnailJobLog.REMOTE.info("随机数: {},客户端端口:{}", randomInt, clientPort);
+        if (randomInt < 50) {
+            throw new RuntimeException("随机数小于50，收集日志任务执行失败");
+        }
+        // 获得jobArgs 中传入的相加的两个数
+        return ExecuteResult.success("随机数大于50，收集日志任务执行成功");
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/TestClassJobExecutor.java b/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/TestClassJobExecutor.java
new file mode 100644
index 0000000..47c731b
--- /dev/null
+++ b/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/TestClassJobExecutor.java
@@ -0,0 +1,20 @@
+package org.dromara.job.snailjob;
+
+import com.aizuda.snailjob.client.job.core.dto.JobArgs;
+import com.aizuda.snailjob.client.job.core.executor.AbstractJobExecutor;
+import com.aizuda.snailjob.client.model.ExecuteResult;
+import org.springframework.stereotype.Component;
+
+/**
+ * 测试类
+ *
+ * @author pengles
+ */
+@Component
+public class TestClassJobExecutor extends AbstractJobExecutor {
+
+    @Override
+    protected ExecuteResult doJobExecute(JobArgs jobArgs) {
+        return ExecuteResult.success("TestJobExecutor测试成功");
+    }
+}
diff --git a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/TestMapJobAnnotation.java b/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/TestMapJobAnnotation.java
new file mode 100644
index 0000000..2f3eef5
--- /dev/null
+++ b/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/TestMapJobAnnotation.java
@@ -0,0 +1,53 @@
+package org.dromara.job.snailjob;
+
+import cn.hutool.core.thread.ThreadUtil;
+import cn.hutool.extra.spring.SpringUtil;
+import com.aizuda.snailjob.client.job.core.MapHandler;
+import com.aizuda.snailjob.client.job.core.annotation.JobExecutor;
+import com.aizuda.snailjob.client.job.core.annotation.MapExecutor;
+import com.aizuda.snailjob.client.job.core.dto.MapArgs;
+import com.aizuda.snailjob.client.model.ExecuteResult;
+import com.aizuda.snailjob.common.log.SnailJobLog;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+
+/**
+ * Map任务 动态分配 只分片不关注结果
+ * <a href="https://juejin.cn/post/7446362500478894106"></a>
+ *
+ * @author pengles
+ */
+@Component
+@JobExecutor(name = "testMapJobAnnotation")
+public class TestMapJobAnnotation {
+
+    @MapExecutor
+    public ExecuteResult doJobMapExecute(MapArgs mapArgs, MapHandler mapHandler) {
+        // 生成1~200数值并分片
+        int partitionSize = 50;
+        List<List<Integer>> partition = IntStream.rangeClosed(1, 200)
+                .boxed()
+                .collect(Collectors.groupingBy(i -> (i - 1) / partitionSize))
+                .values()
+                .stream()
+                .toList();
+        SnailJobLog.REMOTE.info("端口:{}完成分配任务", SpringUtil.getProperty("server.port"));
+        return mapHandler.doMap(partition, "doCalc");
+    }
+
+    @MapExecutor(taskName = "doCalc")
+    public ExecuteResult doCalc(MapArgs mapArgs) {
+        List<Integer> sourceList = (List<Integer>) mapArgs.getMapResult();
+        // 遍历sourceList的每一个元素,计算出一个累加值partitionTotal
+        int partitionTotal = sourceList.stream().mapToInt(i -> i).sum();
+        // 打印日志到服务器
+        ThreadUtil.sleep(3, TimeUnit.SECONDS);
+        SnailJobLog.REMOTE.info("端口:{},partitionTotal:{}", SpringUtil.getProperty("server.port"), partitionTotal);
+        return ExecuteResult.success(partitionTotal);
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/TestMapReduceAnnotation1.java b/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/TestMapReduceAnnotation1.java
new file mode 100644
index 0000000..e54ef0a
--- /dev/null
+++ b/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/TestMapReduceAnnotation1.java
@@ -0,0 +1,60 @@
+package org.dromara.job.snailjob;
+
+import cn.hutool.core.thread.ThreadUtil;
+import cn.hutool.extra.spring.SpringUtil;
+import com.aizuda.snailjob.client.job.core.MapHandler;
+import com.aizuda.snailjob.client.job.core.annotation.JobExecutor;
+import com.aizuda.snailjob.client.job.core.annotation.MapExecutor;
+import com.aizuda.snailjob.client.job.core.annotation.ReduceExecutor;
+import com.aizuda.snailjob.client.job.core.dto.MapArgs;
+import com.aizuda.snailjob.client.job.core.dto.ReduceArgs;
+import com.aizuda.snailjob.client.model.ExecuteResult;
+import com.aizuda.snailjob.common.log.SnailJobLog;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+
+/**
+ * MapReduce任务 动态分配 分片后合并结果
+ * <a href="https://juejin.cn/post/7448551286506913802"></a>
+ *
+ * @author pengles
+ */
+@Component
+@JobExecutor(name = "testMapReduceAnnotation1")
+public class TestMapReduceAnnotation1 {
+
+    @MapExecutor
+    public ExecuteResult rootMapExecute(MapArgs mapArgs, MapHandler mapHandler) {
+        int partitionSize = 50;
+        List<List<Integer>> partition = IntStream.rangeClosed(1, 200)
+                .boxed()
+                .collect(Collectors.groupingBy(i -> (i - 1) / partitionSize))
+                .values()
+                .stream()
+                .toList();
+        SnailJobLog.REMOTE.info("端口:{}完成分配任务", SpringUtil.getProperty("server.port"));
+        return mapHandler.doMap(partition, "doCalc");
+    }
+
+    @MapExecutor(taskName = "doCalc")
+    public ExecuteResult doCalc(MapArgs mapArgs) {
+        List<Integer> sourceList = (List<Integer>) mapArgs.getMapResult();
+        // 遍历sourceList的每一个元素,计算出一个累加值partitionTotal
+        int partitionTotal = sourceList.stream().mapToInt(i -> i).sum();
+        // 打印日志到服务器
+        ThreadUtil.sleep(3, TimeUnit.SECONDS);
+        SnailJobLog.REMOTE.info("端口:{},partitionTotal:{}", SpringUtil.getProperty("server.port"), partitionTotal);
+        return ExecuteResult.success(partitionTotal);
+    }
+
+    @ReduceExecutor
+    public ExecuteResult reduceExecute(ReduceArgs reduceArgs) {
+        int reduceTotal = reduceArgs.getMapResult().stream().mapToInt(i -> Integer.parseInt((String) i)).sum();
+        SnailJobLog.REMOTE.info("端口:{},reduceTotal:{}", SpringUtil.getProperty("server.port"), reduceTotal);
+        return ExecuteResult.success(reduceTotal);
+    }
+}
diff --git a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/TestStaticShardingJob.java b/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/TestStaticShardingJob.java
new file mode 100644
index 0000000..b8fcf17
--- /dev/null
+++ b/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/TestStaticShardingJob.java
@@ -0,0 +1,36 @@
+package org.dromara.job.snailjob;
+
+import com.aizuda.snailjob.client.job.core.annotation.JobExecutor;
+import com.aizuda.snailjob.client.job.core.dto.JobArgs;
+import com.aizuda.snailjob.client.model.ExecuteResult;
+import com.aizuda.snailjob.common.log.SnailJobLog;
+import org.springframework.stereotype.Component;
+
+/**
+ * 静态分片 根据服务端任务参数分片
+ * <a href="https://juejin.cn/post/7426232375703896101"></a>
+ *
+ * @author pengles
+ */
+@Component
+@JobExecutor(name = "testStaticShardingJob")
+public class TestStaticShardingJob {
+
+    public ExecuteResult jobExecute(JobArgs jobArgs) {
+        String jobParams = String.valueOf(jobArgs.getJobParams());
+        SnailJobLog.LOCAL.info("开始执行分片任务,参数:{}", jobParams);
+        // 获得jobArgs 中传入的开始id和结束id
+        String[] split = jobParams.split(",");
+        Long fromId = Long.parseLong(split[0]);
+        Long toId = Long.parseLong(split[1]);
+        // 模拟数据库操作,对范围id,进行加密处理
+        try {
+            SnailJobLog.REMOTE.info("开始对id范围:{}进行加密处理", fromId + "-" + toId);
+            Thread.sleep(3000);
+            SnailJobLog.REMOTE.info("对id范围:{}进行加密处理完成", fromId + "-" + toId);
+        } catch (InterruptedException e) {
+            return ExecuteResult.failure("任务执行失败");
+        }
+        return ExecuteResult.success("执行分片任务完成");
+    }
+}
diff --git a/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/WechatBillTask.java b/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/WechatBillTask.java
new file mode 100644
index 0000000..cd60e44
--- /dev/null
+++ b/ruoyi-modules/ruoyi-job/src/main/java/org/dromara/job/snailjob/WechatBillTask.java
@@ -0,0 +1,43 @@
+package org.dromara.job.snailjob;
+
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
+import com.aizuda.snailjob.client.job.core.annotation.JobExecutor;
+import com.aizuda.snailjob.client.job.core.dto.JobArgs;
+import com.aizuda.snailjob.client.model.ExecuteResult;
+import com.aizuda.snailjob.common.log.SnailJobLog;
+import org.dromara.common.json.utils.JsonUtils;
+import org.dromara.job.entity.BillDto;
+import org.springframework.stereotype.Component;
+
+import java.math.BigDecimal;
+
+/**
+ * DAG工作流任务-模拟微信账单任务
+ * <a href="https://juejin.cn/post/7487860254114644019"></a>
+ *
+ * @author pengles
+ */
+@Component
+@JobExecutor(name = "wechatBillTask")
+public class WechatBillTask {
+
+    public ExecuteResult jobExecute(JobArgs jobArgs) throws InterruptedException {
+        BillDto billDto = new BillDto();
+        billDto.setBillId(123456789L);
+        billDto.setBillChannel("wechat");
+        // 从上下文中获得清算日期并设置，如果上下文中清算日期
+        // 是sysdate设置为当前日期；否则取管理页面设置的值
+        String settlementDate = (String) jobArgs.getWfContext().get("settlementDate");
+        if (StrUtil.equals(settlementDate, "sysdate")) {
+            settlementDate = DateUtil.today();
+        }
+        billDto.setBillDate(settlementDate);
+        billDto.setBillAmount(new BigDecimal("1234.56"));
+        // 把billDto对象放入上下文进行传递
+        jobArgs.appendContext("wechat", JsonUtils.toJsonString(billDto));
+        SnailJobLog.REMOTE.info("上下文: {}", jobArgs.getWfContext());
+        return ExecuteResult.success(billDto);
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-knowledge/README.md b/ruoyi-modules/ruoyi-knowledge/README.md
new file mode 100644
index 0000000..ab1a1ac
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/README.md
@@ -0,0 +1,1553 @@
+# RuoYi Knowledge 模块
+
+## 概述
+
+RuoYi Knowledge 模块是一个智能知识库管理系统，提供知识库的创建、管理、向量化处理和智能检索功能。该模块支持多种文档格式，具备强大的向量搜索能力，为AI问答系统提供知识基础。
+
+## 目录结构
+
+```
+ruoyi-knowledge/
+├─ src/main/java/org/dromara/knowledge/
+│  ├─ data/           # 文档解析与数据清洗（PDF/Word/Excel等）
+│  ├─ embedding/      # 文本向量化引擎接口（多模型可插拔）
+│  ├─ retrieval/      # 检索器与索引更新（支持多后端）
+│  ├─ generation/     # 响应生成（LLM集成与后处理）
+│  ├─ version/        # 版本管理与回滚接口
+│  └─ config/         # RAG 配置属性（rag.*）
+├─ docs/              # API/设计/配置文档
+└─ src/test/java/org/dromara/knowledge/
+   ├─ unit/           # 单元测试
+   ├─ integration/    # 集成测试
+   └─ mock/           # 测试用 Mock 数据
+```
+
+## 核心特性
+
+### 📚 知识库管理
+
+- ✅ 知识库创建和配置（名称、描述、向量模型、分片参数等）
+- ✅ 知识库列表查询（分页、筛选）
+- ✅ 知识库信息更新和删除
+- ✅ 知识库状态查询
+- ✅ 用户知识库列表查询
+- ✅ 知识库公开/私有设置
+
+### 📄 文档处理
+
+- ✅ 文档上传（单文件、批量上传）
+- ✅ 多格式文档支持（PDF、Word、TXT、Markdown、Excel、CSV、HTML等）
+- ✅ 自动文档解析（通过DocumentParser接口，支持多种格式）
+- ✅ 智能分片处理（可配置分片大小、重叠字符数）
+- ✅ 文档解析状态跟踪（拆解图片状态、分析图片状态、向量化状态）
+- ✅ 文档列表查询和管理
+
+### 📑 知识片段管理
+
+- ✅ 片段列表查询（分页、筛选）
+- ✅ 片段信息查询和管理
+- ✅ 片段创建、更新、删除
+- ✅ 根据知识库/文档ID查询片段列表
+
+### ⚡ 向量化处理
+
+- ✅ 向量生成（单片段、批量生成）
+- ✅ 多种嵌入模型支持（通过EmbeddingEngine接口，支持模型扩展）
+- ✅ 文档批量向量化
+- ✅ 向量列表查询和管理
+- ✅ 向量索引重建
+- ✅ 向量统计信息查询
+
+### 🔍 智能检索
+
+- ✅ 基于向量的语义搜索（向量相似度搜索）
+- ✅ 相似度排序
+- ✅ 检索结果过滤（按文档去重）
+- ✅ 检索器接口可插拔（`Retriever`），默认实现调用向量服务
+- ✅ 检索命中日志记录和分析
+
+### 📊 任务管理
+
+- ✅ 任务创建和查询（支持多种任务类型：upload、process、delete、export、embedding、sync）
+- ✅ 任务状态跟踪（等待、进行中、成功、失败、暂停）
+- ✅ 任务进度管理（进度百分比、总项目数、已处理项目数等）
+- ✅ 任务重试机制（重试次数、最大重试次数）
+- ✅ 任务错误信息记录
+- ✅ 任务通知机制（通知URL、通知状态）
+
+### 💡 提示词模板管理
+
+- ✅ 模板创建和配置
+- ✅ 模板列表查询（分页、筛选）
+- ✅ 模板更新和删除
+- ✅ 按分类查询模板（knowledge、chat、draw）
+- ✅ 按模板名称查询
+
+### 🎯 数据模型管理
+
+- ✅ 模型分组管理（分组创建、查询、更新、删除）
+- ✅ 数据模型管理（模型创建、查询、更新、删除）
+- ✅ 模型字段管理（字段创建、查询、更新、删除）
+- ✅ 灵活的Schema定义（字段类型、属性配置）
+- ✅ 字段类型支持（文本、数字、日期等）
+- ✅ 字段属性配置（是否主键、是否必填、是否唯一、默认值、长度等）
+- ✅ 字段显示配置（是否列表显示、是否查询字段、是否插入字段、是否编辑字段）
+- ✅ 查询方式配置（EQ、NE、GT、LT、LIKE、BETWEEN）
+- ✅ 显示类型配置（input、textarea、select、checkbox、radio、datetime、image、upload、editor）
+- ✅ 字典类型支持
+
+### 👥 角色与权限管理
+
+- ✅ 角色组管理（Service层已实现）
+- ✅ 角色管理（Service层已实现）
+- ✅ 角色与知识库关联管理（Service层已实现）
+- ⚠️ 角色管理Controller（待实现，目前只有Service层）
+
+### 📈 检索日志与分析
+
+- ✅ 命中日志记录（记录每次检索的详细信息）
+- ✅ 命中日志查询（按知识库、会话、片段、查询文本筛选）
+- ✅ 热门查询统计
+- ✅ 平均响应时间分析
+- ✅ 日志导出功能
+
+### 🔧 RAG架构组件
+
+- ✅ 文档解析器接口（`DocumentParser`）及多种实现（PDF、Word、Excel、Text、Markdown、CSV、HTML）
+- ✅ 向量化引擎接口（`EmbeddingEngine`）及HTTP实现（`HttpEmbeddingService`）
+- ✅ 检索器接口（`Retriever`）及默认实现（`DefaultRetriever`）
+- ✅ 索引更新器接口（`IndexUpdater`）及默认实现（`DefaultIndexUpdater`）
+- ✅ 响应生成器接口（`Generator`）及默认实现（`DefaultGenerator`）
+- ✅ 版本管理器接口（`VersionManager`）及默认实现（`DefaultVersionManager`）
+- ✅ 向量存储服务接口（`VectorStoreService`）及多种实现（`DbVectorStoreService`、`QdrantVectorStoreService`、`WeaviateVectorStoreService`）
+
+## 架构设计
+
+```
+┌─────────────────────────────────────────────────────────────┐
+│                  Knowledge Controller Layer                 │
+├─────────────────────────────────────────────────────────────┤
+│  KnowledgeInfoController   │ KnowledgeAttachController      │
+│  KnowledgeFragmentController │ KnowledgeSchemaController    │
+│  KnowledgeRoleController   │ KnowledgeVectorController      │
+└─────────────────────┬───────────────────────────────────────┘
+                      │
+┌─────────────────────▼───────────────────────────────────────┐
+│                    Service Layer                            │
+├─────────────────────────────────────────────────────────────┤
+│  KnowledgeInfoService      │ KnowledgeAttachService         │
+│  KnowledgeFragmentService  │ KnowledgeSchemaService         │
+│  KnowledgeVectorService    │ KnowledgeRoleService           │
+└─────────────────────┬───────────────────────────────────────┘
+                      │
+┌─────────────────────▼───────────────────────────────────────┐
+│                 Processing Layer                            │
+├─────────────────────────────────────────────────────────────┤
+│  Document Parser   │ Vector Processor │ Search Engine       │
+│  Embedding Models  │ Index Manager    │ Cache Manager       │
+└─────────────────────────────────────────────────────────────┘
+```
+
+## 主要组件
+
+### 控制器 (Controllers)
+
+#### KnowledgeInfoController
+
+知识库信息管理控制器，路径：`/knowledge/info`
+
+**主要接口：**
+
+- `GET /knowledge/info/list` - 查询知识库信息列表（分页，支持筛选）
+- `POST /knowledge/info/export` - 导出知识库信息列表（需要权限 `knowledge:info:export`）
+- `GET /knowledge/info/{knowledgeId}` - 获取知识库信息详细信息（需要权限 `knowledge:info:query`）
+- `POST /knowledge/info` - 新增知识库信息（需要权限 `knowledge:info:add`）
+- `PUT /knowledge/info` - 修改知识库信息（需要权限 `knowledge:info:edit`）
+- `DELETE /knowledge/info/{knowledgeIds}` - 删除知识库信息（需要权限 `knowledge:info:remove`）
+- `GET /knowledge/info/user/{userId}` - 根据用户ID查询知识库信息列表（需要权限 `knowledge:info:query`）
+- `GET /knowledge/info/knowledge/{knowledgeId}` - 根据知识库ID查询知识库信息（需要权限 `knowledge:info:query`）
+- `POST /knowledge/info/{knowledgeId}/upload` - 上传文档到知识库（需要权限 `knowledge:info:upload`）
+- `POST /knowledge/info/{knowledgeId}/batch-upload` - 批量上传文档到知识库（需要权限 `knowledge:info:upload`）
+- `POST /knowledge/info/{knowledgeId}/search` - 检索知识库（需要权限 `knowledge:info:search`）
+- `GET /knowledge/info/{knowledgeId}/status` - 获取知识库处理状态（需要权限 `knowledge:info:query`）
+
+#### KnowledgeAttachController
+
+知识库附件管理控制器，路径：`/knowledge/attach`
+
+**主要接口：**
+
+- `GET /knowledge/attach/list` - 查询知识库附件列表（分页，需要权限 `knowledge:attach:list`）
+- `POST /knowledge/attach/export` - 导出知识库附件列表（需要权限 `knowledge:attach:export`）
+- `GET /knowledge/attach/{attachId}` - 获取知识库附件详细信息（需要权限 `knowledge:attach:query`）
+- `POST /knowledge/attach` - 新增知识库附件（需要权限 `knowledge:attach:add`）
+- `PUT /knowledge/attach` - 修改知识库附件（需要权限 `knowledge:attach:edit`）
+- `DELETE /knowledge/attach/{attachIds}` - 删除知识库附件（需要权限 `knowledge:attach:remove`）
+- `GET /knowledge/attach/knowledge/{knowledgeId}` - 根据知识库ID查询附件列表（需要权限 `knowledge:attach:query`）
+- `GET /knowledge/attach/document/{documentId}` - 根据文档ID查询附件信息（需要权限 `knowledge:attach:query`）
+
+#### KnowledgeFragmentController
+
+知识库片段管理控制器，路径：`/knowledge/fragment`
+
+**主要接口：**
+
+- `GET /knowledge/fragment/list` - 查询知识库片段列表（分页，需要权限 `knowledge:fragment:list`）
+- `POST /knowledge/fragment/export` - 导出知识库片段列表（需要权限 `knowledge:fragment:export`）
+- `GET /knowledge/fragment/{fragmentId}` - 获取知识库片段详细信息（需要权限 `knowledge:fragment:query`）
+- `POST /knowledge/fragment` - 新增知识库片段（需要权限 `knowledge:fragment:add`）
+- `PUT /knowledge/fragment` - 修改知识库片段（需要权限 `knowledge:fragment:edit`）
+- `DELETE /knowledge/fragment/{fragmentIds}` - 删除知识库片段（需要权限 `knowledge:fragment:remove`）
+- `GET /knowledge/fragment/knowledge/{knowledgeId}` - 根据知识库ID查询片段列表（需要权限 `knowledge:fragment:query`）
+- `GET /knowledge/fragment/document/{documentId}` - 根据文档ID查询片段列表（需要权限 `knowledge:fragment:query`）
+- `GET /knowledge/fragment/fragment/{fragmentId}` - 根据片段ID查询片段信息（需要权限 `knowledge:fragment:query`）
+
+#### KnowledgeVectorController
+
+向量管理控制器，路径：`/knowledge/vector`
+
+**主要接口：**
+
+- `POST /knowledge/vector/generate` - 生成向量（批量生成片段向量）
+- `POST /knowledge/vector/search` - 向量搜索（向量相似度搜索，支持按文档去重）
+- `GET /knowledge/vector/stats/{knowledgeId}` - 向量统计（获取向量统计信息）
+- `POST /knowledge/vector/rebuild/{knowledgeId}` - 重建索引（重建向量索引）
+- `POST /knowledge/vector/vectorize-doc` - 文档批量向量化（对文档的所有片段进行向量化）
+- `GET /knowledge/vector/list` - 查询知识库向量列表（分页，需要权限 `knowledge:vector:list`）
+- `POST /knowledge/vector/export` - 导出知识库向量列表（需要权限 `knowledge:vector:export`）
+- `GET /knowledge/vector/{vectorId}` - 获取知识库向量详细信息（需要权限 `knowledge:vector:query`）
+- `POST /knowledge/vector` - 新增知识库向量（需要权限 `knowledge:vector:add`）
+- `PUT /knowledge/vector` - 修改知识库向量（需要权限 `knowledge:vector:edit`）
+- `DELETE /knowledge/vector/{vectorIds}` - 删除知识库向量（需要权限 `knowledge:vector:remove`）
+- `GET /knowledge/vector/fragment/{fragmentId}` - 根据片段ID查询向量列表（需要权限 `knowledge:vector:query`）
+- `GET /knowledge/vector/knowledge/{knowledgeId}` - 根据知识库ID查询向量列表（需要权限 `knowledge:vector:query`）
+
+#### KnowledgeHitLogController
+
+知识库命中日志控制器，路径：`/knowledge/hitlog`
+
+**主要接口：**
+
+- `GET /knowledge/hitlog/list` - 查询命中日志列表（分页，需要权限 `knowledge:hitlog:list`）
+- `POST /knowledge/hitlog/export` - 导出命中日志列表（需要权限 `knowledge:hitlog:export`）
+- `GET /knowledge/hitlog/{logId}` - 获取命中日志详细信息（需要权限 `knowledge:hitlog:query`）
+- `POST /knowledge/hitlog` - 新增命中日志（需要权限 `knowledge:hitlog:add`）
+- `PUT /knowledge/hitlog` - 修改命中日志（需要权限 `knowledge:hitlog:edit`）
+- `DELETE /knowledge/hitlog/{logIds}` - 删除命中日志（需要权限 `knowledge:hitlog:remove`）
+- `GET /knowledge/hitlog/knowledge/{knowledgeId}` - 根据知识库ID查询命中日志列表（需要权限 `knowledge:hitlog:query`）
+- `GET /knowledge/hitlog/session/{sessionId}` - 根据会话ID查询命中日志列表（需要权限 `knowledge:hitlog:query`）
+- `GET /knowledge/hitlog/fragment/{fragmentId}` - 根据片段ID查询命中日志列表（需要权限 `knowledge:hitlog:query`）
+- `GET /knowledge/hitlog/query/{queryText}` - 根据查询文本查询命中日志列表（需要权限 `knowledge:hitlog:query`）
+- `GET /knowledge/hitlog/popular` - 获取热门查询列表（需要权限 `knowledge:hitlog:query`，参数：`knowledgeId`（可选）、`limit`（默认10））
+- `GET /knowledge/hitlog/avg-response-time` - 获取平均响应时间（需要权限 `knowledge:hitlog:query`，参数：`knowledgeId`（可选））
+
+#### KnowledgeJobController
+
+知识库任务管理控制器，路径：`/knowledge/job`
+
+**主要接口：**
+
+- `GET /knowledge/job/list` - 查询知识库任务列表（分页，需要权限 `knowledge:job:list`）
+- `POST /knowledge/job/export` - 导出知识库任务列表（需要权限 `knowledge:job:export`）
+- `GET /knowledge/job/{jobId}` - 获取知识库任务详细信息（需要权限 `knowledge:job:query`）
+- `POST /knowledge/job` - 新增知识库任务（需要权限 `knowledge:job:add`）
+- `PUT /knowledge/job` - 修改知识库任务（需要权限 `knowledge:job:edit`）
+- `DELETE /knowledge/job/{jobIds}` - 删除知识库任务（需要权限 `knowledge:job:remove`）
+- `GET /knowledge/job/knowledge/{knowledgeId}` - 根据知识库ID查询任务列表（需要权限 `knowledge:job:query`）
+- `GET /knowledge/job/status/{status}` - 根据任务状态查询任务列表（需要权限 `knowledge:job:query`）
+- `GET /knowledge/job/type/{jobType}` - 根据任务类型查询任务列表（需要权限 `knowledge:job:query`）
+
+#### KnowledgePromptTemplateController
+
+知识库提示词模板管理控制器，路径：`/knowledge/prompt`
+
+**主要接口：**
+
+- `GET /knowledge/prompt/list` - 查询知识库提示模板列表（分页，需要权限 `knowledge:prompt:list`）
+- `POST /knowledge/prompt/export` - 导出知识库提示模板列表（需要权限 `knowledge:prompt:export`）
+- `GET /knowledge/prompt/{templateId}` - 获取知识库提示模板详细信息（需要权限 `knowledge:prompt:query`）
+- `POST /knowledge/prompt` - 新增知识库提示模板（需要权限 `knowledge:prompt:add`）
+- `PUT /knowledge/prompt` - 修改知识库提示模板（需要权限 `knowledge:prompt:edit`）
+- `DELETE /knowledge/prompt/{templateIds}` - 删除知识库提示模板（需要权限 `knowledge:prompt:remove`）
+- `GET /knowledge/prompt/category/{category}` - 根据分类查询提示模板列表（需要权限 `knowledge:prompt:query`）
+- `GET /knowledge/prompt/name/{templateName}` - 根据模板名称查询提示模板（需要权限 `knowledge:prompt:query`）
+
+#### KnowledgeSchemaController
+
+知识库数据模型管理控制器，路径：`/knowledge/schema`
+
+**主要接口：**
+
+- `GET /knowledge/schema/list` - 查询知识库模式列表（分页，需要权限 `knowledge:schema:list`）
+- `POST /knowledge/schema/export` - 导出知识库模式列表（需要权限 `knowledge:schema:export`）
+- `GET /knowledge/schema/{schemaId}` - 获取知识库模式详细信息（需要权限 `knowledge:schema:query`）
+- `POST /knowledge/schema` - 新增知识库模式（需要权限 `knowledge:schema:add`）
+- `PUT /knowledge/schema` - 修改知识库模式（需要权限 `knowledge:schema:edit`）
+- `DELETE /knowledge/schema/{schemaIds}` - 删除知识库模式（需要权限 `knowledge:schema:remove`）
+- `GET /knowledge/schema/id/{id}` - 根据ID查询模式信息（需要权限 `knowledge:schema:query`）
+- `GET /knowledge/schema/group/{schemaGroupId}` - 根据模式组ID查询模式列表（需要权限 `knowledge:schema:query`）
+- `GET /knowledge/schema/code/{code}` - 根据编码查询模式信息（需要权限 `knowledge:schema:query`）
+- `GET /knowledge/schema/table/{tableName}` - 根据表名查询模式信息（需要权限 `knowledge:schema:query`）
+
+#### KnowledgeSchemaGroupController
+
+知识库数据模型分组管理控制器，路径：`/knowledge/schema/group`
+
+**主要接口：**
+
+- `GET /knowledge/schema/group/list` - 查询知识库模式组列表（分页，需要权限 `knowledge:schema:group:list`）
+- `POST /knowledge/schema/group/export` - 导出知识库模式组列表（需要权限 `knowledge:schema:group:export`）
+- `GET /knowledge/schema/group/{groupId}` - 获取知识库模式组详细信息（需要权限 `knowledge:schema:group:query`）
+- `POST /knowledge/schema/group` - 新增知识库模式组（需要权限 `knowledge:schema:group:add`）
+- `PUT /knowledge/schema/group` - 修改知识库模式组（需要权限 `knowledge:schema:group:edit`）
+- `DELETE /knowledge/schema/group/{groupIds}` - 删除知识库模式组（需要权限 `knowledge:schema:group:remove`）
+- `GET /knowledge/schema/group/id/{id}` - 根据ID查询模式组信息（需要权限 `knowledge:schema:group:query`）
+- `GET /knowledge/schema/group/code/{code}` - 根据编码查询模式组信息（需要权限 `knowledge:schema:group:query`）
+- `GET /knowledge/schema/group/name/{name}` - 根据名称查询模式组信息（需要权限 `knowledge:schema:group:query`）
+
+#### KnowledgeSchemaFieldController
+
+知识库数据模型字段管理控制器，路径：`/knowledge/schema/field`
+
+**主要接口：**
+
+- `GET /knowledge/schema/field/list` - 查询知识库模式字段列表（分页，需要权限 `knowledge:schema:field:list`）
+- `POST /knowledge/schema/field/export` - 导出知识库模式字段列表（需要权限 `knowledge:schema:field:export`）
+- `GET /knowledge/schema/field/{fieldId}` - 获取知识库模式字段详细信息（需要权限 `knowledge:schema:field:query`）
+- `POST /knowledge/schema/field` - 新增知识库模式字段（需要权限 `knowledge:schema:field:add`）
+- `PUT /knowledge/schema/field` - 修改知识库模式字段（需要权限 `knowledge:schema:field:edit`）
+- `DELETE /knowledge/schema/field/{fieldIds}` - 删除知识库模式字段（需要权限 `knowledge:schema:field:remove`）
+- `GET /knowledge/schema/field/id/{id}` - 根据ID查询字段信息（需要权限 `knowledge:schema:field:query`）
+- `GET /knowledge/schema/field/schema/{schemaId}` - 根据模式ID查询字段列表（需要权限 `knowledge:schema:field:query`）
+- `GET /knowledge/schema/field/code/{code}` - 根据编码查询字段信息（需要权限 `knowledge:schema:field:query`）
+- `GET /knowledge/schema/field/schema/{schemaId}/code/{code}` - 根据模式ID和编码查询字段信息（需要权限 `knowledge:schema:field:query`）
+
+### 服务层 (Services)
+
+#### KnowledgeInfoService
+
+知识库信息服务，核心业务逻辑实现。
+
+**主要方法：**
+
+```java
+// 查询知识库列表
+TableDataInfo<KnowledgeInfoVo> queryPageList(KnowledgeInfoBo bo, PageQuery pageQuery);
+List<KnowledgeInfoVo> queryList(KnowledgeInfoBo bo);
+
+// 查询知识库
+KnowledgeInfoVo queryById(Long id);
+KnowledgeInfoVo queryByKnowledgeId(Long knowledgeId);
+
+// 创建/更新/删除知识库
+Boolean insertByBo(KnowledgeInfoBo bo);
+Boolean updateByBo(KnowledgeInfoBo bo);
+Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+// 根据用户ID查询知识库列表
+List<KnowledgeInfoVo> queryListByUserId(Long userId);
+
+// 上传文档
+String uploadDocument(String knowledgeId, MultipartFile file);
+
+// 批量上传文档
+List<String> batchUploadDocuments(String knowledgeId, MultipartFile[] files);
+
+// 搜索知识库
+List<KnowledgeSearchResultVo> searchKnowledge(String knowledgeId, String query, Integer limit);
+
+// 获取知识库处理状态
+KnowledgeStatusVo getKnowledgeStatus(String knowledgeId);
+
+// 处理文档并生成知识片段
+String processDocument(String knowledgeId, String docId, String content);
+
+// 对知识片段进行向量化
+String vectorizeFragment(String knowledgeId, String fragmentId);
+```
+
+#### KnowledgeVectorService
+
+向量化服务，处理文档向量化和搜索。
+
+**主要方法：**
+
+```java
+// 查询向量列表
+TableDataInfo<KnowledgeVectorVo> queryPageList(KnowledgeVectorBo bo, PageQuery pageQuery);
+List<KnowledgeVectorVo> queryList(KnowledgeVectorBo bo);
+
+// 查询向量
+KnowledgeVectorVo queryById(Long vectorId);
+
+// 创建/更新/删除向量
+Boolean insertByBo(KnowledgeVectorBo bo);
+Boolean updateByBo(KnowledgeVectorBo bo);
+Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+// 向量相似度搜索
+List<KnowledgeSearchResultVo> vectorSimilaritySearch(String knowledgeId, String queryText,
+    String modelName, Integer topK, Double threshold);
+
+// 单片段向量生成
+String generateVector(String knowledgeId, String docId, String fragmentId, String content, String modelName);
+
+// 批量向量生成
+List<String> batchGenerateVectors(String knowledgeId, String docId, 
+    Map<String, String> fragmentContents, String modelName);
+
+// 统计与可用性
+Map<String, Object> getVectorStatistics(String knowledgeId);
+boolean isModelAvailable(String modelName);
+List<String> getAvailableModels();
+
+// 根据片段ID/知识库ID/文档ID/模型名称/状态查询向量列表
+List<KnowledgeVectorVo> queryByFragmentId(String fragmentId);
+List<KnowledgeVectorVo> queryByKnowledgeId(String knowledgeId);
+List<KnowledgeVectorVo> queryByDocId(String docId);
+List<KnowledgeVectorVo> queryByModelName(String modelName);
+List<KnowledgeVectorVo> queryByStatus(Integer status);
+List<KnowledgeVectorVo> queryByKnowledgeIdAndStatus(String knowledgeId, Integer status);
+
+// 根据向量ID查询向量
+KnowledgeVectorVo queryByVectorId(String vectorId);
+
+// 批量更新向量状态
+Boolean updateStatusByIds(Collection<Long> ids, Integer status);
+
+// 文本转向量和相似度计算
+double[] textToVector(String text, String modelName);
+double calculateSimilarity(double[] vector1, double[] vector2);
+
+// 批量删除向量
+int deleteVectorsByKnowledgeId(String knowledgeId);
+int deleteVectorsByDocId(String docId);
+```
+
+#### KnowledgeFragmentService
+
+知识片段管理服务。
+
+**主要方法：**
+
+```java
+// 查询知识片段列表
+TableDataInfo<KnowledgeFragmentVo> queryPageList(KnowledgeFragmentBo bo, PageQuery pageQuery);
+List<KnowledgeFragmentVo> queryList(KnowledgeFragmentBo bo);
+
+// 查询知识片段
+KnowledgeFragmentVo queryById(Long fragmentId);
+KnowledgeFragmentVo queryByFid(String fid);
+
+// 创建/更新/删除知识片段
+Boolean insertByBo(KnowledgeFragmentBo bo);
+Boolean updateByBo(KnowledgeFragmentBo bo);
+Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+// 根据知识库ID/文档ID查询片段列表
+List<KnowledgeFragmentVo> queryListByKnowledgeId(Long knowledgeId);
+List<KnowledgeFragmentVo> queryListByDocId(String docId);
+```
+
+#### KnowledgeAttachService
+
+知识库附件管理服务。
+
+**主要方法：**
+
+```java
+// 查询附件列表
+TableDataInfo<KnowledgeAttachVo> queryPageList(KnowledgeAttachBo bo, PageQuery pageQuery);
+List<KnowledgeAttachVo> queryList(KnowledgeAttachBo bo);
+
+// 查询附件
+KnowledgeAttachVo queryById(Long attachId);
+KnowledgeAttachVo queryByDocId(String docId);
+
+// 创建/更新/删除附件
+Boolean insertByBo(KnowledgeAttachBo bo);
+Boolean updateByBo(KnowledgeAttachBo bo);
+Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+// 根据知识库ID查询附件列表
+List<KnowledgeAttachVo> queryListByKnowledgeId(String knowledgeId);
+```
+
+#### KnowledgeDocumentService
+
+文档处理服务，处理文档上传、解析和分片。
+
+**主要方法：**
+
+```java
+// 上传文档并处理
+String uploadDocument(String knowledgeId, MultipartFile file);
+
+// 批量上传文档
+List<String> batchUploadDocuments(String knowledgeId, MultipartFile[] files);
+
+// 分割文档为片段
+List<String> splitDocumentIntoFragments(String knowledgeId, String docId, 
+    String content, Integer chunkSize, Integer overlapSize);
+```
+
+#### KnowledgeJobService
+
+任务管理服务，处理知识库处理任务的创建、查询和状态管理。
+
+**主要方法：**
+
+```java
+// 查询任务列表
+TableDataInfo<KnowledgeJobVo> queryPageList(KnowledgeJobBo bo, PageQuery pageQuery);
+List<KnowledgeJobVo> queryList(KnowledgeJobBo bo);
+
+// 查询任务
+KnowledgeJobVo queryById(Long jobId);
+
+// 创建/更新/删除任务
+Boolean insertByBo(KnowledgeJobBo bo);
+Boolean updateByBo(KnowledgeJobBo bo);
+Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+// 根据知识库ID/状态/类型查询任务
+List<KnowledgeJobVo> queryByKnowledgeId(String knowledgeId);
+List<KnowledgeJobVo> queryByStatus(Integer status);
+List<KnowledgeJobVo> queryByJobType(String jobType);
+```
+
+#### KnowledgePromptTemplateService
+
+提示词模板管理服务。
+
+**主要方法：**
+
+```java
+// 查询模板列表
+TableDataInfo<KnowledgePromptTemplateVo> queryPageList(KnowledgePromptTemplateBo bo, PageQuery pageQuery);
+List<KnowledgePromptTemplateVo> queryList(KnowledgePromptTemplateBo bo);
+
+// 查询模板
+KnowledgePromptTemplateVo queryById(Long templateId);
+KnowledgePromptTemplateVo queryByTemplateName(String templateName);
+
+// 创建/更新/删除模板
+Boolean insertByBo(KnowledgePromptTemplateBo bo);
+Boolean updateByBo(KnowledgePromptTemplateBo bo);
+Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+// 根据分类查询模板列表
+List<KnowledgePromptTemplateVo> queryListByCategory(String category);
+```
+
+#### KnowledgeSchemaService
+
+数据模型管理服务。
+
+**主要方法：**
+
+```java
+// 查询模型列表
+TableDataInfo<KnowledgeSchemaVo> queryPageList(KnowledgeSchemaBo bo, PageQuery pageQuery);
+List<KnowledgeSchemaVo> queryList(KnowledgeSchemaBo bo);
+
+// 查询模型
+KnowledgeSchemaVo queryById(Long schemaId);
+KnowledgeSchemaVo queryByCode(String code);
+KnowledgeSchemaVo queryByTableName(String tableName);
+
+// 创建/更新/删除模型
+Boolean insertByBo(KnowledgeSchemaBo bo);
+Boolean updateByBo(KnowledgeSchemaBo bo);
+Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+// 根据分组ID查询模型列表
+List<KnowledgeSchemaVo> queryListBySchemaGroupId(Long schemaGroupId);
+```
+
+#### KnowledgeSchemaGroupService
+
+数据模型分组管理服务。
+
+**主要方法：**
+
+```java
+// 查询分组列表
+TableDataInfo<KnowledgeSchemaGroupVo> queryPageList(KnowledgeSchemaGroupBo bo, PageQuery pageQuery);
+List<KnowledgeSchemaGroupVo> queryList(KnowledgeSchemaGroupBo bo);
+
+// 查询分组
+KnowledgeSchemaGroupVo queryById(Long groupId);
+KnowledgeSchemaGroupVo queryByCode(String code);
+KnowledgeSchemaGroupVo queryByName(String name);
+
+// 创建/更新/删除分组
+Boolean insertByBo(KnowledgeSchemaGroupBo bo);
+Boolean updateByBo(KnowledgeSchemaGroupBo bo);
+Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+```
+
+#### KnowledgeSchemaFieldService
+
+数据模型字段管理服务。
+
+**主要方法：**
+
+```java
+// 查询字段列表
+TableDataInfo<KnowledgeSchemaFieldVo> queryPageList(KnowledgeSchemaFieldBo bo, PageQuery pageQuery);
+List<KnowledgeSchemaFieldVo> queryList(KnowledgeSchemaFieldBo bo);
+
+// 查询字段
+KnowledgeSchemaFieldVo queryById(Long fieldId);
+KnowledgeSchemaFieldVo queryByCode(String code);
+KnowledgeSchemaFieldVo queryBySchemaIdAndCode(Long schemaId, String code);
+
+// 创建/更新/删除字段
+Boolean insertByBo(KnowledgeSchemaFieldBo bo);
+Boolean updateByBo(KnowledgeSchemaFieldBo bo);
+Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+// 根据模式ID查询字段列表
+List<KnowledgeSchemaFieldVo> queryListBySchemaId(Long schemaId);
+```
+
+#### KnowledgeHitLogService
+
+命中日志管理服务。
+
+**主要方法：**
+
+```java
+// 查询日志列表
+TableDataInfo<KnowledgeHitLogVo> queryPageList(KnowledgeHitLogBo bo, PageQuery pageQuery);
+List<KnowledgeHitLogVo> queryList(KnowledgeHitLogBo bo);
+
+// 查询日志
+KnowledgeHitLogVo queryById(Long logId);
+
+// 创建/更新/删除日志
+Boolean insertByBo(KnowledgeHitLogBo bo);
+Boolean updateByBo(KnowledgeHitLogBo bo);
+Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+// 根据知识库ID/会话ID/片段ID/查询文本查询日志
+List<KnowledgeHitLogVo> queryByKnowledgeId(String knowledgeId);
+List<KnowledgeHitLogVo> queryBySessionId(String sessionId);
+List<KnowledgeHitLogVo> queryByFragmentId(String fragmentId);
+List<KnowledgeHitLogVo> queryByQueryText(String queryText);
+
+// 统计分析
+List<Map<String, Object>> getPopularQueries(String knowledgeId, Integer limit);
+Double getAverageResponseTime(String knowledgeId);
+```
+
+#### KnowledgeRoleService
+
+角色管理服务（Service层已实现，Controller层待实现）。
+
+**主要方法：**
+
+```java
+// 查询角色列表
+TableDataInfo<KnowledgeRoleVo> queryPageList(KnowledgeRoleBo bo, PageQuery pageQuery);
+List<KnowledgeRoleVo> queryList(KnowledgeRoleBo bo);
+List<KnowledgeRoleVo> queryEnabledList(); // 查询启用状态的角色列表
+
+// 查询角色
+KnowledgeRoleVo queryById(Long id);
+KnowledgeRoleVo queryByRoleCode(String roleCode);
+
+// 创建/更新/删除角色
+Boolean insertByBo(KnowledgeRoleBo bo);
+Boolean updateByBo(KnowledgeRoleBo bo);
+Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+```
+
+#### KnowledgeRoleGroupService
+
+角色组管理服务（Service层已实现，Controller层待实现）。
+
+**主要方法：**
+
+```java
+// 查询角色组列表
+TableDataInfo<KnowledgeRoleGroupVo> queryPageList(KnowledgeRoleGroupBo bo, PageQuery pageQuery);
+List<KnowledgeRoleGroupVo> queryList(KnowledgeRoleGroupBo bo);
+
+// 查询角色组
+KnowledgeRoleGroupVo queryById(Long groupId);
+
+// 创建/更新/删除角色组
+Boolean insertByBo(KnowledgeRoleGroupBo bo);
+Boolean updateByBo(KnowledgeRoleGroupBo bo);
+Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+```
+
+#### KnowledgeRoleRelationService
+
+角色关联管理服务（Service层已实现，Controller层待实现）。
+
+**主要方法：**
+
+```java
+// 查询关联列表
+TableDataInfo<KnowledgeRoleRelationVo> queryPageList(KnowledgeRoleRelationBo bo, PageQuery pageQuery);
+List<KnowledgeRoleRelationVo> queryList(KnowledgeRoleRelationBo bo);
+
+// 查询关联
+KnowledgeRoleRelationVo queryById(Long id);
+KnowledgeRoleRelationVo queryByRoleIdAndGroupId(Long roleId, Long groupId);
+
+// 创建/更新/删除关联
+Boolean insertByBo(KnowledgeRoleRelationBo bo);
+Boolean updateByBo(KnowledgeRoleRelationBo bo);
+Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+// 根据角色ID/分组ID查询关联列表
+List<KnowledgeRoleRelationVo> queryByRoleId(Long roleId);
+List<KnowledgeRoleRelationVo> queryByGroupId(Long groupId);
+```
+
+## 数据库表结构
+
+知识库模块包含以下数据表（详细SQL请参考 `script/sql/ry_knowledge.sql`）：
+
+### 数据库表清单
+
+1. `knowledge_info` - 知识库信息表
+2. `knowledge_attach` - 知识库附件表
+3. `knowledge_fragment` - 知识库片段表
+4. `knowledge_vector` - 知识片段向量表
+5. `knowledge_prompt_template` - 知识库提示词模板表
+6. `knowledge_schema_group` - 知识库数据模型分组表
+7. `knowledge_schema` - 知识库数据模型表
+8. `knowledge_schema_field` - 知识库数据模型字段表
+9. `knowledge_role` - 知识库角色表
+10. `knowledge_role_group` - 知识库角色组表
+11. `knowledge_role_relation` - 知识库角色与知识库关联表
+12. `knowledge_job` - 知识库任务进度表
+13. `knowledge_hit_log` - 知识检索命中日志表
+
+### 主要数据表说明
+
+#### 1. knowledge_info (知识库信息表)
+
+存储知识库的基本信息和配置。
+
+**主要字段：**
+- `id` - 主键ID
+- `user_id` - 用户ID
+- `knowledge_id` - 知识库ID（唯一标识）
+- `knowledge_name` - 知识库名称
+- `share` - 是否公开知识库（0否,1是）
+- `description` - 描述
+- `knowledge_separator` - 知识分隔符
+- `question_separator` - 提问分隔符
+- `overlap_char` - 重叠字符数
+- `retrieve_limit` - 知识库中检索的条数
+- `text_block_size` - 文本块大小
+- `vector_model_name` - 向量库
+- `embedding_model_name` - 向量模型
+- `system_prompt` - 系统提示词
+- `del_flag` - 删除标志（0存在,1删除）
+
+#### 2. knowledge_attach (知识库附件表)
+
+存储上传到知识库的文档文件信息。
+
+**主要字段：**
+- `id` - 主键ID
+- `knowledge_id` - 知识库ID
+- `doc_id` - 文档ID（唯一标识）
+- `doc_name` - 文档名称
+- `doc_type` - 文档类型（pdf/docx/txt/md等）
+- `oss_id` - 对象存储ID
+- `pic_status` - 拆解图片状态（10未开始,20进行中,30已完成）
+- `pic_anys_status` - 分析图片状态（10未开始,20进行中,30已完成）
+- `vector_status` - 写入向量数据库状态（10未开始,20进行中,30已完成）
+- `content` - 文档内容（长文本）
+
+#### 3. knowledge_fragment (知识库片段表)
+
+存储文档分割后的知识片段。
+
+**主要字段：**
+- `id` - 主键ID
+- `knowledge_id` - 知识库ID
+- `doc_id` - 文档ID
+- `fid` - 知识片段ID（唯一标识）
+- `idx` - 片段索引下标
+- `content` - 文档内容（文本）
+
+#### 4. knowledge_vector (知识片段向量表)
+
+存储知识片段的向量化数据。
+
+**主要字段：**
+- `id` - 主键ID
+- `knowledge_id` - 知识库ID
+- `doc_id` - 文档ID
+- `fragment_id` - 知识片段ID
+- `vector_id` - 向量唯一标识
+- `vector_data` - 向量数据（BLOB）
+- `dimension` - 向量维度
+- `model_name` - 向量模型名称
+- `status` - 状态（0启用,1禁用）
+
+#### 5. knowledge_prompt_template (知识库提示词模板表)
+
+存储提示词模板信息。
+
+**主要字段：**
+- `id` - 主键ID
+- `template_name` - 提示词模板名称
+- `template_content` - 提示词模板内容
+- `category` - 提示词分类（knowledge知识库类型,chat对话类型,draw绘画类型）
+- `del_flag` - 删除标志（0存在,1删除）
+
+#### 6. knowledge_schema_group (知识库数据模型分组表)
+
+存储数据模型分组信息。
+
+**主要字段：**
+- `id` - 主键ID
+- `name` - 分组名称
+- `code` - 分组编码（唯一）
+- `icon` - 图标
+- `del_flag` - 删除标志（0存在,1删除）
+
+#### 7. knowledge_schema (知识库数据模型表)
+
+存储数据模型定义信息。
+
+**主要字段：**
+- `id` - 主键ID
+- `schema_group_id` - 分组ID
+- `name` - 模型名称
+- `code` - 模型编码（唯一）
+- `table_name` - 表名（唯一）
+- `del_flag` - 删除标志（0存在,1删除）
+
+#### 8. knowledge_schema_field (知识库数据模型字段表)
+
+存储数据模型的字段定义信息。
+
+**主要字段：**
+- `id` - 主键ID
+- `schema_id` - 模型ID
+- `schema_name` - 模型名称
+- `name` - 字段名称
+- `code` - 字段编码
+- `type` - 字段类型
+- `comment` - 字段注释
+- `is_pk` - 是否主键（0否,1是）
+- `is_required` - 是否必填（0否,1是）
+- `is_unique` - 是否唯一（0否,1是）
+- `default_value` - 默认值
+- `length` - 字段长度
+- `scale` - 小数位数
+- `is_list` - 是否列表显示（0否,1是）
+- `is_query` - 是否查询字段（0否,1是）
+- `is_insert` - 是否插入字段（0否,1是）
+- `is_edit` - 是否编辑字段（0否,1是）
+- `query_type` - 查询方式（EQ,NE,GT,LT,LIKE,BETWEEN）
+- `html_type` - 显示类型（input,textarea,select,checkbox,radio,datetime,image,upload,editor）
+- `dict_type` - 字典类型
+- `sort` - 排序
+- `del_flag` - 删除标志（0存在,1删除）
+
+#### 9. knowledge_role (知识库角色表)
+
+存储知识库角色信息。
+
+**主要字段：**
+- `id` - 知识库角色id（主键）
+- `name` - 知识库角色名称（注意：SQL建表语句中字段名为`name`，但Java实体类中通过MyBatis-Plus字段映射使用`roleName`、`roleCode`、`roleDesc`等字段，实际运行时通过字段映射或XML映射处理）
+- `group_id` - 知识库角色组id
+- `remark` - 备注
+- `del_flag` - 删除标志（0存在,1删除）
+- `create_by` - 创建者
+- `create_time` - 创建时间
+- `update_by` - 更新者
+- `update_time` - 更新时间
+
+**注意**：
+1. SQL建表语句与Java实体类字段可能存在不一致（SQL中仅定义了`name`字段，但Java实体类中有`roleName`、`roleCode`、`roleDesc`、`status`、`sort`等字段），实际使用时会通过MyBatis-Plus的字段映射或XML映射处理。
+2. 角色管理功能的Service层已实现（`KnowledgeRoleService`、`KnowledgeRoleGroupService`、`KnowledgeRoleRelationService`），但Controller层尚未实现，可通过Service层调用或后续补充Controller。
+
+#### 10. knowledge_role_group (知识库角色组表)
+
+存储知识库角色组信息。
+
+**主要字段（基于SQL建表语句）：**
+- `id` - 知识库角色组id（主键）
+- `name` - 知识库角色组名称（在Java实体类中映射为`groupName`）
+- `remark` - 备注
+- `del_flag` - 删除标志（0存在,1删除）
+- `create_by` - 创建者
+- `create_time` - 创建时间
+- `update_by` - 更新者
+- `update_time` - 更新时间
+
+**注意**：SQL建表语句仅定义了基本字段，但Java实体类（`KnowledgeRoleGroup`）中还包含`groupCode`、`groupDesc`、`status`、`sort`等字段。这些字段可能在SQL中未定义或通过后续ALTER TABLE添加，实际使用时会通过MyBatis-Plus的字段映射或XML映射处理。
+
+#### 11. knowledge_role_relation (知识库角色与知识库关联表)
+
+存储角色与知识库的关联关系。
+
+**主要字段（基于SQL建表语句和XML映射）：**
+- `id` - 主键ID
+- `knowledge_role_id` - 知识库角色id（在Java实体类中映射为`knowledgeRoleId`，通过XML映射）
+- `knowledge_id` - 知识库id（在Java实体类中映射为`knowledgeId`，通过XML映射）
+- `remark` - 备注
+- `del_flag` - 删除标志（0存在,1删除）
+- `create_by` - 创建者
+- `create_time` - 创建时间
+- `update_by` - 更新者
+- `update_time` - 更新时间
+- 唯一索引：`uk_role_knowledge` (`knowledge_role_id`, `knowledge_id`)
+
+**注意**：SQL建表语句仅定义了基本字段（`knowledge_role_id`和`knowledge_id`），但Java实体类（`KnowledgeRoleRelation`）中还包含`roleId`、`groupId`、`relationType`、`status`、`sort`等字段。XML映射文件（`KnowledgeRoleRelationMapper.xml`）中只映射了`knowledgeRoleId`和`knowledgeId`字段，其他字段（`roleId`、`groupId`、`relationType`、`status`、`sort`）可能在SQL中未定义或通过后续ALTER TABLE添加，实际使用时会通过MyBatis-Plus的字段映射处理。
+
+#### 12. knowledge_job (知识库任务进度表)
+
+存储知识库处理任务的进度和状态信息。
+
+**主要字段：**
+- `id` - 任务ID
+- `job_id` - 任务唯一标识
+- `job_type` - 任务类型（upload,process,delete,export,embedding,sync）
+- `job_sub_type` - 任务子类型
+- `knowledge_id` - 知识库ID
+- `doc_id` - 文档ID
+- `user_id` - 用户ID
+- `status` - 任务状态（0等待,1进行中,2成功,3失败,4暂停）
+- `progress` - 进度（0-100）
+- `total_items` - 总项目数
+- `processed_items` - 已处理项目数
+- `success_items` - 成功项目数
+- `failed_items` - 失败项目数
+- `priority` - 优先级（1低,2中,3高）
+- `retry_count` - 重试次数
+- `max_retry` - 最大重试次数
+- `start_time` - 开始时间
+- `end_time` - 结束时间
+- `timeout` - 超时时间（秒）
+- `error_message` - 错误信息
+- `error_stack` - 错误堆栈
+- `result_data` - 结果数据（JSON格式）
+- `notify_url` - 通知URL
+- `notify_status` - 通知状态（0未通知,1已通知）
+
+#### 13. knowledge_hit_log (知识检索命中日志表)
+
+存储知识检索的命中日志，用于分析检索效果和热门查询。
+
+**主要字段：**
+- `id` - 主键ID
+- `session_id` - 会话ID
+- `knowledge_id` - 知识库ID
+- `doc_id` - 文档ID
+- `fragment_id` - 知识片段ID
+- `query_text` - 查询文本
+- `query_vector` - 查询向量（BLOB）
+- `similarity_score` - 相似度分数
+- `ranking` - 排名位置
+- `model_name` - 向量模型名称
+- `search_params` - 搜索参数（JSON格式）
+- `response_time` - 响应时间（毫秒）
+- `hit_count` - 命中次数
+
+## 使用示例
+
+### 1. 创建知识库
+
+```bash
+curl -X POST "http://localhost:8080/knowledge/info" \
+  -H "Content-Type: application/json" \
+  -H "Authorization: Bearer YOUR_TOKEN" \
+  -d '{
+    "knowledgeName": "技术文档库",
+    "description": "存储技术相关文档",
+    "share": 0,
+    "textBlockSize": 1000,
+    "overlapChar": 200,
+    "retrieveLimit": 5,
+    "embeddingModelName": "bge-large-zh",
+    "vectorModelName": "db"
+  }'
+```
+
+### 2. 上传文档
+
+```bash
+curl -X POST "http://localhost:8080/knowledge/info/kb123/upload" \
+  -H "Authorization: Bearer YOUR_TOKEN" \
+  -F "file=@document.pdf"
+```
+
+### 3. 批量上传文档
+
+```bash
+curl -X POST "http://localhost:8080/knowledge/info/kb123/batch-upload" \
+  -H "Authorization: Bearer YOUR_TOKEN" \
+  -F "files=@document1.pdf" \
+  -F "files=@document2.docx"
+```
+
+### 4. 搜索知识库
+
+```bash
+curl -X POST "http://localhost:8080/knowledge/info/kb123/search?query=Spring Boot&limit=5" \
+  -H "Authorization: Bearer YOUR_TOKEN"
+```
+
+### 5. 向量搜索
+
+```bash
+curl -X POST "http://localhost:8080/knowledge/vector/search?knowledgeId=kb123&query=什么是微服务架构？&model=bge-large-zh&topK=5&threshold=0.7" \
+  -H "Authorization: Bearer YOUR_TOKEN"
+```
+
+### 6. 生成向量
+
+```bash
+curl -X POST "http://localhost:8080/knowledge/vector/generate?knowledgeId=kb123&docId=doc456&model=bge-large-zh" \
+  -H "Content-Type: application/json" \
+  -H "Authorization: Bearer YOUR_TOKEN" \
+  -d '[
+    {
+      "fid": "fragment1",
+      "content": "这是第一个片段的内容..."
+    },
+    {
+      "fid": "fragment2",
+      "content": "这是第二个片段的内容..."
+    }
+  ]'
+```
+
+### 7. 文档批量向量化
+
+```bash
+curl -X POST "http://localhost:8080/knowledge/vector/vectorize-doc?knowledgeId=kb123&docId=doc456&model=bge-large-zh" \
+  -H "Authorization: Bearer YOUR_TOKEN"
+```
+
+### 8. 获取向量统计
+
+```bash
+curl -X GET "http://localhost:8080/knowledge/vector/stats/kb123" \
+  -H "Authorization: Bearer YOUR_TOKEN"
+```
+
+### 9. 重建向量索引
+
+```bash
+curl -X POST "http://localhost:8080/knowledge/vector/rebuild/kb123" \
+  -H "Authorization: Bearer YOUR_TOKEN"
+```
+
+### 10. 获取知识库状态
+
+```bash
+curl -X GET "http://localhost:8080/knowledge/info/kb123/status" \
+  -H "Authorization: Bearer YOUR_TOKEN"
+```
+
+### 11. 查询知识库列表
+
+```bash
+curl -X GET "http://localhost:8080/knowledge/info/list?pageNum=1&pageSize=10&knowledgeName=技术" \
+  -H "Authorization: Bearer YOUR_TOKEN"
+```
+
+### 12. 查询附件列表
+
+```bash
+curl -X GET "http://localhost:8080/knowledge/attach/list?knowledgeId=kb123&pageNum=1&pageSize=10" \
+  -H "Authorization: Bearer YOUR_TOKEN"
+```
+
+### 13. 查询片段列表
+
+```bash
+curl -X GET "http://localhost:8080/knowledge/fragment/list?knowledgeId=kb123&pageNum=1&pageSize=10" \
+  -H "Authorization: Bearer YOUR_TOKEN"
+```
+
+### 14. 查询任务列表
+
+```bash
+curl -X GET "http://localhost:8080/knowledge/job/list?knowledgeId=kb123&status=1&pageNum=1&pageSize=10" \
+  -H "Authorization: Bearer YOUR_TOKEN"
+```
+
+### 15. 获取热门查询列表
+
+```bash
+curl -X GET "http://localhost:8080/knowledge/hitlog/popular?knowledgeId=kb123&limit=10" \
+  -H "Authorization: Bearer YOUR_TOKEN"
+```
+
+### 16. 获取平均响应时间
+
+```bash
+curl -X GET "http://localhost:8080/knowledge/hitlog/avg-response-time?knowledgeId=kb123" \
+  -H "Authorization: Bearer YOUR_TOKEN"
+```
+
+### 17. 查询命中日志
+
+```bash
+curl -X GET "http://localhost:8080/knowledge/hitlog/list?knowledgeId=kb123&pageNum=1&pageSize=10" \
+  -H "Authorization: Bearer YOUR_TOKEN"
+```
+
+### 18. 创建提示词模板
+
+```bash
+curl -X POST "http://localhost:8080/knowledge/prompt" \
+  -H "Content-Type: application/json" \
+  -H "Authorization: Bearer YOUR_TOKEN" \
+  -d '{
+    "templateName": "技术问答模板",
+    "templateContent": "你是一个专业的技术助手，请基于以下知识回答问题：\n{knowledge}\n\n问题：{question}",
+    "category": "knowledge"
+  }'
+```
+
+### 19. 创建数据模型分组
+
+```bash
+curl -X POST "http://localhost:8080/knowledge/schema/group" \
+  -H "Content-Type: application/json" \
+  -H "Authorization: Bearer YOUR_TOKEN" \
+  -d '{
+    "name": "业务模型组",
+    "code": "business_models",
+    "icon": "icon-business"
+  }'
+```
+
+### 20. 创建数据模型
+
+```bash
+curl -X POST "http://localhost:8080/knowledge/schema" \
+  -H "Content-Type: application/json" \
+  -H "Authorization: Bearer YOUR_TOKEN" \
+  -d '{
+    "schemaGroupId": 1,
+    "name": "产品模型",
+    "code": "product_model",
+    "tableName": "product_data"
+  }'
+```
+
+## 配置说明
+
+### 应用配置
+
+```yaml
+# 知识库模块配置
+knowledge:
+  # 默认嵌入模型
+  default-embedding-model: text-embedding-ada-002
+  # 默认分片大小
+  default-chunk-size: 1000
+  # 默认分片重叠
+  default-chunk-overlap: 200
+  # 支持的文件类型
+  supported-file-types:
+    - pdf
+    - docx
+    - txt
+    - md
+  # 最大文件大小（MB）
+  max-file-size: 50
+  # 向量搜索配置
+  vector-search:
+    # 默认返回数量
+    default-top-k: 5
+    # 默认相似度阈值
+    default-threshold: 0.7
+    # 缓存过期时间（秒）
+    cache-expire-time: 3600
+
+# RAG 配置（统一前缀 rag.*）
+rag:
+  enabled: true
+  default-embedding-model: text-embedding
+  default-vector-backend: db   # 可扩展 qdrant/weaviate 等
+```
+
+### 文件存储配置
+
+```yaml
+# OSS配置
+oss:
+  # 知识库文件存储桶
+  knowledge-bucket: knowledge-files
+  # 文件访问路径前缀
+  file-url-prefix: /knowledge/files/
+```
+
+## 支持的文档格式
+
+### 文本格式
+
+- **TXT**: 纯文本文件
+- **MD**: Markdown文档
+- **CSV**: 逗号分隔值文件
+
+### 办公文档
+
+- **PDF**: Adobe PDF文档
+- **DOCX**: Microsoft Word文档
+- **PPTX**: Microsoft PowerPoint文档
+- **XLSX**: Microsoft Excel文档
+
+### 网页格式
+
+- **HTML**: 网页文档
+- **XML**: 结构化文档
+
+## 嵌入模型支持
+
+### OpenAI模型
+
+- `text-embedding-ada-002`
+- `text-embedding-3-small`
+- `text-embedding-3-large`
+
+### 其他模型
+
+- `sentence-transformers/all-MiniLM-L6-v2`
+- `sentence-transformers/all-mpnet-base-v2`
+- `text2vec-chinese`
+
+## 开发指南
+
+### 添加新的文档解析器
+
+1. 实现 `DocumentParser` 接口（签名：`String parse(byte[] bytes, String filename)`）
+2. 注册解析器到Spring容器
+3. 配置文件类型映射
+4. 添加单元测试
+
+```java
+@Component
+public class CustomDocumentParser implements DocumentParser {
+    @Override
+    public String parse(byte[] bytes, String filename) {
+        // 实现解析逻辑并返回纯文本
+        return new String(bytes);
+    }
+}
+```
+
+### 集成新的嵌入模型
+
+1. 实现 `EmbeddingEngine` 接口
+2. 配置模型参数
+3. 添加模型验证
+4. 更新配置文档
+
+```java
+@Component
+public class CustomEmbeddingEngine implements EmbeddingEngine {
+    @Override
+    public double[] embed(String text, String model) {
+        // 实现嵌入逻辑
+        return new double[]{0.1, 0.2, 0.3};
+    }
+}
+```
+
+### 自定义搜索策略
+
+1. 实现 `Retriever` 接口
+2. 配置搜索权重
+3. 添加性能测试
+4. 文档化搜索算法
+
+```java
+@Component
+public class HybridRetriever implements Retriever {
+    public List<KnowledgeSearchResultVo> search(String knowledgeId, String query, String model, int topK, double threshold) {
+        // 实现混合搜索逻辑：关键词 + 向量
+        return java.util.Collections.emptyList();
+    }
+}
+```
+
+### 增量索引与版本控制
+
+- 索引更新：`IndexUpdater` 接口，默认实现 `DefaultIndexUpdater` 触发分片重建与任务追踪
+- 版本管理：`VersionManager` 接口，默认实现 `DefaultVersionManager`（创建版本与回滚占位）
+- 推荐将版本信息与片段/向量表做快照/变更日志以支持精准回滚
+
+## 性能优化
+
+### 向量索引优化
+
+1. **索引策略**
+    - 使用适当的向量索引算法（HNSW、IVF等）
+    - 定期重建索引
+    - 增量索引更新
+
+2. **内存管理**
+    - 向量数据分页加载
+    - LRU缓存策略
+    - 内存使用监控
+
+### 搜索性能
+
+1. **缓存策略**
+    - 热门查询结果缓存
+    - 向量计算结果缓存
+    - 分布式缓存支持
+
+2. **并发处理**
+    - 异步向量化处理
+    - 并行搜索执行
+    - 线程池优化
+
+### 存储优化
+
+1. **数据压缩**
+    - 向量数据压缩
+    - 文档内容压缩
+    - 索引数据优化
+
+2. **分库分表**
+    - 按知识库分表
+    - 向量数据分片
+    - 读写分离
+
+## 监控和运维
+
+### 关键指标
+
+- 知识库数量和大小
+- 文档处理成功率
+- 向量化处理时间
+- 搜索响应时间
+- 搜索准确率
+- 存储使用量
+
+### 日志配置
+
+```yaml
+logging:
+  level:
+    org.dromara.knowledge: DEBUG
+    org.dromara.knowledge.service.impl.KnowledgeVectorServiceImpl: INFO
+```
+
+### 健康检查
+
+```bash
+# 检查知识库状态
+curl -X GET "http://localhost:8080/knowledge/health"
+
+# 检查向量服务状态
+curl -X GET "http://localhost:8080/knowledge/vector/health"
+```
+
+## 故障排除
+
+### 常见问题
+
+1. **文档上传失败**
+    - 检查文件格式支持
+    - 验证文件大小限制
+    - 查看存储空间
+
+2. **向量化处理失败**
+    - 检查嵌入模型配置
+    - 验证API密钥
+    - 查看网络连接
+
+3. **搜索结果不准确**
+    - 调整相似度阈值
+    - 优化分片策略
+    - 重建向量索引
+
+4. **性能问题**
+    - 检查索引状态
+    - 优化查询条件
+    - 增加缓存配置
+
+### 数据恢复
+
+1. **备份策略**
+    - 定期备份知识库数据
+    - 向量索引备份
+    - 配置文件备份
+
+2. **恢复流程**
+    - 恢复数据库数据
+    - 重建向量索引
+    - 验证数据完整性
+
+## API文档
+
+完整的API文档可通过Swagger UI访问：
+`http://localhost:8080/doc.html#/knowledge`
+
+## 功能清单
+
+### 已实现功能 ✅
+
+#### 知识库管理
+- ✅ 知识库创建和配置
+- ✅ 知识库列表查询（分页、筛选）
+- ✅ 知识库信息更新和删除
+- ✅ 知识库状态查询
+- ✅ 用户知识库列表查询
+
+#### 文档管理
+- ✅ 文档上传（单文件）
+- ✅ 文档批量上传
+- ✅ 文档列表查询
+- ✅ 文档信息查询
+- ✅ 文档删除
+- ✅ 多格式文档支持（PDF、Word、TXT、Markdown、Excel、CSV、HTML等）
+- ✅ 文档解析状态跟踪（拆解图片状态、分析图片状态、向量化状态）
+
+#### 知识片段管理
+- ✅ 片段列表查询（分页、筛选）
+- ✅ 片段信息查询
+- ✅ 片段创建、更新、删除
+- ✅ 根据知识库ID查询片段列表
+- ✅ 根据文档ID查询片段列表
+- ✅ 片段内容管理
+
+#### 向量化处理
+- ✅ 向量生成（单片段、批量）
+- ✅ 向量搜索（相似度搜索）
+- ✅ 向量列表查询
+- ✅ 向量统计
+- ✅ 向量索引重建
+- ✅ 文档批量向量化
+- ✅ 多向量模型支持
+
+#### 智能检索
+- ✅ 基于向量的语义搜索
+- ✅ 相似度排序
+- ✅ 检索结果过滤
+- ✅ 检索命中日志记录
+
+#### 任务管理
+- ✅ 任务创建和查询
+- ✅ 任务状态跟踪（等待、进行中、成功、失败、暂停）
+- ✅ 任务进度管理
+- ✅ 任务重试机制
+- ✅ 根据知识库ID查询任务
+- ✅ 根据任务状态/类型查询任务
+
+#### 提示词模板管理
+- ✅ 模板创建和配置
+- ✅ 模板列表查询
+- ✅ 模板更新和删除
+- ✅ 按分类查询模板
+- ✅ 按模板名称查询
+
+#### 数据模型管理
+- ✅ 模型分组管理（分组创建、查询、更新、删除）
+- ✅ 数据模型管理（模型创建、查询、更新、删除）
+- ✅ 模型字段管理（字段创建、查询、更新、删除）
+- ✅ 模型与分组的关联管理
+- ✅ 字段类型和属性配置
+
+#### 角色与权限管理
+- ✅ 角色组管理（Service层已实现）
+- ✅ 角色管理（Service层已实现）
+- ✅ 角色与知识库关联管理（Service层已实现）
+
+#### 检索日志与分析
+- ✅ 命中日志记录
+- ✅ 命中日志查询（按知识库、会话、片段、查询文本）
+- ✅ 热门查询统计
+- ✅ 平均响应时间分析
+- ✅ 日志导出
+
+#### RAG架构组件
+- ✅ 文档解析器接口（DocumentParser）及多种实现
+- ✅ 向量化引擎接口（EmbeddingEngine）及HTTP实现
+- ✅ 检索器接口（Retriever）及默认实现
+- ✅ 索引更新器接口（IndexUpdater）及默认实现
+- ✅ 响应生成器接口（Generator）及默认实现
+- ✅ 版本管理器接口（VersionManager）及默认实现
+- ✅ 向量存储服务接口（VectorStoreService）及多种实现（DB、Qdrant、Weaviate）
+
+### 待实现功能
+
+#### 文档处理增强
+- [ ] 文档版本管理（版本对比、回滚）
+- [ ] 文档预览功能（PDF预览、图片预览）
+- [ ] 文档在线编辑
+- [ ] 文档标签和分类管理
+- [ ] 文档批量操作（批量删除、批量导出）
+
+#### 检索功能增强
+- [ ] 关键词搜索（全文检索）
+- [ ] 混合搜索策略（关键词+向量）
+- [ ] 检索结果排序优化（多种排序策略）
+- [ ] 检索结果高亮显示
+- [ ] 检索历史记录
+
+#### 权限控制增强
+- [ ] 角色管理Controller（目前只有Service层）
+- [ ] 知识库访问权限控制（读写权限、分享权限）
+- [ ] 用户权限验证和拦截
+- [ ] 权限审计日志
+
+#### 数据分析与统计
+- [ ] 知识库使用统计（文档数量、检索次数、用户数等）
+- [ ] 检索效果分析（准确率、召回率）
+- [ ] 热门知识库统计
+- [ ] 用户行为分析
+
+#### 性能优化
+- [ ] 向量索引优化（HNSW、IVF等算法）
+- [ ] 检索结果缓存
+- [ ] 批量处理优化
+- [ ] 异步任务队列优化
+
+#### 集成功能
+- [ ] 与AI模块深度集成（RAG问答优化）
+- [ ] 与聊天模块集成（知识库聊天增强）
+- [ ] 知识库导入导出（批量导入、格式转换）
+
+## 版本历史
+
+- **v1.0.0**: 初始版本，基础知识库功能
+- **v1.1.0**: 添加向量搜索支持
+- **v1.2.0**: 支持多种文档格式
+- **v1.3.0**: 增加批量处理功能
+- **v1.4.0**: 引入 RAG 模块化目录、解析/检索接口与增量索引/版本控制
+- **v1.5.0**: 完善命中日志功能，新增热门查询统计和平均响应时间分析
+- **v1.6.0**: 完善文档，补充完整的API接口列表、数据库表结构说明、Service层方法说明和使用示例（2025-01-09）
+
+## 贡献指南
+
+1. Fork 项目
+2. 创建功能分支 (`git checkout -b feature/AmazingFeature`)
+3. 提交代码变更 (`git commit -m 'Add some AmazingFeature'`)
+4. 推送到分支 (`git push origin feature/AmazingFeature`)
+5. 创建 Pull Request
+
+## 许可证
+
+本项目采用 MIT 许可证，详见 LICENSE 文件。
+
+## 技术支持
+
+如有问题或建议，请通过以下方式联系：
+
+- 提交 Issue
+- 发送邮件至技术支持
+- 参与社区讨论
diff --git a/ruoyi-modules/ruoyi-knowledge/pom.xml b/ruoyi-modules/ruoyi-knowledge/pom.xml
new file mode 100644
index 0000000..39cfc31
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/pom.xml
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>org.dromara</groupId>
+        <artifactId>ruoyi-modules</artifactId>
+        <version>${revision}</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>ruoyi-knowledge</artifactId>
+
+    <description>
+        knowledge知识库模块
+    </description>
+
+    <dependencies>
+        <!-- HTTP 客户端 -->
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
+        </dependency>
+
+
+        <!-- 通用工具-->
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-core</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-doc</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-mybatis</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-translation</artifactId>
+        </dependency>
+
+        <!-- OSS功能模块 -->
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-oss</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-log</artifactId>
+        </dependency>
+
+        <!-- excel-->
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-excel</artifactId>
+        </dependency>
+
+        <!-- SMS功能模块 -->
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-sms</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-security</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-web</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-idempotent</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-sensitive</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-encrypt</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-websocket</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-sse</artifactId>
+        </dependency>
+
+        <!-- Apache POI for document processing -->
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi-ooxml</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi-scratchpad</artifactId>
+        </dependency>
+
+        <!-- iText for PDF processing -->
+        <dependency>
+            <groupId>com.itextpdf</groupId>
+            <artifactId>kernel</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.itextpdf</groupId>
+            <artifactId>layout</artifactId>
+        </dependency>
+
+    </dependencies>
+
+</project>
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/config/RagConfigProperties.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/config/RagConfigProperties.java
new file mode 100644
index 0000000..30562e2
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/config/RagConfigProperties.java
@@ -0,0 +1,35 @@
+package org.dromara.knowledge.config;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+@ConfigurationProperties(prefix = "rag")
+public class RagConfigProperties {
+    private boolean enabled = true;
+    private String defaultEmbeddingModel = "text-embedding";
+    private String defaultVectorBackend = "db";
+
+    public boolean isEnabled() {
+        return enabled;
+    }
+
+    public void setEnabled(boolean enabled) {
+        this.enabled = enabled;
+    }
+
+    public String getDefaultEmbeddingModel() {
+        return defaultEmbeddingModel;
+    }
+
+    public void setDefaultEmbeddingModel(String defaultEmbeddingModel) {
+        this.defaultEmbeddingModel = defaultEmbeddingModel;
+    }
+
+    public String getDefaultVectorBackend() {
+        return defaultVectorBackend;
+    }
+
+    public void setDefaultVectorBackend(String defaultVectorBackend) {
+        this.defaultVectorBackend = defaultVectorBackend;
+    }
+}
+
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/config/RagConfiguration.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/config/RagConfiguration.java
new file mode 100644
index 0000000..5dec6a5
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/config/RagConfiguration.java
@@ -0,0 +1,10 @@
+package org.dromara.knowledge.config;
+
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@EnableConfigurationProperties(RagConfigProperties.class)
+public class RagConfiguration {
+}
+
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/controller/KnowledgeAttachController.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/controller/KnowledgeAttachController.java
new file mode 100644
index 0000000..57cc6ca
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/controller/KnowledgeAttachController.java
@@ -0,0 +1,118 @@
+package org.dromara.knowledge.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.knowledge.domain.bo.KnowledgeAttachBo;
+import org.dromara.knowledge.domain.vo.KnowledgeAttachVo;
+import org.dromara.knowledge.service.KnowledgeAttachService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 知识库附件控制器
+ *
+ * @author pengles
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/knowledge/attach")
+public class KnowledgeAttachController extends BaseController {
+
+    private final KnowledgeAttachService knowledgeAttachService;
+
+    /**
+     * 查询知识库附件列表
+     */
+    @SaCheckPermission("knowledge:attach:list")
+    @GetMapping("/list")
+    public TableDataInfo<KnowledgeAttachVo> list(KnowledgeAttachBo bo, PageQuery pageQuery) {
+        return knowledgeAttachService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出知识库附件列表
+     */
+    @SaCheckPermission("knowledge:attach:export")
+    @Log(title = "知识库附件", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(KnowledgeAttachBo bo, HttpServletResponse response) {
+        List<KnowledgeAttachVo> list = knowledgeAttachService.queryList(bo);
+        ExcelUtil.exportExcel(list, "知识库附件数据", KnowledgeAttachVo.class, response);
+    }
+
+    /**
+     * 获取知识库附件详细信息
+     *
+     * @param attachId 附件ID
+     */
+    @SaCheckPermission("knowledge:attach:query")
+    @GetMapping("/{attachId}")
+    public R<KnowledgeAttachVo> getInfo(@PathVariable Long attachId) {
+        return R.ok(knowledgeAttachService.queryById(attachId));
+    }
+
+    /**
+     * 新增知识库附件
+     */
+    @SaCheckPermission("knowledge:attach:add")
+    @Log(title = "知识库附件", businessType = BusinessType.INSERT)
+    @PostMapping
+    public R<Void> add(@Validated @RequestBody KnowledgeAttachBo bo) {
+        return toAjax(knowledgeAttachService.insertByBo(bo));
+    }
+
+    /**
+     * 修改知识库附件
+     */
+    @SaCheckPermission("knowledge:attach:edit")
+    @Log(title = "知识库附件", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public R<Void> edit(@Validated @RequestBody KnowledgeAttachBo bo) {
+        return toAjax(knowledgeAttachService.updateByBo(bo));
+    }
+
+    /**
+     * 删除知识库附件
+     *
+     * @param attachIds 附件ID串
+     */
+    @SaCheckPermission("knowledge:attach:remove")
+    @Log(title = "知识库附件", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{attachIds}")
+    public R<Void> remove(@PathVariable Long[] attachIds) {
+        return toAjax(knowledgeAttachService.deleteWithValidByIds(List.of(attachIds), true));
+    }
+
+    /**
+     * 根据知识库ID查询附件列表
+     *
+     * @param knowledgeId 知识库ID
+     */
+    @SaCheckPermission("knowledge:attach:query")
+    @GetMapping("/knowledge/{knowledgeId}")
+    public R<List<KnowledgeAttachVo>> getByKnowledgeId(@PathVariable String knowledgeId) {
+        return R.ok(knowledgeAttachService.queryListByKnowledgeId(knowledgeId));
+    }
+
+    /**
+     * 根据文档ID查询附件信息
+     *
+     * @param documentId 文档ID
+     */
+    @SaCheckPermission("knowledge:attach:query")
+    @GetMapping("/document/{documentId}")
+    public R<KnowledgeAttachVo> getByDocumentId(@PathVariable String documentId) {
+        return R.ok(knowledgeAttachService.queryByDocId(documentId));
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/controller/KnowledgeFragmentController.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/controller/KnowledgeFragmentController.java
new file mode 100644
index 0000000..18355f4
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/controller/KnowledgeFragmentController.java
@@ -0,0 +1,129 @@
+package org.dromara.knowledge.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.knowledge.domain.bo.KnowledgeFragmentBo;
+import org.dromara.knowledge.domain.vo.KnowledgeFragmentVo;
+import org.dromara.knowledge.service.KnowledgeFragmentService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 知识库片段控制器
+ *
+ * @author pengles
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/knowledge/fragment")
+public class KnowledgeFragmentController extends BaseController {
+
+    private final KnowledgeFragmentService knowledgeFragmentService;
+
+    /**
+     * 查询知识库片段列表
+     */
+    @SaCheckPermission("knowledge:fragment:list")
+    @GetMapping("/list")
+    public TableDataInfo<KnowledgeFragmentVo> list(KnowledgeFragmentBo bo, PageQuery pageQuery) {
+        return knowledgeFragmentService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出知识库片段列表
+     */
+    @SaCheckPermission("knowledge:fragment:export")
+    @Log(title = "知识库片段", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(KnowledgeFragmentBo bo, HttpServletResponse response) {
+        List<KnowledgeFragmentVo> list = knowledgeFragmentService.queryList(bo);
+        ExcelUtil.exportExcel(list, "知识库片段数据", KnowledgeFragmentVo.class, response);
+    }
+
+    /**
+     * 获取知识库片段详细信息
+     *
+     * @param fragmentId 片段ID
+     */
+    @SaCheckPermission("knowledge:fragment:query")
+    @GetMapping("/{fragmentId}")
+    public R<KnowledgeFragmentVo> getInfo(@PathVariable Long fragmentId) {
+        return R.ok(knowledgeFragmentService.queryById(fragmentId));
+    }
+
+    /**
+     * 新增知识库片段
+     */
+    @SaCheckPermission("knowledge:fragment:add")
+    @Log(title = "知识库片段", businessType = BusinessType.INSERT)
+    @PostMapping
+    public R<Void> add(@Validated @RequestBody KnowledgeFragmentBo bo) {
+        return toAjax(knowledgeFragmentService.insertByBo(bo));
+    }
+
+    /**
+     * 修改知识库片段
+     */
+    @SaCheckPermission("knowledge:fragment:edit")
+    @Log(title = "知识库片段", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public R<Void> edit(@Validated @RequestBody KnowledgeFragmentBo bo) {
+        return toAjax(knowledgeFragmentService.updateByBo(bo));
+    }
+
+    /**
+     * 删除知识库片段
+     *
+     * @param fragmentIds 片段ID串
+     */
+    @SaCheckPermission("knowledge:fragment:remove")
+    @Log(title = "知识库片段", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{fragmentIds}")
+    public R<Void> remove(@PathVariable Long[] fragmentIds) {
+        return toAjax(knowledgeFragmentService.deleteWithValidByIds(List.of(fragmentIds), true));
+    }
+
+    /**
+     * 根据知识库ID查询片段列表
+     *
+     * @param knowledgeId 知识库ID
+     */
+    @SaCheckPermission("knowledge:fragment:query")
+    @GetMapping("/knowledge/{knowledgeId}")
+    public R<List<KnowledgeFragmentVo>> getByKnowledgeId(@PathVariable Long knowledgeId) {
+        return R.ok(knowledgeFragmentService.queryListByKnowledgeId(knowledgeId));
+    }
+
+    /**
+     * 根据文档ID查询片段列表
+     *
+     * @param documentId 文档ID
+     */
+    @SaCheckPermission("knowledge:fragment:query")
+    @GetMapping("/document/{documentId}")
+    public R<List<KnowledgeFragmentVo>> getByDocumentId(@PathVariable String documentId) {
+        return R.ok(knowledgeFragmentService.queryListByDocId(documentId));
+    }
+
+    /**
+     * 根据片段ID查询片段信息
+     *
+     * @param fragmentId 片段ID
+     */
+    @SaCheckPermission("knowledge:fragment:query")
+    @GetMapping("/fragment/{fragmentId}")
+    public R<KnowledgeFragmentVo> getByFragmentId(@PathVariable String fragmentId) {
+        return R.ok(knowledgeFragmentService.queryByFid(fragmentId));
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/controller/KnowledgeHitLogController.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/controller/KnowledgeHitLogController.java
new file mode 100644
index 0000000..e854110
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/controller/KnowledgeHitLogController.java
@@ -0,0 +1,165 @@
+package org.dromara.knowledge.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.knowledge.domain.bo.KnowledgeHitLogBo;
+import org.dromara.knowledge.domain.vo.KnowledgeHitLogVo;
+import org.dromara.knowledge.service.KnowledgeHitLogService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 知识库命中日志控制器
+ *
+ * @author pengles
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/knowledge/hitlog")
+public class KnowledgeHitLogController extends BaseController {
+
+    private final KnowledgeHitLogService knowledgeHitLogService;
+
+    /**
+     * 查询知识库命中日志列表
+     */
+    @SaCheckPermission("knowledge:hitlog:list")
+    @GetMapping("/list")
+    public TableDataInfo<KnowledgeHitLogVo> list(KnowledgeHitLogBo bo, PageQuery pageQuery) {
+        return knowledgeHitLogService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出知识库命中日志列表
+     */
+    @SaCheckPermission("knowledge:hitlog:export")
+    @Log(title = "知识库命中日志", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(KnowledgeHitLogBo bo, HttpServletResponse response) {
+        List<KnowledgeHitLogVo> list = knowledgeHitLogService.queryList(bo);
+        ExcelUtil.exportExcel(list, "知识库命中日志", KnowledgeHitLogVo.class, response);
+    }
+
+    /**
+     * 获取知识库命中日志详细信息
+     *
+     * @param logId 日志ID
+     */
+    @SaCheckPermission("knowledge:hitlog:query")
+    @GetMapping("/{logId}")
+    public R<KnowledgeHitLogVo> getInfo(@PathVariable Long logId) {
+        return R.ok(knowledgeHitLogService.queryById(logId));
+    }
+
+    /**
+     * 新增知识库命中日志
+     */
+    @SaCheckPermission("knowledge:hitlog:add")
+    @Log(title = "知识库命中日志", businessType = BusinessType.INSERT)
+    @PostMapping
+    public R<Void> add(@Validated @RequestBody KnowledgeHitLogBo bo) {
+        return toAjax(knowledgeHitLogService.insertByBo(bo));
+    }
+
+    /**
+     * 修改知识库命中日志
+     */
+    @SaCheckPermission("knowledge:hitlog:edit")
+    @Log(title = "知识库命中日志", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public R<Void> edit(@Validated @RequestBody KnowledgeHitLogBo bo) {
+        return toAjax(knowledgeHitLogService.updateByBo(bo));
+    }
+
+    /**
+     * 删除知识库命中日志
+     *
+     * @param logIds 日志ID数组
+     */
+    @SaCheckPermission("knowledge:hitlog:remove")
+    @Log(title = "知识库命中日志", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{logIds}")
+    public R<Void> remove(@PathVariable Long[] logIds) {
+        return toAjax(knowledgeHitLogService.deleteWithValidByIds(List.of(logIds), true));
+    }
+
+    /**
+     * 根据知识库ID查询命中日志列表
+     *
+     * @param knowledgeId 知识库ID
+     */
+    @SaCheckPermission("knowledge:hitlog:query")
+    @GetMapping("/knowledge/{knowledgeId}")
+    public R<List<KnowledgeHitLogVo>> getByKnowledgeId(@PathVariable String knowledgeId) {
+        return R.ok(knowledgeHitLogService.queryByKnowledgeId(knowledgeId));
+    }
+
+    /**
+     * 根据会话ID查询命中日志列表
+     *
+     * @param sessionId 会话ID
+     */
+    @SaCheckPermission("knowledge:hitlog:query")
+    @GetMapping("/session/{sessionId}")
+    public R<List<KnowledgeHitLogVo>> getBySessionId(@PathVariable String sessionId) {
+        return R.ok(knowledgeHitLogService.queryBySessionId(sessionId));
+    }
+
+    /**
+     * 根据片段ID查询命中日志列表
+     *
+     * @param fragmentId 片段ID
+     */
+    @SaCheckPermission("knowledge:hitlog:query")
+    @GetMapping("/fragment/{fragmentId}")
+    public R<List<KnowledgeHitLogVo>> getByFragmentId(@PathVariable String fragmentId) {
+        return R.ok(knowledgeHitLogService.queryByFragmentId(fragmentId));
+    }
+
+    /**
+     * 根据查询文本查询命中日志列表
+     *
+     * @param queryText 查询文本
+     */
+    @SaCheckPermission("knowledge:hitlog:query")
+    @GetMapping("/query/{queryText}")
+    public R<List<KnowledgeHitLogVo>> getByQueryText(@PathVariable String queryText) {
+        return R.ok(knowledgeHitLogService.queryByQueryText(queryText));
+    }
+
+    /**
+     * 获取热门查询列表
+     *
+     * @param knowledgeId 知识库ID
+     * @param limit       限制数量
+     */
+    @SaCheckPermission("knowledge:hitlog:query")
+    @GetMapping("/popular")
+    public R<java.util.List<java.util.Map<String, Object>>> getPopularQueries(
+            @RequestParam(required = false) String knowledgeId,
+            @RequestParam(defaultValue = "10") Integer limit) {
+        return R.ok(knowledgeHitLogService.getPopularQueries(knowledgeId, limit));
+    }
+
+    /**
+     * 获取平均响应时间
+     *
+     * @param knowledgeId 知识库ID
+     */
+    @SaCheckPermission("knowledge:hitlog:query")
+    @GetMapping("/avg-response-time")
+    public R<Double> getAverageResponseTime(@RequestParam(required = false) String knowledgeId) {
+        return R.ok(knowledgeHitLogService.getAverageResponseTime(knowledgeId));
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/controller/KnowledgeInfoController.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/controller/KnowledgeInfoController.java
new file mode 100644
index 0000000..2cad463
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/controller/KnowledgeInfoController.java
@@ -0,0 +1,175 @@
+package org.dromara.knowledge.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.knowledge.domain.bo.KnowledgeInfoBo;
+import org.dromara.knowledge.domain.vo.KnowledgeInfoVo;
+import org.dromara.knowledge.domain.vo.KnowledgeSearchResultVo;
+import org.dromara.knowledge.domain.vo.KnowledgeStatusVo;
+import org.dromara.knowledge.service.KnowledgeInfoService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+
+/**
+ * 知识库信息控制器
+ *
+ * @author pengles
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/knowledge/info")
+public class KnowledgeInfoController extends BaseController {
+
+    private final KnowledgeInfoService knowledgeInfoService;
+
+    /**
+     * 查询知识库信息列表
+     */
+    @SaCheckPermission("knowledge:info:list")
+    @GetMapping("/list")
+    public TableDataInfo<KnowledgeInfoVo> list(KnowledgeInfoBo bo, PageQuery pageQuery) {
+        return knowledgeInfoService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出知识库信息列表
+     */
+    @SaCheckPermission("knowledge:info:export")
+    @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);
+    }
+
+    /**
+     * 获取知识库信息详细信息
+     *
+     * @param knowledgeId 知识库ID
+     */
+    @SaCheckPermission("knowledge:info:query")
+    @GetMapping("/{knowledgeId}")
+    public R<KnowledgeInfoVo> getInfo(@PathVariable Long knowledgeId) {
+        return R.ok(knowledgeInfoService.queryById(knowledgeId));
+    }
+
+    /**
+     * 新增知识库信息
+     */
+    @SaCheckPermission("knowledge:info:add")
+    @Log(title = "知识库信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public R<Void> add(@Validated @RequestBody KnowledgeInfoBo bo) {
+        return toAjax(knowledgeInfoService.insertByBo(bo));
+    }
+
+    /**
+     * 修改知识库信息
+     */
+    @SaCheckPermission("knowledge:info:edit")
+    @Log(title = "知识库信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public R<Void> edit(@Validated @RequestBody KnowledgeInfoBo bo) {
+        return toAjax(knowledgeInfoService.updateByBo(bo));
+    }
+
+    /**
+     * 删除知识库信息
+     *
+     * @param knowledgeIds 知识库ID串
+     */
+    @SaCheckPermission("knowledge:info:remove")
+    @Log(title = "知识库信息", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{knowledgeIds}")
+    public R<Void> remove(@PathVariable Long[] knowledgeIds) {
+        return toAjax(knowledgeInfoService.deleteWithValidByIds(List.of(knowledgeIds), true));
+    }
+
+    /**
+     * 根据用户ID查询知识库信息列表
+     *
+     * @param userId 用户ID
+     */
+    @SaCheckPermission("knowledge:info:query")
+    @GetMapping("/user/{userId}")
+    public R<List<KnowledgeInfoVo>> getByUserId(@PathVariable Long userId) {
+        return R.ok(knowledgeInfoService.queryListByUserId(userId));
+    }
+
+    /**
+     * 根据知识库ID查询知识库信息
+     *
+     * @param knowledgeId 知识库ID
+     */
+    @SaCheckPermission("knowledge:info:query")
+    @GetMapping("/knowledge/{knowledgeId}")
+    public R<KnowledgeInfoVo> getByKnowledgeId(@PathVariable Long knowledgeId) {
+        return R.ok(knowledgeInfoService.queryByKnowledgeId(knowledgeId));
+    }
+
+    /**
+     * 上传文档到知识库
+     *
+     * @param knowledgeId 知识库ID
+     * @param file        上传的文件
+     */
+    @SaCheckPermission("knowledge:info:upload")
+    @Log(title = "知识库文档上传", businessType = BusinessType.INSERT)
+    @PostMapping("/{knowledgeId}/upload")
+    public R<String> uploadDocument(@PathVariable String knowledgeId,
+                                    @RequestParam("file") MultipartFile file) {
+        return R.ok(knowledgeInfoService.uploadDocument(knowledgeId, file));
+    }
+
+    /**
+     * 批量上传文档到知识库
+     *
+     * @param knowledgeId 知识库ID
+     * @param files       上传的文件列表
+     */
+    @SaCheckPermission("knowledge:info:upload")
+    @Log(title = "知识库批量文档上传", businessType = BusinessType.INSERT)
+    @PostMapping("/{knowledgeId}/batch-upload")
+    public R<List<String>> batchUploadDocuments(@PathVariable String knowledgeId,
+                                                @RequestParam("files") MultipartFile[] files) {
+        return R.ok(knowledgeInfoService.batchUploadDocuments(knowledgeId, files));
+    }
+
+    /**
+     * 检索知识库
+     *
+     * @param knowledgeId 知识库ID
+     * @param query       查询文本
+     * @param limit       返回结果数量限制
+     */
+    @SaCheckPermission("knowledge:info:search")
+    @PostMapping("/{knowledgeId}/search")
+    public R<List<KnowledgeSearchResultVo>> searchKnowledge(@PathVariable String knowledgeId,
+                                                            @RequestParam String query,
+                                                            @RequestParam(defaultValue = "10") Integer limit) {
+        return R.ok(knowledgeInfoService.searchKnowledge(knowledgeId, query, limit));
+    }
+
+    /**
+     * 获取知识库处理状态
+     *
+     * @param knowledgeId 知识库ID
+     */
+    @SaCheckPermission("knowledge:info:query")
+    @GetMapping("/{knowledgeId}/status")
+    public R<KnowledgeStatusVo> getKnowledgeStatus(@PathVariable String knowledgeId) {
+        return R.ok(knowledgeInfoService.getKnowledgeStatus(knowledgeId));
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/controller/KnowledgeJobController.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/controller/KnowledgeJobController.java
new file mode 100644
index 0000000..f9b7d26
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/controller/KnowledgeJobController.java
@@ -0,0 +1,129 @@
+package org.dromara.knowledge.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.knowledge.domain.bo.KnowledgeJobBo;
+import org.dromara.knowledge.domain.vo.KnowledgeJobVo;
+import org.dromara.knowledge.service.KnowledgeJobService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 知识库任务控制器
+ *
+ * @author pengles
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/knowledge/job")
+public class KnowledgeJobController extends BaseController {
+
+    private final KnowledgeJobService knowledgeJobService;
+
+    /**
+     * 查询知识库任务列表
+     */
+    @SaCheckPermission("knowledge:job:list")
+    @GetMapping("/list")
+    public TableDataInfo<KnowledgeJobVo> list(KnowledgeJobBo bo, PageQuery pageQuery) {
+        return knowledgeJobService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出知识库任务列表
+     */
+    @SaCheckPermission("knowledge:job:export")
+    @Log(title = "知识库任务", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(KnowledgeJobBo bo, HttpServletResponse response) {
+        List<KnowledgeJobVo> list = knowledgeJobService.queryList(bo);
+        ExcelUtil.exportExcel(list, "知识库任务", KnowledgeJobVo.class, response);
+    }
+
+    /**
+     * 获取知识库任务详细信息
+     *
+     * @param jobId 任务ID
+     */
+    @SaCheckPermission("knowledge:job:query")
+    @GetMapping("/{jobId}")
+    public R<KnowledgeJobVo> getInfo(@PathVariable Long jobId) {
+        return R.ok(knowledgeJobService.queryById(jobId));
+    }
+
+    /**
+     * 新增知识库任务
+     */
+    @SaCheckPermission("knowledge:job:add")
+    @Log(title = "知识库任务", businessType = BusinessType.INSERT)
+    @PostMapping
+    public R<Void> add(@Validated @RequestBody KnowledgeJobBo bo) {
+        return toAjax(knowledgeJobService.insertByBo(bo));
+    }
+
+    /**
+     * 修改知识库任务
+     */
+    @SaCheckPermission("knowledge:job:edit")
+    @Log(title = "知识库任务", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public R<Void> edit(@Validated @RequestBody KnowledgeJobBo bo) {
+        return toAjax(knowledgeJobService.updateByBo(bo));
+    }
+
+    /**
+     * 删除知识库任务
+     *
+     * @param jobIds 任务ID数组
+     */
+    @SaCheckPermission("knowledge:job:remove")
+    @Log(title = "知识库任务", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{jobIds}")
+    public R<Void> remove(@PathVariable Long[] jobIds) {
+        return toAjax(knowledgeJobService.deleteWithValidByIds(List.of(jobIds), true));
+    }
+
+    /**
+     * 根据知识库ID查询任务列表
+     *
+     * @param knowledgeId 知识库ID
+     */
+    @SaCheckPermission("knowledge:job:query")
+    @GetMapping("/knowledge/{knowledgeId}")
+    public R<List<KnowledgeJobVo>> getByKnowledgeId(@PathVariable String knowledgeId) {
+        return R.ok(knowledgeJobService.queryByKnowledgeId(knowledgeId));
+    }
+
+    /**
+     * 根据任务状态查询任务列表
+     *
+     * @param status 任务状态
+     */
+    @SaCheckPermission("knowledge:job:query")
+    @GetMapping("/status/{status}")
+    public R<List<KnowledgeJobVo>> getByStatus(@PathVariable Integer status) {
+        return R.ok(knowledgeJobService.queryByStatus(status));
+    }
+
+    /**
+     * 根据任务类型查询任务列表
+     *
+     * @param jobType 任务类型
+     */
+    @SaCheckPermission("knowledge:job:query")
+    @GetMapping("/type/{jobType}")
+    public R<List<KnowledgeJobVo>> getByJobType(@PathVariable String jobType) {
+        return R.ok(knowledgeJobService.queryByJobType(jobType));
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/controller/KnowledgePromptTemplateController.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/controller/KnowledgePromptTemplateController.java
new file mode 100644
index 0000000..97daf1f
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/controller/KnowledgePromptTemplateController.java
@@ -0,0 +1,118 @@
+package org.dromara.knowledge.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.knowledge.domain.bo.KnowledgePromptTemplateBo;
+import org.dromara.knowledge.domain.vo.KnowledgePromptTemplateVo;
+import org.dromara.knowledge.service.KnowledgePromptTemplateService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 知识库提示模板控制器
+ *
+ * @author pengles
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/knowledge/prompt")
+public class KnowledgePromptTemplateController extends BaseController {
+
+    private final KnowledgePromptTemplateService knowledgePromptTemplateService;
+
+    /**
+     * 查询知识库提示模板列表
+     */
+    @SaCheckPermission("knowledge:prompt:list")
+    @GetMapping("/list")
+    public TableDataInfo<KnowledgePromptTemplateVo> list(KnowledgePromptTemplateBo bo, PageQuery pageQuery) {
+        return knowledgePromptTemplateService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出知识库提示模板列表
+     */
+    @SaCheckPermission("knowledge:prompt:export")
+    @Log(title = "知识库提示模板", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(KnowledgePromptTemplateBo bo, HttpServletResponse response) {
+        List<KnowledgePromptTemplateVo> list = knowledgePromptTemplateService.queryList(bo);
+        ExcelUtil.exportExcel(list, "知识库提示模板数据", KnowledgePromptTemplateVo.class, response);
+    }
+
+    /**
+     * 获取知识库提示模板详细信息
+     *
+     * @param templateId 模板ID
+     */
+    @SaCheckPermission("knowledge:prompt:query")
+    @GetMapping("/{templateId}")
+    public R<KnowledgePromptTemplateVo> getInfo(@PathVariable Long templateId) {
+        return R.ok(knowledgePromptTemplateService.queryById(templateId));
+    }
+
+    /**
+     * 新增知识库提示模板
+     */
+    @SaCheckPermission("knowledge:prompt:add")
+    @Log(title = "知识库提示模板", businessType = BusinessType.INSERT)
+    @PostMapping
+    public R<Void> add(@Validated @RequestBody KnowledgePromptTemplateBo bo) {
+        return toAjax(knowledgePromptTemplateService.insertByBo(bo));
+    }
+
+    /**
+     * 修改知识库提示模板
+     */
+    @SaCheckPermission("knowledge:prompt:edit")
+    @Log(title = "知识库提示模板", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public R<Void> edit(@Validated @RequestBody KnowledgePromptTemplateBo bo) {
+        return toAjax(knowledgePromptTemplateService.updateByBo(bo));
+    }
+
+    /**
+     * 删除知识库提示模板
+     *
+     * @param templateIds 模板ID串
+     */
+    @SaCheckPermission("knowledge:prompt:remove")
+    @Log(title = "知识库提示模板", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{templateIds}")
+    public R<Void> remove(@PathVariable Long[] templateIds) {
+        return toAjax(knowledgePromptTemplateService.deleteWithValidByIds(List.of(templateIds), true));
+    }
+
+    /**
+     * 根据分类查询提示模板列表
+     *
+     * @param category 分类
+     */
+    @SaCheckPermission("knowledge:prompt:query")
+    @GetMapping("/category/{category}")
+    public R<List<KnowledgePromptTemplateVo>> getByCategory(@PathVariable String category) {
+        return R.ok(knowledgePromptTemplateService.queryListByCategory(category));
+    }
+
+    /**
+     * 根据模板名称查询提示模板
+     *
+     * @param templateName 模板名称
+     */
+    @SaCheckPermission("knowledge:prompt:query")
+    @GetMapping("/name/{templateName}")
+    public R<KnowledgePromptTemplateVo> getByTemplateName(@PathVariable String templateName) {
+        return R.ok(knowledgePromptTemplateService.queryByTemplateName(templateName));
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/controller/KnowledgeSchemaController.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/controller/KnowledgeSchemaController.java
new file mode 100644
index 0000000..c043b06
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/controller/KnowledgeSchemaController.java
@@ -0,0 +1,140 @@
+package org.dromara.knowledge.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.knowledge.domain.bo.KnowledgeSchemaBo;
+import org.dromara.knowledge.domain.vo.KnowledgeSchemaVo;
+import org.dromara.knowledge.service.KnowledgeSchemaService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 知识库模式控制器
+ *
+ * @author pengles
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/knowledge/schema")
+public class KnowledgeSchemaController extends BaseController {
+
+    private final KnowledgeSchemaService knowledgeSchemaService;
+
+    /**
+     * 查询知识库模式列表
+     */
+    @SaCheckPermission("knowledge:schema:list")
+    @GetMapping("/list")
+    public TableDataInfo<KnowledgeSchemaVo> list(KnowledgeSchemaBo bo, PageQuery pageQuery) {
+        return knowledgeSchemaService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出知识库模式列表
+     */
+    @SaCheckPermission("knowledge:schema:export")
+    @Log(title = "知识库模式", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(KnowledgeSchemaBo bo, HttpServletResponse response) {
+        List<KnowledgeSchemaVo> list = knowledgeSchemaService.queryList(bo);
+        ExcelUtil.exportExcel(list, "知识库模式数据", KnowledgeSchemaVo.class, response);
+    }
+
+    /**
+     * 获取知识库模式详细信息
+     *
+     * @param schemaId 模式ID
+     */
+    @SaCheckPermission("knowledge:schema:query")
+    @GetMapping("/{schemaId}")
+    public R<KnowledgeSchemaVo> getInfo(@PathVariable Long schemaId) {
+        return R.ok(knowledgeSchemaService.queryById(schemaId));
+    }
+
+    /**
+     * 新增知识库模式
+     */
+    @SaCheckPermission("knowledge:schema:add")
+    @Log(title = "知识库模式", businessType = BusinessType.INSERT)
+    @PostMapping
+    public R<Void> add(@Validated @RequestBody KnowledgeSchemaBo bo) {
+        return toAjax(knowledgeSchemaService.insertByBo(bo));
+    }
+
+    /**
+     * 修改知识库模式
+     */
+    @SaCheckPermission("knowledge:schema:edit")
+    @Log(title = "知识库模式", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public R<Void> edit(@Validated @RequestBody KnowledgeSchemaBo bo) {
+        return toAjax(knowledgeSchemaService.updateByBo(bo));
+    }
+
+    /**
+     * 删除知识库模式
+     *
+     * @param schemaIds 模式ID串
+     */
+    @SaCheckPermission("knowledge:schema:remove")
+    @Log(title = "知识库模式", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{schemaIds}")
+    public R<Void> remove(@PathVariable Long[] schemaIds) {
+        return toAjax(knowledgeSchemaService.deleteWithValidByIds(List.of(schemaIds), true));
+    }
+
+    /**
+     * 根据ID查询模式信息
+     *
+     * @param id ID
+     */
+    @SaCheckPermission("knowledge:schema:query")
+    @GetMapping("/id/{id}")
+    public R<KnowledgeSchemaVo> getById(@PathVariable Long id) {
+        return R.ok(knowledgeSchemaService.queryById(id));
+    }
+
+    /**
+     * 根据模式组ID查询模式列表
+     *
+     * @param schemaGroupId 模式组ID
+     */
+    @SaCheckPermission("knowledge:schema:query")
+    @GetMapping("/group/{schemaGroupId}")
+    public R<List<KnowledgeSchemaVo>> getBySchemaGroupId(@PathVariable Long schemaGroupId) {
+        return R.ok(knowledgeSchemaService.queryListBySchemaGroupId(schemaGroupId));
+    }
+
+    /**
+     * 根据编码查询模式信息
+     *
+     * @param code 编码
+     */
+    @SaCheckPermission("knowledge:schema:query")
+    @GetMapping("/code/{code}")
+    public R<KnowledgeSchemaVo> getByCode(@PathVariable String code) {
+        return R.ok(knowledgeSchemaService.queryByCode(code));
+    }
+
+    /**
+     * 根据表名查询模式信息
+     *
+     * @param tableName 表名
+     */
+    @SaCheckPermission("knowledge:schema:query")
+    @GetMapping("/table/{tableName}")
+    public R<KnowledgeSchemaVo> getByTableName(@PathVariable String tableName) {
+        return R.ok(knowledgeSchemaService.queryByTableName(tableName));
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/controller/KnowledgeSchemaFieldController.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/controller/KnowledgeSchemaFieldController.java
new file mode 100644
index 0000000..578df08
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/controller/KnowledgeSchemaFieldController.java
@@ -0,0 +1,141 @@
+package org.dromara.knowledge.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.knowledge.domain.bo.KnowledgeSchemaFieldBo;
+import org.dromara.knowledge.domain.vo.KnowledgeSchemaFieldVo;
+import org.dromara.knowledge.service.KnowledgeSchemaFieldService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 知识库模式字段控制器
+ *
+ * @author pengles
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/knowledge/schema/field")
+public class KnowledgeSchemaFieldController extends BaseController {
+
+    private final KnowledgeSchemaFieldService knowledgeSchemaFieldService;
+
+    /**
+     * 查询知识库模式字段列表
+     */
+    @SaCheckPermission("knowledge:schema:field:list")
+    @GetMapping("/list")
+    public TableDataInfo<KnowledgeSchemaFieldVo> list(KnowledgeSchemaFieldBo bo, PageQuery pageQuery) {
+        return knowledgeSchemaFieldService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出知识库模式字段列表
+     */
+    @SaCheckPermission("knowledge:schema:field:export")
+    @Log(title = "知识库模式字段", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(KnowledgeSchemaFieldBo bo, HttpServletResponse response) {
+        List<KnowledgeSchemaFieldVo> list = knowledgeSchemaFieldService.queryList(bo);
+        ExcelUtil.exportExcel(list, "知识库模式字段数据", KnowledgeSchemaFieldVo.class, response);
+    }
+
+    /**
+     * 获取知识库模式字段详细信息
+     *
+     * @param fieldId 字段ID
+     */
+    @SaCheckPermission("knowledge:schema:field:query")
+    @GetMapping("/{fieldId}")
+    public R<KnowledgeSchemaFieldVo> getInfo(@PathVariable Long fieldId) {
+        return R.ok(knowledgeSchemaFieldService.queryById(fieldId));
+    }
+
+    /**
+     * 新增知识库模式字段
+     */
+    @SaCheckPermission("knowledge:schema:field:add")
+    @Log(title = "知识库模式字段", businessType = BusinessType.INSERT)
+    @PostMapping
+    public R<Void> add(@Validated @RequestBody KnowledgeSchemaFieldBo bo) {
+        return toAjax(knowledgeSchemaFieldService.insertByBo(bo));
+    }
+
+    /**
+     * 修改知识库模式字段
+     */
+    @SaCheckPermission("knowledge:schema:field:edit")
+    @Log(title = "知识库模式字段", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public R<Void> edit(@Validated @RequestBody KnowledgeSchemaFieldBo bo) {
+        return toAjax(knowledgeSchemaFieldService.updateByBo(bo));
+    }
+
+    /**
+     * 删除知识库模式字段
+     *
+     * @param fieldIds 字段ID串
+     */
+    @SaCheckPermission("knowledge:schema:field:remove")
+    @Log(title = "知识库模式字段", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{fieldIds}")
+    public R<Void> remove(@PathVariable Long[] fieldIds) {
+        return toAjax(knowledgeSchemaFieldService.deleteWithValidByIds(List.of(fieldIds), true));
+    }
+
+    /**
+     * 根据ID查询字段信息
+     *
+     * @param id ID
+     */
+    @SaCheckPermission("knowledge:schema:field:query")
+    @GetMapping("/id/{id}")
+    public R<KnowledgeSchemaFieldVo> getById(@PathVariable Long id) {
+        return R.ok(knowledgeSchemaFieldService.queryById(id));
+    }
+
+    /**
+     * 根据模式ID查询字段列表
+     *
+     * @param schemaId 模式ID
+     */
+    @SaCheckPermission("knowledge:schema:field:query")
+    @GetMapping("/schema/{schemaId}")
+    public R<List<KnowledgeSchemaFieldVo>> getBySchemaId(@PathVariable Long schemaId) {
+        return R.ok(knowledgeSchemaFieldService.queryListBySchemaId(schemaId));
+    }
+
+    /**
+     * 根据编码查询字段信息
+     *
+     * @param code 编码
+     */
+    @SaCheckPermission("knowledge:schema:field:query")
+    @GetMapping("/code/{code}")
+    public R<KnowledgeSchemaFieldVo> getByCode(@PathVariable String code) {
+        return R.ok(knowledgeSchemaFieldService.queryByCode(code));
+    }
+
+    /**
+     * 根据模式ID和编码查询字段信息
+     *
+     * @param schemaId 模式ID
+     * @param code     编码
+     */
+    @SaCheckPermission("knowledge:schema:field:query")
+    @GetMapping("/schema/{schemaId}/code/{code}")
+    public R<KnowledgeSchemaFieldVo> getBySchemaIdAndCode(@PathVariable Long schemaId, @PathVariable String code) {
+        return R.ok(knowledgeSchemaFieldService.queryBySchemaIdAndCode(schemaId, code));
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/controller/KnowledgeSchemaGroupController.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/controller/KnowledgeSchemaGroupController.java
new file mode 100644
index 0000000..08d4cfc
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/controller/KnowledgeSchemaGroupController.java
@@ -0,0 +1,129 @@
+package org.dromara.knowledge.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.knowledge.domain.bo.KnowledgeSchemaGroupBo;
+import org.dromara.knowledge.domain.vo.KnowledgeSchemaGroupVo;
+import org.dromara.knowledge.service.KnowledgeSchemaGroupService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 知识库模式组控制器
+ *
+ * @author pengles
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/knowledge/schema/group")
+public class KnowledgeSchemaGroupController extends BaseController {
+
+    private final KnowledgeSchemaGroupService knowledgeSchemaGroupService;
+
+    /**
+     * 查询知识库模式组列表
+     */
+    @SaCheckPermission("knowledge:schema:group:list")
+    @GetMapping("/list")
+    public TableDataInfo<KnowledgeSchemaGroupVo> list(KnowledgeSchemaGroupBo bo, PageQuery pageQuery) {
+        return knowledgeSchemaGroupService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出知识库模式组列表
+     */
+    @SaCheckPermission("knowledge:schema:group:export")
+    @Log(title = "知识库模式组", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(KnowledgeSchemaGroupBo bo, HttpServletResponse response) {
+        List<KnowledgeSchemaGroupVo> list = knowledgeSchemaGroupService.queryList(bo);
+        ExcelUtil.exportExcel(list, "知识库模式组数据", KnowledgeSchemaGroupVo.class, response);
+    }
+
+    /**
+     * 获取知识库模式组详细信息
+     *
+     * @param groupId 模式组ID
+     */
+    @SaCheckPermission("knowledge:schema:group:query")
+    @GetMapping("/{groupId}")
+    public R<KnowledgeSchemaGroupVo> getInfo(@PathVariable Long groupId) {
+        return R.ok(knowledgeSchemaGroupService.queryById(groupId));
+    }
+
+    /**
+     * 新增知识库模式组
+     */
+    @SaCheckPermission("knowledge:schema:group:add")
+    @Log(title = "知识库模式组", businessType = BusinessType.INSERT)
+    @PostMapping
+    public R<Void> add(@Validated @RequestBody KnowledgeSchemaGroupBo bo) {
+        return toAjax(knowledgeSchemaGroupService.insertByBo(bo));
+    }
+
+    /**
+     * 修改知识库模式组
+     */
+    @SaCheckPermission("knowledge:schema:group:edit")
+    @Log(title = "知识库模式组", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public R<Void> edit(@Validated @RequestBody KnowledgeSchemaGroupBo bo) {
+        return toAjax(knowledgeSchemaGroupService.updateByBo(bo));
+    }
+
+    /**
+     * 删除知识库模式组
+     *
+     * @param groupIds 模式组ID串
+     */
+    @SaCheckPermission("knowledge:schema:group:remove")
+    @Log(title = "知识库模式组", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{groupIds}")
+    public R<Void> remove(@PathVariable Long[] groupIds) {
+        return toAjax(knowledgeSchemaGroupService.deleteWithValidByIds(List.of(groupIds), true));
+    }
+
+    /**
+     * 根据ID查询模式组信息
+     *
+     * @param id ID
+     */
+    @SaCheckPermission("knowledge:schema:group:query")
+    @GetMapping("/id/{id}")
+    public R<KnowledgeSchemaGroupVo> getById(@PathVariable Long id) {
+        return R.ok(knowledgeSchemaGroupService.queryById(id));
+    }
+
+    /**
+     * 根据编码查询模式组信息
+     *
+     * @param code 编码
+     */
+    @SaCheckPermission("knowledge:schema:group:query")
+    @GetMapping("/code/{code}")
+    public R<KnowledgeSchemaGroupVo> getByCode(@PathVariable String code) {
+        return R.ok(knowledgeSchemaGroupService.queryByCode(code));
+    }
+
+    /**
+     * 根据名称查询模式组信息
+     *
+     * @param name 名称
+     */
+    @SaCheckPermission("knowledge:schema:group:query")
+    @GetMapping("/name/{name}")
+    public R<KnowledgeSchemaGroupVo> getByName(@PathVariable String name) {
+        return R.ok(knowledgeSchemaGroupService.queryByName(name));
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/controller/KnowledgeVectorController.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/controller/KnowledgeVectorController.java
new file mode 100644
index 0000000..4b41b35
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/controller/KnowledgeVectorController.java
@@ -0,0 +1,180 @@
+package org.dromara.knowledge.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.knowledge.domain.bo.KnowledgeVectorBo;
+import org.dromara.knowledge.domain.vo.KnowledgeVectorVo;
+import org.dromara.knowledge.service.KnowledgeVectorService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 知识库向量控制器
+ *
+ * @author pengles
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/knowledge/vector")
+public class KnowledgeVectorController extends BaseController {
+
+    private final KnowledgeVectorService knowledgeVectorService;
+    private final org.dromara.knowledge.vectorstore.VectorStoreManager vectorStoreManager;
+
+    @PostMapping("/generate")
+    @Log(title = "向量生成", businessType = BusinessType.OTHER)
+    public R<List<String>> generate(@RequestParam String knowledgeId,
+                                    @RequestParam String docId,
+                                    @RequestBody List<org.dromara.knowledge.domain.vo.KnowledgeFragmentVo> fragments,
+                                    @RequestParam(defaultValue = "bge-large-zh") String model) {
+        java.util.Map<String, String> map = new java.util.HashMap<>();
+        for (var f : fragments) {
+            map.put(f.getFid(), f.getContent());
+        }
+        List<String> ids = knowledgeVectorService.batchGenerateVectors(knowledgeId, docId, map, model);
+        return R.ok(ids);
+    }
+
+    @PostMapping("/search")
+    @Log(title = "向量检索", businessType = BusinessType.OTHER)
+    public R<List<org.dromara.knowledge.domain.vo.KnowledgeSearchResultVo>> search(@RequestParam String knowledgeId,
+                                                                                   @RequestParam String query,
+                                                                                   @RequestParam(defaultValue = "bge-large-zh") String model,
+                                                                                   @RequestParam(defaultValue = "5") Integer topK,
+                                                                                   @RequestParam(defaultValue = "0.5") Double threshold,
+                                                                                   @RequestParam(defaultValue = "false") boolean distinctByDoc) {
+        var res = knowledgeVectorService.vectorSimilaritySearch(knowledgeId, query, model, topK, threshold);
+        if (distinctByDoc) {
+            java.util.Set<String> seen = new java.util.HashSet<>();
+            res = res.stream().filter(r -> {
+                if (seen.contains(r.getDocId())) return false;
+                seen.add(r.getDocId());
+                return true;
+            }).toList();
+        }
+        return R.ok(res);
+    }
+
+    @GetMapping("/stats/{knowledgeId}")
+    @Log(title = "向量统计", businessType = BusinessType.OTHER)
+    public R<java.util.Map<String, Object>> stats(@PathVariable String knowledgeId) {
+        return R.ok(knowledgeVectorService.getVectorStatistics(knowledgeId));
+    }
+
+    @PostMapping("/rebuild/{knowledgeId}")
+    @Log(title = "重建向量索引", businessType = BusinessType.OTHER)
+    public R<Void> rebuild(@PathVariable String knowledgeId) {
+        vectorStoreManager.current().rebuildIndex(knowledgeId);
+        return R.ok();
+    }
+
+    @PostMapping("/vectorize-doc")
+    @Log(title = "文档批量向量化", businessType = BusinessType.OTHER)
+    public R<java.util.List<String>> vectorizeDoc(@RequestParam String knowledgeId,
+                                                  @RequestParam String docId,
+                                                  @RequestParam(defaultValue = "bge-large-zh") String model) {
+        java.util.List<org.dromara.knowledge.domain.vo.KnowledgeFragmentVo> fragments =
+                org.dromara.common.core.utils.SpringUtils.getBean(org.dromara.knowledge.service.KnowledgeFragmentService.class)
+                        .queryListByDocId(docId);
+        java.util.Map<String, String> map = new java.util.HashMap<>();
+        for (var f : fragments) map.put(f.getFid(), f.getContent());
+        java.util.List<String> ids = knowledgeVectorService.batchGenerateVectors(knowledgeId, docId, map, model);
+        return R.ok(ids);
+    }
+
+    /**
+     * 查询知识库向量列表
+     */
+    @SaCheckPermission("knowledge:vector:list")
+    @GetMapping("/list")
+    public TableDataInfo<KnowledgeVectorVo> list(KnowledgeVectorBo bo, PageQuery pageQuery) {
+        return knowledgeVectorService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出知识库向量列表
+     */
+    @SaCheckPermission("knowledge:vector:export")
+    @Log(title = "知识库向量", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(KnowledgeVectorBo bo, HttpServletResponse response) {
+        List<KnowledgeVectorVo> list = knowledgeVectorService.queryList(bo);
+        ExcelUtil.exportExcel(list, "知识库向量", KnowledgeVectorVo.class, response);
+    }
+
+    /**
+     * 获取知识库向量详细信息
+     *
+     * @param vectorId 向量ID
+     */
+    @SaCheckPermission("knowledge:vector:query")
+    @GetMapping("/{vectorId}")
+    public R<KnowledgeVectorVo> getInfo(@PathVariable Long vectorId) {
+        return R.ok(knowledgeVectorService.queryById(vectorId));
+    }
+
+    /**
+     * 新增知识库向量
+     */
+    @SaCheckPermission("knowledge:vector:add")
+    @Log(title = "知识库向量", businessType = BusinessType.INSERT)
+    @PostMapping
+    public R<Void> add(@Validated @RequestBody KnowledgeVectorBo bo) {
+        return toAjax(knowledgeVectorService.insertByBo(bo));
+    }
+
+    /**
+     * 修改知识库向量
+     */
+    @SaCheckPermission("knowledge:vector:edit")
+    @Log(title = "知识库向量", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public R<Void> edit(@Validated @RequestBody KnowledgeVectorBo bo) {
+        return toAjax(knowledgeVectorService.updateByBo(bo));
+    }
+
+    /**
+     * 删除知识库向量
+     *
+     * @param vectorIds 向量ID数组
+     */
+    @SaCheckPermission("knowledge:vector:remove")
+    @Log(title = "知识库向量", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{vectorIds}")
+    public R<Void> remove(@PathVariable Long[] vectorIds) {
+        return toAjax(knowledgeVectorService.deleteWithValidByIds(List.of(vectorIds), true));
+    }
+
+    /**
+     * 根据片段ID查询向量列表
+     *
+     * @param fragmentId 片段ID
+     */
+    @SaCheckPermission("knowledge:vector:query")
+    @GetMapping("/fragment/{fragmentId}")
+    public R<List<KnowledgeVectorVo>> getByFragmentId(@PathVariable String fragmentId) {
+        return R.ok(knowledgeVectorService.queryByFragmentId(fragmentId));
+    }
+
+    /**
+     * 根据知识库ID查询向量列表
+     *
+     * @param knowledgeId 知识库ID
+     */
+    @SaCheckPermission("knowledge:vector:query")
+    @GetMapping("/knowledge/{knowledgeId}")
+    public R<List<KnowledgeVectorVo>> getByKnowledgeId(@PathVariable String knowledgeId) {
+        return R.ok(knowledgeVectorService.queryByKnowledgeId(knowledgeId));
+    }
+}
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/data/CsvDocumentParser.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/data/CsvDocumentParser.java
new file mode 100644
index 0000000..f94ef43
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/data/CsvDocumentParser.java
@@ -0,0 +1,44 @@
+package org.dromara.knowledge.data;
+
+import org.dromara.common.core.exception.ServiceException;
+import org.springframework.stereotype.Component;
+
+import java.nio.charset.StandardCharsets;
+import java.util.StringJoiner;
+
+/**
+ * CSV 文档解析器
+ * 将 CSV 文件转换为文本格式，保留表格结构信息
+ * 使用制表符分隔，便于后续处理
+ *
+ * @author pengles
+ */
+@Component
+public class CsvDocumentParser implements DocumentParser {
+    @Override
+    public String parse(byte[] bytes, String filename) {
+        try {
+            String csv = new String(bytes, StandardCharsets.UTF_8);
+
+            // CSV 文件通常使用逗号分隔，但可能包含引号和换行符
+            // 简单处理：将逗号替换为制表符，使其更易读
+            // 注意：这种方法适用于简单的 CSV，复杂 CSV（包含引号内的逗号）需要专门的 CSV 解析库
+            String[] lines = csv.split("\\r?\\n");
+            StringJoiner result = new StringJoiner("\n");
+            
+            for (String line : lines) {
+                if (line.trim().isEmpty()) {
+                    continue;
+                }
+                // 简单替换：将逗号替换为制表符
+                // 更复杂的 CSV 解析可以使用 Apache Commons CSV 等库
+                String processedLine = line.replace(",", "\t");
+                result.add(processedLine);
+            }
+
+            return result.toString();
+        } catch (Exception e) {
+            throw new ServiceException("CSV解析失败: " + e.getMessage());
+        }
+    }
+}
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/data/DataPipeline.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/data/DataPipeline.java
new file mode 100644
index 0000000..529bc09
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/data/DataPipeline.java
@@ -0,0 +1,10 @@
+package org.dromara.knowledge.data;
+
+public interface DataPipeline {
+    String ingest(String sourceUri);
+
+    String transform(String raw);
+
+    String store(String transformed);
+}
+
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/data/DocumentParser.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/data/DocumentParser.java
new file mode 100644
index 0000000..6fc1338
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/data/DocumentParser.java
@@ -0,0 +1,6 @@
+package org.dromara.knowledge.data;
+
+public interface DocumentParser {
+    String parse(byte[] bytes, String filename);
+}
+
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/data/DocumentParserFactory.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/data/DocumentParserFactory.java
new file mode 100644
index 0000000..ac2ebac
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/data/DocumentParserFactory.java
@@ -0,0 +1,152 @@
+package org.dromara.knowledge.data;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.exception.ServiceException;
+import org.springframework.stereotype.Component;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 文档解析器工厂
+ * 统一管理所有文档解析器，根据文件扩展名选择合适的解析器
+ *
+ * @author pengles
+ */
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class DocumentParserFactory {
+
+    private final List<DocumentParser> parsers;
+    private final Map<String, DocumentParser> parserMap = new HashMap<>();
+
+    /**
+     * 初始化解析器映射
+     * 通过构造函数注入所有 DocumentParser 实现，并建立文件扩展名到解析器的映射
+     */
+    private void initParserMap() {
+        if (!parserMap.isEmpty()) {
+            return;
+        }
+
+        // PDF 解析器
+        parserMap.put("pdf", findParserByClass(PdfDocumentParser.class));
+        // Word 解析器
+        parserMap.put("doc", findParserByClass(WordDocumentParser.class));
+        parserMap.put("docx", findParserByClass(WordDocumentParser.class));
+        // Excel 解析器
+        parserMap.put("xls", findParserByClass(ExcelDocumentParser.class));
+        parserMap.put("xlsx", findParserByClass(ExcelDocumentParser.class));
+        // Markdown 解析器
+        parserMap.put("md", findParserByClass(MarkdownDocumentParser.class));
+        // HTML 解析器
+        parserMap.put("html", findParserByClass(HtmlDocumentParser.class));
+        parserMap.put("htm", findParserByClass(HtmlDocumentParser.class));
+        // CSV 解析器
+        parserMap.put("csv", findParserByClass(CsvDocumentParser.class));
+        // 文本解析器（作为默认）
+        parserMap.put("txt", findParserByClass(TextDocumentParser.class));
+        parserMap.put("json", findParserByClass(TextDocumentParser.class));
+        parserMap.put("xml", findParserByClass(TextDocumentParser.class));
+
+        log.info("文档解析器工厂初始化完成，已注册 {} 种文件类型", parserMap.size());
+    }
+
+    /**
+     * 根据类类型查找解析器
+     */
+    private DocumentParser findParserByClass(Class<? extends DocumentParser> clazz) {
+        return parsers.stream()
+                .filter(parser -> clazz.isInstance(parser))
+                .findFirst()
+                .orElseGet(() -> {
+                    try {
+                        DocumentParser instance = clazz.getDeclaredConstructor().newInstance();
+                        log.warn("解析器 {} 未注册为 Spring Bean，使用默认实例", clazz.getSimpleName());
+                        return instance;
+                    } catch (Exception e) {
+                        throw new ServiceException("无法创建解析器实例: " + clazz.getName() + ": " + e.getMessage());
+                    }
+                });
+    }
+
+    /**
+     * 根据文件扩展名获取解析器
+     *
+     * @param extension 文件扩展名（不包含点号）
+     * @return 文档解析器
+     */
+    public DocumentParser getParser(String extension) {
+        initParserMap();
+        String ext = extension != null ? extension.toLowerCase() : "";
+        DocumentParser parser = parserMap.get(ext);
+        if (parser == null) {
+            // 如果没有找到对应的解析器，使用文本解析器作为默认
+            parser = parserMap.get("txt");
+            log.warn("未找到文件扩展名 {} 的解析器，使用默认文本解析器", extension);
+        }
+        return parser;
+    }
+
+    /**
+     * 根据文件名获取解析器
+     *
+     * @param filename 文件名
+     * @return 文档解析器
+     */
+    public DocumentParser getParserByFilename(String filename) {
+        String extension = extractExtension(filename);
+        return getParser(extension);
+    }
+
+    /**
+     * 解析文档
+     *
+     * @param bytes    文件字节数组
+     * @param filename 文件名
+     * @return 解析后的文本内容
+     */
+    public String parse(byte[] bytes, String filename) {
+        DocumentParser parser = getParserByFilename(filename);
+        return parser.parse(bytes, filename);
+    }
+
+    /**
+     * 检查是否支持该文件类型
+     *
+     * @param extension 文件扩展名
+     * @return 是否支持
+     */
+    public boolean isSupported(String extension) {
+        initParserMap();
+        String ext = extension != null ? extension.toLowerCase() : "";
+        return parserMap.containsKey(ext);
+    }
+
+    /**
+     * 获取支持的文件扩展名列表
+     *
+     * @return 支持的文件扩展名列表
+     */
+    public List<String> getSupportedExtensions() {
+        initParserMap();
+        return parserMap.keySet().stream().sorted().toList();
+    }
+
+    /**
+     * 从文件名中提取扩展名
+     */
+    private String extractExtension(String filename) {
+        if (filename == null || filename.isEmpty()) {
+            return "";
+        }
+        int lastDotIndex = filename.lastIndexOf('.');
+        if (lastDotIndex > 0 && lastDotIndex < filename.length() - 1) {
+            return filename.substring(lastDotIndex + 1);
+        }
+        return "";
+    }
+}
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/data/ExcelDocumentParser.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/data/ExcelDocumentParser.java
new file mode 100644
index 0000000..02d90c8
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/data/ExcelDocumentParser.java
@@ -0,0 +1,57 @@
+package org.dromara.knowledge.data;
+
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.dromara.common.core.exception.ServiceException;
+import org.springframework.stereotype.Component;
+
+import java.io.ByteArrayInputStream;
+import java.util.StringJoiner;
+
+/**
+ * Excel 文档解析器（支持 .xls 和 .xlsx 格式）
+ *
+ * @author pengles
+ */
+@Component
+public class ExcelDocumentParser implements DocumentParser {
+    @Override
+    public String parse(byte[] bytes, String filename) {
+        String ext = filename != null && filename.contains(".") ? filename.substring(filename.lastIndexOf('.') + 1).toLowerCase() : "xlsx";
+        try (ByteArrayInputStream is = new ByteArrayInputStream(bytes)) {
+            StringJoiner joiner = new StringJoiner("\n");
+            if ("xls".equals(ext)) {
+                HSSFWorkbook wb = new HSSFWorkbook(is);
+                for (Sheet sheet : wb) {
+                    for (Row row : sheet) {
+                        StringJoiner rowJoin = new StringJoiner("\t");
+                        for (Cell cell : row) {
+                            rowJoin.add(cell.toString());
+                        }
+                        joiner.add(rowJoin.toString());
+                    }
+                }
+                wb.close();
+            } else {
+                XSSFWorkbook wb = new XSSFWorkbook(is);
+                for (Sheet sheet : wb) {
+                    for (Row row : sheet) {
+                        StringJoiner rowJoin = new StringJoiner("\t");
+                        for (Cell cell : row) {
+                            rowJoin.add(cell.toString());
+                        }
+                        joiner.add(rowJoin.toString());
+                    }
+                }
+                wb.close();
+            }
+            return joiner.toString();
+        } catch (Exception e) {
+            throw new ServiceException("Excel解析失败: " + e.getMessage());
+        }
+    }
+}
+
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/data/HtmlDocumentParser.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/data/HtmlDocumentParser.java
new file mode 100644
index 0000000..3b3cedd
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/data/HtmlDocumentParser.java
@@ -0,0 +1,53 @@
+package org.dromara.knowledge.data;
+
+import org.dromara.common.core.exception.ServiceException;
+import org.springframework.stereotype.Component;
+
+import java.nio.charset.StandardCharsets;
+import java.util.regex.Pattern;
+
+/**
+ * HTML 文档解析器
+ * 提取 HTML 中的纯文本内容，移除标签和脚本
+ *
+ * @author pengles
+ */
+@Component
+public class HtmlDocumentParser implements DocumentParser {
+
+    // 匹配 HTML 标签的正则表达式
+    private static final Pattern HTML_TAG_PATTERN = Pattern.compile("<[^>]+>");
+    // 匹配脚本和样式标签及其内容
+    private static final Pattern SCRIPT_STYLE_PATTERN = Pattern.compile(
+            "(?i)<(script|style)[^>]*>.*?</\\1>", Pattern.DOTALL);
+    // 匹配 HTML 实体
+    private static final Pattern HTML_ENTITY_PATTERN = Pattern.compile("&[a-zA-Z]+;|&#\\d+;");
+
+    @Override
+    public String parse(byte[] bytes, String filename) {
+        try {
+            String html = new String(bytes, StandardCharsets.UTF_8);
+
+            // 移除脚本和样式标签及其内容
+            html = SCRIPT_STYLE_PATTERN.matcher(html).replaceAll("");
+
+            // 移除 HTML 标签
+            html = HTML_TAG_PATTERN.matcher(html).replaceAll(" ");
+
+            // 简单处理 HTML 实体（可以扩展更完整的实体映射）
+            html = html.replace("&nbsp;", " ")
+                    .replace("&lt;", "<")
+                    .replace("&gt;", ">")
+                    .replace("&amp;", "&")
+                    .replace("&quot;", "\"")
+                    .replace("&#39;", "'");
+
+            // 清理多余的空白字符
+            html = html.replaceAll("\\s+", " ").trim();
+
+            return html;
+        } catch (Exception e) {
+            throw new ServiceException("HTML解析失败: " + e.getMessage());
+        }
+    }
+}
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/data/MarkdownDocumentParser.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/data/MarkdownDocumentParser.java
new file mode 100644
index 0000000..a19a5d0
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/data/MarkdownDocumentParser.java
@@ -0,0 +1,24 @@
+package org.dromara.knowledge.data;
+
+import org.dromara.common.core.exception.ServiceException;
+import org.springframework.stereotype.Component;
+
+import java.nio.charset.StandardCharsets;
+
+/**
+ * Markdown 文档解析器
+ * 直接返回 Markdown 文本内容，保留格式供后续处理
+ *
+ * @author pengles
+ */
+@Component
+public class MarkdownDocumentParser implements DocumentParser {
+    @Override
+    public String parse(byte[] bytes, String filename) {
+        try {
+            return new String(bytes, StandardCharsets.UTF_8);
+        } catch (Exception e) {
+            throw new ServiceException("Markdown解析失败: " + e.getMessage());
+        }
+    }
+}
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/data/PdfDocumentParser.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/data/PdfDocumentParser.java
new file mode 100644
index 0000000..57abe2d
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/data/PdfDocumentParser.java
@@ -0,0 +1,37 @@
+package org.dromara.knowledge.data;
+
+import com.itextpdf.kernel.pdf.PdfDocument;
+import com.itextpdf.kernel.pdf.PdfReader;
+import com.itextpdf.kernel.pdf.canvas.parser.PdfTextExtractor;
+import com.itextpdf.kernel.pdf.canvas.parser.listener.LocationTextExtractionStrategy;
+import org.dromara.common.core.exception.ServiceException;
+import org.springframework.stereotype.Component;
+
+import java.io.ByteArrayInputStream;
+
+/**
+ * PDF 文档解析器
+ *
+ * @author pengles
+ */
+@Component
+public class PdfDocumentParser implements DocumentParser {
+    @Override
+    public String parse(byte[] bytes, String filename) {
+        try (ByteArrayInputStream is = new ByteArrayInputStream(bytes)) {
+            PdfReader reader = new PdfReader(is);
+            PdfDocument pdf = new PdfDocument(reader);
+            StringBuilder sb = new StringBuilder();
+            for (int i = 1; i <= pdf.getNumberOfPages(); i++) {
+                String text = PdfTextExtractor.getTextFromPage(pdf.getPage(i), new LocationTextExtractionStrategy());
+                if (text != null && !text.isEmpty()) {
+                    sb.append(text).append("\n");
+                }
+            }
+            pdf.close();
+            return sb.toString();
+        } catch (Exception e) {
+            throw new ServiceException("PDF解析失败: " + e.getMessage());
+        }
+    }
+}
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/data/TextDocumentParser.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/data/TextDocumentParser.java
new file mode 100644
index 0000000..b5b0392
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/data/TextDocumentParser.java
@@ -0,0 +1,32 @@
+package org.dromara.knowledge.data;
+
+import org.dromara.common.core.exception.ServiceException;
+import org.springframework.stereotype.Component;
+
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+
+/**
+ * 纯文本文档解析器
+ * 支持 TXT、JSON、XML 等纯文本格式
+ *
+ * @author pengles
+ */
+@Component
+public class TextDocumentParser implements DocumentParser {
+    @Override
+    public String parse(byte[] bytes, String filename) {
+        try {
+            // 尝试使用 UTF-8 编码，如果失败则使用系统默认编码
+            String text;
+            try {
+                text = new String(bytes, StandardCharsets.UTF_8);
+            } catch (Exception e) {
+                text = new String(bytes, Charset.defaultCharset());
+            }
+            return text;
+        } catch (Exception e) {
+            throw new ServiceException("文本解析失败: " + e.getMessage());
+        }
+    }
+}
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/data/WordDocumentParser.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/data/WordDocumentParser.java
new file mode 100644
index 0000000..b819256
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/data/WordDocumentParser.java
@@ -0,0 +1,35 @@
+package org.dromara.knowledge.data;
+
+import org.apache.poi.hwpf.extractor.WordExtractor;
+import org.apache.poi.xwpf.extractor.XWPFWordExtractor;
+import org.apache.poi.xwpf.usermodel.XWPFDocument;
+import org.dromara.common.core.exception.ServiceException;
+import org.springframework.stereotype.Component;
+
+import java.io.ByteArrayInputStream;
+
+/**
+ * Word 文档解析器（支持 .doc 和 .docx 格式）
+ *
+ * @author pengles
+ */
+@Component
+public class WordDocumentParser implements DocumentParser {
+    @Override
+    public String parse(byte[] bytes, String filename) {
+        String ext = filename != null && filename.contains(".") ? filename.substring(filename.lastIndexOf('.') + 1).toLowerCase() : "docx";
+        try (ByteArrayInputStream is = new ByteArrayInputStream(bytes)) {
+            if ("doc".equals(ext)) {
+                WordExtractor extractor = new WordExtractor(is);
+                return extractor.getText();
+            } else {
+                XWPFDocument docx = new XWPFDocument(is);
+                XWPFWordExtractor extractor = new XWPFWordExtractor(docx);
+                return extractor.getText();
+            }
+        } catch (Exception e) {
+            throw new org.dromara.common.core.exception.ServiceException("Word解析失败: " + e.getMessage());
+        }
+    }
+}
+
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/KnowledgeAttach.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/KnowledgeAttach.java
new file mode 100644
index 0000000..8ce92be
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/KnowledgeAttach.java
@@ -0,0 +1,106 @@
+package org.dromara.knowledge.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * 知识库附件表 knowledge_attach
+ *
+ * @author pengles
+ */
+@Data
+@TableName("knowledge_attach")
+public class KnowledgeAttach implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 知识库ID
+     */
+    private String knowledgeId;
+
+    /**
+     * 文档ID
+     */
+    private String docId;
+
+    /**
+     * 文档名称
+     */
+    private String docName;
+
+    /**
+     * 文档类型
+     */
+    private String docType;
+
+    /**
+     * 对象存储ID
+     */
+    private Integer ossId;
+
+    /**
+     * 拆解图片状态:10未开始,20进行中,30已完成
+     */
+    private Integer picStatus;
+
+    /**
+     * 分析图片状态:10未开始,20进行中,30已完成
+     */
+    private Integer picAnysStatus;
+
+    /**
+     * 写入向量数据库状态:10未开始,20进行中,30已完成
+     */
+    private Integer vectorStatus;
+
+    /**
+     * 文档内容
+     */
+    private String content;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 删除标志:0存在,1删除
+     */
+    @TableLogic
+    private Integer delFlag;
+
+    /**
+     * 创建者
+     */
+    private Long createBy;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 更新者
+     */
+    private Long updateBy;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/KnowledgeFragment.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/KnowledgeFragment.java
new file mode 100644
index 0000000..42b0b7e
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/KnowledgeFragment.java
@@ -0,0 +1,86 @@
+package org.dromara.knowledge.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * 知识库片段表 knowledge_fragment
+ *
+ * @author pengles
+ */
+@Data
+@TableName("knowledge_fragment")
+public class KnowledgeFragment implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 知识库ID
+     */
+    private String knowledgeId;
+
+    /**
+     * 文档ID
+     */
+    private String docId;
+
+    /**
+     * 知识片段ID
+     */
+    private String fid;
+
+    /**
+     * 片段索引下标
+     */
+    private Integer idx;
+
+    /**
+     * 文档内容
+     */
+    private String content;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 删除标志:0存在,1删除
+     */
+    @TableLogic
+    private Integer delFlag;
+
+    /**
+     * 创建者
+     */
+    private Long createBy;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 更新者
+     */
+    private Long updateBy;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/KnowledgeHitLog.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/KnowledgeHitLog.java
new file mode 100644
index 0000000..f834d9c
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/KnowledgeHitLog.java
@@ -0,0 +1,96 @@
+package org.dromara.knowledge.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 知识库命中日志对象 knowledge_hit_log
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("knowledge_hit_log")
+public class KnowledgeHitLog extends BaseEntity implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 会话ID
+     */
+    private String sessionId;
+
+    /**
+     * 知识库ID
+     */
+    private String knowledgeId;
+
+    /**
+     * 文档ID
+     */
+    private String docId;
+
+    /**
+     * 知识片段ID
+     */
+    private String fragmentId;
+
+    /**
+     * 查询文本
+     */
+    private String queryText;
+
+    /**
+     * 查询向量
+     */
+    private String queryVector;
+
+    /**
+     * 相似度分数
+     */
+    private Double similarityScore;
+
+    /**
+     * 排名
+     */
+    private Integer ranking;
+
+    /**
+     * 模型名称
+     */
+    private String modelName;
+
+    /**
+     * 搜索参数
+     */
+    private String searchParams;
+
+    /**
+     * 响应时间（毫秒）
+     */
+    private Long responseTime;
+
+    /**
+     * 命中次数
+     */
+    private Integer hitCount;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/KnowledgeInfo.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/KnowledgeInfo.java
new file mode 100644
index 0000000..aeab3a2
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/KnowledgeInfo.java
@@ -0,0 +1,126 @@
+package org.dromara.knowledge.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * 知识库信息表 knowledge_info
+ *
+ * @author pengles
+ */
+@Data
+@TableName("knowledge_info")
+public class KnowledgeInfo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 用户ID
+     */
+    private Long userId;
+
+    /**
+     * 知识库ID
+     */
+    private String knowledgeId;
+
+    /**
+     * 知识库名称
+     */
+    private String knowledgeName;
+
+    /**
+     * 是否公开知识库:0否,1是
+     */
+    private Integer share;
+
+    /**
+     * 描述
+     */
+    private String description;
+
+    /**
+     * 知识分隔符
+     */
+    private String knowledgeSeparator;
+
+    /**
+     * 提问分隔符
+     */
+    private String questionSeparator;
+
+    /**
+     * 重叠字符数
+     */
+    private Integer overlapChar;
+
+    /**
+     * 知识库中检索的条数
+     */
+    private Integer retrieveLimit;
+
+    /**
+     * 文本块大小
+     */
+    private Integer textBlockSize;
+
+    /**
+     * 向量库
+     */
+    private String vectorModelName;
+
+    /**
+     * 向量模型
+     */
+    private String embeddingModelName;
+
+    /**
+     * 系统提示词
+     */
+    private String systemPrompt;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 删除标志:0存在,1删除
+     */
+    @TableLogic
+    private Integer delFlag;
+
+    /**
+     * 创建者
+     */
+    private Long createBy;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 更新者
+     */
+    private Long updateBy;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/KnowledgeJob.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/KnowledgeJob.java
new file mode 100644
index 0000000..433e402
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/KnowledgeJob.java
@@ -0,0 +1,147 @@
+package org.dromara.knowledge.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 知识库任务对象 knowledge_job
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("knowledge_job")
+public class KnowledgeJob extends BaseEntity implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 任务ID
+     */
+    private String jobId;
+
+    /**
+     * 任务类型
+     */
+    private String jobType;
+
+    /**
+     * 任务子类型
+     */
+    private String jobSubType;
+
+    /**
+     * 知识库ID
+     */
+    private String knowledgeId;
+
+    /**
+     * 文档ID
+     */
+    private String docId;
+
+    /**
+     * 用户ID
+     */
+    private Long userId;
+
+    /**
+     * 任务状态
+     */
+    private Integer status;
+
+    /**
+     * 任务进度
+     */
+    private Integer progress;
+
+    /**
+     * 总项目数
+     */
+    private Integer totalItems;
+
+    /**
+     * 已处理项目数
+     */
+    private Integer processedItems;
+
+    /**
+     * 成功项目数
+     */
+    private Integer successItems;
+
+    /**
+     * 失败项目数
+     */
+    private Integer failedItems;
+
+    /**
+     * 任务优先级
+     */
+    private Integer priority;
+
+    /**
+     * 重试次数
+     */
+    private Integer retryCount;
+
+    /**
+     * 最大重试次数
+     */
+    private Integer maxRetryCount;
+
+    /**
+     * 任务开始时间
+     */
+    private Date startTime;
+
+    /**
+     * 任务结束时间
+     */
+    private Date endTime;
+
+    /**
+     * 任务超时时间（秒）
+     */
+    private Integer timeout;
+
+    /**
+     * 错误信息
+     */
+    private String errorInfo;
+
+    /**
+     * 任务结果数据
+     */
+    private String resultData;
+
+    /**
+     * 通知配置
+     */
+    private String notificationConfig;
+
+    /**
+     * 通知状态
+     */
+    private Integer notificationStatus;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/KnowledgePromptTemplate.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/KnowledgePromptTemplate.java
new file mode 100644
index 0000000..31e7a25
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/KnowledgePromptTemplate.java
@@ -0,0 +1,76 @@
+package org.dromara.knowledge.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * 知识库提示模板表 knowledge_prompt_template
+ *
+ * @author pengles
+ */
+@Data
+@TableName("knowledge_prompt_template")
+public class KnowledgePromptTemplate implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 提示词模板名称
+     */
+    private String templateName;
+
+    /**
+     * 提示词模板内容
+     */
+    private String templateContent;
+
+    /**
+     * 提示词分类:knowledge知识库类型,chat对话类型,draw绘画类型
+     */
+    private String category;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 删除标志:0存在,1删除
+     */
+    @TableLogic
+    private Integer delFlag;
+
+    /**
+     * 创建者
+     */
+    private Long createBy;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 更新者
+     */
+    private Long updateBy;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/KnowledgeRole.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/KnowledgeRole.java
new file mode 100644
index 0000000..2c25e36
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/KnowledgeRole.java
@@ -0,0 +1,86 @@
+package org.dromara.knowledge.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * 知识库角色表 knowledge_role
+ *
+ * @author pengles
+ */
+@Data
+@TableName("knowledge_role")
+public class KnowledgeRole implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 角色名称
+     */
+    private String roleName;
+
+    /**
+     * 角色编码
+     */
+    private String roleCode;
+
+    /**
+     * 角色描述
+     */
+    private String roleDesc;
+
+    /**
+     * 角色状态:0禁用,1启用
+     */
+    private Integer status;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 删除标志:0存在,1删除
+     */
+    @TableLogic
+    private Integer delFlag;
+
+    /**
+     * 创建者
+     */
+    private Long createBy;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 更新者
+     */
+    private Long updateBy;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/KnowledgeRoleGroup.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/KnowledgeRoleGroup.java
new file mode 100644
index 0000000..2cb8859
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/KnowledgeRoleGroup.java
@@ -0,0 +1,86 @@
+package org.dromara.knowledge.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * 知识库角色分组表 knowledge_role_group
+ *
+ * @author pengles
+ */
+@Data
+@TableName("knowledge_role_group")
+public class KnowledgeRoleGroup implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 分组名称
+     */
+    private String groupName;
+
+    /**
+     * 分组编码
+     */
+    private String groupCode;
+
+    /**
+     * 分组描述
+     */
+    private String groupDesc;
+
+    /**
+     * 分组状态:0禁用,1启用
+     */
+    private Integer status;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 删除标志:0存在,1删除
+     */
+    @TableLogic
+    private Integer delFlag;
+
+    /**
+     * 创建者
+     */
+    private Long createBy;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 更新者
+     */
+    private Long updateBy;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/KnowledgeRoleRelation.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/KnowledgeRoleRelation.java
new file mode 100644
index 0000000..ee45c5a
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/KnowledgeRoleRelation.java
@@ -0,0 +1,86 @@
+package org.dromara.knowledge.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * 知识库角色关系表 knowledge_role_relation
+ *
+ * @author pengles
+ */
+@Data
+@TableName("knowledge_role_relation")
+public class KnowledgeRoleRelation implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 角色ID
+     */
+    private Long roleId;
+
+    /**
+     * 分组ID
+     */
+    private Long groupId;
+
+    /**
+     * 关系类型:1角色属于分组,2分组包含角色
+     */
+    private Integer relationType;
+
+    /**
+     * 关系状态:0禁用,1启用
+     */
+    private Integer status;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 删除标志:0存在,1删除
+     */
+    @TableLogic
+    private Integer delFlag;
+
+    /**
+     * 创建者
+     */
+    private Long createBy;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 更新者
+     */
+    private Long updateBy;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/KnowledgeSchema.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/KnowledgeSchema.java
new file mode 100644
index 0000000..be05e77
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/KnowledgeSchema.java
@@ -0,0 +1,81 @@
+package org.dromara.knowledge.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * 知识库数据模型表 knowledge_schema
+ *
+ * @author pengles
+ */
+@Data
+@TableName("knowledge_schema")
+public class KnowledgeSchema implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 分组ID
+     */
+    private Long schemaGroupId;
+
+    /**
+     * 模型名称
+     */
+    private String name;
+
+    /**
+     * 模型编码
+     */
+    private String code;
+
+    /**
+     * 表名
+     */
+    private String tableName;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 删除标志:0存在,1删除
+     */
+    @TableLogic
+    private Integer delFlag;
+
+    /**
+     * 创建者
+     */
+    private Long createBy;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 更新者
+     */
+    private Long updateBy;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/KnowledgeSchemaField.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/KnowledgeSchemaField.java
new file mode 100644
index 0000000..d3cfc70
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/KnowledgeSchemaField.java
@@ -0,0 +1,161 @@
+package org.dromara.knowledge.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * 知识库数据模型字段表 knowledge_schema_field
+ *
+ * @author pengles
+ */
+@Data
+@TableName("knowledge_schema_field")
+public class KnowledgeSchemaField implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 模型ID
+     */
+    private Long schemaId;
+
+    /**
+     * 模型名称
+     */
+    private String schemaName;
+
+    /**
+     * 字段名称
+     */
+    private String name;
+
+    /**
+     * 字段编码
+     */
+    private String code;
+
+    /**
+     * 字段类型
+     */
+    private String type;
+
+    /**
+     * 字段注释
+     */
+    private String comment;
+
+    /**
+     * 是否主键:0否,1是
+     */
+    private Integer isPk;
+
+    /**
+     * 是否必填:0否,1是
+     */
+    private Integer isRequired;
+
+    /**
+     * 是否唯一:0否,1是
+     */
+    private Integer isUnique;
+
+    /**
+     * 默认值
+     */
+    private String defaultValue;
+
+    /**
+     * 字段长度
+     */
+    private Integer length;
+
+    /**
+     * 小数位数
+     */
+    private Integer scale;
+
+    /**
+     * 是否列表显示:0否,1是
+     */
+    private Integer isList;
+
+    /**
+     * 是否查询字段:0否,1是
+     */
+    private Integer isQuery;
+
+    /**
+     * 是否插入字段:0否,1是
+     */
+    private Integer isInsert;
+
+    /**
+     * 是否编辑字段:0否,1是
+     */
+    private Integer isEdit;
+
+    /**
+     * 查询方式(EQ,NE,GT,LT,LIKE,BETWEEN)
+     */
+    private String queryType;
+
+    /**
+     * 显示类型(input,textarea,select,checkbox,radio,datetime,image,upload,editor)
+     */
+    private String htmlType;
+
+    /**
+     * 字典类型
+     */
+    private String dictType;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    /**
+     * 删除标志:0存在,1删除
+     */
+    @TableLogic
+    private Integer delFlag;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 创建者
+     */
+    private Long createBy;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 更新者
+     */
+    private Long updateBy;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/KnowledgeSchemaGroup.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/KnowledgeSchemaGroup.java
new file mode 100644
index 0000000..329f71f
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/KnowledgeSchemaGroup.java
@@ -0,0 +1,76 @@
+package org.dromara.knowledge.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * 知识库数据模型分组表 knowledge_schema_group
+ *
+ * @author pengles
+ */
+@Data
+@TableName("knowledge_schema_group")
+public class KnowledgeSchemaGroup implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 分组名称
+     */
+    private String name;
+
+    /**
+     * 分组编码
+     */
+    private String code;
+
+    /**
+     * 图标
+     */
+    private String icon;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 删除标志:0存在,1删除
+     */
+    @TableLogic
+    private Integer delFlag;
+
+    /**
+     * 创建者
+     */
+    private Long createBy;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 更新者
+     */
+    private Long updateBy;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/KnowledgeVector.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/KnowledgeVector.java
new file mode 100644
index 0000000..76d02f9
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/KnowledgeVector.java
@@ -0,0 +1,76 @@
+package org.dromara.knowledge.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 知识片段向量对象 knowledge_vector
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("knowledge_vector")
+public class KnowledgeVector extends BaseEntity implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 知识库ID
+     */
+    private String knowledgeId;
+
+    /**
+     * 文档ID
+     */
+    private String docId;
+
+    /**
+     * 知识片段ID
+     */
+    private String fragmentId;
+
+    /**
+     * 向量ID
+     */
+    private String vectorId;
+
+    /**
+     * 向量数据
+     */
+    private String vectorData;
+
+    /**
+     * 向量维度
+     */
+    private Integer dimension;
+
+    /**
+     * 模型名称
+     */
+    private String modelName;
+
+    /**
+     * 状态（0正常 1停用）
+     */
+    private Integer status;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/bo/KnowledgeAttachBo.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/bo/KnowledgeAttachBo.java
new file mode 100644
index 0000000..0d1cfeb
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/bo/KnowledgeAttachBo.java
@@ -0,0 +1,82 @@
+package org.dromara.knowledge.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.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.knowledge.domain.KnowledgeAttach;
+
+/**
+ * 知识库附件业务对象 knowledge_attach
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = KnowledgeAttach.class, reverseConvertGenerate = false)
+public class KnowledgeAttachBo extends BaseEntity {
+
+    /**
+     * 主键ID
+     */
+    @NotNull(message = "主键ID不能为空", groups = {EditGroup.class})
+    private Long id;
+
+    /**
+     * 知识库ID
+     */
+    @NotBlank(message = "知识库ID不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String knowledgeId;
+
+    /**
+     * 文档ID
+     */
+    @NotBlank(message = "文档ID不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String docId;
+
+    /**
+     * 文档名称
+     */
+    @NotBlank(message = "文档名称不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String docName;
+
+    /**
+     * 文档类型
+     */
+    private String docType;
+
+    /**
+     * OSS文件ID
+     */
+    private Integer ossId;
+
+    /**
+     * 图片状态
+     */
+    private Integer picStatus;
+
+    /**
+     * 图片分析状态
+     */
+    private Integer picAnysStatus;
+
+    /**
+     * 向量化状态
+     */
+    private Integer vectorStatus;
+
+    /**
+     * 文档内容
+     */
+    private String content;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/bo/KnowledgeFragmentBo.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/bo/KnowledgeFragmentBo.java
new file mode 100644
index 0000000..d578ecb
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/bo/KnowledgeFragmentBo.java
@@ -0,0 +1,63 @@
+package org.dromara.knowledge.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.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.knowledge.domain.KnowledgeFragment;
+
+/**
+ * 知识库片段业务对象 knowledge_fragment
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = KnowledgeFragment.class, reverseConvertGenerate = false)
+public class KnowledgeFragmentBo extends BaseEntity {
+
+    /**
+     * 主键ID
+     */
+    @NotNull(message = "主键ID不能为空", groups = {EditGroup.class})
+    private Long id;
+
+    /**
+     * 知识库ID
+     */
+    @NotBlank(message = "知识库ID不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String knowledgeId;
+
+    /**
+     * 文档ID
+     */
+    @NotBlank(message = "文档ID不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String docId;
+
+    /**
+     * 知识片段ID
+     */
+    @NotBlank(message = "知识片段ID不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String fid;
+
+    /**
+     * 片段索引下标
+     */
+    private Integer idx;
+
+    /**
+     * 片段内容
+     */
+    @NotBlank(message = "片段内容不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String content;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/bo/KnowledgeHitLogBo.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/bo/KnowledgeHitLogBo.java
new file mode 100644
index 0000000..4526e27
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/bo/KnowledgeHitLogBo.java
@@ -0,0 +1,110 @@
+package org.dromara.knowledge.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.knowledge.domain.KnowledgeHitLog;
+
+/**
+ * 知识库命中日志业务对象 knowledge_hit_log
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = KnowledgeHitLog.class, reverseConvertGenerate = false)
+public class KnowledgeHitLogBo extends BaseEntity {
+
+    /**
+     * 主键ID
+     */
+    @NotNull(message = "主键ID不能为空", groups = {EditGroup.class})
+    private Long id;
+
+    /**
+     * 会话ID
+     */
+    @NotBlank(message = "会话ID不能为空", groups = {AddGroup.class, EditGroup.class})
+    @Size(max = 64, message = "会话ID长度不能超过64个字符")
+    private String sessionId;
+
+    /**
+     * 知识库ID
+     */
+    @NotBlank(message = "知识库ID不能为空", groups = {AddGroup.class, EditGroup.class})
+    @Size(max = 64, message = "知识库ID长度不能超过64个字符")
+    private String knowledgeId;
+
+    /**
+     * 文档ID
+     */
+    @Size(max = 64, message = "文档ID长度不能超过64个字符")
+    private String docId;
+
+    /**
+     * 知识片段ID
+     */
+    @Size(max = 64, message = "知识片段ID长度不能超过64个字符")
+    private String fragmentId;
+
+    /**
+     * 查询文本
+     */
+    @NotBlank(message = "查询文本不能为空", groups = {AddGroup.class, EditGroup.class})
+    @Size(max = 2000, message = "查询文本长度不能超过2000个字符")
+    private String queryText;
+
+    /**
+     * 查询向量
+     */
+    @Size(max = 65535, message = "查询向量长度不能超过65535个字符")
+    private String queryVector;
+
+    /**
+     * 相似度分数
+     */
+    @DecimalMin(value = "0.0", message = "相似度分数不能小于0")
+    @DecimalMax(value = "1.0", message = "相似度分数不能大于1")
+    private Double similarityScore;
+
+    /**
+     * 排名
+     */
+    @Min(value = 1, message = "排名必须大于0")
+    private Integer ranking;
+
+    /**
+     * 模型名称
+     */
+    @Size(max = 100, message = "模型名称长度不能超过100个字符")
+    private String modelName;
+
+    /**
+     * 搜索参数
+     */
+    @Size(max = 1000, message = "搜索参数长度不能超过1000个字符")
+    private String searchParams;
+
+    /**
+     * 响应时间（毫秒）
+     */
+    @Min(value = 0, message = "响应时间不能小于0")
+    private Long responseTime;
+
+    /**
+     * 命中次数
+     */
+    @Min(value = 0, message = "命中次数不能小于0")
+    private Integer hitCount;
+
+    /**
+     * 备注
+     */
+    @Size(max = 500, message = "备注长度不能超过500个字符")
+    private String remark;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/bo/KnowledgeInfoBo.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/bo/KnowledgeInfoBo.java
new file mode 100644
index 0000000..3c1eb19
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/bo/KnowledgeInfoBo.java
@@ -0,0 +1,101 @@
+package org.dromara.knowledge.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.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.knowledge.domain.KnowledgeInfo;
+
+/**
+ * 知识库信息业务对象 knowledge_info
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = KnowledgeInfo.class, reverseConvertGenerate = false)
+public class KnowledgeInfoBo extends BaseEntity {
+
+    /**
+     * 主键ID
+     */
+    @NotNull(message = "主键ID不能为空", groups = {EditGroup.class})
+    private Long id;
+
+    /**
+     * 用户ID
+     */
+    private Long userId;
+
+    /**
+     * 知识库ID
+     */
+    @NotBlank(message = "知识库ID不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String knowledgeId;
+
+    /**
+     * 知识库名称
+     */
+    @NotBlank(message = "知识库名称不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String knowledgeName;
+
+    /**
+     * 是否公开知识库:0否,1是
+     */
+    private Integer share;
+
+    /**
+     * 描述
+     */
+    private String description;
+
+    /**
+     * 知识分隔符
+     */
+    private String knowledgeSeparator;
+
+    /**
+     * 问题分隔符
+     */
+    private String questionSeparator;
+
+    /**
+     * 重叠字符数
+     */
+    private Integer overlapChar;
+
+    /**
+     * 检索限制
+     */
+    private Integer retrieveLimit;
+
+    /**
+     * 文本块大小
+     */
+    private Integer textBlockSize;
+
+    /**
+     * 向量模型名称
+     */
+    private String vectorModelName;
+
+    /**
+     * 嵌入模型名称
+     */
+    private String embeddingModelName;
+
+    /**
+     * 系统提示词
+     */
+    private String systemPrompt;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/bo/KnowledgeJobBo.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/bo/KnowledgeJobBo.java
new file mode 100644
index 0000000..0b58b1b
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/bo/KnowledgeJobBo.java
@@ -0,0 +1,167 @@
+package org.dromara.knowledge.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.knowledge.domain.KnowledgeJob;
+
+import java.util.Date;
+
+/**
+ * 知识库任务业务对象 knowledge_job
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = KnowledgeJob.class, reverseConvertGenerate = false)
+public class KnowledgeJobBo extends BaseEntity {
+
+    /**
+     * 主键ID
+     */
+    @NotNull(message = "主键ID不能为空", groups = {EditGroup.class})
+    private Long id;
+
+    /**
+     * 任务ID
+     */
+    @NotBlank(message = "任务ID不能为空", groups = {AddGroup.class, EditGroup.class})
+    @Size(max = 64, message = "任务ID长度不能超过64个字符")
+    private String jobId;
+
+    /**
+     * 任务类型
+     */
+    @NotBlank(message = "任务类型不能为空", groups = {AddGroup.class, EditGroup.class})
+    @Size(max = 50, message = "任务类型长度不能超过50个字符")
+    private String jobType;
+
+    /**
+     * 任务子类型
+     */
+    @Size(max = 50, message = "任务子类型长度不能超过50个字符")
+    private String jobSubType;
+
+    /**
+     * 知识库ID
+     */
+    @Size(max = 64, message = "知识库ID长度不能超过64个字符")
+    private String knowledgeId;
+
+    /**
+     * 文档ID
+     */
+    @Size(max = 64, message = "文档ID长度不能超过64个字符")
+    private String docId;
+
+    /**
+     * 用户ID
+     */
+    private Long userId;
+
+    /**
+     * 任务状态
+     */
+    private Integer status;
+
+    /**
+     * 任务进度
+     */
+    @Min(value = 0, message = "任务进度不能小于0")
+    @Max(value = 100, message = "任务进度不能大于100")
+    private Integer progress;
+
+    /**
+     * 总项目数
+     */
+    @Min(value = 0, message = "总项目数不能小于0")
+    private Integer totalItems;
+
+    /**
+     * 已处理项目数
+     */
+    @Min(value = 0, message = "已处理项目数不能小于0")
+    private Integer processedItems;
+
+    /**
+     * 成功项目数
+     */
+    @Min(value = 0, message = "成功项目数不能小于0")
+    private Integer successItems;
+
+    /**
+     * 失败项目数
+     */
+    @Min(value = 0, message = "失败项目数不能小于0")
+    private Integer failedItems;
+
+    /**
+     * 任务优先级
+     */
+    @Min(value = 1, message = "任务优先级不能小于1")
+    @Max(value = 10, message = "任务优先级不能大于10")
+    private Integer priority;
+
+    /**
+     * 重试次数
+     */
+    @Min(value = 0, message = "重试次数不能小于0")
+    private Integer retryCount;
+
+    /**
+     * 最大重试次数
+     */
+    @Min(value = 0, message = "最大重试次数不能小于0")
+    private Integer maxRetryCount;
+
+    /**
+     * 任务开始时间
+     */
+    private Date startTime;
+
+    /**
+     * 任务结束时间
+     */
+    private Date endTime;
+
+    /**
+     * 任务超时时间（秒）
+     */
+    @Min(value = 1, message = "任务超时时间必须大于0")
+    private Integer timeout;
+
+    /**
+     * 错误信息
+     */
+    @Size(max = 2000, message = "错误信息长度不能超过2000个字符")
+    private String errorInfo;
+
+    /**
+     * 任务结果数据
+     */
+    @Size(max = 65535, message = "任务结果数据长度不能超过65535个字符")
+    private String resultData;
+
+    /**
+     * 通知配置
+     */
+    @Size(max = 1000, message = "通知配置长度不能超过1000个字符")
+    private String notificationConfig;
+
+    /**
+     * 通知状态
+     */
+    private Integer notificationStatus;
+
+    /**
+     * 备注
+     */
+    @Size(max = 500, message = "备注长度不能超过500个字符")
+    private String remark;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/bo/KnowledgePromptTemplateBo.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/bo/KnowledgePromptTemplateBo.java
new file mode 100644
index 0000000..13dc471
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/bo/KnowledgePromptTemplateBo.java
@@ -0,0 +1,51 @@
+package org.dromara.knowledge.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.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.knowledge.domain.KnowledgePromptTemplate;
+
+/**
+ * 知识库提示模板业务对象 knowledge_prompt_template
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = KnowledgePromptTemplate.class, reverseConvertGenerate = false)
+public class KnowledgePromptTemplateBo extends BaseEntity {
+
+    /**
+     * 主键
+     */
+    @NotNull(message = "主键不能为空", groups = {EditGroup.class})
+    private Long id;
+
+    /**
+     * 提示词模板名称
+     */
+    @NotBlank(message = "提示词模板名称不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String templateName;
+
+    /**
+     * 提示词模板内容
+     */
+    @NotBlank(message = "提示词模板内容不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String templateContent;
+
+    /**
+     * 提示词分类:knowledge知识库类型,chat对话类型,draw绘画类型
+     */
+    private String category;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/bo/KnowledgeRoleBo.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/bo/KnowledgeRoleBo.java
new file mode 100644
index 0000000..2e8ea9e
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/bo/KnowledgeRoleBo.java
@@ -0,0 +1,61 @@
+package org.dromara.knowledge.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.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.knowledge.domain.KnowledgeRole;
+
+/**
+ * 知识库角色业务对象 knowledge_role
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = KnowledgeRole.class, reverseConvertGenerate = false)
+public class KnowledgeRoleBo extends BaseEntity {
+
+    /**
+     * 主键ID
+     */
+    @NotNull(message = "主键ID不能为空", groups = {EditGroup.class})
+    private Long id;
+
+    /**
+     * 角色名称
+     */
+    @NotBlank(message = "角色名称不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String roleName;
+
+    /**
+     * 角色编码
+     */
+    @NotBlank(message = "角色编码不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String roleCode;
+
+    /**
+     * 角色描述
+     */
+    private String roleDesc;
+
+    /**
+     * 角色状态:0禁用,1启用
+     */
+    private Integer status;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/bo/KnowledgeRoleGroupBo.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/bo/KnowledgeRoleGroupBo.java
new file mode 100644
index 0000000..e8e94e3
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/bo/KnowledgeRoleGroupBo.java
@@ -0,0 +1,61 @@
+package org.dromara.knowledge.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.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.knowledge.domain.KnowledgeRoleGroup;
+
+/**
+ * 知识库角色分组业务对象 knowledge_role_group
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = KnowledgeRoleGroup.class, reverseConvertGenerate = false)
+public class KnowledgeRoleGroupBo extends BaseEntity {
+
+    /**
+     * 主键ID
+     */
+    @NotNull(message = "主键ID不能为空", groups = {EditGroup.class})
+    private Long id;
+
+    /**
+     * 分组名称
+     */
+    @NotBlank(message = "分组名称不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String groupName;
+
+    /**
+     * 分组编码
+     */
+    @NotBlank(message = "分组编码不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String groupCode;
+
+    /**
+     * 分组描述
+     */
+    private String groupDesc;
+
+    /**
+     * 分组状态:0禁用,1启用
+     */
+    private Integer status;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/bo/KnowledgeRoleRelationBo.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/bo/KnowledgeRoleRelationBo.java
new file mode 100644
index 0000000..48cdf94
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/bo/KnowledgeRoleRelationBo.java
@@ -0,0 +1,60 @@
+package org.dromara.knowledge.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.knowledge.domain.KnowledgeRoleRelation;
+
+/**
+ * 知识库角色关系业务对象 knowledge_role_relation
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = KnowledgeRoleRelation.class, reverseConvertGenerate = false)
+public class KnowledgeRoleRelationBo extends BaseEntity {
+
+    /**
+     * 主键ID
+     */
+    @NotNull(message = "主键ID不能为空", groups = {EditGroup.class})
+    private Long id;
+
+    /**
+     * 角色ID
+     */
+    @NotNull(message = "角色ID不能为空", groups = {AddGroup.class, EditGroup.class})
+    private Long roleId;
+
+    /**
+     * 分组ID
+     */
+    @NotNull(message = "分组ID不能为空", groups = {AddGroup.class, EditGroup.class})
+    private Long groupId;
+
+    /**
+     * 关系类型:1角色属于分组,2分组包含角色
+     */
+    private Integer relationType;
+
+    /**
+     * 关系状态:0禁用,1启用
+     */
+    private Integer status;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/bo/KnowledgeSchemaBo.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/bo/KnowledgeSchemaBo.java
new file mode 100644
index 0000000..f6402e3
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/bo/KnowledgeSchemaBo.java
@@ -0,0 +1,57 @@
+package org.dromara.knowledge.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.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.knowledge.domain.KnowledgeSchema;
+
+/**
+ * 知识库数据模型业务对象 knowledge_schema
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = KnowledgeSchema.class, reverseConvertGenerate = false)
+public class KnowledgeSchemaBo extends BaseEntity {
+
+    /**
+     * 主键
+     */
+    @NotNull(message = "主键不能为空", groups = {EditGroup.class})
+    private Long id;
+
+    /**
+     * 分组ID
+     */
+    private Long schemaGroupId;
+
+    /**
+     * 模型名称
+     */
+    @NotBlank(message = "模型名称不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String name;
+
+    /**
+     * 模型编码
+     */
+    @NotBlank(message = "模型编码不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String code;
+
+    /**
+     * 表名
+     */
+    @NotBlank(message = "表名不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String tableName;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/bo/KnowledgeSchemaFieldBo.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/bo/KnowledgeSchemaFieldBo.java
new file mode 100644
index 0000000..2ee7ba2
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/bo/KnowledgeSchemaFieldBo.java
@@ -0,0 +1,138 @@
+package org.dromara.knowledge.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.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.knowledge.domain.KnowledgeSchemaField;
+
+/**
+ * 知识库数据模型字段业务对象 knowledge_schema_field
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = KnowledgeSchemaField.class, reverseConvertGenerate = false)
+public class KnowledgeSchemaFieldBo extends BaseEntity {
+
+    /**
+     * 主键
+     */
+    @NotNull(message = "主键不能为空", groups = {EditGroup.class})
+    private Long id;
+
+    /**
+     * 模型ID
+     */
+    @NotNull(message = "模型ID不能为空", groups = {AddGroup.class, EditGroup.class})
+    private Long schemaId;
+
+    /**
+     * 模型名称
+     */
+    private String schemaName;
+
+    /**
+     * 字段名称
+     */
+    @NotBlank(message = "字段名称不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String name;
+
+    /**
+     * 字段编码
+     */
+    @NotBlank(message = "字段编码不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String code;
+
+    /**
+     * 字段类型
+     */
+    @NotBlank(message = "字段类型不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String type;
+
+    /**
+     * 字段注释
+     */
+    private String comment;
+
+    /**
+     * 是否主键:0否,1是
+     */
+    private Integer isPk;
+
+    /**
+     * 是否必填:0否,1是
+     */
+    private Integer isRequired;
+
+    /**
+     * 是否唯一:0否,1是
+     */
+    private Integer isUnique;
+
+    /**
+     * 默认值
+     */
+    private String defaultValue;
+
+    /**
+     * 字段长度
+     */
+    private Integer length;
+
+    /**
+     * 小数位数
+     */
+    private Integer scale;
+
+    /**
+     * 是否列表:0否,1是
+     */
+    private Integer isList;
+
+    /**
+     * 是否查询:0否,1是
+     */
+    private Integer isQuery;
+
+    /**
+     * 是否插入:0否,1是
+     */
+    private Integer isInsert;
+
+    /**
+     * 是否编辑:0否,1是
+     */
+    private Integer isEdit;
+
+    /**
+     * 查询类型
+     */
+    private String queryType;
+
+    /**
+     * HTML类型
+     */
+    private String htmlType;
+
+    /**
+     * 字典类型
+     */
+    private String dictType;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/bo/KnowledgeSchemaGroupBo.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/bo/KnowledgeSchemaGroupBo.java
new file mode 100644
index 0000000..bda29ae
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/bo/KnowledgeSchemaGroupBo.java
@@ -0,0 +1,51 @@
+package org.dromara.knowledge.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.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.knowledge.domain.KnowledgeSchemaGroup;
+
+/**
+ * 知识库数据模型分组业务对象 knowledge_schema_group
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = KnowledgeSchemaGroup.class, reverseConvertGenerate = false)
+public class KnowledgeSchemaGroupBo extends BaseEntity {
+
+    /**
+     * 主键
+     */
+    @NotNull(message = "主键不能为空", 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 code;
+
+    /**
+     * 图标
+     */
+    private String icon;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/bo/KnowledgeVectorBo.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/bo/KnowledgeVectorBo.java
new file mode 100644
index 0000000..406efa6
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/bo/KnowledgeVectorBo.java
@@ -0,0 +1,86 @@
+package org.dromara.knowledge.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.knowledge.domain.KnowledgeVector;
+
+/**
+ * 知识片段向量业务对象 knowledge_vector
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = KnowledgeVector.class, reverseConvertGenerate = false)
+public class KnowledgeVectorBo extends BaseEntity {
+
+    /**
+     * 主键ID
+     */
+    @NotNull(message = "主键ID不能为空", groups = {EditGroup.class})
+    private Long id;
+
+    /**
+     * 知识库ID
+     */
+    @NotBlank(message = "知识库ID不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String knowledgeId;
+
+    /**
+     * 文档ID
+     */
+    @NotBlank(message = "文档ID不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String docId;
+
+    /**
+     * 知识片段ID
+     */
+    @NotBlank(message = "知识片段ID不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String fragmentId;
+
+    /**
+     * 向量ID
+     */
+    @NotBlank(message = "向量ID不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String vectorId;
+
+    /**
+     * 向量数据
+     */
+    @Size(max = 65535, message = "向量数据长度不能超过65535个字符")
+    private String vectorData;
+
+    /**
+     * 向量维度
+     */
+    @NotNull(message = "向量维度不能为空", groups = {AddGroup.class, EditGroup.class})
+    @Min(value = 1, message = "向量维度必须大于0")
+    private Integer dimension;
+
+    /**
+     * 模型名称
+     */
+    @NotBlank(message = "模型名称不能为空", groups = {AddGroup.class, EditGroup.class})
+    @Size(max = 100, message = "模型名称长度不能超过100个字符")
+    private String modelName;
+
+    /**
+     * 状态（0正常 1停用）
+     */
+    private Integer status;
+
+    /**
+     * 备注
+     */
+    @Size(max = 500, message = "备注长度不能超过500个字符")
+    private String remark;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/vo/KnowledgeAttachVo.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/vo/KnowledgeAttachVo.java
new file mode 100644
index 0000000..c511417
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/vo/KnowledgeAttachVo.java
@@ -0,0 +1,107 @@
+package org.dromara.knowledge.domain.vo;
+
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.knowledge.domain.KnowledgeAttach;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * 知识库附件视图对象 knowledge_attach
+ *
+ * @author pengles
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = KnowledgeAttach.class)
+public class KnowledgeAttachVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @ExcelProperty(value = "主键ID")
+    private Long id;
+
+    /**
+     * 知识库ID
+     */
+    @ExcelProperty(value = "知识库ID")
+    private String knowledgeId;
+
+    /**
+     * 文档ID
+     */
+    @ExcelProperty(value = "文档ID")
+    private String docId;
+
+    /**
+     * 文档名称
+     */
+    @ExcelProperty(value = "文档名称")
+    private String docName;
+
+    /**
+     * 文档类型
+     */
+    @ExcelProperty(value = "文档类型")
+    private String docType;
+
+    /**
+     * OSS对象存储主键
+     */
+    @ExcelProperty(value = "OSS对象存储主键")
+    private Integer ossId;
+
+    /**
+     * 图片识别状态
+     */
+    @ExcelProperty(value = "图片识别状态")
+    private Integer picStatus;
+
+    /**
+     * 图片分析状态
+     */
+    @ExcelProperty(value = "图片分析状态")
+    private Integer picAnysStatus;
+
+    /**
+     * 向量化状态
+     */
+    @ExcelProperty(value = "向量化状态")
+    private Integer vectorStatus;
+    /**
+     * 文档内容
+     */
+    @ExcelProperty(value = "文档内容")
+    private String content;
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "创建时间")
+    private LocalDateTime createTime;
+    /**
+     * 更新时间
+     */
+    @ExcelProperty(value = "更新时间")
+    private LocalDateTime updateTime;
+
+    /**
+     * 获取向量化状态
+     */
+    public Integer getVectorStatus() {
+        return vectorStatus;
+    }
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/vo/KnowledgeFragmentVo.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/vo/KnowledgeFragmentVo.java
new file mode 100644
index 0000000..7eb23d5
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/vo/KnowledgeFragmentVo.java
@@ -0,0 +1,80 @@
+package org.dromara.knowledge.domain.vo;
+
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.knowledge.domain.KnowledgeFragment;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * 知识库片段视图对象 knowledge_fragment
+ *
+ * @author pengles
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = KnowledgeFragment.class)
+public class KnowledgeFragmentVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @ExcelProperty(value = "主键ID")
+    private Long id;
+
+    /**
+     * 知识库ID
+     */
+    @ExcelProperty(value = "知识库ID")
+    private String knowledgeId;
+
+    /**
+     * 文档ID
+     */
+    @ExcelProperty(value = "文档ID")
+    private String docId;
+
+    /**
+     * 知识片段ID
+     */
+    @ExcelProperty(value = "知识片段ID")
+    private String fid;
+
+    /**
+     * 片段索引下标
+     */
+    @ExcelProperty(value = "片段索引下标")
+    private Integer idx;
+
+    /**
+     * 片段内容
+     */
+    @ExcelProperty(value = "片段内容")
+    private String content;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "创建时间")
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    @ExcelProperty(value = "更新时间")
+    private LocalDateTime updateTime;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/vo/KnowledgeHitLogVo.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/vo/KnowledgeHitLogVo.java
new file mode 100644
index 0000000..74ac9c2
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/vo/KnowledgeHitLogVo.java
@@ -0,0 +1,110 @@
+package org.dromara.knowledge.domain.vo;
+
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.knowledge.domain.KnowledgeHitLog;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 知识库命中日志视图对象 knowledge_hit_log
+ *
+ * @author pengles
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = KnowledgeHitLog.class)
+public class KnowledgeHitLogVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @ExcelProperty(value = "主键ID")
+    private Long id;
+
+    /**
+     * 会话ID
+     */
+    @ExcelProperty(value = "会话ID")
+    private String sessionId;
+
+    /**
+     * 知识库ID
+     */
+    @ExcelProperty(value = "知识库ID")
+    private String knowledgeId;
+
+    /**
+     * 文档ID
+     */
+    @ExcelProperty(value = "文档ID")
+    private String docId;
+
+    /**
+     * 知识片段ID
+     */
+    @ExcelProperty(value = "知识片段ID")
+    private String fragmentId;
+
+    /**
+     * 查询文本
+     */
+    @ExcelProperty(value = "查询文本")
+    private String queryText;
+
+    /**
+     * 相似度分数
+     */
+    @ExcelProperty(value = "相似度分数")
+    private Double similarityScore;
+
+    /**
+     * 排名
+     */
+    @ExcelProperty(value = "排名")
+    private Integer ranking;
+
+    /**
+     * 模型名称
+     */
+    @ExcelProperty(value = "模型名称")
+    private String modelName;
+
+    /**
+     * 搜索参数
+     */
+    @ExcelProperty(value = "搜索参数")
+    private String searchParams;
+
+    /**
+     * 响应时间（毫秒）
+     */
+    @ExcelProperty(value = "响应时间")
+    private Long responseTime;
+
+    /**
+     * 命中次数
+     */
+    @ExcelProperty(value = "命中次数")
+    private Integer hitCount;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "创建时间")
+    private Date createTime;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/vo/KnowledgeInfoVo.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/vo/KnowledgeInfoVo.java
new file mode 100644
index 0000000..4e48c3f
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/vo/KnowledgeInfoVo.java
@@ -0,0 +1,128 @@
+package org.dromara.knowledge.domain.vo;
+
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.knowledge.domain.KnowledgeInfo;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * 知识库信息视图对象 knowledge_info
+ *
+ * @author pengles
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = KnowledgeInfo.class)
+public class KnowledgeInfoVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @ExcelProperty(value = "主键ID")
+    private Long id;
+
+    /**
+     * 用户ID
+     */
+    @ExcelProperty(value = "用户ID")
+    private Long userId;
+
+    /**
+     * 知识库ID
+     */
+    @ExcelProperty(value = "知识库ID")
+    private String knowledgeId;
+
+    /**
+     * 知识库名称
+     */
+    @ExcelProperty(value = "知识库名称")
+    private String knowledgeName;
+
+    /**
+     * 是否公开知识库:0否,1是
+     */
+    @ExcelProperty(value = "是否公开知识库")
+    private Integer share;
+
+    /**
+     * 知识库描述
+     */
+    @ExcelProperty(value = "知识库描述")
+    private String description;
+
+    /**
+     * 知识库分隔符
+     */
+    @ExcelProperty(value = "知识库分隔符")
+    private String knowledgeSeparator;
+
+    /**
+     * 问题分隔符
+     */
+    @ExcelProperty(value = "问题分隔符")
+    private String questionSeparator;
+
+    /**
+     * 重叠字符数
+     */
+    @ExcelProperty(value = "重叠字符数")
+    private Integer overlapChar;
+
+    /**
+     * 检索限制
+     */
+    @ExcelProperty(value = "检索限制")
+    private Integer retrieveLimit;
+
+    /**
+     * 文本块大小
+     */
+    @ExcelProperty(value = "文本块大小")
+    private Integer textBlockSize;
+
+    /**
+     * 向量模型名称
+     */
+    @ExcelProperty(value = "向量模型名称")
+    private String vectorModelName;
+
+    /**
+     * 嵌入模型名称
+     */
+    @ExcelProperty(value = "嵌入模型名称")
+    private String embeddingModelName;
+
+    /**
+     * 系统提示词
+     */
+    @ExcelProperty(value = "系统提示词")
+    private String systemPrompt;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "创建时间")
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    @ExcelProperty(value = "更新时间")
+    private LocalDateTime updateTime;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/vo/KnowledgeJobVo.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/vo/KnowledgeJobVo.java
new file mode 100644
index 0000000..08456af
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/vo/KnowledgeJobVo.java
@@ -0,0 +1,170 @@
+package org.dromara.knowledge.domain.vo;
+
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.knowledge.domain.KnowledgeJob;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 知识库任务视图对象 knowledge_job
+ *
+ * @author pengles
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = KnowledgeJob.class)
+public class KnowledgeJobVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @ExcelProperty(value = "主键ID")
+    private Long id;
+
+    /**
+     * 任务ID
+     */
+    @ExcelProperty(value = "任务ID")
+    private String jobId;
+
+    /**
+     * 任务类型
+     */
+    @ExcelProperty(value = "任务类型")
+    private String jobType;
+
+    /**
+     * 任务子类型
+     */
+    @ExcelProperty(value = "任务子类型")
+    private String jobSubType;
+
+    /**
+     * 知识库ID
+     */
+    @ExcelProperty(value = "知识库ID")
+    private String knowledgeId;
+
+    /**
+     * 文档ID
+     */
+    @ExcelProperty(value = "文档ID")
+    private String docId;
+
+    /**
+     * 用户ID
+     */
+    @ExcelProperty(value = "用户ID")
+    private Long userId;
+
+    /**
+     * 任务状态
+     */
+    @ExcelProperty(value = "任务状态")
+    private Integer status;
+
+    /**
+     * 任务进度
+     */
+    @ExcelProperty(value = "任务进度")
+    private Integer progress;
+
+    /**
+     * 总项目数
+     */
+    @ExcelProperty(value = "总项目数")
+    private Integer totalItems;
+
+    /**
+     * 已处理项目数
+     */
+    @ExcelProperty(value = "已处理项目数")
+    private Integer processedItems;
+
+    /**
+     * 成功项目数
+     */
+    @ExcelProperty(value = "成功项目数")
+    private Integer successItems;
+
+    /**
+     * 失败项目数
+     */
+    @ExcelProperty(value = "失败项目数")
+    private Integer failedItems;
+
+    /**
+     * 任务优先级
+     */
+    @ExcelProperty(value = "任务优先级")
+    private Integer priority;
+
+    /**
+     * 重试次数
+     */
+    @ExcelProperty(value = "重试次数")
+    private Integer retryCount;
+
+    /**
+     * 最大重试次数
+     */
+    @ExcelProperty(value = "最大重试次数")
+    private Integer maxRetryCount;
+
+    /**
+     * 任务开始时间
+     */
+    @ExcelProperty(value = "任务开始时间")
+    private Date startTime;
+
+    /**
+     * 任务结束时间
+     */
+    @ExcelProperty(value = "任务结束时间")
+    private Date endTime;
+
+    /**
+     * 任务超时时间（秒）
+     */
+    @ExcelProperty(value = "任务超时时间")
+    private Integer timeout;
+
+    /**
+     * 错误信息
+     */
+    @ExcelProperty(value = "错误信息")
+    private String errorInfo;
+
+    /**
+     * 通知配置
+     */
+    @ExcelProperty(value = "通知配置")
+    private String notificationConfig;
+
+    /**
+     * 通知状态
+     */
+    @ExcelProperty(value = "通知状态")
+    private Integer notificationStatus;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "创建时间")
+    private Date createTime;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/vo/KnowledgePromptTemplateVo.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/vo/KnowledgePromptTemplateVo.java
new file mode 100644
index 0000000..35fef5c
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/vo/KnowledgePromptTemplateVo.java
@@ -0,0 +1,68 @@
+package org.dromara.knowledge.domain.vo;
+
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.knowledge.domain.KnowledgePromptTemplate;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * 知识库提示模板视图对象 knowledge_prompt_template
+ *
+ * @author pengles
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = KnowledgePromptTemplate.class)
+public class KnowledgePromptTemplateVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @ExcelProperty(value = "主键")
+    private Long id;
+
+    /**
+     * 提示词模板名称
+     */
+    @ExcelProperty(value = "提示词模板名称")
+    private String templateName;
+
+    /**
+     * 提示词模板内容
+     */
+    @ExcelProperty(value = "提示词模板内容")
+    private String templateContent;
+
+    /**
+     * 提示词分类:knowledge知识库类型,chat对话类型,draw绘画类型
+     */
+    @ExcelProperty(value = "提示词分类")
+    private String category;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "创建时间")
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    @ExcelProperty(value = "更新时间")
+    private LocalDateTime updateTime;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/vo/KnowledgeRoleGroupVo.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/vo/KnowledgeRoleGroupVo.java
new file mode 100644
index 0000000..40172e8
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/vo/KnowledgeRoleGroupVo.java
@@ -0,0 +1,77 @@
+package org.dromara.knowledge.domain.vo;
+
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import org.dromara.knowledge.domain.KnowledgeRoleGroup;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * 知识库角色分组视图对象 knowledge_role_group
+ *
+ * @author pengles
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = KnowledgeRoleGroup.class)
+public class KnowledgeRoleGroupVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @ExcelProperty(value = "主键ID")
+    private Long id;
+
+    /**
+     * 分组名称
+     */
+    @ExcelProperty(value = "分组名称")
+    private String groupName;
+
+    /**
+     * 分组编码
+     */
+    @ExcelProperty(value = "分组编码")
+    private String groupCode;
+
+    /**
+     * 分组描述
+     */
+    @ExcelProperty(value = "分组描述")
+    private String groupDesc;
+
+    /**
+     * 分组状态:0禁用,1启用
+     */
+    @ExcelProperty(value = "分组状态", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "sys_normal_disable")
+    private Integer status;
+
+    /**
+     * 排序
+     */
+    @ExcelProperty(value = "排序")
+    private Integer sort;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "创建时间")
+    private LocalDateTime createTime;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/vo/KnowledgeRoleRelationVo.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/vo/KnowledgeRoleRelationVo.java
new file mode 100644
index 0000000..abe16fb
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/vo/KnowledgeRoleRelationVo.java
@@ -0,0 +1,77 @@
+package org.dromara.knowledge.domain.vo;
+
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import org.dromara.knowledge.domain.KnowledgeRoleRelation;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * 知识库角色关系视图对象 knowledge_role_relation
+ *
+ * @author pengles
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = KnowledgeRoleRelation.class)
+public class KnowledgeRoleRelationVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @ExcelProperty(value = "主键ID")
+    private Long id;
+
+    /**
+     * 角色ID
+     */
+    @ExcelProperty(value = "角色ID")
+    private Long roleId;
+
+    /**
+     * 分组ID
+     */
+    @ExcelProperty(value = "分组ID")
+    private Long groupId;
+
+    /**
+     * 关系类型:1角色属于分组,2分组包含角色
+     */
+    @ExcelProperty(value = "关系类型")
+    private Integer relationType;
+
+    /**
+     * 关系状态:0禁用,1启用
+     */
+    @ExcelProperty(value = "关系状态", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "sys_normal_disable")
+    private Integer status;
+
+    /**
+     * 排序
+     */
+    @ExcelProperty(value = "排序")
+    private Integer sort;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "创建时间")
+    private LocalDateTime createTime;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/vo/KnowledgeRoleVo.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/vo/KnowledgeRoleVo.java
new file mode 100644
index 0000000..d5d9d7d
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/vo/KnowledgeRoleVo.java
@@ -0,0 +1,77 @@
+package org.dromara.knowledge.domain.vo;
+
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import org.dromara.knowledge.domain.KnowledgeRole;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * 知识库角色视图对象 knowledge_role
+ *
+ * @author pengles
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = KnowledgeRole.class)
+public class KnowledgeRoleVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @ExcelProperty(value = "主键ID")
+    private Long id;
+
+    /**
+     * 角色名称
+     */
+    @ExcelProperty(value = "角色名称")
+    private String roleName;
+
+    /**
+     * 角色编码
+     */
+    @ExcelProperty(value = "角色编码")
+    private String roleCode;
+
+    /**
+     * 角色描述
+     */
+    @ExcelProperty(value = "角色描述")
+    private String roleDesc;
+
+    /**
+     * 角色状态:0禁用,1启用
+     */
+    @ExcelProperty(value = "角色状态", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "sys_normal_disable")
+    private Integer status;
+
+    /**
+     * 排序
+     */
+    @ExcelProperty(value = "排序")
+    private Integer sort;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "创建时间")
+    private LocalDateTime createTime;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/vo/KnowledgeSchemaFieldVo.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/vo/KnowledgeSchemaFieldVo.java
new file mode 100644
index 0000000..d2831fa
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/vo/KnowledgeSchemaFieldVo.java
@@ -0,0 +1,170 @@
+package org.dromara.knowledge.domain.vo;
+
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.knowledge.domain.KnowledgeSchemaField;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * 知识库数据模型字段视图对象 knowledge_schema_field
+ *
+ * @author pengles
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = KnowledgeSchemaField.class)
+public class KnowledgeSchemaFieldVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @ExcelProperty(value = "主键")
+    private Long id;
+
+    /**
+     * 模型ID
+     */
+    @ExcelProperty(value = "模型ID")
+    private Long schemaId;
+
+    /**
+     * 模型名称
+     */
+    @ExcelProperty(value = "模型名称")
+    private String schemaName;
+
+    /**
+     * 字段名称
+     */
+    @ExcelProperty(value = "字段名称")
+    private String name;
+
+    /**
+     * 字段编码
+     */
+    @ExcelProperty(value = "字段编码")
+    private String code;
+
+    /**
+     * 字段类型
+     */
+    @ExcelProperty(value = "字段类型")
+    private String type;
+
+    /**
+     * 字段注释
+     */
+    @ExcelProperty(value = "字段注释")
+    private String comment;
+
+    /**
+     * 是否主键
+     */
+    @ExcelProperty(value = "是否主键")
+    private Integer isPk;
+
+    /**
+     * 是否必填
+     */
+    @ExcelProperty(value = "是否必填")
+    private Integer isRequired;
+
+    /**
+     * 是否唯一
+     */
+    @ExcelProperty(value = "是否唯一")
+    private Integer isUnique;
+
+    /**
+     * 默认值
+     */
+    @ExcelProperty(value = "默认值")
+    private String defaultValue;
+
+    /**
+     * 字段长度
+     */
+    @ExcelProperty(value = "字段长度")
+    private Integer length;
+
+    /**
+     * 小数位数
+     */
+    @ExcelProperty(value = "小数位数")
+    private Integer scale;
+
+    /**
+     * 是否列表显示
+     */
+    @ExcelProperty(value = "是否列表显示")
+    private Integer isList;
+
+    /**
+     * 是否查询字段
+     */
+    @ExcelProperty(value = "是否查询字段")
+    private Integer isQuery;
+
+    /**
+     * 是否插入字段
+     */
+    @ExcelProperty(value = "是否插入字段")
+    private Integer isInsert;
+
+    /**
+     * 是否编辑字段
+     */
+    @ExcelProperty(value = "是否编辑字段")
+    private Integer isEdit;
+
+    /**
+     * 查询方式
+     */
+    @ExcelProperty(value = "查询方式")
+    private String queryType;
+
+    /**
+     * 显示类型
+     */
+    @ExcelProperty(value = "显示类型")
+    private String htmlType;
+
+    /**
+     * 字典类型
+     */
+    @ExcelProperty(value = "字典类型")
+    private String dictType;
+
+    /**
+     * 排序
+     */
+    @ExcelProperty(value = "排序")
+    private Integer sort;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "创建时间")
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    @ExcelProperty(value = "更新时间")
+    private LocalDateTime updateTime;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/vo/KnowledgeSchemaGroupVo.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/vo/KnowledgeSchemaGroupVo.java
new file mode 100644
index 0000000..426471b
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/vo/KnowledgeSchemaGroupVo.java
@@ -0,0 +1,68 @@
+package org.dromara.knowledge.domain.vo;
+
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.knowledge.domain.KnowledgeSchemaGroup;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * 知识库数据模型分组视图对象 knowledge_schema_group
+ *
+ * @author pengles
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = KnowledgeSchemaGroup.class)
+public class KnowledgeSchemaGroupVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @ExcelProperty(value = "主键")
+    private Long id;
+
+    /**
+     * 分组名称
+     */
+    @ExcelProperty(value = "分组名称")
+    private String name;
+
+    /**
+     * 分组编码
+     */
+    @ExcelProperty(value = "分组编码")
+    private String code;
+
+    /**
+     * 图标
+     */
+    @ExcelProperty(value = "图标")
+    private String icon;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "创建时间")
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    @ExcelProperty(value = "更新时间")
+    private LocalDateTime updateTime;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/vo/KnowledgeSchemaVo.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/vo/KnowledgeSchemaVo.java
new file mode 100644
index 0000000..fd6a8de
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/vo/KnowledgeSchemaVo.java
@@ -0,0 +1,74 @@
+package org.dromara.knowledge.domain.vo;
+
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.knowledge.domain.KnowledgeSchema;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * 知识库数据模型视图对象 knowledge_schema
+ *
+ * @author pengles
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = KnowledgeSchema.class)
+public class KnowledgeSchemaVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @ExcelProperty(value = "主键")
+    private Long id;
+
+    /**
+     * 分组ID
+     */
+    @ExcelProperty(value = "分组ID")
+    private Long schemaGroupId;
+
+    /**
+     * 模型名称
+     */
+    @ExcelProperty(value = "模型名称")
+    private String name;
+
+    /**
+     * 模型编码
+     */
+    @ExcelProperty(value = "模型编码")
+    private String code;
+
+    /**
+     * 表名
+     */
+    @ExcelProperty(value = "表名")
+    private String tableName;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "创建时间")
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    @ExcelProperty(value = "更新时间")
+    private LocalDateTime updateTime;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/vo/KnowledgeSearchResultVo.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/vo/KnowledgeSearchResultVo.java
new file mode 100644
index 0000000..b8e4c61
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/vo/KnowledgeSearchResultVo.java
@@ -0,0 +1,73 @@
+package org.dromara.knowledge.domain.vo;
+
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * 知识库检索结果视图对象 knowledge_search_result
+ *
+ * @author pengles
+ */
+@Data
+@ExcelIgnoreUnannotated
+public class KnowledgeSearchResultVo implements Serializable {
+
+    /**
+     * 知识片段ID
+     */
+    @ExcelProperty(value = "知识片段ID")
+    private String fragmentId;
+
+    /**
+     * 文档ID
+     */
+    @ExcelProperty(value = "文档ID")
+    private String docId;
+
+    /**
+     * 文档名称
+     */
+    @ExcelProperty(value = "文档名称")
+    private String docName;
+
+    /**
+     * 知识片段内容
+     */
+    @ExcelProperty(value = "内容")
+    private String content;
+
+    /**
+     * 相似度分数
+     */
+    @ExcelProperty(value = "相似度分数")
+    private Double similarityScore;
+
+    /**
+     * 排名位置
+     */
+    @ExcelProperty(value = "排名")
+    private Integer ranking;
+
+    /**
+     * 片段索引
+     */
+    @ExcelProperty(value = "片段索引")
+    private Integer fragmentIndex;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "创建时间")
+    private LocalDateTime createTime;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/vo/KnowledgeStatusVo.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/vo/KnowledgeStatusVo.java
new file mode 100644
index 0000000..8cf028f
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/vo/KnowledgeStatusVo.java
@@ -0,0 +1,107 @@
+package org.dromara.knowledge.domain.vo;
+
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * 知识库状态视图对象 knowledge_status
+ *
+ * @author pengles
+ */
+@Data
+@ExcelIgnoreUnannotated
+public class KnowledgeStatusVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 知识库ID
+     */
+    @ExcelProperty(value = "知识库ID")
+    private String knowledgeId;
+
+    /**
+     * 知识库名称
+     */
+    @ExcelProperty(value = "知识库名称")
+    private String knowledgeName;
+
+    /**
+     * 文档总数
+     */
+    @ExcelProperty(value = "文档总数")
+    private Integer totalDocuments;
+
+    /**
+     * 已处理文档数
+     */
+    @ExcelProperty(value = "已处理文档数")
+    private Integer processedDocuments;
+
+    /**
+     * 知识片段总数
+     */
+    @ExcelProperty(value = "知识片段总数")
+    private Integer totalFragments;
+
+    /**
+     * 已向量化片段数
+     */
+    @ExcelProperty(value = "已向量化片段数")
+    private Integer vectorizedFragments;
+
+    /**
+     * 处理进度百分比
+     */
+    @ExcelProperty(value = "处理进度")
+    private Double progressPercentage;
+
+    /**
+     * 当前处理状态
+     */
+    @ExcelProperty(value = "处理状态")
+    private String processingStatus;
+
+    /**
+     * 正在进行的任务数
+     */
+    @ExcelProperty(value = "进行中任务数")
+    private Integer runningJobs;
+
+    /**
+     * 等待中的任务数
+     */
+    @ExcelProperty(value = "等待中任务数")
+    private Integer pendingJobs;
+
+    /**
+     * 失败的任务数
+     */
+    @ExcelProperty(value = "失败任务数")
+    private Integer failedJobs;
+
+    /**
+     * 最后更新时间
+     */
+    @ExcelProperty(value = "最后更新时间")
+    private LocalDateTime lastUpdateTime;
+
+    /**
+     * 错误信息
+     */
+    @ExcelProperty(value = "错误信息")
+    private String errorMessage;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/vo/KnowledgeVectorVo.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/vo/KnowledgeVectorVo.java
new file mode 100644
index 0000000..0ade238
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/domain/vo/KnowledgeVectorVo.java
@@ -0,0 +1,94 @@
+package org.dromara.knowledge.domain.vo;
+
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.knowledge.domain.KnowledgeVector;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 知识片段向量视图对象 knowledge_vector
+ *
+ * @author pengles
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = KnowledgeVector.class)
+public class KnowledgeVectorVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @ExcelProperty(value = "主键ID")
+    private Long id;
+
+    /**
+     * 知识库ID
+     */
+    @ExcelProperty(value = "知识库ID")
+    private String knowledgeId;
+
+    /**
+     * 文档ID
+     */
+    @ExcelProperty(value = "文档ID")
+    private String docId;
+
+    /**
+     * 知识片段ID
+     */
+    @ExcelProperty(value = "知识片段ID")
+    private String fragmentId;
+
+    /**
+     * 向量ID
+     */
+    @ExcelProperty(value = "向量ID")
+    private String vectorId;
+
+    /**
+     * 向量数据
+     */
+    @ExcelProperty(value = "向量数据")
+    private String vectorData;
+
+    /**
+     * 向量维度
+     */
+    @ExcelProperty(value = "向量维度")
+    private Integer dimension;
+
+    /**
+     * 模型名称
+     */
+    @ExcelProperty(value = "模型名称")
+    private String modelName;
+
+    /**
+     * 状态（0正常 1停用）
+     */
+    @ExcelProperty(value = "状态", converter = org.dromara.common.excel.convert.ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "sys_normal_disable")
+    private Integer status;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "创建时间")
+    private Date createTime;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/embedding/EmbeddingEngine.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/embedding/EmbeddingEngine.java
new file mode 100644
index 0000000..892c39d
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/embedding/EmbeddingEngine.java
@@ -0,0 +1,13 @@
+package org.dromara.knowledge.embedding;
+
+/**
+ * 嵌入引擎接口（已弃用，请使用 EmbeddingService）
+ * 
+ * @deprecated 请使用 {@link EmbeddingService} 接口
+ * @author pengles
+ */
+@Deprecated
+public interface EmbeddingEngine extends EmbeddingService {
+    // 此接口已弃用，所有实现应该使用 EmbeddingService 接口
+}
+
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/embedding/EmbeddingService.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/embedding/EmbeddingService.java
new file mode 100644
index 0000000..27fe056
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/embedding/EmbeddingService.java
@@ -0,0 +1,5 @@
+package org.dromara.knowledge.embedding;
+
+public interface EmbeddingService {
+    double[] embed(String text, String modelName);
+}
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/embedding/HttpEmbeddingService.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/embedding/HttpEmbeddingService.java
new file mode 100644
index 0000000..0a3a295
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/embedding/HttpEmbeddingService.java
@@ -0,0 +1,73 @@
+package org.dromara.knowledge.embedding;
+
+import okhttp3.*;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+import java.util.Objects;
+
+@Component
+public class HttpEmbeddingService implements EmbeddingService {
+
+    @Value("${ruoyi.ai.embedding.base-url:}")
+    private String baseUrl;
+
+    @Value("${ruoyi.ai.embedding.default-model:bge-large-zh}")
+    private String defaultModel;
+
+    private final OkHttpClient client = new OkHttpClient();
+    private static final int CACHE_MAX = 1024;
+    private final java.util.Map<String, double[]> cache = new java.util.LinkedHashMap<>(CACHE_MAX, 0.75f, true) {
+        @Override
+        protected boolean removeEldestEntry(java.util.Map.Entry<String, double[]> eldest) {
+            return size() > CACHE_MAX;
+        }
+    };
+
+    @Override
+    public double[] embed(String text, String modelName) {
+        String model = modelName != null && !modelName.isBlank() ? modelName : defaultModel;
+        if (baseUrl == null || baseUrl.isBlank()) {
+            return mock(text, model);
+        }
+        try {
+            String key = model + "|" + Integer.toHexString(text.hashCode());
+            double[] cached = cache.get(key);
+            if (cached != null) return cached;
+            String payload = "{\"model\":\"" + model + "\",\"input\":\"" + text.replace("\"", "\\\"") + "\"}";
+            Request req = new Request.Builder()
+                    .url(baseUrl + "/embeddings")
+                    .post(RequestBody.create(MediaType.parse("application/json"), payload))
+                    .build();
+            try (Response resp = client.newCall(req).execute()) {
+                String body = Objects.requireNonNull(resp.body()).string();
+                String arr = body.replaceAll("[^\\d\\.,-]", "");
+                String[] parts = arr.split(",");
+                double[] v = new double[parts.length];
+                for (int i = 0; i < parts.length; i++) {
+                    v[i] = Double.parseDouble(parts[i]);
+                }
+                cache.put(key, v);
+                return v;
+            }
+        } catch (Exception e) {
+            return mock(text, model);
+        }
+    }
+
+    private double[] mock(String text, String model) {
+        int dim = switch (model) {
+            case "bge-large-zh" -> 1024;
+            case "bge-base-zh" -> 768;
+            default -> 768;
+        };
+        double[] v = new double[dim];
+        java.util.Random r = new java.util.Random(text.hashCode());
+        for (int i = 0; i < dim; i++) v[i] = r.nextGaussian();
+        double norm = 0;
+        for (double x : v) norm += x * x;
+        norm = Math.sqrt(norm);
+        for (int i = 0; i < v.length; i++) v[i] /= norm;
+        return v;
+    }
+}
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/generation/DefaultGenerator.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/generation/DefaultGenerator.java
new file mode 100644
index 0000000..7895c3b
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/generation/DefaultGenerator.java
@@ -0,0 +1,97 @@
+package org.dromara.knowledge.generation;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.exception.ServiceException;
+import org.springframework.stereotype.Component;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 默认响应生成器实现
+ * 基于检索到的上下文和查询生成响应
+ *
+ * @author pengles
+ */
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class DefaultGenerator implements Generator {
+
+    @Override
+    public String generate(String query, String context, Map<String, Object> options) {
+        if (query == null || query.trim().isEmpty()) {
+            throw new ServiceException("查询内容不能为空");
+        }
+
+        // 构建提示词
+        String prompt = buildPrompt(query, context, options);
+
+        // 这里可以根据 options 中的配置选择不同的生成策略
+        // 例如：调用 LLM API、使用模板生成等
+        // 当前实现为简单拼接，实际应用中应该调用 LLM 服务
+
+        log.debug("生成响应，查询: {}, 上下文长度: {}", query, context != null ? context.length() : 0);
+
+        // 简单的模板生成（实际应该调用 LLM）
+        return generateSimpleResponse(query, context);
+    }
+
+    /**
+     * 构建提示词
+     */
+    private String buildPrompt(String query, String context, Map<String, Object> options) {
+        StringBuilder promptBuilder = new StringBuilder();
+
+        // 系统提示
+        String systemPrompt = getOption(options, "systemPrompt", 
+            "你是一个知识库助手，基于提供的上下文回答问题。如果上下文中没有相关信息，请说明。");
+        promptBuilder.append(systemPrompt).append("\n\n");
+
+        // 上下文
+        if (context != null && !context.trim().isEmpty()) {
+            promptBuilder.append("上下文：\n").append(context).append("\n\n");
+        }
+
+        // 查询
+        promptBuilder.append("问题：").append(query).append("\n\n");
+        promptBuilder.append("回答：");
+
+        return promptBuilder.toString();
+    }
+
+    /**
+     * 简单响应生成（占位实现）
+     * 实际应用中应该调用 LLM API
+     */
+    private String generateSimpleResponse(String query, String context) {
+        if (context == null || context.trim().isEmpty()) {
+            return "抱歉，我无法在知识库中找到相关信息来回答您的问题。";
+        }
+
+        // 简单的摘要生成（实际应该使用 LLM）
+        // 这里只是占位实现，实际应该调用 LLM 服务
+        return String.format("基于提供的上下文，相关内容如下：\n\n%s\n\n这是对您问题 '%s' 的回答。", 
+            context.substring(0, Math.min(context.length(), 500)), query);
+    }
+
+    /**
+     * 从选项 Map 中获取值
+     */
+    @SuppressWarnings("unchecked")
+    private <T> T getOption(Map<String, Object> options, String key, T defaultValue) {
+        if (options == null) {
+            return defaultValue;
+        }
+        Object value = options.get(key);
+        return value != null ? (T) value : defaultValue;
+    }
+
+    /**
+     * 生成响应（带默认选项）
+     */
+    public String generate(String query, String context) {
+        return generate(query, context, new HashMap<>());
+    }
+}
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/generation/Generator.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/generation/Generator.java
new file mode 100644
index 0000000..87405a0
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/generation/Generator.java
@@ -0,0 +1,8 @@
+package org.dromara.knowledge.generation;
+
+import java.util.Map;
+
+public interface Generator {
+    String generate(String query, String context, Map<String, Object> options);
+}
+
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/mapper/KnowledgeAttachMapper.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/mapper/KnowledgeAttachMapper.java
new file mode 100644
index 0000000..c913edc
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/mapper/KnowledgeAttachMapper.java
@@ -0,0 +1,14 @@
+package org.dromara.knowledge.mapper;
+
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.knowledge.domain.KnowledgeAttach;
+import org.dromara.knowledge.domain.vo.KnowledgeAttachVo;
+
+/**
+ * 知识库附件Mapper接口
+ *
+ * @author pengles
+ */
+public interface KnowledgeAttachMapper extends BaseMapperPlus<KnowledgeAttach, KnowledgeAttachVo> {
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/mapper/KnowledgeFragmentMapper.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/mapper/KnowledgeFragmentMapper.java
new file mode 100644
index 0000000..796217b
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/mapper/KnowledgeFragmentMapper.java
@@ -0,0 +1,14 @@
+package org.dromara.knowledge.mapper;
+
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.knowledge.domain.KnowledgeFragment;
+import org.dromara.knowledge.domain.vo.KnowledgeFragmentVo;
+
+/**
+ * 知识库片段Mapper接口
+ *
+ * @author pengles
+ */
+public interface KnowledgeFragmentMapper extends BaseMapperPlus<KnowledgeFragment, KnowledgeFragmentVo> {
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/mapper/KnowledgeHitLogMapper.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/mapper/KnowledgeHitLogMapper.java
new file mode 100644
index 0000000..703f627
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/mapper/KnowledgeHitLogMapper.java
@@ -0,0 +1,14 @@
+package org.dromara.knowledge.mapper;
+
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.knowledge.domain.KnowledgeHitLog;
+import org.dromara.knowledge.domain.vo.KnowledgeHitLogVo;
+
+/**
+ * 知识库命中日志Mapper接口
+ *
+ * @author pengles
+ */
+public interface KnowledgeHitLogMapper extends BaseMapperPlus<KnowledgeHitLog, KnowledgeHitLogVo> {
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/mapper/KnowledgeInfoMapper.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/mapper/KnowledgeInfoMapper.java
new file mode 100644
index 0000000..1288684
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/mapper/KnowledgeInfoMapper.java
@@ -0,0 +1,14 @@
+package org.dromara.knowledge.mapper;
+
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.knowledge.domain.KnowledgeInfo;
+import org.dromara.knowledge.domain.vo.KnowledgeInfoVo;
+
+/**
+ * 知识库信息Mapper接口
+ *
+ * @author pengles
+ */
+public interface KnowledgeInfoMapper extends BaseMapperPlus<KnowledgeInfo, KnowledgeInfoVo> {
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/mapper/KnowledgeJobMapper.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/mapper/KnowledgeJobMapper.java
new file mode 100644
index 0000000..b29a098
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/mapper/KnowledgeJobMapper.java
@@ -0,0 +1,14 @@
+package org.dromara.knowledge.mapper;
+
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.knowledge.domain.KnowledgeJob;
+import org.dromara.knowledge.domain.vo.KnowledgeJobVo;
+
+/**
+ * 知识库任务Mapper接口
+ *
+ * @author pengles
+ */
+public interface KnowledgeJobMapper extends BaseMapperPlus<KnowledgeJob, KnowledgeJobVo> {
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/mapper/KnowledgePromptTemplateMapper.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/mapper/KnowledgePromptTemplateMapper.java
new file mode 100644
index 0000000..e07fcbc
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/mapper/KnowledgePromptTemplateMapper.java
@@ -0,0 +1,14 @@
+package org.dromara.knowledge.mapper;
+
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.knowledge.domain.KnowledgePromptTemplate;
+import org.dromara.knowledge.domain.vo.KnowledgePromptTemplateVo;
+
+/**
+ * 知识库提示模板Mapper接口
+ *
+ * @author pengles
+ */
+public interface KnowledgePromptTemplateMapper extends BaseMapperPlus<KnowledgePromptTemplate, KnowledgePromptTemplateVo> {
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/mapper/KnowledgeRoleGroupMapper.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/mapper/KnowledgeRoleGroupMapper.java
new file mode 100644
index 0000000..df0a855
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/mapper/KnowledgeRoleGroupMapper.java
@@ -0,0 +1,14 @@
+package org.dromara.knowledge.mapper;
+
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.knowledge.domain.KnowledgeRoleGroup;
+import org.dromara.knowledge.domain.vo.KnowledgeRoleGroupVo;
+
+/**
+ * 知识库角色分组Mapper接口
+ *
+ * @author pengles
+ */
+public interface KnowledgeRoleGroupMapper extends BaseMapperPlus<KnowledgeRoleGroup, KnowledgeRoleGroupVo> {
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/mapper/KnowledgeRoleMapper.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/mapper/KnowledgeRoleMapper.java
new file mode 100644
index 0000000..55c5ef1
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/mapper/KnowledgeRoleMapper.java
@@ -0,0 +1,14 @@
+package org.dromara.knowledge.mapper;
+
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.knowledge.domain.KnowledgeRole;
+import org.dromara.knowledge.domain.vo.KnowledgeRoleVo;
+
+/**
+ * 知识库角色Mapper接口
+ *
+ * @author pengles
+ */
+public interface KnowledgeRoleMapper extends BaseMapperPlus<KnowledgeRole, KnowledgeRoleVo> {
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/mapper/KnowledgeRoleRelationMapper.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/mapper/KnowledgeRoleRelationMapper.java
new file mode 100644
index 0000000..a2f2f5d
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/mapper/KnowledgeRoleRelationMapper.java
@@ -0,0 +1,14 @@
+package org.dromara.knowledge.mapper;
+
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.knowledge.domain.KnowledgeRoleRelation;
+import org.dromara.knowledge.domain.vo.KnowledgeRoleRelationVo;
+
+/**
+ * 知识库角色关系Mapper接口
+ *
+ * @author pengles
+ */
+public interface KnowledgeRoleRelationMapper extends BaseMapperPlus<KnowledgeRoleRelation, KnowledgeRoleRelationVo> {
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/mapper/KnowledgeSchemaFieldMapper.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/mapper/KnowledgeSchemaFieldMapper.java
new file mode 100644
index 0000000..101699d
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/mapper/KnowledgeSchemaFieldMapper.java
@@ -0,0 +1,14 @@
+package org.dromara.knowledge.mapper;
+
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.knowledge.domain.KnowledgeSchemaField;
+import org.dromara.knowledge.domain.vo.KnowledgeSchemaFieldVo;
+
+/**
+ * 知识库数据模型字段Mapper接口
+ *
+ * @author pengles
+ */
+public interface KnowledgeSchemaFieldMapper extends BaseMapperPlus<KnowledgeSchemaField, KnowledgeSchemaFieldVo> {
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/mapper/KnowledgeSchemaGroupMapper.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/mapper/KnowledgeSchemaGroupMapper.java
new file mode 100644
index 0000000..472e8d5
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/mapper/KnowledgeSchemaGroupMapper.java
@@ -0,0 +1,14 @@
+package org.dromara.knowledge.mapper;
+
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.knowledge.domain.KnowledgeSchemaGroup;
+import org.dromara.knowledge.domain.vo.KnowledgeSchemaGroupVo;
+
+/**
+ * 知识库数据模型分组Mapper接口
+ *
+ * @author pengles
+ */
+public interface KnowledgeSchemaGroupMapper extends BaseMapperPlus<KnowledgeSchemaGroup, KnowledgeSchemaGroupVo> {
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/mapper/KnowledgeSchemaMapper.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/mapper/KnowledgeSchemaMapper.java
new file mode 100644
index 0000000..c7f1df3
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/mapper/KnowledgeSchemaMapper.java
@@ -0,0 +1,14 @@
+package org.dromara.knowledge.mapper;
+
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.knowledge.domain.KnowledgeSchema;
+import org.dromara.knowledge.domain.vo.KnowledgeSchemaVo;
+
+/**
+ * 知识库数据模型Mapper接口
+ *
+ * @author pengles
+ */
+public interface KnowledgeSchemaMapper extends BaseMapperPlus<KnowledgeSchema, KnowledgeSchemaVo> {
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/mapper/KnowledgeVectorMapper.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/mapper/KnowledgeVectorMapper.java
new file mode 100644
index 0000000..abcad56
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/mapper/KnowledgeVectorMapper.java
@@ -0,0 +1,14 @@
+package org.dromara.knowledge.mapper;
+
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.knowledge.domain.KnowledgeVector;
+import org.dromara.knowledge.domain.vo.KnowledgeVectorVo;
+
+/**
+ * 知识片段向量Mapper接口
+ *
+ * @author pengles
+ */
+public interface KnowledgeVectorMapper extends BaseMapperPlus<KnowledgeVector, KnowledgeVectorVo> {
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/retrieval/DefaultIndexUpdater.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/retrieval/DefaultIndexUpdater.java
new file mode 100644
index 0000000..6f48c84
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/retrieval/DefaultIndexUpdater.java
@@ -0,0 +1,19 @@
+package org.dromara.knowledge.retrieval;
+
+import lombok.RequiredArgsConstructor;
+import org.dromara.knowledge.service.KnowledgeDocumentService;
+import org.springframework.stereotype.Component;
+
+@Component
+@RequiredArgsConstructor
+public class DefaultIndexUpdater implements IndexUpdater {
+    private final KnowledgeDocumentService knowledgeDocumentService;
+
+    @Override
+    public String updateFragments(String knowledgeId, String docId) {
+        // 触发分片重建，依赖 KnowledgeDocumentService 的分片逻辑
+        // 返回任务ID用于追踪
+        return knowledgeDocumentService.processDocumentContent(knowledgeId, docId, "", null);
+    }
+}
+
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/retrieval/DefaultRetriever.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/retrieval/DefaultRetriever.java
new file mode 100644
index 0000000..47426ad
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/retrieval/DefaultRetriever.java
@@ -0,0 +1,20 @@
+package org.dromara.knowledge.retrieval;
+
+import lombok.RequiredArgsConstructor;
+import org.dromara.knowledge.domain.vo.KnowledgeSearchResultVo;
+import org.dromara.knowledge.service.KnowledgeVectorService;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+@Component
+@RequiredArgsConstructor
+public class DefaultRetriever implements Retriever {
+    private final KnowledgeVectorService knowledgeVectorService;
+
+    @Override
+    public List<KnowledgeSearchResultVo> search(String knowledgeId, String query, String model, int topK, double threshold) {
+        return knowledgeVectorService.vectorSimilaritySearch(knowledgeId, query, model, topK, threshold);
+    }
+}
+
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/retrieval/IndexUpdater.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/retrieval/IndexUpdater.java
new file mode 100644
index 0000000..d3afbc8
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/retrieval/IndexUpdater.java
@@ -0,0 +1,6 @@
+package org.dromara.knowledge.retrieval;
+
+public interface IndexUpdater {
+    String updateFragments(String knowledgeId, String docId);
+}
+
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/retrieval/Retriever.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/retrieval/Retriever.java
new file mode 100644
index 0000000..010832a
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/retrieval/Retriever.java
@@ -0,0 +1,10 @@
+package org.dromara.knowledge.retrieval;
+
+import org.dromara.knowledge.domain.vo.KnowledgeSearchResultVo;
+
+import java.util.List;
+
+public interface Retriever {
+    List<KnowledgeSearchResultVo> search(String knowledgeId, String query, String model, int topK, double threshold);
+}
+
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/service/KnowledgeAttachService.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/service/KnowledgeAttachService.java
new file mode 100644
index 0000000..e9ff940
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/service/KnowledgeAttachService.java
@@ -0,0 +1,59 @@
+package org.dromara.knowledge.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.knowledge.domain.KnowledgeAttach;
+import org.dromara.knowledge.domain.bo.KnowledgeAttachBo;
+import org.dromara.knowledge.domain.vo.KnowledgeAttachVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 知识库附件Service接口
+ *
+ * @author pengles
+ */
+public interface KnowledgeAttachService extends IService<KnowledgeAttach> {
+
+    /**
+     * 查询知识库附件
+     */
+    KnowledgeAttachVo queryById(Long id);
+
+    /**
+     * 查询知识库附件列表
+     */
+    TableDataInfo<KnowledgeAttachVo> queryPageList(KnowledgeAttachBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询知识库附件列表
+     */
+    List<KnowledgeAttachVo> queryList(KnowledgeAttachBo bo);
+
+    /**
+     * 新增知识库附件
+     */
+    Boolean insertByBo(KnowledgeAttachBo bo);
+
+    /**
+     * 修改知识库附件
+     */
+    Boolean updateByBo(KnowledgeAttachBo bo);
+
+    /**
+     * 校验并批量删除知识库附件
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    /**
+     * 根据知识库ID查询附件列表
+     */
+    List<KnowledgeAttachVo> queryListByKnowledgeId(String knowledgeId);
+
+    /**
+     * 根据文档ID查询附件信息
+     */
+    KnowledgeAttachVo queryByDocId(String docId);
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/service/KnowledgeDocumentService.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/service/KnowledgeDocumentService.java
new file mode 100644
index 0000000..e69db09
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/service/KnowledgeDocumentService.java
@@ -0,0 +1,97 @@
+package org.dromara.knowledge.service;
+
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+
+/**
+ * 知识库文档处理Service接口
+ *
+ * @author pengles
+ */
+public interface KnowledgeDocumentService {
+
+    /**
+     * 处理上传的文档
+     *
+     * @param knowledgeId 知识库ID
+     * @param file        上传的文件
+     * @return 文档ID
+     */
+    String processUploadedDocument(String knowledgeId, MultipartFile file);
+
+    /**
+     * 将文档内容分割成知识片段
+     *
+     * @param knowledgeId 知识库ID
+     * @param docId       文档ID
+     * @param content     文档内容
+     * @param chunkSize   分片大小
+     * @param overlapSize 重叠大小
+     * @return 知识片段ID列表
+     */
+    List<String> splitDocumentIntoFragments(String knowledgeId, String docId, String content,
+                                            Integer chunkSize, Integer overlapSize);
+
+    /**
+     * 提取文档文本内容
+     *
+     * @param file 文件
+     * @return 文本内容
+     */
+    String extractTextContent(MultipartFile file);
+
+    /**
+     * 清理和预处理文本内容
+     *
+     * @param content 原始内容
+     * @return 清理后的内容
+     */
+    String cleanTextContent(String content);
+
+    /**
+     * 验证文件类型是否支持
+     *
+     * @param file 文件
+     * @return 是否支持
+     */
+    boolean isSupportedFileType(MultipartFile file);
+
+    /**
+     * 获取支持的文件类型列表
+     *
+     * @return 支持的文件类型列表
+     */
+    List<String> getSupportedFileTypes();
+
+    /**
+     * 获取知识库处理状态
+     *
+     * @param knowledgeId   知识库ID
+     * @param knowledgeInfo 知识库信息
+     * @return 知识库状态信息
+     */
+    org.dromara.knowledge.domain.vo.KnowledgeStatusVo getKnowledgeProcessingStatus(Long knowledgeId, org.dromara.knowledge.domain.vo.KnowledgeInfoVo knowledgeInfo);
+
+    /**
+     * 处理文档内容并生成知识片段
+     *
+     * @param knowledgeId   知识库ID
+     * @param docId         文档ID
+     * @param content       文档内容
+     * @param knowledgeInfo 知识库信息
+     * @return 处理任务ID
+     */
+    String processDocumentContent(String knowledgeId, String docId, String content, org.dromara.knowledge.domain.KnowledgeInfo knowledgeInfo);
+
+    /**
+     * 对知识片段进行向量化
+     *
+     * @param knowledgeId   知识库ID
+     * @param fragmentId    知识片段ID
+     * @param knowledgeInfo 知识库信息
+     * @return 向量化任务ID
+     */
+    String vectorizeKnowledgeFragment(String knowledgeId, String fragmentId, org.dromara.knowledge.domain.KnowledgeInfo knowledgeInfo);
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/service/KnowledgeFragmentService.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/service/KnowledgeFragmentService.java
new file mode 100644
index 0000000..d30134d
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/service/KnowledgeFragmentService.java
@@ -0,0 +1,64 @@
+package org.dromara.knowledge.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.knowledge.domain.KnowledgeFragment;
+import org.dromara.knowledge.domain.bo.KnowledgeFragmentBo;
+import org.dromara.knowledge.domain.vo.KnowledgeFragmentVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 知识库片段Service接口
+ *
+ * @author pengles
+ */
+public interface KnowledgeFragmentService extends IService<KnowledgeFragment> {
+
+    /**
+     * 查询知识库片段
+     */
+    KnowledgeFragmentVo queryById(Long id);
+
+    /**
+     * 查询知识库片段列表
+     */
+    TableDataInfo<KnowledgeFragmentVo> queryPageList(KnowledgeFragmentBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询知识库片段列表
+     */
+    List<KnowledgeFragmentVo> queryList(KnowledgeFragmentBo bo);
+
+    /**
+     * 新增知识库片段
+     */
+    Boolean insertByBo(KnowledgeFragmentBo bo);
+
+    /**
+     * 修改知识库片段
+     */
+    Boolean updateByBo(KnowledgeFragmentBo bo);
+
+    /**
+     * 校验并批量删除知识库片段
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    /**
+     * 根据知识库ID查询片段列表
+     */
+    List<KnowledgeFragmentVo> queryListByKnowledgeId(Long knowledgeId);
+
+    /**
+     * 根据文档ID查询片段列表
+     */
+    List<KnowledgeFragmentVo> queryListByDocId(String docId);
+
+    /**
+     * 根据片段ID查询片段信息
+     */
+    KnowledgeFragmentVo queryByFid(String fid);
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/service/KnowledgeHitLogService.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/service/KnowledgeHitLogService.java
new file mode 100644
index 0000000..4f3afe5
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/service/KnowledgeHitLogService.java
@@ -0,0 +1,126 @@
+package org.dromara.knowledge.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.knowledge.domain.KnowledgeHitLog;
+import org.dromara.knowledge.domain.bo.KnowledgeHitLogBo;
+import org.dromara.knowledge.domain.vo.KnowledgeHitLogVo;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 知识库命中日志Service接口
+ *
+ * @author pengles
+ */
+public interface KnowledgeHitLogService extends IService<KnowledgeHitLog> {
+
+    /**
+     * 查询知识库命中日志
+     */
+    KnowledgeHitLogVo queryById(Long id);
+
+    /**
+     * 查询知识库命中日志列表
+     */
+    TableDataInfo<KnowledgeHitLogVo> queryPageList(KnowledgeHitLogBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询知识库命中日志列表
+     */
+    List<KnowledgeHitLogVo> queryList(KnowledgeHitLogBo bo);
+
+    /**
+     * 新增知识库命中日志
+     */
+    Boolean insertByBo(KnowledgeHitLogBo bo);
+
+    /**
+     * 修改知识库命中日志
+     */
+    Boolean updateByBo(KnowledgeHitLogBo bo);
+
+    /**
+     * 校验并批量删除知识库命中日志信息
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    /**
+     * 根据会话ID查询知识库命中日志列表
+     */
+    List<KnowledgeHitLogVo> queryBySessionId(String sessionId);
+
+    /**
+     * 根据知识库ID查询知识库命中日志列表
+     */
+    List<KnowledgeHitLogVo> queryByKnowledgeId(String knowledgeId);
+
+    /**
+     * 根据文档ID查询知识库命中日志列表
+     */
+    List<KnowledgeHitLogVo> queryByDocId(String docId);
+
+    /**
+     * 根据知识片段ID查询知识库命中日志列表
+     */
+    List<KnowledgeHitLogVo> queryByFragmentId(String fragmentId);
+
+    /**
+     * 根据模型名称查询知识库命中日志列表
+     */
+    List<KnowledgeHitLogVo> queryByModelName(String modelName);
+
+    /**
+     * 根据相似度分数范围查询知识库命中日志列表
+     */
+    List<KnowledgeHitLogVo> queryBySimilarityRange(Double minScore, Double maxScore);
+
+    /**
+     * 根据查询文本查询知识库命中日志列表
+     */
+    List<KnowledgeHitLogVo> queryByQueryText(String queryText);
+
+    /**
+     * 统计知识库命中次数
+     */
+    Long countHitsByKnowledgeId(String knowledgeId);
+
+    /**
+     * 统计文档命中次数
+     */
+    Long countHitsByDocId(String docId);
+
+    /**
+     * 统计知识片段命中次数
+     */
+    Long countHitsByFragmentId(String fragmentId);
+
+    /**
+     * 获取热门查询列表
+     */
+    List<Map<String, Object>> getPopularQueries(String knowledgeId, Integer limit);
+
+    /**
+     * 获取平均响应时间
+     */
+    Double getAverageResponseTime(String knowledgeId);
+
+    /**
+     * 根据排名查询知识库命中日志列表
+     */
+    List<KnowledgeHitLogVo> queryByRanking(Integer ranking);
+
+    /**
+     * 根据响应时间范围查询知识库命中日志列表
+     */
+    List<KnowledgeHitLogVo> queryByResponseTimeRange(Long minTime, Long maxTime);
+
+    /**
+     * 批量插入知识库命中日志
+     */
+    Boolean batchInsert(List<KnowledgeHitLogBo> boList);
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/service/KnowledgeInfoService.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/service/KnowledgeInfoService.java
new file mode 100644
index 0000000..ae8b298
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/service/KnowledgeInfoService.java
@@ -0,0 +1,117 @@
+package org.dromara.knowledge.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.knowledge.domain.KnowledgeInfo;
+import org.dromara.knowledge.domain.bo.KnowledgeInfoBo;
+import org.dromara.knowledge.domain.vo.KnowledgeInfoVo;
+import org.dromara.knowledge.domain.vo.KnowledgeSearchResultVo;
+import org.dromara.knowledge.domain.vo.KnowledgeStatusVo;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 知识库信息Service接口
+ *
+ * @author pengles
+ */
+public interface KnowledgeInfoService extends IService<KnowledgeInfo> {
+
+    /**
+     * 查询知识库信息
+     */
+    KnowledgeInfoVo queryById(Long id);
+
+    /**
+     * 查询知识库信息列表
+     */
+    TableDataInfo<KnowledgeInfoVo> queryPageList(KnowledgeInfoBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询知识库信息列表
+     */
+    List<KnowledgeInfoVo> queryList(KnowledgeInfoBo bo);
+
+    /**
+     * 新增知识库信息
+     */
+    Boolean insertByBo(KnowledgeInfoBo bo);
+
+    /**
+     * 修改知识库信息
+     */
+    Boolean updateByBo(KnowledgeInfoBo bo);
+
+    /**
+     * 校验并批量删除知识库信息
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    /**
+     * 根据用户ID查询知识库列表
+     */
+    List<KnowledgeInfoVo> queryListByUserId(Long userId);
+
+    /**
+     * 根据知识库ID查询知识库信息
+     */
+    KnowledgeInfoVo queryByKnowledgeId(Long knowledgeId);
+
+    /**
+     * 上传文档到知识库
+     *
+     * @param knowledgeId 知识库ID
+     * @param file        上传的文件
+     * @return 文档ID
+     */
+    String uploadDocument(String knowledgeId, MultipartFile file);
+
+    /**
+     * 批量上传文档到知识库
+     *
+     * @param knowledgeId 知识库ID
+     * @param files       上传的文件列表
+     * @return 文档ID列表
+     */
+    List<String> batchUploadDocuments(String knowledgeId, MultipartFile[] files);
+
+    /**
+     * 检索知识库
+     *
+     * @param knowledgeId 知识库ID
+     * @param query       查询文本
+     * @param limit       返回结果数量限制
+     * @return 检索结果列表
+     */
+    List<KnowledgeSearchResultVo> searchKnowledge(String knowledgeId, String query, Integer limit);
+
+    /**
+     * 获取知识库处理状态
+     *
+     * @param knowledgeId 知识库ID
+     * @return 知识库状态信息
+     */
+    KnowledgeStatusVo getKnowledgeStatus(String knowledgeId);
+
+    /**
+     * 处理文档并生成知识片段
+     *
+     * @param knowledgeId 知识库ID
+     * @param docId       文档ID
+     * @param content     文档内容
+     * @return 处理任务ID
+     */
+    String processDocument(String knowledgeId, String docId, String content);
+
+    /**
+     * 对知识片段进行向量化
+     *
+     * @param knowledgeId 知识库ID
+     * @param fragmentId  知识片段ID
+     * @return 向量化任务ID
+     */
+    String vectorizeFragment(String knowledgeId, String fragmentId);
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/service/KnowledgeJobService.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/service/KnowledgeJobService.java
new file mode 100644
index 0000000..2d05c7a
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/service/KnowledgeJobService.java
@@ -0,0 +1,125 @@
+package org.dromara.knowledge.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.knowledge.domain.KnowledgeJob;
+import org.dromara.knowledge.domain.bo.KnowledgeJobBo;
+import org.dromara.knowledge.domain.vo.KnowledgeJobVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 知识库任务Service接口
+ *
+ * @author pengles
+ */
+public interface KnowledgeJobService extends IService<KnowledgeJob> {
+
+    /**
+     * 查询知识库任务
+     */
+    KnowledgeJobVo queryById(Long id);
+
+    /**
+     * 查询知识库任务列表
+     */
+    TableDataInfo<KnowledgeJobVo> queryPageList(KnowledgeJobBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询知识库任务列表
+     */
+    List<KnowledgeJobVo> queryList(KnowledgeJobBo bo);
+
+    /**
+     * 新增知识库任务
+     */
+    Boolean insertByBo(KnowledgeJobBo bo);
+
+    /**
+     * 修改知识库任务
+     */
+    Boolean updateByBo(KnowledgeJobBo bo);
+
+    /**
+     * 校验并批量删除知识库任务信息
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    /**
+     * 根据任务ID查询知识库任务
+     */
+    KnowledgeJobVo queryByJobId(String jobId);
+
+    /**
+     * 根据知识库ID查询知识库任务列表
+     */
+    List<KnowledgeJobVo> queryByKnowledgeId(String knowledgeId);
+
+    /**
+     * 根据文档ID查询知识库任务列表
+     */
+    List<KnowledgeJobVo> queryByDocId(String docId);
+
+    /**
+     * 根据用户ID查询知识库任务列表
+     */
+    List<KnowledgeJobVo> queryByUserId(Long userId);
+
+    /**
+     * 根据任务类型查询知识库任务列表
+     */
+    List<KnowledgeJobVo> queryByJobType(String jobType);
+
+    /**
+     * 根据任务状态查询知识库任务列表
+     */
+    List<KnowledgeJobVo> queryByStatus(Integer status);
+
+    /**
+     * 查询正在运行的任务列表
+     */
+    List<KnowledgeJobVo> queryRunningJobs();
+
+    /**
+     * 查询待处理的任务列表
+     */
+    List<KnowledgeJobVo> queryPendingJobs();
+
+    /**
+     * 查询失败的任务列表
+     */
+    List<KnowledgeJobVo> queryFailedJobs();
+
+    /**
+     * 更新任务进度
+     */
+    Boolean updateProgress(Long id, Integer progress);
+
+    /**
+     * 更新任务状态
+     */
+    Boolean updateStatus(Long id, Integer status);
+
+    /**
+     * 增加重试次数
+     */
+    Boolean incrementRetryCount(Long id);
+
+    /**
+     * 更新任务项目计数
+     */
+    Boolean updateItemCounts(Long id, Integer totalItems, Integer processedItems, Integer successItems, Integer failedItems);
+
+    /**
+     * 根据优先级查询任务列表
+     */
+    List<KnowledgeJobVo> queryByPriority(Integer priority);
+
+    /**
+     * 查询超时的任务列表
+     */
+    List<KnowledgeJobVo> queryTimeoutJobs();
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/service/KnowledgePromptTemplateService.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/service/KnowledgePromptTemplateService.java
new file mode 100644
index 0000000..f8366c9
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/service/KnowledgePromptTemplateService.java
@@ -0,0 +1,59 @@
+package org.dromara.knowledge.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.knowledge.domain.KnowledgePromptTemplate;
+import org.dromara.knowledge.domain.bo.KnowledgePromptTemplateBo;
+import org.dromara.knowledge.domain.vo.KnowledgePromptTemplateVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 知识库提示模板Service接口
+ *
+ * @author pengles
+ */
+public interface KnowledgePromptTemplateService extends IService<KnowledgePromptTemplate> {
+
+    /**
+     * 查询知识库提示模板
+     */
+    KnowledgePromptTemplateVo queryById(Long id);
+
+    /**
+     * 查询知识库提示模板列表
+     */
+    TableDataInfo<KnowledgePromptTemplateVo> queryPageList(KnowledgePromptTemplateBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询知识库提示模板列表
+     */
+    List<KnowledgePromptTemplateVo> queryList(KnowledgePromptTemplateBo bo);
+
+    /**
+     * 新增知识库提示模板
+     */
+    Boolean insertByBo(KnowledgePromptTemplateBo bo);
+
+    /**
+     * 修改知识库提示模板
+     */
+    Boolean updateByBo(KnowledgePromptTemplateBo bo);
+
+    /**
+     * 校验并批量删除知识库提示模板
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    /**
+     * 根据分类查询模板列表
+     */
+    List<KnowledgePromptTemplateVo> queryListByCategory(String category);
+
+    /**
+     * 根据模板名称查询模板信息
+     */
+    KnowledgePromptTemplateVo queryByTemplateName(String templateName);
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/service/KnowledgeRoleGroupService.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/service/KnowledgeRoleGroupService.java
new file mode 100644
index 0000000..ebc8b2d
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/service/KnowledgeRoleGroupService.java
@@ -0,0 +1,60 @@
+package org.dromara.knowledge.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.knowledge.domain.KnowledgeRoleGroup;
+import org.dromara.knowledge.domain.bo.KnowledgeRoleGroupBo;
+import org.dromara.knowledge.domain.vo.KnowledgeRoleGroupVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 知识库角色分组Service接口
+ *
+ * @author pengles
+ */
+public interface KnowledgeRoleGroupService extends IService<KnowledgeRoleGroup> {
+
+    /**
+     * 查询知识库角色分组
+     */
+    KnowledgeRoleGroupVo queryById(Long id);
+
+    /**
+     * 查询知识库角色分组列表
+     */
+    TableDataInfo<KnowledgeRoleGroupVo> queryPageList(KnowledgeRoleGroupBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询知识库角色分组列表
+     */
+    List<KnowledgeRoleGroupVo> queryList(KnowledgeRoleGroupBo bo);
+
+    /**
+     * 新增知识库角色分组
+     */
+    Boolean insertByBo(KnowledgeRoleGroupBo bo);
+
+    /**
+     * 修改知识库角色分组
+     */
+    Boolean updateByBo(KnowledgeRoleGroupBo bo);
+
+    /**
+     * 校验并批量删除知识库角色分组
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    /**
+     * 根据分组编码查询分组信息
+     */
+    KnowledgeRoleGroupVo queryByGroupCode(String groupCode);
+
+    /**
+     * 查询启用状态的分组列表
+     */
+    List<KnowledgeRoleGroupVo> queryEnabledList();
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/service/KnowledgeRoleRelationService.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/service/KnowledgeRoleRelationService.java
new file mode 100644
index 0000000..289de67
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/service/KnowledgeRoleRelationService.java
@@ -0,0 +1,65 @@
+package org.dromara.knowledge.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.knowledge.domain.KnowledgeRoleRelation;
+import org.dromara.knowledge.domain.bo.KnowledgeRoleRelationBo;
+import org.dromara.knowledge.domain.vo.KnowledgeRoleRelationVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 知识库角色关系Service接口
+ *
+ * @author pengles
+ */
+public interface KnowledgeRoleRelationService extends IService<KnowledgeRoleRelation> {
+
+    /**
+     * 查询知识库角色关系
+     */
+    KnowledgeRoleRelationVo queryById(Long id);
+
+    /**
+     * 查询知识库角色关系列表
+     */
+    TableDataInfo<KnowledgeRoleRelationVo> queryPageList(KnowledgeRoleRelationBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询知识库角色关系列表
+     */
+    List<KnowledgeRoleRelationVo> queryList(KnowledgeRoleRelationBo bo);
+
+    /**
+     * 新增知识库角色关系
+     */
+    Boolean insertByBo(KnowledgeRoleRelationBo bo);
+
+    /**
+     * 修改知识库角色关系
+     */
+    Boolean updateByBo(KnowledgeRoleRelationBo bo);
+
+    /**
+     * 校验并批量删除知识库角色关系
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    /**
+     * 根据角色ID查询关系列表
+     */
+    List<KnowledgeRoleRelationVo> queryByRoleId(Long roleId);
+
+    /**
+     * 根据分组ID查询关系列表
+     */
+    List<KnowledgeRoleRelationVo> queryByGroupId(Long groupId);
+
+    /**
+     * 根据角色ID和分组ID查询关系
+     */
+    KnowledgeRoleRelationVo queryByRoleIdAndGroupId(Long roleId, Long groupId);
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/service/KnowledgeRoleService.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/service/KnowledgeRoleService.java
new file mode 100644
index 0000000..17887c2
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/service/KnowledgeRoleService.java
@@ -0,0 +1,60 @@
+package org.dromara.knowledge.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.knowledge.domain.KnowledgeRole;
+import org.dromara.knowledge.domain.bo.KnowledgeRoleBo;
+import org.dromara.knowledge.domain.vo.KnowledgeRoleVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 知识库角色Service接口
+ *
+ * @author pengles
+ */
+public interface KnowledgeRoleService extends IService<KnowledgeRole> {
+
+    /**
+     * 查询知识库角色
+     */
+    KnowledgeRoleVo queryById(Long id);
+
+    /**
+     * 查询知识库角色列表
+     */
+    TableDataInfo<KnowledgeRoleVo> queryPageList(KnowledgeRoleBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询知识库角色列表
+     */
+    List<KnowledgeRoleVo> queryList(KnowledgeRoleBo bo);
+
+    /**
+     * 新增知识库角色
+     */
+    Boolean insertByBo(KnowledgeRoleBo bo);
+
+    /**
+     * 修改知识库角色
+     */
+    Boolean updateByBo(KnowledgeRoleBo bo);
+
+    /**
+     * 校验并批量删除知识库角色
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    /**
+     * 根据角色编码查询角色信息
+     */
+    KnowledgeRoleVo queryByRoleCode(String roleCode);
+
+    /**
+     * 查询启用状态的角色列表
+     */
+    List<KnowledgeRoleVo> queryEnabledList();
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/service/KnowledgeSchemaFieldService.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/service/KnowledgeSchemaFieldService.java
new file mode 100644
index 0000000..a4d8e14
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/service/KnowledgeSchemaFieldService.java
@@ -0,0 +1,64 @@
+package org.dromara.knowledge.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.knowledge.domain.KnowledgeSchemaField;
+import org.dromara.knowledge.domain.bo.KnowledgeSchemaFieldBo;
+import org.dromara.knowledge.domain.vo.KnowledgeSchemaFieldVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 知识库数据模型字段Service接口
+ *
+ * @author pengles
+ */
+public interface KnowledgeSchemaFieldService extends IService<KnowledgeSchemaField> {
+
+    /**
+     * 查询知识库模式字段
+     */
+    KnowledgeSchemaFieldVo queryById(Long id);
+
+    /**
+     * 查询知识库模式字段列表
+     */
+    TableDataInfo<KnowledgeSchemaFieldVo> queryPageList(KnowledgeSchemaFieldBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询知识库模式字段列表
+     */
+    List<KnowledgeSchemaFieldVo> queryList(KnowledgeSchemaFieldBo bo);
+
+    /**
+     * 新增知识库模式字段
+     */
+    Boolean insertByBo(KnowledgeSchemaFieldBo bo);
+
+    /**
+     * 修改知识库模式字段
+     */
+    Boolean updateByBo(KnowledgeSchemaFieldBo bo);
+
+    /**
+     * 校验并批量删除知识库模式字段
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    /**
+     * 根据模式ID查询字段列表
+     */
+    List<KnowledgeSchemaFieldVo> queryListBySchemaId(Long schemaId);
+
+    /**
+     * 根据编码查询字段信息
+     */
+    KnowledgeSchemaFieldVo queryByCode(String code);
+
+    /**
+     * 根据模式ID和字段编码查询字段信息
+     */
+    KnowledgeSchemaFieldVo queryBySchemaIdAndCode(Long schemaId, String code);
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/service/KnowledgeSchemaGroupService.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/service/KnowledgeSchemaGroupService.java
new file mode 100644
index 0000000..47cb3fc
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/service/KnowledgeSchemaGroupService.java
@@ -0,0 +1,59 @@
+package org.dromara.knowledge.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.knowledge.domain.KnowledgeSchemaGroup;
+import org.dromara.knowledge.domain.bo.KnowledgeSchemaGroupBo;
+import org.dromara.knowledge.domain.vo.KnowledgeSchemaGroupVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 知识库数据模型分组Service接口
+ *
+ * @author pengles
+ */
+public interface KnowledgeSchemaGroupService extends IService<KnowledgeSchemaGroup> {
+
+    /**
+     * 查询知识库模式组
+     */
+    KnowledgeSchemaGroupVo queryById(Long id);
+
+    /**
+     * 查询知识库模式组列表
+     */
+    TableDataInfo<KnowledgeSchemaGroupVo> queryPageList(KnowledgeSchemaGroupBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询知识库模式组列表
+     */
+    List<KnowledgeSchemaGroupVo> queryList(KnowledgeSchemaGroupBo bo);
+
+    /**
+     * 新增知识库模式组
+     */
+    Boolean insertByBo(KnowledgeSchemaGroupBo bo);
+
+    /**
+     * 修改知识库模式组
+     */
+    Boolean updateByBo(KnowledgeSchemaGroupBo bo);
+
+    /**
+     * 校验并批量删除知识库模式组
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    /**
+     * 根据编码查询模式组信息
+     */
+    KnowledgeSchemaGroupVo queryByCode(String code);
+
+    /**
+     * 根据名称查询模式组信息
+     */
+    KnowledgeSchemaGroupVo queryByName(String name);
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/service/KnowledgeSchemaService.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/service/KnowledgeSchemaService.java
new file mode 100644
index 0000000..5c375fb
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/service/KnowledgeSchemaService.java
@@ -0,0 +1,64 @@
+package org.dromara.knowledge.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.knowledge.domain.KnowledgeSchema;
+import org.dromara.knowledge.domain.bo.KnowledgeSchemaBo;
+import org.dromara.knowledge.domain.vo.KnowledgeSchemaVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 知识库数据模型Service接口
+ *
+ * @author pengles
+ */
+public interface KnowledgeSchemaService extends IService<KnowledgeSchema> {
+
+    /**
+     * 查询知识库模式
+     */
+    KnowledgeSchemaVo queryById(Long id);
+
+    /**
+     * 查询知识库模式列表
+     */
+    TableDataInfo<KnowledgeSchemaVo> queryPageList(KnowledgeSchemaBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询知识库模式列表
+     */
+    List<KnowledgeSchemaVo> queryList(KnowledgeSchemaBo bo);
+
+    /**
+     * 新增知识库模式
+     */
+    Boolean insertByBo(KnowledgeSchemaBo bo);
+
+    /**
+     * 修改知识库模式
+     */
+    Boolean updateByBo(KnowledgeSchemaBo bo);
+
+    /**
+     * 校验并批量删除知识库模式
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    /**
+     * 根据模式组ID查询模式列表
+     */
+    List<KnowledgeSchemaVo> queryListBySchemaGroupId(Long schemaGroupId);
+
+    /**
+     * 根据编码查询模式信息
+     */
+    KnowledgeSchemaVo queryByCode(String code);
+
+    /**
+     * 根据表名查询模式信息
+     */
+    KnowledgeSchemaVo queryByTableName(String tableName);
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/service/KnowledgeVectorService.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/service/KnowledgeVectorService.java
new file mode 100644
index 0000000..36f7070
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/service/KnowledgeVectorService.java
@@ -0,0 +1,186 @@
+package org.dromara.knowledge.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.knowledge.domain.KnowledgeVector;
+import org.dromara.knowledge.domain.bo.KnowledgeVectorBo;
+import org.dromara.knowledge.domain.vo.KnowledgeSearchResultVo;
+import org.dromara.knowledge.domain.vo.KnowledgeVectorVo;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 知识片段向量Service接口
+ *
+ * @author pengles
+ */
+public interface KnowledgeVectorService extends IService<KnowledgeVector> {
+
+    /**
+     * 查询知识片段向量
+     */
+    KnowledgeVectorVo queryById(Long id);
+
+    /**
+     * 查询知识片段向量列表
+     */
+    TableDataInfo<KnowledgeVectorVo> queryPageList(KnowledgeVectorBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询知识片段向量列表
+     */
+    List<KnowledgeVectorVo> queryList(KnowledgeVectorBo bo);
+
+    /**
+     * 新增知识片段向量
+     */
+    Boolean insertByBo(KnowledgeVectorBo bo);
+
+    /**
+     * 修改知识片段向量
+     */
+    Boolean updateByBo(KnowledgeVectorBo bo);
+
+    /**
+     * 校验并批量删除知识片段向量信息
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    /**
+     * 根据向量ID查询知识片段向量
+     */
+    KnowledgeVectorVo queryByVectorId(String vectorId);
+
+    /**
+     * 根据知识库ID查询知识片段向量列表
+     */
+    List<KnowledgeVectorVo> queryByKnowledgeId(String knowledgeId);
+
+    /**
+     * 根据文档ID查询知识片段向量列表
+     */
+    List<KnowledgeVectorVo> queryByDocId(String docId);
+
+    /**
+     * 根据知识片段ID查询知识片段向量列表
+     */
+    List<KnowledgeVectorVo> queryByFragmentId(String fragmentId);
+
+    /**
+     * 根据模型名称查询知识片段向量列表
+     */
+    List<KnowledgeVectorVo> queryByModelName(String modelName);
+
+    /**
+     * 根据状态查询知识片段向量列表
+     */
+    List<KnowledgeVectorVo> queryByStatus(Integer status);
+
+    /**
+     * 批量更新知识片段向量状态
+     */
+    Boolean updateStatusByIds(Collection<Long> ids, Integer status);
+
+    /**
+     * 根据知识库ID和状态查询知识片段向量列表
+     */
+    List<KnowledgeVectorVo> queryByKnowledgeIdAndStatus(String knowledgeId, Integer status);
+
+    /**
+     * 为知识片段生成向量
+     *
+     * @param knowledgeId 知识库ID
+     * @param docId       文档ID
+     * @param fragmentId  片段ID
+     * @param content     片段内容
+     * @param modelName   向量模型名称
+     * @return 向量ID
+     */
+    String generateVector(String knowledgeId, String docId, String fragmentId, String content, String modelName);
+
+    /**
+     * 批量为知识片段生成向量
+     *
+     * @param knowledgeId      知识库ID
+     * @param docId            文档ID
+     * @param fragmentContents 片段内容映射 (fragmentId -> content)
+     * @param modelName        向量模型名称
+     * @return 成功生成向量的片段ID列表
+     */
+    List<String> batchGenerateVectors(String knowledgeId, String docId,
+                                      Map<String, String> fragmentContents, String modelName);
+
+    /**
+     * 向量相似度搜索
+     *
+     * @param knowledgeId 知识库ID
+     * @param queryText   查询文本
+     * @param modelName   向量模型名称
+     * @param topK        返回结果数量
+     * @param threshold   相似度阈值
+     * @return 搜索结果列表
+     */
+    List<KnowledgeSearchResultVo> vectorSimilaritySearch(String knowledgeId, String queryText,
+                                                         String modelName, Integer topK, Double threshold);
+
+    /**
+     * 文本转向量
+     *
+     * @param text      文本内容
+     * @param modelName 模型名称
+     * @return 向量数据
+     */
+    double[] textToVector(String text, String modelName);
+
+    /**
+     * 计算向量相似度
+     *
+     * @param vector1 向量1
+     * @param vector2 向量2
+     * @return 相似度分数 (0-1)
+     */
+    double calculateSimilarity(double[] vector1, double[] vector2);
+
+    /**
+     * 删除知识库相关的所有向量
+     *
+     * @param knowledgeId 知识库ID
+     * @return 删除的向量数量
+     */
+    int deleteVectorsByKnowledgeId(String knowledgeId);
+
+    /**
+     * 删除文档相关的所有向量
+     *
+     * @param docId 文档ID
+     * @return 删除的向量数量
+     */
+    int deleteVectorsByDocId(String docId);
+
+    /**
+     * 获取知识库向量统计信息
+     *
+     * @param knowledgeId 知识库ID
+     * @return 统计信息映射
+     */
+    Map<String, Object> getVectorStatistics(String knowledgeId);
+
+    /**
+     * 检查向量模型是否可用
+     *
+     * @param modelName 模型名称
+     * @return 是否可用
+     */
+    boolean isModelAvailable(String modelName);
+
+    /**
+     * 获取可用的向量模型列表
+     *
+     * @return 模型名称列表
+     */
+    List<String> getAvailableModels();
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/service/impl/KnowledgeAttachServiceImpl.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/service/impl/KnowledgeAttachServiceImpl.java
new file mode 100644
index 0000000..8c3156c
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/service/impl/KnowledgeAttachServiceImpl.java
@@ -0,0 +1,135 @@
+package org.dromara.knowledge.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.knowledge.domain.KnowledgeAttach;
+import org.dromara.knowledge.domain.bo.KnowledgeAttachBo;
+import org.dromara.knowledge.domain.vo.KnowledgeAttachVo;
+import org.dromara.knowledge.mapper.KnowledgeAttachMapper;
+import org.dromara.knowledge.service.KnowledgeAttachService;
+import org.springframework.stereotype.Service;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 知识库附件Service业务层处理
+ *
+ * @author pengles
+ */
+@RequiredArgsConstructor
+@Service
+public class KnowledgeAttachServiceImpl extends ServiceImpl<KnowledgeAttachMapper, KnowledgeAttach> implements KnowledgeAttachService {
+
+    private final KnowledgeAttachMapper baseMapper;
+
+    /**
+     * 查询知识库附件
+     */
+    @Override
+    public KnowledgeAttachVo queryById(Long id) {
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 查询知识库附件列表
+     */
+    @Override
+    public TableDataInfo<KnowledgeAttachVo> queryPageList(KnowledgeAttachBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<KnowledgeAttach> lqw = buildQueryWrapper(bo);
+        Page<KnowledgeAttachVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询知识库附件列表
+     */
+    @Override
+    public List<KnowledgeAttachVo> queryList(KnowledgeAttachBo bo) {
+        LambdaQueryWrapper<KnowledgeAttach> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<KnowledgeAttach> buildQueryWrapper(KnowledgeAttachBo bo) {
+        LambdaQueryWrapper<KnowledgeAttach> lqw = Wrappers.lambdaQuery();
+        lqw.eq(StringUtils.isNotBlank(bo.getKnowledgeId()), KnowledgeAttach::getKnowledgeId, bo.getKnowledgeId());
+        lqw.eq(StringUtils.isNotBlank(bo.getDocId()), KnowledgeAttach::getDocId, bo.getDocId());
+        lqw.like(StringUtils.isNotBlank(bo.getDocName()), KnowledgeAttach::getDocName, bo.getDocName());
+        lqw.eq(StringUtils.isNotBlank(bo.getDocType()), KnowledgeAttach::getDocType, bo.getDocType());
+        lqw.eq(ObjectUtil.isNotNull(bo.getOssId()), KnowledgeAttach::getOssId, bo.getOssId());
+        lqw.eq(ObjectUtil.isNotNull(bo.getPicStatus()), KnowledgeAttach::getPicStatus, bo.getPicStatus());
+        lqw.eq(ObjectUtil.isNotNull(bo.getPicAnysStatus()), KnowledgeAttach::getPicAnysStatus, bo.getPicAnysStatus());
+        lqw.eq(ObjectUtil.isNotNull(bo.getVectorStatus()), KnowledgeAttach::getVectorStatus, bo.getVectorStatus());
+        return lqw;
+    }
+
+    /**
+     * 新增知识库附件
+     */
+    @Override
+    public Boolean insertByBo(KnowledgeAttachBo bo) {
+        KnowledgeAttach add = BeanUtil.toBean(bo, KnowledgeAttach.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改知识库附件
+     */
+    @Override
+    public Boolean updateByBo(KnowledgeAttachBo bo) {
+        KnowledgeAttach update = BeanUtil.toBean(bo, KnowledgeAttach.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(KnowledgeAttach entity) {
+        // TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除知识库附件
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if (isValid) {
+            // TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+
+    /**
+     * 根据知识库ID查询附件列表
+     */
+    @Override
+    public List<KnowledgeAttachVo> queryListByKnowledgeId(String knowledgeId) {
+        LambdaQueryWrapper<KnowledgeAttach> lqw = Wrappers.lambdaQuery();
+        lqw.eq(KnowledgeAttach::getKnowledgeId, knowledgeId);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    /**
+     * 根据文档ID查询附件信息
+     */
+    @Override
+    public KnowledgeAttachVo queryByDocId(String docId) {
+        LambdaQueryWrapper<KnowledgeAttach> lqw = Wrappers.lambdaQuery();
+        lqw.eq(KnowledgeAttach::getDocId, docId);
+        return baseMapper.selectVoOne(lqw);
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/service/impl/KnowledgeDocumentServiceImpl.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/service/impl/KnowledgeDocumentServiceImpl.java
new file mode 100644
index 0000000..fc19800
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/service/impl/KnowledgeDocumentServiceImpl.java
@@ -0,0 +1,407 @@
+package org.dromara.knowledge.service.impl;
+
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.StrUtil;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.knowledge.data.DocumentParserFactory;
+import org.dromara.knowledge.domain.KnowledgeAttach;
+import org.dromara.knowledge.domain.KnowledgeFragment;
+import org.dromara.knowledge.domain.KnowledgeInfo;
+import org.dromara.knowledge.domain.KnowledgeJob;
+import org.dromara.knowledge.domain.vo.*;
+import org.dromara.knowledge.service.*;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.regex.Pattern;
+
+/**
+ * 知识库文档处理Service业务层处理
+ *
+ * @author pengles
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class KnowledgeDocumentServiceImpl implements KnowledgeDocumentService {
+
+    // 文本清理正则表达式
+    private static final Pattern MULTIPLE_SPACES = Pattern.compile("\\s+");
+    private static final Pattern MULTIPLE_NEWLINES = Pattern.compile("\\n{3,}");
+    private final KnowledgeAttachService knowledgeAttachService;
+    private final KnowledgeFragmentService knowledgeFragmentService;
+    private final KnowledgeJobService knowledgeJobService;
+    private final KnowledgeVectorService knowledgeVectorService;
+    private final DocumentParserFactory documentParserFactory;
+    @org.springframework.beans.factory.annotation.Value("${ruoyi.ai.knowledge.chunk.size:1000}")
+    private Integer defaultChunkSize;
+    @org.springframework.beans.factory.annotation.Value("${ruoyi.ai.knowledge.chunk.overlap:100}")
+    private Integer defaultOverlapSize;
+
+    @Override
+    public String processUploadedDocument(String knowledgeId, MultipartFile file) {
+        // 验证文件类型
+        if (!isSupportedFileType(file)) {
+            throw new ServiceException("不支持的文件类型: " + getFileExtension(file.getOriginalFilename()));
+        }
+
+        // 生成文档ID
+        String docId = IdUtil.fastSimpleUUID();
+
+        try {
+            // 提取文本内容
+            String content = extractTextContent(file);
+
+            // 清理文本内容
+            String cleanContent = cleanTextContent(content);
+
+            // 创建文档附件记录
+            KnowledgeAttach attach = new KnowledgeAttach();
+            attach.setKnowledgeId(knowledgeId);
+            attach.setDocId(docId);
+            attach.setDocName(file.getOriginalFilename());
+            attach.setDocType(getFileExtension(file.getOriginalFilename()));
+            attach.setContent(cleanContent);
+            attach.setPicStatus(10); // 未开始
+            attach.setPicAnysStatus(10); // 未开始
+            attach.setVectorStatus(10); // 未开始
+
+            // 保存文档记录
+            knowledgeAttachService.save(attach);
+
+            splitDocumentIntoFragments(knowledgeId, docId, cleanContent, defaultChunkSize, defaultOverlapSize);
+
+            return docId;
+        } catch (Exception e) {
+            log.error("处理文档失败: {}", e.getMessage(), e);
+            throw new ServiceException("文档处理失败: " + e.getMessage());
+        }
+    }
+
+    @Override
+    public List<String> splitDocumentIntoFragments(String knowledgeId, String docId, String content,
+                                                   Integer chunkSize, Integer overlapSize) {
+        List<String> fragmentIds = new ArrayList<>();
+
+        if (StrUtil.isBlank(content)) {
+            return fragmentIds;
+        }
+
+        // 设置默认值
+        int actualChunkSize = chunkSize != null ? chunkSize : 1000;
+        int actualOverlapSize = overlapSize != null ? overlapSize : 100;
+
+        // 分割文档
+        List<String> chunks = splitTextIntoChunks(content, actualChunkSize, actualOverlapSize);
+
+        for (int i = 0; i < chunks.size(); i++) {
+            String chunk = chunks.get(i);
+            if (StrUtil.isNotBlank(chunk)) {
+                String fragmentId = IdUtil.fastSimpleUUID();
+
+                // 创建知识片段记录
+                KnowledgeFragment fragment = new KnowledgeFragment();
+                fragment.setKnowledgeId(knowledgeId);
+                fragment.setDocId(docId);
+                fragment.setFid(fragmentId);
+                fragment.setIdx(i);
+                fragment.setContent(chunk.trim());
+
+                // 保存知识片段
+                knowledgeFragmentService.save(fragment);
+                fragmentIds.add(fragmentId);
+            }
+        }
+
+        log.info("文档 {} 分割完成，共生成 {} 个知识片段", docId, fragmentIds.size());
+        return fragmentIds;
+    }
+
+    @Override
+    public String extractTextContent(MultipartFile file) {
+        try {
+            String fileName = file.getOriginalFilename();
+            if (StrUtil.isBlank(fileName)) {
+                throw new ServiceException("文件名不能为空");
+            }
+
+            // 使用文档解析器工厂解析文件
+            byte[] fileBytes = file.getBytes();
+            String content = documentParserFactory.parse(fileBytes, fileName);
+
+            log.debug("成功解析文件: {}, 内容长度: {}", fileName, content != null ? content.length() : 0);
+            return content;
+        } catch (IOException e) {
+            log.error("读取文件内容失败: {}", file.getOriginalFilename(), e);
+            throw new ServiceException("读取文件内容失败: " + e.getMessage());
+        } catch (Exception e) {
+            log.error("解析文件失败: {}", file.getOriginalFilename(), e);
+            throw new ServiceException("解析文件失败: " + e.getMessage());
+        }
+    }
+
+    @Override
+    public String cleanTextContent(String content) {
+        if (StrUtil.isBlank(content)) {
+            return "";
+        }
+
+        // 移除多余的空白字符
+        String cleaned = MULTIPLE_SPACES.matcher(content).replaceAll(" ");
+
+        // 移除多余的换行符
+        cleaned = MULTIPLE_NEWLINES.matcher(cleaned).replaceAll("\n\n");
+
+        // 移除首尾空白
+        cleaned = cleaned.trim();
+
+        return cleaned;
+    }
+
+    @Override
+    public boolean isSupportedFileType(MultipartFile file) {
+        String fileName = file.getOriginalFilename();
+        if (StrUtil.isBlank(fileName)) {
+            return false;
+        }
+
+        String extension = getFileExtension(fileName);
+        return documentParserFactory.isSupported(extension);
+    }
+
+    @Override
+    public List<String> getSupportedFileTypes() {
+        return new ArrayList<>(documentParserFactory.getSupportedExtensions());
+    }
+
+    @Override
+    public KnowledgeStatusVo getKnowledgeProcessingStatus(Long knowledgeId, KnowledgeInfoVo knowledgeInfo) {
+        KnowledgeStatusVo statusVo = new KnowledgeStatusVo();
+
+        // 设置基本信息
+        statusVo.setKnowledgeId(knowledgeId.toString());
+        statusVo.setKnowledgeName(knowledgeInfo.getKnowledgeName());
+        statusVo.setLastUpdateTime(LocalDateTime.parse(DateUtil.now()));
+
+        try {
+            // 获取知识库附件统计
+            List<KnowledgeAttachVo> attachList = knowledgeAttachService.queryListByKnowledgeId(knowledgeId.toString());
+            int totalDocuments = attachList.size();
+            int processedDocuments = (int) attachList.stream().filter(attach -> attach.getVectorStatus() != null && attach.getVectorStatus() == 30).count();
+
+            statusVo.setTotalDocuments(totalDocuments);
+            statusVo.setProcessedDocuments(processedDocuments);
+
+            // 获取知识片段统计
+            List<KnowledgeFragmentVo> fragmentList = knowledgeFragmentService.queryListByKnowledgeId(knowledgeId);
+            int totalFragments = fragmentList.size();
+            statusVo.setTotalFragments(totalFragments);
+
+            // 获取向量化统计
+            List<KnowledgeVectorVo> vectorList = knowledgeVectorService.queryByKnowledgeId(knowledgeId.toString());
+            int vectorizedFragments = vectorList.size();
+            statusVo.setVectorizedFragments(vectorizedFragments);
+
+            // 获取任务统计
+            List<KnowledgeJobVo> runningJobs = knowledgeJobService.queryRunningJobs();
+            List<KnowledgeJobVo> pendingJobs = knowledgeJobService.queryPendingJobs();
+            List<KnowledgeJobVo> failedJobs = knowledgeJobService.queryFailedJobs();
+
+            // 过滤当前知识库的任务
+            long runningCount = runningJobs.stream().filter(job -> knowledgeId.toString().equals(job.getKnowledgeId())).count();
+            long pendingCount = pendingJobs.stream().filter(job -> knowledgeId.toString().equals(job.getKnowledgeId())).count();
+            long failedCount = failedJobs.stream().filter(job -> knowledgeId.toString().equals(job.getKnowledgeId())).count();
+
+            statusVo.setRunningJobs((int) runningCount);
+            statusVo.setPendingJobs((int) pendingCount);
+            statusVo.setFailedJobs((int) failedCount);
+
+            // 计算进度百分比
+            if (totalFragments > 0) {
+                double progress = (double) vectorizedFragments / totalFragments * 100;
+                statusVo.setProgressPercentage((double) Math.round(progress));
+            } else {
+                statusVo.setProgressPercentage((double) 0);
+            }
+
+            // 确定处理状态
+            if (runningCount > 0) {
+                statusVo.setProcessingStatus("PROCESSING");
+            } else if (pendingCount > 0) {
+                statusVo.setProcessingStatus("PENDING");
+            } else if (failedCount > 0) {
+                statusVo.setProcessingStatus("FAILED");
+            } else if (totalFragments > 0 && vectorizedFragments == totalFragments) {
+                statusVo.setProcessingStatus("COMPLETED");
+            } else {
+                statusVo.setProcessingStatus("IDLE");
+            }
+
+        } catch (Exception e) {
+            statusVo.setProcessingStatus("ERROR");
+            statusVo.setErrorMessage("获取状态信息时发生错误: " + e.getMessage());
+        }
+
+        return statusVo;
+    }
+
+    @Override
+    public String processDocumentContent(String knowledgeId, String docId, String content, KnowledgeInfo knowledgeInfo) {
+        try {
+            // 生成任务ID
+            String taskId = IdUtil.fastSimpleUUID();
+
+            // 创建处理任务记录
+            KnowledgeJob job = new KnowledgeJob();
+            job.setJobId(taskId);
+            job.setKnowledgeId(knowledgeId);
+            job.setDocId(docId);
+            job.setJobType("DOCUMENT_PROCESSING");
+            job.setStatus(1); // 处理中
+            job.setProgress(0);
+            job.setTotalItems(1);
+            job.setProcessedItems(0);
+            job.setSuccessItems(0);
+            job.setFailedItems(0);
+            job.setRetryCount(0);
+            job.setPriority(5);
+            job.setRemark("文档内容处理任务");
+
+            knowledgeJobService.save(job);
+
+            // 异步处理文档内容分片
+            splitDocumentIntoFragments(knowledgeId, docId, content, 1000, 100);
+
+            // 更新任务状态为完成
+            job.setStatus(2); // 已完成
+            job.setProgress(100);
+            job.setProcessedItems(1);
+            job.setSuccessItems(1);
+            knowledgeJobService.updateById(job);
+
+            return taskId;
+        } catch (Exception e) {
+            log.error("处理文档内容失败: {}", e.getMessage(), e);
+            throw new ServiceException("文档内容处理失败: " + e.getMessage());
+        }
+    }
+
+    @Override
+    public String vectorizeKnowledgeFragment(String knowledgeId, String fragmentId, KnowledgeInfo knowledgeInfo) {
+        try {
+            // 生成任务ID
+            String taskId = IdUtil.fastSimpleUUID();
+
+            // 创建向量化任务记录
+            KnowledgeJob job = new KnowledgeJob();
+            job.setJobId(taskId);
+            job.setKnowledgeId(knowledgeId);
+            job.setJobType("FRAGMENT_VECTORIZATION");
+            job.setStatus(1); // 处理中
+            job.setProgress(0);
+            job.setTotalItems(1);
+            job.setProcessedItems(0);
+            job.setSuccessItems(0);
+            job.setFailedItems(0);
+            job.setRetryCount(0);
+            job.setPriority(5);
+            job.setRemark("知识片段向量化任务");
+
+            knowledgeJobService.save(job);
+
+            // 获取知识片段信息
+            KnowledgeFragmentVo fragment = knowledgeFragmentService.queryByFid(fragmentId);
+            if (fragment == null) {
+                throw new ServiceException("知识片段不存在: " + fragmentId);
+            }
+
+            // 调用向量化服务
+            String vectorId = knowledgeVectorService.generateVector(knowledgeId, fragment.getDocId(), fragmentId, fragment.getContent(), "bge-base-zh");
+
+            // 更新任务状态为完成
+            job.setStatus(2); // 已完成
+            job.setProgress(100);
+            job.setProcessedItems(1);
+            job.setSuccessItems(1);
+            job.setRemark("知识片段向量化任务完成，向量ID: " + vectorId);
+            knowledgeJobService.updateById(job);
+
+            log.info("知识片段 {} 向量化完成，向量ID: {}", fragmentId, vectorId);
+
+            return taskId;
+        } catch (Exception e) {
+            log.error("向量化知识片段失败: {}", e.getMessage(), e);
+            throw new ServiceException("向量化处理失败: " + e.getMessage());
+        }
+    }
+
+    /**
+     * 获取文件扩展名
+     */
+    private String getFileExtension(String fileName) {
+        if (StrUtil.isBlank(fileName)) {
+            return "";
+        }
+
+        int lastDotIndex = fileName.lastIndexOf('.');
+        if (lastDotIndex == -1 || lastDotIndex == fileName.length() - 1) {
+            return "";
+        }
+
+        return fileName.substring(lastDotIndex + 1);
+    }
+
+    /**
+     * 将文本分割成指定大小的块
+     */
+    private List<String> splitTextIntoChunks(String text, int chunkSize, int overlapSize) {
+        List<String> chunks = new ArrayList<>();
+
+        if (text.length() <= chunkSize) {
+            chunks.add(text);
+            return chunks;
+        }
+
+        int start = 0;
+        while (start < text.length()) {
+            int end = Math.min(start + chunkSize, text.length());
+
+            // 尝试在句号、问号、感叹号处分割
+            if (end < text.length()) {
+                int lastSentenceEnd = findLastSentenceEnd(text, start, end);
+                if (lastSentenceEnd > start) {
+                    end = lastSentenceEnd + 1;
+                }
+            }
+
+            String chunk = text.substring(start, end);
+            chunks.add(chunk);
+
+            // 计算下一个块的起始位置（考虑重叠）
+            start = Math.max(start + 1, end - overlapSize);
+        }
+
+        return chunks;
+    }
+
+    /**
+     * 查找最后一个句子结束位置
+     */
+    private int findLastSentenceEnd(String text, int start, int end) {
+        for (int i = end - 1; i >= start; i--) {
+            char c = text.charAt(i);
+            if (c == '。' || c == '！' || c == '？' || c == '.' || c == '!' || c == '?') {
+                return i;
+            }
+        }
+        return -1;
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/service/impl/KnowledgeFragmentServiceImpl.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/service/impl/KnowledgeFragmentServiceImpl.java
new file mode 100644
index 0000000..f204596
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/service/impl/KnowledgeFragmentServiceImpl.java
@@ -0,0 +1,142 @@
+package org.dromara.knowledge.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.knowledge.domain.KnowledgeFragment;
+import org.dromara.knowledge.domain.bo.KnowledgeFragmentBo;
+import org.dromara.knowledge.domain.vo.KnowledgeFragmentVo;
+import org.dromara.knowledge.mapper.KnowledgeFragmentMapper;
+import org.dromara.knowledge.service.KnowledgeFragmentService;
+import org.springframework.stereotype.Service;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 知识库片段Service业务层处理
+ *
+ * @author pengles
+ */
+@RequiredArgsConstructor
+@Service
+public class KnowledgeFragmentServiceImpl extends ServiceImpl<KnowledgeFragmentMapper, KnowledgeFragment> implements KnowledgeFragmentService {
+
+    private final KnowledgeFragmentMapper baseMapper;
+
+    /**
+     * 查询知识库片段
+     */
+    @Override
+    public KnowledgeFragmentVo queryById(Long id) {
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 查询知识库片段列表
+     */
+    @Override
+    public TableDataInfo<KnowledgeFragmentVo> queryPageList(KnowledgeFragmentBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<KnowledgeFragment> lqw = buildQueryWrapper(bo);
+        Page<KnowledgeFragmentVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询知识库片段列表
+     */
+    @Override
+    public List<KnowledgeFragmentVo> queryList(KnowledgeFragmentBo bo) {
+        LambdaQueryWrapper<KnowledgeFragment> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<KnowledgeFragment> buildQueryWrapper(KnowledgeFragmentBo bo) {
+        LambdaQueryWrapper<KnowledgeFragment> lqw = Wrappers.lambdaQuery();
+        lqw.eq(StringUtils.isNotBlank(bo.getKnowledgeId()), KnowledgeFragment::getKnowledgeId, bo.getKnowledgeId());
+        lqw.eq(StringUtils.isNotBlank(bo.getDocId()), KnowledgeFragment::getDocId, bo.getDocId());
+        lqw.eq(StringUtils.isNotBlank(bo.getFid()), KnowledgeFragment::getFid, bo.getFid());
+        lqw.eq(ObjectUtil.isNotNull(bo.getIdx()), KnowledgeFragment::getIdx, bo.getIdx());
+        lqw.like(StringUtils.isNotBlank(bo.getContent()), KnowledgeFragment::getContent, bo.getContent());
+        return lqw;
+    }
+
+    /**
+     * 新增知识库片段
+     */
+    @Override
+    public Boolean insertByBo(KnowledgeFragmentBo bo) {
+        KnowledgeFragment add = BeanUtil.toBean(bo, KnowledgeFragment.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改知识库片段
+     */
+    @Override
+    public Boolean updateByBo(KnowledgeFragmentBo bo) {
+        KnowledgeFragment update = BeanUtil.toBean(bo, KnowledgeFragment.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(KnowledgeFragment entity) {
+        // TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除知识库片段
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if (isValid) {
+            // TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+
+    /**
+     * 根据知识库ID查询片段列表
+     */
+    @Override
+    public List<KnowledgeFragmentVo> queryListByKnowledgeId(Long knowledgeId) {
+        LambdaQueryWrapper<KnowledgeFragment> lqw = Wrappers.lambdaQuery();
+        lqw.eq(KnowledgeFragment::getKnowledgeId, knowledgeId);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    /**
+     * 根据文档ID查询片段列表
+     */
+    @Override
+    public List<KnowledgeFragmentVo> queryListByDocId(String docId) {
+        LambdaQueryWrapper<KnowledgeFragment> lqw = Wrappers.lambdaQuery();
+        lqw.eq(KnowledgeFragment::getDocId, docId);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    /**
+     * 根据片段ID查询片段信息
+     */
+    @Override
+    public KnowledgeFragmentVo queryByFid(String fid) {
+        LambdaQueryWrapper<KnowledgeFragment> lqw = Wrappers.lambdaQuery();
+        lqw.eq(KnowledgeFragment::getFid, fid);
+        return baseMapper.selectVoOne(lqw);
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/service/impl/KnowledgeHitLogServiceImpl.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/service/impl/KnowledgeHitLogServiceImpl.java
new file mode 100644
index 0000000..802bb8f
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/service/impl/KnowledgeHitLogServiceImpl.java
@@ -0,0 +1,317 @@
+package org.dromara.knowledge.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.knowledge.domain.KnowledgeHitLog;
+import org.dromara.knowledge.domain.bo.KnowledgeHitLogBo;
+import org.dromara.knowledge.domain.vo.KnowledgeHitLogVo;
+import org.dromara.knowledge.mapper.KnowledgeHitLogMapper;
+import org.dromara.knowledge.service.KnowledgeHitLogService;
+import org.springframework.stereotype.Service;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * 知识库命中日志Service业务层处理
+ *
+ * @author pengles
+ */
+@RequiredArgsConstructor
+@Service
+public class KnowledgeHitLogServiceImpl extends ServiceImpl<KnowledgeHitLogMapper, KnowledgeHitLog> implements KnowledgeHitLogService {
+
+    private final KnowledgeHitLogMapper baseMapper;
+
+    /**
+     * 查询知识库命中日志
+     */
+    @Override
+    public KnowledgeHitLogVo queryById(Long id) {
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 查询知识库命中日志列表
+     */
+    @Override
+    public TableDataInfo<KnowledgeHitLogVo> queryPageList(KnowledgeHitLogBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<KnowledgeHitLog> lqw = buildQueryWrapper(bo);
+        Page<KnowledgeHitLogVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询知识库命中日志列表
+     */
+    @Override
+    public List<KnowledgeHitLogVo> queryList(KnowledgeHitLogBo bo) {
+        LambdaQueryWrapper<KnowledgeHitLog> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<KnowledgeHitLog> buildQueryWrapper(KnowledgeHitLogBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<KnowledgeHitLog> lqw = Wrappers.lambdaQuery();
+        lqw.eq(StringUtils.isNotBlank(bo.getSessionId()), KnowledgeHitLog::getSessionId, bo.getSessionId());
+        lqw.eq(StringUtils.isNotBlank(bo.getKnowledgeId()), KnowledgeHitLog::getKnowledgeId, bo.getKnowledgeId());
+        lqw.eq(StringUtils.isNotBlank(bo.getDocId()), KnowledgeHitLog::getDocId, bo.getDocId());
+        lqw.eq(StringUtils.isNotBlank(bo.getFragmentId()), KnowledgeHitLog::getFragmentId, bo.getFragmentId());
+        lqw.like(StringUtils.isNotBlank(bo.getQueryText()), KnowledgeHitLog::getQueryText, bo.getQueryText());
+        lqw.ge(bo.getSimilarityScore() != null, KnowledgeHitLog::getSimilarityScore, bo.getSimilarityScore());
+        lqw.eq(bo.getRanking() != null, KnowledgeHitLog::getRanking, bo.getRanking());
+        lqw.like(StringUtils.isNotBlank(bo.getModelName()), KnowledgeHitLog::getModelName, bo.getModelName());
+        lqw.ge(bo.getResponseTime() != null, KnowledgeHitLog::getResponseTime, bo.getResponseTime());
+        lqw.ge(bo.getHitCount() != null, KnowledgeHitLog::getHitCount, bo.getHitCount());
+        return lqw;
+    }
+
+    /**
+     * 新增知识库命中日志
+     */
+    @Override
+    public Boolean insertByBo(KnowledgeHitLogBo bo) {
+        KnowledgeHitLog add = MapstructUtils.convert(bo, KnowledgeHitLog.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改知识库命中日志
+     */
+    @Override
+    public Boolean updateByBo(KnowledgeHitLogBo bo) {
+        KnowledgeHitLog update = MapstructUtils.convert(bo, KnowledgeHitLog.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(KnowledgeHitLog entity) {
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 批量删除知识库命中日志
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if (isValid) {
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+
+    /**
+     * 根据会话ID查询知识库命中日志列表
+     */
+    @Override
+    public List<KnowledgeHitLogVo> queryBySessionId(String sessionId) {
+        LambdaQueryWrapper<KnowledgeHitLog> lqw = Wrappers.lambdaQuery();
+        lqw.eq(KnowledgeHitLog::getSessionId, sessionId);
+        lqw.orderByAsc(KnowledgeHitLog::getRanking);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    /**
+     * 根据知识库ID查询知识库命中日志列表
+     */
+    @Override
+    public List<KnowledgeHitLogVo> queryByKnowledgeId(String knowledgeId) {
+        LambdaQueryWrapper<KnowledgeHitLog> lqw = Wrappers.lambdaQuery();
+        lqw.eq(KnowledgeHitLog::getKnowledgeId, knowledgeId);
+        lqw.orderByDesc(KnowledgeHitLog::getCreateTime);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    /**
+     * 根据文档ID查询知识库命中日志列表
+     */
+    @Override
+    public List<KnowledgeHitLogVo> queryByDocId(String docId) {
+        LambdaQueryWrapper<KnowledgeHitLog> lqw = Wrappers.lambdaQuery();
+        lqw.eq(KnowledgeHitLog::getDocId, docId);
+        lqw.orderByDesc(KnowledgeHitLog::getCreateTime);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    /**
+     * 根据知识片段ID查询知识库命中日志列表
+     */
+    @Override
+    public List<KnowledgeHitLogVo> queryByFragmentId(String fragmentId) {
+        LambdaQueryWrapper<KnowledgeHitLog> lqw = Wrappers.lambdaQuery();
+        lqw.eq(KnowledgeHitLog::getFragmentId, fragmentId);
+        lqw.orderByDesc(KnowledgeHitLog::getCreateTime);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    /**
+     * 根据模型名称查询知识库命中日志列表
+     */
+    @Override
+    public List<KnowledgeHitLogVo> queryByModelName(String modelName) {
+        LambdaQueryWrapper<KnowledgeHitLog> lqw = Wrappers.lambdaQuery();
+        lqw.eq(KnowledgeHitLog::getModelName, modelName);
+        lqw.orderByDesc(KnowledgeHitLog::getCreateTime);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    /**
+     * 根据相似度分数范围查询知识库命中日志列表
+     */
+    @Override
+    public List<KnowledgeHitLogVo> queryBySimilarityRange(Double minScore, Double maxScore) {
+        LambdaQueryWrapper<KnowledgeHitLog> lqw = Wrappers.lambdaQuery();
+        lqw.between(KnowledgeHitLog::getSimilarityScore, minScore, maxScore);
+        lqw.orderByDesc(KnowledgeHitLog::getSimilarityScore);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    /**
+     * 根据查询文本查询知识库命中日志列表
+     */
+    @Override
+    public List<KnowledgeHitLogVo> queryByQueryText(String queryText) {
+        LambdaQueryWrapper<KnowledgeHitLog> lqw = Wrappers.lambdaQuery();
+        lqw.like(KnowledgeHitLog::getQueryText, queryText);
+        lqw.orderByDesc(KnowledgeHitLog::getCreateTime);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    /**
+     * 统计知识库命中次数
+     */
+    @Override
+    public Long countHitsByKnowledgeId(String knowledgeId) {
+        LambdaQueryWrapper<KnowledgeHitLog> lqw = Wrappers.lambdaQuery();
+        lqw.eq(KnowledgeHitLog::getKnowledgeId, knowledgeId);
+        return baseMapper.selectCount(lqw);
+    }
+
+    /**
+     * 统计文档命中次数
+     */
+    @Override
+    public Long countHitsByDocId(String docId) {
+        LambdaQueryWrapper<KnowledgeHitLog> lqw = Wrappers.lambdaQuery();
+        lqw.eq(KnowledgeHitLog::getDocId, docId);
+        return baseMapper.selectCount(lqw);
+    }
+
+    /**
+     * 统计知识片段命中次数
+     */
+    @Override
+    public Long countHitsByFragmentId(String fragmentId) {
+        LambdaQueryWrapper<KnowledgeHitLog> lqw = Wrappers.lambdaQuery();
+        lqw.eq(KnowledgeHitLog::getFragmentId, fragmentId);
+        return baseMapper.selectCount(lqw);
+    }
+
+    /**
+     * 获取热门查询列表
+     */
+    @Override
+    public List<Map<String, Object>> getPopularQueries(String knowledgeId, Integer limit) {
+        LambdaQueryWrapper<KnowledgeHitLog> lqw = Wrappers.lambdaQuery();
+        lqw.eq(StringUtils.isNotBlank(knowledgeId), KnowledgeHitLog::getKnowledgeId, knowledgeId);
+        lqw.isNotNull(KnowledgeHitLog::getQueryText);
+        lqw.ne(KnowledgeHitLog::getQueryText, "");
+        lqw.orderByDesc(KnowledgeHitLog::getCreateTime);
+
+        List<KnowledgeHitLog> logs = baseMapper.selectList(lqw);
+
+        // 按查询文本分组统计
+        Map<String, Long> queryCountMap = logs.stream()
+                .filter(log -> StringUtils.isNotBlank(log.getQueryText()))
+                .collect(Collectors.groupingBy(KnowledgeHitLog::getQueryText, Collectors.counting()));
+
+        // 转换为Map列表并按数量排序
+        List<Map<String, Object>> result = queryCountMap.entrySet().stream()
+                .sorted(Map.Entry.<String, Long>comparingByValue().reversed())
+                .limit(limit != null && limit > 0 ? limit : 10)
+                .map(entry -> {
+                    Map<String, Object> map = new java.util.HashMap<>();
+                    map.put("queryText", entry.getKey());
+                    map.put("count", entry.getValue());
+                    return map;
+                })
+                .collect(Collectors.toList());
+
+        return result;
+    }
+
+    /**
+     * 获取平均响应时间
+     */
+    @Override
+    public Double getAverageResponseTime(String knowledgeId) {
+        LambdaQueryWrapper<KnowledgeHitLog> lqw = Wrappers.lambdaQuery();
+        lqw.eq(StringUtils.isNotBlank(knowledgeId), KnowledgeHitLog::getKnowledgeId, knowledgeId);
+        lqw.isNotNull(KnowledgeHitLog::getResponseTime);
+        lqw.gt(KnowledgeHitLog::getResponseTime, 0L);
+
+        List<KnowledgeHitLog> logs = baseMapper.selectList(lqw);
+
+        if (logs.isEmpty()) {
+            return 0.0;
+        }
+
+        // 计算平均响应时间
+        return logs.stream()
+                .filter(log -> log.getResponseTime() != null && log.getResponseTime() > 0)
+                .mapToLong(KnowledgeHitLog::getResponseTime)
+                .average()
+                .orElse(0.0);
+    }
+
+    /**
+     * 根据排名查询知识库命中日志列表
+     */
+    @Override
+    public List<KnowledgeHitLogVo> queryByRanking(Integer ranking) {
+        LambdaQueryWrapper<KnowledgeHitLog> lqw = Wrappers.lambdaQuery();
+        lqw.eq(KnowledgeHitLog::getRanking, ranking);
+        lqw.orderByDesc(KnowledgeHitLog::getCreateTime);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    /**
+     * 根据响应时间范围查询知识库命中日志列表
+     */
+    @Override
+    public List<KnowledgeHitLogVo> queryByResponseTimeRange(Long minTime, Long maxTime) {
+        LambdaQueryWrapper<KnowledgeHitLog> lqw = Wrappers.lambdaQuery();
+        lqw.between(KnowledgeHitLog::getResponseTime, minTime, maxTime);
+        lqw.orderByAsc(KnowledgeHitLog::getResponseTime);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    /**
+     * 批量插入知识库命中日志
+     */
+    @Override
+    public Boolean batchInsert(List<KnowledgeHitLogBo> boList) {
+        List<KnowledgeHitLog> entityList = boList.stream()
+                .map(bo -> MapstructUtils.convert(bo, KnowledgeHitLog.class))
+                .collect(Collectors.toList());
+        return saveBatch(entityList);
+    }
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/service/impl/KnowledgeInfoServiceImpl.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/service/impl/KnowledgeInfoServiceImpl.java
new file mode 100644
index 0000000..ee255da
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/service/impl/KnowledgeInfoServiceImpl.java
@@ -0,0 +1,260 @@
+package org.dromara.knowledge.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.knowledge.domain.KnowledgeInfo;
+import org.dromara.knowledge.domain.bo.KnowledgeInfoBo;
+import org.dromara.knowledge.domain.vo.KnowledgeInfoVo;
+import org.dromara.knowledge.domain.vo.KnowledgeSearchResultVo;
+import org.dromara.knowledge.domain.vo.KnowledgeStatusVo;
+import org.dromara.knowledge.mapper.KnowledgeInfoMapper;
+import org.dromara.knowledge.service.*;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 知识库信息Service业务层处理
+ *
+ * @author pengles
+ */
+@RequiredArgsConstructor
+@Service
+public class KnowledgeInfoServiceImpl extends ServiceImpl<KnowledgeInfoMapper, KnowledgeInfo> implements KnowledgeInfoService {
+
+    private final KnowledgeInfoMapper baseMapper;
+    private final KnowledgeAttachService knowledgeAttachService;
+    private final KnowledgeFragmentService knowledgeFragmentService;
+    private final KnowledgeVectorService knowledgeVectorService;
+    private final KnowledgeJobService knowledgeJobService;
+    private final KnowledgeHitLogService knowledgeHitLogService;
+    private final KnowledgeDocumentService knowledgeDocumentService;
+
+    /**
+     * 查询知识库信息
+     */
+    @Override
+    public KnowledgeInfoVo queryById(Long id) {
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 查询知识库信息列表
+     */
+    @Override
+    public TableDataInfo<KnowledgeInfoVo> queryPageList(KnowledgeInfoBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<KnowledgeInfo> lqw = buildQueryWrapper(bo);
+        Page<KnowledgeInfoVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询知识库信息列表
+     */
+    @Override
+    public List<KnowledgeInfoVo> queryList(KnowledgeInfoBo bo) {
+        LambdaQueryWrapper<KnowledgeInfo> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<KnowledgeInfo> buildQueryWrapper(KnowledgeInfoBo bo) {
+        LambdaQueryWrapper<KnowledgeInfo> lqw = Wrappers.lambdaQuery();
+        lqw.eq(ObjectUtil.isNotNull(bo.getUserId()), KnowledgeInfo::getUserId, bo.getUserId());
+        lqw.eq(StringUtils.isNotBlank(bo.getKnowledgeId()), KnowledgeInfo::getKnowledgeId, bo.getKnowledgeId());
+        lqw.like(StringUtils.isNotBlank(bo.getKnowledgeName()), KnowledgeInfo::getKnowledgeName, bo.getKnowledgeName());
+        lqw.eq(ObjectUtil.isNotNull(bo.getShare()), KnowledgeInfo::getShare, bo.getShare());
+        lqw.like(StringUtils.isNotBlank(bo.getDescription()), KnowledgeInfo::getDescription, bo.getDescription());
+        lqw.eq(StringUtils.isNotBlank(bo.getVectorModelName()), KnowledgeInfo::getVectorModelName, bo.getVectorModelName());
+        lqw.eq(StringUtils.isNotBlank(bo.getEmbeddingModelName()), KnowledgeInfo::getEmbeddingModelName, bo.getEmbeddingModelName());
+        return lqw;
+    }
+
+    /**
+     * 新增知识库信息
+     */
+    @Override
+    public Boolean insertByBo(KnowledgeInfoBo bo) {
+        KnowledgeInfo add = BeanUtil.toBean(bo, KnowledgeInfo.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改知识库信息
+     */
+    @Override
+    public Boolean updateByBo(KnowledgeInfoBo bo) {
+        KnowledgeInfo update = BeanUtil.toBean(bo, KnowledgeInfo.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(KnowledgeInfo entity) {
+        // TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除知识库信息
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if (isValid) {
+            // TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+
+    /**
+     * 根据用户ID查询知识库列表
+     */
+    @Override
+    public List<KnowledgeInfoVo> queryListByUserId(Long userId) {
+        LambdaQueryWrapper<KnowledgeInfo> lqw = Wrappers.lambdaQuery();
+        lqw.eq(KnowledgeInfo::getUserId, userId);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    /**
+     * 根据知识库ID查询知识库信息
+     */
+    @Override
+    public KnowledgeInfoVo queryByKnowledgeId(Long knowledgeId) {
+        LambdaQueryWrapper<KnowledgeInfo> lqw = Wrappers.lambdaQuery();
+        lqw.eq(KnowledgeInfo::getId, knowledgeId);
+        return baseMapper.selectVoOne(lqw);
+    }
+
+    @Override
+    public String uploadDocument(String knowledgeId, MultipartFile file) {
+        if (file.isEmpty()) {
+            throw new ServiceException("上传文件不能为空");
+        }
+
+        // 验证知识库是否存在
+        LambdaQueryWrapper<KnowledgeInfo> lqw = Wrappers.lambdaQuery();
+        lqw.eq(KnowledgeInfo::getKnowledgeId, knowledgeId);
+        KnowledgeInfo knowledgeInfo = baseMapper.selectOne(lqw);
+        if (knowledgeInfo == null) {
+            throw new ServiceException("知识库不存在");
+        }
+
+        // 验证文件大小（限制为50MB）
+        if (file.getSize() > 50 * 1024 * 1024) {
+            throw new ServiceException("文件大小不能超过50MB");
+        }
+
+        // 使用文档处理服务上传文档
+        return knowledgeDocumentService.processUploadedDocument(knowledgeId, file);
+    }
+
+    @Override
+    public List<String> batchUploadDocuments(String knowledgeId, MultipartFile[] files) {
+        List<String> docIds = new ArrayList<>();
+        List<String> failedFiles = new ArrayList<>();
+
+        for (MultipartFile file : files) {
+            try {
+                String docId = uploadDocument(knowledgeId, file);
+                docIds.add(docId);
+            } catch (Exception e) {
+                failedFiles.add(file.getOriginalFilename() + ": " + e.getMessage());
+            }
+        }
+
+        if (!failedFiles.isEmpty()) {
+            throw new ServiceException("部分文件上传失败: " + String.join(", ", failedFiles));
+        }
+
+        return docIds;
+    }
+
+    @Override
+    public List<KnowledgeSearchResultVo> searchKnowledge(String knowledgeId, String query, Integer limit) {
+        // 验证知识库是否存在
+        LambdaQueryWrapper<KnowledgeInfo> lqw = Wrappers.lambdaQuery();
+        lqw.eq(KnowledgeInfo::getKnowledgeId, knowledgeId);
+        KnowledgeInfo knowledgeInfo = baseMapper.selectOne(lqw);
+        if (knowledgeInfo == null) {
+            throw new ServiceException("知识库不存在");
+        }
+
+        // 获取知识库的向量模型
+        String vectorModel = knowledgeInfo.getVectorModelName();
+        if (vectorModel == null) {
+            vectorModel = "bge-base-zh"; // 默认模型
+        }
+
+        // 设置默认值
+        if (limit == null) {
+            limit = 10;
+        }
+        Double threshold = 0.7; // 默认相似度阈值
+
+        // 使用向量服务进行搜索
+        return knowledgeVectorService.vectorSimilaritySearch(knowledgeId, query, vectorModel, limit, threshold);
+    }
+
+    @Override
+    public KnowledgeStatusVo getKnowledgeStatus(String knowledgeId) {
+        // 验证知识库是否存在
+        LambdaQueryWrapper<KnowledgeInfo> lqw = Wrappers.lambdaQuery();
+        lqw.eq(KnowledgeInfo::getKnowledgeId, knowledgeId);
+        KnowledgeInfo knowledgeInfo = baseMapper.selectOne(lqw);
+        if (knowledgeInfo == null) {
+            throw new ServiceException("知识库不存在");
+        }
+
+        // 转换为VO对象
+        KnowledgeInfoVo knowledgeInfoVo = baseMapper.selectVoById(knowledgeInfo.getId());
+
+        // 使用文档处理服务获取状态信息
+        return knowledgeDocumentService.getKnowledgeProcessingStatus(Long.valueOf(knowledgeId), knowledgeInfoVo);
+    }
+
+    @Override
+    public String processDocument(String knowledgeId, String docId, String content) {
+        // 验证知识库是否存在
+        LambdaQueryWrapper<KnowledgeInfo> lqw = Wrappers.lambdaQuery();
+        lqw.eq(KnowledgeInfo::getKnowledgeId, knowledgeId);
+        KnowledgeInfo knowledgeInfo = baseMapper.selectOne(lqw);
+        if (knowledgeInfo == null) {
+            throw new ServiceException("知识库不存在");
+        }
+
+        // 使用文档处理服务处理文档
+        return knowledgeDocumentService.processDocumentContent(knowledgeId, docId, content, knowledgeInfo);
+    }
+
+    @Override
+    public String vectorizeFragment(String knowledgeId, String fragmentId) {
+        // 验证知识库是否存在
+        LambdaQueryWrapper<KnowledgeInfo> lqw = Wrappers.lambdaQuery();
+        lqw.eq(KnowledgeInfo::getKnowledgeId, knowledgeId);
+        KnowledgeInfo knowledgeInfo = baseMapper.selectOne(lqw);
+        if (knowledgeInfo == null) {
+            throw new ServiceException("知识库不存在");
+        }
+
+        // 使用文档处理服务进行向量化
+        return knowledgeDocumentService.vectorizeKnowledgeFragment(knowledgeId, fragmentId, knowledgeInfo);
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/service/impl/KnowledgeJobServiceImpl.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/service/impl/KnowledgeJobServiceImpl.java
new file mode 100644
index 0000000..6be0b3c
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/service/impl/KnowledgeJobServiceImpl.java
@@ -0,0 +1,288 @@
+package org.dromara.knowledge.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.knowledge.domain.KnowledgeJob;
+import org.dromara.knowledge.domain.bo.KnowledgeJobBo;
+import org.dromara.knowledge.domain.vo.KnowledgeJobVo;
+import org.dromara.knowledge.mapper.KnowledgeJobMapper;
+import org.dromara.knowledge.service.KnowledgeJobService;
+import org.springframework.stereotype.Service;
+
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 知识库任务Service业务层处理
+ *
+ * @author pengles
+ */
+@RequiredArgsConstructor
+@Service
+public class KnowledgeJobServiceImpl extends ServiceImpl<KnowledgeJobMapper, KnowledgeJob> implements KnowledgeJobService {
+
+    private final KnowledgeJobMapper baseMapper;
+
+    /**
+     * 查询知识库任务
+     */
+    @Override
+    public KnowledgeJobVo queryById(Long id) {
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 查询知识库任务列表
+     */
+    @Override
+    public TableDataInfo<KnowledgeJobVo> queryPageList(KnowledgeJobBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<KnowledgeJob> lqw = buildQueryWrapper(bo);
+        Page<KnowledgeJobVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询知识库任务列表
+     */
+    @Override
+    public List<KnowledgeJobVo> queryList(KnowledgeJobBo bo) {
+        LambdaQueryWrapper<KnowledgeJob> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<KnowledgeJob> buildQueryWrapper(KnowledgeJobBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<KnowledgeJob> lqw = Wrappers.lambdaQuery();
+        lqw.eq(StringUtils.isNotBlank(bo.getJobId()), KnowledgeJob::getJobId, bo.getJobId());
+        lqw.eq(StringUtils.isNotBlank(bo.getJobType()), KnowledgeJob::getJobType, bo.getJobType());
+        lqw.eq(StringUtils.isNotBlank(bo.getJobSubType()), KnowledgeJob::getJobSubType, bo.getJobSubType());
+        lqw.eq(StringUtils.isNotBlank(bo.getKnowledgeId()), KnowledgeJob::getKnowledgeId, bo.getKnowledgeId());
+        lqw.eq(StringUtils.isNotBlank(bo.getDocId()), KnowledgeJob::getDocId, bo.getDocId());
+        lqw.eq(bo.getUserId() != null, KnowledgeJob::getUserId, bo.getUserId());
+        lqw.eq(bo.getStatus() != null, KnowledgeJob::getStatus, bo.getStatus());
+        lqw.eq(bo.getPriority() != null, KnowledgeJob::getPriority, bo.getPriority());
+        lqw.between(params.get("beginStartTime") != null && params.get("endStartTime") != null,
+                KnowledgeJob::getStartTime, params.get("beginStartTime"), params.get("endStartTime"));
+        lqw.between(params.get("beginEndTime") != null && params.get("endEndTime") != null,
+                KnowledgeJob::getEndTime, params.get("beginEndTime"), params.get("endEndTime"));
+        return lqw;
+    }
+
+    /**
+     * 新增知识库任务
+     */
+    @Override
+    public Boolean insertByBo(KnowledgeJobBo bo) {
+        KnowledgeJob add = MapstructUtils.convert(bo, KnowledgeJob.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改知识库任务
+     */
+    @Override
+    public Boolean updateByBo(KnowledgeJobBo bo) {
+        KnowledgeJob update = MapstructUtils.convert(bo, KnowledgeJob.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(KnowledgeJob entity) {
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 批量删除知识库任务
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if (isValid) {
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+
+    /**
+     * 根据任务ID查询知识库任务
+     */
+    @Override
+    public KnowledgeJobVo queryByJobId(String jobId) {
+        LambdaQueryWrapper<KnowledgeJob> lqw = Wrappers.lambdaQuery();
+        lqw.eq(KnowledgeJob::getJobId, jobId);
+        return baseMapper.selectVoOne(lqw);
+    }
+
+    /**
+     * 根据知识库ID查询知识库任务列表
+     */
+    @Override
+    public List<KnowledgeJobVo> queryByKnowledgeId(String knowledgeId) {
+        LambdaQueryWrapper<KnowledgeJob> lqw = Wrappers.lambdaQuery();
+        lqw.eq(KnowledgeJob::getKnowledgeId, knowledgeId);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    /**
+     * 根据文档ID查询知识库任务列表
+     */
+    @Override
+    public List<KnowledgeJobVo> queryByDocId(String docId) {
+        LambdaQueryWrapper<KnowledgeJob> lqw = Wrappers.lambdaQuery();
+        lqw.eq(KnowledgeJob::getDocId, docId);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    /**
+     * 根据用户ID查询知识库任务列表
+     */
+    @Override
+    public List<KnowledgeJobVo> queryByUserId(Long userId) {
+        LambdaQueryWrapper<KnowledgeJob> lqw = Wrappers.lambdaQuery();
+        lqw.eq(KnowledgeJob::getUserId, userId);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    /**
+     * 根据任务类型查询知识库任务列表
+     */
+    @Override
+    public List<KnowledgeJobVo> queryByJobType(String jobType) {
+        LambdaQueryWrapper<KnowledgeJob> lqw = Wrappers.lambdaQuery();
+        lqw.eq(KnowledgeJob::getJobType, jobType);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    /**
+     * 根据任务状态查询知识库任务列表
+     */
+    @Override
+    public List<KnowledgeJobVo> queryByStatus(Integer status) {
+        LambdaQueryWrapper<KnowledgeJob> lqw = Wrappers.lambdaQuery();
+        lqw.eq(KnowledgeJob::getStatus, status);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    /**
+     * 查询正在运行的任务列表
+     */
+    @Override
+    public List<KnowledgeJobVo> queryRunningJobs() {
+        LambdaQueryWrapper<KnowledgeJob> lqw = Wrappers.lambdaQuery();
+        lqw.eq(KnowledgeJob::getStatus, 1); // 假设1表示运行中
+        return baseMapper.selectVoList(lqw);
+    }
+
+    /**
+     * 查询待处理的任务列表
+     */
+    @Override
+    public List<KnowledgeJobVo> queryPendingJobs() {
+        LambdaQueryWrapper<KnowledgeJob> lqw = Wrappers.lambdaQuery();
+        lqw.eq(KnowledgeJob::getStatus, 0); // 假设0表示待处理
+        return baseMapper.selectVoList(lqw);
+    }
+
+    /**
+     * 查询失败的任务列表
+     */
+    @Override
+    public List<KnowledgeJobVo> queryFailedJobs() {
+        LambdaQueryWrapper<KnowledgeJob> lqw = Wrappers.lambdaQuery();
+        lqw.eq(KnowledgeJob::getStatus, 3); // 假设3表示失败
+        return baseMapper.selectVoList(lqw);
+    }
+
+    /**
+     * 更新任务进度
+     */
+    @Override
+    public Boolean updateProgress(Long id, Integer progress) {
+        KnowledgeJob update = new KnowledgeJob();
+        update.setId(id);
+        update.setProgress(progress);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 更新任务状态
+     */
+    @Override
+    public Boolean updateStatus(Long id, Integer status) {
+        KnowledgeJob update = new KnowledgeJob();
+        update.setId(id);
+        update.setStatus(status);
+        if (status == 2) { // 假设2表示完成
+            update.setEndTime(new Date());
+        }
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 增加重试次数
+     */
+    @Override
+    public Boolean incrementRetryCount(Long id) {
+        KnowledgeJob job = baseMapper.selectById(id);
+        if (job != null) {
+            job.setRetryCount(job.getRetryCount() + 1);
+            return baseMapper.updateById(job) > 0;
+        }
+        return false;
+    }
+
+    /**
+     * 更新任务项目计数
+     */
+    @Override
+    public Boolean updateItemCounts(Long id, Integer totalItems, Integer processedItems, Integer successItems, Integer failedItems) {
+        KnowledgeJob update = new KnowledgeJob();
+        update.setId(id);
+        update.setTotalItems(totalItems);
+        update.setProcessedItems(processedItems);
+        update.setSuccessItems(successItems);
+        update.setFailedItems(failedItems);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 根据优先级查询任务列表
+     */
+    @Override
+    public List<KnowledgeJobVo> queryByPriority(Integer priority) {
+        LambdaQueryWrapper<KnowledgeJob> lqw = Wrappers.lambdaQuery();
+        lqw.eq(KnowledgeJob::getPriority, priority);
+        lqw.orderByDesc(KnowledgeJob::getCreateTime);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    /**
+     * 查询超时的任务列表
+     */
+    @Override
+    public List<KnowledgeJobVo> queryTimeoutJobs() {
+        LambdaQueryWrapper<KnowledgeJob> lqw = Wrappers.lambdaQuery();
+        lqw.eq(KnowledgeJob::getStatus, 1) // 运行中的任务
+                .isNotNull(KnowledgeJob::getTimeout)
+                .isNotNull(KnowledgeJob::getStartTime)
+                .apply("TIMESTAMPDIFF(SECOND, start_time, NOW()) > timeout");
+        return baseMapper.selectVoList(lqw);
+    }
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/service/impl/KnowledgePromptTemplateServiceImpl.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/service/impl/KnowledgePromptTemplateServiceImpl.java
new file mode 100644
index 0000000..dcb96f7
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/service/impl/KnowledgePromptTemplateServiceImpl.java
@@ -0,0 +1,129 @@
+package org.dromara.knowledge.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.knowledge.domain.KnowledgePromptTemplate;
+import org.dromara.knowledge.domain.bo.KnowledgePromptTemplateBo;
+import org.dromara.knowledge.domain.vo.KnowledgePromptTemplateVo;
+import org.dromara.knowledge.mapper.KnowledgePromptTemplateMapper;
+import org.dromara.knowledge.service.KnowledgePromptTemplateService;
+import org.springframework.stereotype.Service;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 知识库提示模板Service业务层处理
+ *
+ * @author pengles
+ */
+@RequiredArgsConstructor
+@Service
+public class KnowledgePromptTemplateServiceImpl extends ServiceImpl<KnowledgePromptTemplateMapper, KnowledgePromptTemplate> implements KnowledgePromptTemplateService {
+
+    private final KnowledgePromptTemplateMapper baseMapper;
+
+    /**
+     * 查询知识库提示模板
+     */
+    @Override
+    public KnowledgePromptTemplateVo queryById(Long id) {
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 查询知识库提示模板列表
+     */
+    @Override
+    public TableDataInfo<KnowledgePromptTemplateVo> queryPageList(KnowledgePromptTemplateBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<KnowledgePromptTemplate> lqw = buildQueryWrapper(bo);
+        Page<KnowledgePromptTemplateVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询知识库提示模板列表
+     */
+    @Override
+    public List<KnowledgePromptTemplateVo> queryList(KnowledgePromptTemplateBo bo) {
+        LambdaQueryWrapper<KnowledgePromptTemplate> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<KnowledgePromptTemplate> buildQueryWrapper(KnowledgePromptTemplateBo bo) {
+        LambdaQueryWrapper<KnowledgePromptTemplate> lqw = Wrappers.lambdaQuery();
+        lqw.like(StringUtils.isNotBlank(bo.getTemplateName()), KnowledgePromptTemplate::getTemplateName, bo.getTemplateName());
+        lqw.like(StringUtils.isNotBlank(bo.getTemplateContent()), KnowledgePromptTemplate::getTemplateContent, bo.getTemplateContent());
+        lqw.eq(StringUtils.isNotBlank(bo.getCategory()), KnowledgePromptTemplate::getCategory, bo.getCategory());
+        return lqw;
+    }
+
+    /**
+     * 新增知识库提示模板
+     */
+    @Override
+    public Boolean insertByBo(KnowledgePromptTemplateBo bo) {
+        KnowledgePromptTemplate add = BeanUtil.toBean(bo, KnowledgePromptTemplate.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改知识库提示模板
+     */
+    @Override
+    public Boolean updateByBo(KnowledgePromptTemplateBo bo) {
+        KnowledgePromptTemplate update = BeanUtil.toBean(bo, KnowledgePromptTemplate.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(KnowledgePromptTemplate entity) {
+        // TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除知识库提示模板
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if (isValid) {
+            // TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+
+    /**
+     * 根据分类查询模板列表
+     */
+    @Override
+    public List<KnowledgePromptTemplateVo> queryListByCategory(String category) {
+        LambdaQueryWrapper<KnowledgePromptTemplate> lqw = Wrappers.lambdaQuery();
+        lqw.eq(KnowledgePromptTemplate::getCategory, category);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    /**
+     * 根据模板名称查询模板信息
+     */
+    @Override
+    public KnowledgePromptTemplateVo queryByTemplateName(String templateName) {
+        LambdaQueryWrapper<KnowledgePromptTemplate> lqw = Wrappers.lambdaQuery();
+        lqw.eq(KnowledgePromptTemplate::getTemplateName, templateName);
+        return baseMapper.selectVoOne(lqw);
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/service/impl/KnowledgeRoleGroupServiceImpl.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/service/impl/KnowledgeRoleGroupServiceImpl.java
new file mode 100644
index 0000000..2d054de
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/service/impl/KnowledgeRoleGroupServiceImpl.java
@@ -0,0 +1,134 @@
+package org.dromara.knowledge.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.knowledge.domain.KnowledgeRoleGroup;
+import org.dromara.knowledge.domain.bo.KnowledgeRoleGroupBo;
+import org.dromara.knowledge.domain.vo.KnowledgeRoleGroupVo;
+import org.dromara.knowledge.mapper.KnowledgeRoleGroupMapper;
+import org.dromara.knowledge.service.KnowledgeRoleGroupService;
+import org.springframework.stereotype.Service;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 知识库角色分组Service业务层处理
+ *
+ * @author pengles
+ */
+@RequiredArgsConstructor
+@Service
+public class KnowledgeRoleGroupServiceImpl extends ServiceImpl<KnowledgeRoleGroupMapper, KnowledgeRoleGroup> implements KnowledgeRoleGroupService {
+
+    private final KnowledgeRoleGroupMapper baseMapper;
+
+    /**
+     * 查询知识库角色分组
+     */
+    @Override
+    public KnowledgeRoleGroupVo queryById(Long id) {
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 查询知识库角色分组列表
+     */
+    @Override
+    public TableDataInfo<KnowledgeRoleGroupVo> queryPageList(KnowledgeRoleGroupBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<KnowledgeRoleGroup> lqw = buildQueryWrapper(bo);
+        Page<KnowledgeRoleGroupVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询知识库角色分组列表
+     */
+    @Override
+    public List<KnowledgeRoleGroupVo> queryList(KnowledgeRoleGroupBo bo) {
+        LambdaQueryWrapper<KnowledgeRoleGroup> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<KnowledgeRoleGroup> buildQueryWrapper(KnowledgeRoleGroupBo bo) {
+        LambdaQueryWrapper<KnowledgeRoleGroup> lqw = Wrappers.lambdaQuery();
+        lqw.like(StringUtils.isNotBlank(bo.getGroupName()), KnowledgeRoleGroup::getGroupName, bo.getGroupName());
+        lqw.eq(StringUtils.isNotBlank(bo.getGroupCode()), KnowledgeRoleGroup::getGroupCode, bo.getGroupCode());
+        lqw.like(StringUtils.isNotBlank(bo.getGroupDesc()), KnowledgeRoleGroup::getGroupDesc, bo.getGroupDesc());
+        lqw.eq(ObjectUtil.isNotNull(bo.getStatus()), KnowledgeRoleGroup::getStatus, bo.getStatus());
+        lqw.orderByAsc(KnowledgeRoleGroup::getSort);
+        return lqw;
+    }
+
+    /**
+     * 新增知识库角色分组
+     */
+    @Override
+    public Boolean insertByBo(KnowledgeRoleGroupBo bo) {
+        KnowledgeRoleGroup add = BeanUtil.toBean(bo, KnowledgeRoleGroup.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改知识库角色分组
+     */
+    @Override
+    public Boolean updateByBo(KnowledgeRoleGroupBo bo) {
+        KnowledgeRoleGroup update = BeanUtil.toBean(bo, KnowledgeRoleGroup.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(KnowledgeRoleGroup entity) {
+        // TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 批量删除知识库角色分组
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if (isValid) {
+            // TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+
+    /**
+     * 根据分组编码查询分组信息
+     */
+    @Override
+    public KnowledgeRoleGroupVo queryByGroupCode(String groupCode) {
+        LambdaQueryWrapper<KnowledgeRoleGroup> lqw = Wrappers.lambdaQuery();
+        lqw.eq(KnowledgeRoleGroup::getGroupCode, groupCode);
+        return baseMapper.selectVoOne(lqw);
+    }
+
+    /**
+     * 查询启用状态的分组列表
+     */
+    @Override
+    public List<KnowledgeRoleGroupVo> queryEnabledList() {
+        LambdaQueryWrapper<KnowledgeRoleGroup> lqw = Wrappers.lambdaQuery();
+        lqw.eq(KnowledgeRoleGroup::getStatus, 1);
+        lqw.orderByAsc(KnowledgeRoleGroup::getSort);
+        return baseMapper.selectVoList(lqw);
+    }
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/service/impl/KnowledgeRoleRelationServiceImpl.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/service/impl/KnowledgeRoleRelationServiceImpl.java
new file mode 100644
index 0000000..4aff239
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/service/impl/KnowledgeRoleRelationServiceImpl.java
@@ -0,0 +1,145 @@
+package org.dromara.knowledge.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.knowledge.domain.KnowledgeRoleRelation;
+import org.dromara.knowledge.domain.bo.KnowledgeRoleRelationBo;
+import org.dromara.knowledge.domain.vo.KnowledgeRoleRelationVo;
+import org.dromara.knowledge.mapper.KnowledgeRoleRelationMapper;
+import org.dromara.knowledge.service.KnowledgeRoleRelationService;
+import org.springframework.stereotype.Service;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 知识库角色关系Service业务层处理
+ *
+ * @author pengles
+ */
+@RequiredArgsConstructor
+@Service
+public class KnowledgeRoleRelationServiceImpl extends ServiceImpl<KnowledgeRoleRelationMapper, KnowledgeRoleRelation> implements KnowledgeRoleRelationService {
+
+    private final KnowledgeRoleRelationMapper baseMapper;
+
+    /**
+     * 查询知识库角色关系
+     */
+    @Override
+    public KnowledgeRoleRelationVo queryById(Long id) {
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 查询知识库角色关系列表
+     */
+    @Override
+    public TableDataInfo<KnowledgeRoleRelationVo> queryPageList(KnowledgeRoleRelationBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<KnowledgeRoleRelation> lqw = buildQueryWrapper(bo);
+        Page<KnowledgeRoleRelationVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询知识库角色关系列表
+     */
+    @Override
+    public List<KnowledgeRoleRelationVo> queryList(KnowledgeRoleRelationBo bo) {
+        LambdaQueryWrapper<KnowledgeRoleRelation> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<KnowledgeRoleRelation> buildQueryWrapper(KnowledgeRoleRelationBo bo) {
+        LambdaQueryWrapper<KnowledgeRoleRelation> lqw = Wrappers.lambdaQuery();
+        lqw.eq(ObjectUtil.isNotNull(bo.getRoleId()), KnowledgeRoleRelation::getRoleId, bo.getRoleId());
+        lqw.eq(ObjectUtil.isNotNull(bo.getGroupId()), KnowledgeRoleRelation::getGroupId, bo.getGroupId());
+        lqw.eq(ObjectUtil.isNotNull(bo.getRelationType()), KnowledgeRoleRelation::getRelationType, bo.getRelationType());
+        lqw.eq(ObjectUtil.isNotNull(bo.getStatus()), KnowledgeRoleRelation::getStatus, bo.getStatus());
+        lqw.orderByAsc(KnowledgeRoleRelation::getSort);
+        return lqw;
+    }
+
+    /**
+     * 新增知识库角色关系
+     */
+    @Override
+    public Boolean insertByBo(KnowledgeRoleRelationBo bo) {
+        KnowledgeRoleRelation add = BeanUtil.toBean(bo, KnowledgeRoleRelation.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改知识库角色关系
+     */
+    @Override
+    public Boolean updateByBo(KnowledgeRoleRelationBo bo) {
+        KnowledgeRoleRelation update = BeanUtil.toBean(bo, KnowledgeRoleRelation.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(KnowledgeRoleRelation entity) {
+        // TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 批量删除知识库角色关系
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if (isValid) {
+            // TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+
+    /**
+     * 根据角色ID查询关系列表
+     */
+    @Override
+    public List<KnowledgeRoleRelationVo> queryByRoleId(Long roleId) {
+        LambdaQueryWrapper<KnowledgeRoleRelation> lqw = Wrappers.lambdaQuery();
+        lqw.eq(KnowledgeRoleRelation::getRoleId, roleId);
+        lqw.orderByAsc(KnowledgeRoleRelation::getSort);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    /**
+     * 根据分组ID查询关系列表
+     */
+    @Override
+    public List<KnowledgeRoleRelationVo> queryByGroupId(Long groupId) {
+        LambdaQueryWrapper<KnowledgeRoleRelation> lqw = Wrappers.lambdaQuery();
+        lqw.eq(KnowledgeRoleRelation::getGroupId, groupId);
+        lqw.orderByAsc(KnowledgeRoleRelation::getSort);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    /**
+     * 根据角色ID和分组ID查询关系
+     */
+    @Override
+    public KnowledgeRoleRelationVo queryByRoleIdAndGroupId(Long roleId, Long groupId) {
+        LambdaQueryWrapper<KnowledgeRoleRelation> lqw = Wrappers.lambdaQuery();
+        lqw.eq(KnowledgeRoleRelation::getRoleId, roleId);
+        lqw.eq(KnowledgeRoleRelation::getGroupId, groupId);
+        return baseMapper.selectVoOne(lqw);
+    }
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/service/impl/KnowledgeRoleServiceImpl.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/service/impl/KnowledgeRoleServiceImpl.java
new file mode 100644
index 0000000..583593f
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/service/impl/KnowledgeRoleServiceImpl.java
@@ -0,0 +1,134 @@
+package org.dromara.knowledge.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.knowledge.domain.KnowledgeRole;
+import org.dromara.knowledge.domain.bo.KnowledgeRoleBo;
+import org.dromara.knowledge.domain.vo.KnowledgeRoleVo;
+import org.dromara.knowledge.mapper.KnowledgeRoleMapper;
+import org.dromara.knowledge.service.KnowledgeRoleService;
+import org.springframework.stereotype.Service;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 知识库角色Service业务层处理
+ *
+ * @author pengles
+ */
+@RequiredArgsConstructor
+@Service
+public class KnowledgeRoleServiceImpl extends ServiceImpl<KnowledgeRoleMapper, KnowledgeRole> implements KnowledgeRoleService {
+
+    private final KnowledgeRoleMapper baseMapper;
+
+    /**
+     * 查询知识库角色
+     */
+    @Override
+    public KnowledgeRoleVo queryById(Long id) {
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 查询知识库角色列表
+     */
+    @Override
+    public TableDataInfo<KnowledgeRoleVo> queryPageList(KnowledgeRoleBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<KnowledgeRole> lqw = buildQueryWrapper(bo);
+        Page<KnowledgeRoleVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询知识库角色列表
+     */
+    @Override
+    public List<KnowledgeRoleVo> queryList(KnowledgeRoleBo bo) {
+        LambdaQueryWrapper<KnowledgeRole> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<KnowledgeRole> buildQueryWrapper(KnowledgeRoleBo bo) {
+        LambdaQueryWrapper<KnowledgeRole> lqw = Wrappers.lambdaQuery();
+        lqw.like(StringUtils.isNotBlank(bo.getRoleName()), KnowledgeRole::getRoleName, bo.getRoleName());
+        lqw.eq(StringUtils.isNotBlank(bo.getRoleCode()), KnowledgeRole::getRoleCode, bo.getRoleCode());
+        lqw.like(StringUtils.isNotBlank(bo.getRoleDesc()), KnowledgeRole::getRoleDesc, bo.getRoleDesc());
+        lqw.eq(ObjectUtil.isNotNull(bo.getStatus()), KnowledgeRole::getStatus, bo.getStatus());
+        lqw.orderByAsc(KnowledgeRole::getSort);
+        return lqw;
+    }
+
+    /**
+     * 新增知识库角色
+     */
+    @Override
+    public Boolean insertByBo(KnowledgeRoleBo bo) {
+        KnowledgeRole add = BeanUtil.toBean(bo, KnowledgeRole.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改知识库角色
+     */
+    @Override
+    public Boolean updateByBo(KnowledgeRoleBo bo) {
+        KnowledgeRole update = BeanUtil.toBean(bo, KnowledgeRole.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(KnowledgeRole entity) {
+        // TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 批量删除知识库角色
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if (isValid) {
+            // TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+
+    /**
+     * 根据角色编码查询角色信息
+     */
+    @Override
+    public KnowledgeRoleVo queryByRoleCode(String roleCode) {
+        LambdaQueryWrapper<KnowledgeRole> lqw = Wrappers.lambdaQuery();
+        lqw.eq(KnowledgeRole::getRoleCode, roleCode);
+        return baseMapper.selectVoOne(lqw);
+    }
+
+    /**
+     * 查询启用状态的角色列表
+     */
+    @Override
+    public List<KnowledgeRoleVo> queryEnabledList() {
+        LambdaQueryWrapper<KnowledgeRole> lqw = Wrappers.lambdaQuery();
+        lqw.eq(KnowledgeRole::getStatus, 1);
+        lqw.orderByAsc(KnowledgeRole::getSort);
+        return baseMapper.selectVoList(lqw);
+    }
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/service/impl/KnowledgeSchemaFieldServiceImpl.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/service/impl/KnowledgeSchemaFieldServiceImpl.java
new file mode 100644
index 0000000..4298210
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/service/impl/KnowledgeSchemaFieldServiceImpl.java
@@ -0,0 +1,150 @@
+package org.dromara.knowledge.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.knowledge.domain.KnowledgeSchemaField;
+import org.dromara.knowledge.domain.bo.KnowledgeSchemaFieldBo;
+import org.dromara.knowledge.domain.vo.KnowledgeSchemaFieldVo;
+import org.dromara.knowledge.mapper.KnowledgeSchemaFieldMapper;
+import org.dromara.knowledge.service.KnowledgeSchemaFieldService;
+import org.springframework.stereotype.Service;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 知识库模式字段Service业务层处理
+ *
+ * @author pengles
+ */
+@RequiredArgsConstructor
+@Service
+public class KnowledgeSchemaFieldServiceImpl extends ServiceImpl<KnowledgeSchemaFieldMapper, KnowledgeSchemaField> implements KnowledgeSchemaFieldService {
+
+    private final KnowledgeSchemaFieldMapper baseMapper;
+
+    /**
+     * 查询知识库模式字段
+     */
+    @Override
+    public KnowledgeSchemaFieldVo queryById(Long id) {
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 查询知识库模式字段列表
+     */
+    @Override
+    public TableDataInfo<KnowledgeSchemaFieldVo> queryPageList(KnowledgeSchemaFieldBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<KnowledgeSchemaField> lqw = buildQueryWrapper(bo);
+        Page<KnowledgeSchemaFieldVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询知识库模式字段列表
+     */
+    @Override
+    public List<KnowledgeSchemaFieldVo> queryList(KnowledgeSchemaFieldBo bo) {
+        LambdaQueryWrapper<KnowledgeSchemaField> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<KnowledgeSchemaField> buildQueryWrapper(KnowledgeSchemaFieldBo bo) {
+        LambdaQueryWrapper<KnowledgeSchemaField> lqw = Wrappers.lambdaQuery();
+        lqw.eq(ObjectUtil.isNotNull(bo.getSchemaId()), KnowledgeSchemaField::getSchemaId, bo.getSchemaId());
+        lqw.eq(StringUtils.isNotBlank(bo.getSchemaName()), KnowledgeSchemaField::getSchemaName, bo.getSchemaName());
+        lqw.like(StringUtils.isNotBlank(bo.getName()), KnowledgeSchemaField::getName, bo.getName());
+        lqw.eq(StringUtils.isNotBlank(bo.getCode()), KnowledgeSchemaField::getCode, bo.getCode());
+        lqw.eq(StringUtils.isNotBlank(bo.getType()), KnowledgeSchemaField::getType, bo.getType());
+        lqw.eq(ObjectUtil.isNotNull(bo.getIsPk()), KnowledgeSchemaField::getIsPk, bo.getIsPk());
+        lqw.eq(ObjectUtil.isNotNull(bo.getIsRequired()), KnowledgeSchemaField::getIsRequired, bo.getIsRequired());
+        lqw.eq(ObjectUtil.isNotNull(bo.getIsUnique()), KnowledgeSchemaField::getIsUnique, bo.getIsUnique());
+        lqw.eq(StringUtils.isNotBlank(bo.getQueryType()), KnowledgeSchemaField::getQueryType, bo.getQueryType());
+        lqw.eq(StringUtils.isNotBlank(bo.getHtmlType()), KnowledgeSchemaField::getHtmlType, bo.getHtmlType());
+        lqw.eq(StringUtils.isNotBlank(bo.getDictType()), KnowledgeSchemaField::getDictType, bo.getDictType());
+        return lqw;
+    }
+
+    /**
+     * 新增知识库模式字段
+     */
+    @Override
+    public Boolean insertByBo(KnowledgeSchemaFieldBo bo) {
+        KnowledgeSchemaField add = BeanUtil.toBean(bo, KnowledgeSchemaField.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改知识库模式字段
+     */
+    @Override
+    public Boolean updateByBo(KnowledgeSchemaFieldBo bo) {
+        KnowledgeSchemaField update = BeanUtil.toBean(bo, KnowledgeSchemaField.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(KnowledgeSchemaField entity) {
+        // TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除知识库模式字段
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if (isValid) {
+            // TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+
+    /**
+     * 根据模式ID查询字段列表
+     */
+    @Override
+    public List<KnowledgeSchemaFieldVo> queryListBySchemaId(Long schemaId) {
+        LambdaQueryWrapper<KnowledgeSchemaField> lqw = Wrappers.lambdaQuery();
+        lqw.eq(KnowledgeSchemaField::getSchemaId, schemaId);
+        lqw.orderByAsc(KnowledgeSchemaField::getSort);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    /**
+     * 根据编码查询字段信息
+     */
+    @Override
+    public KnowledgeSchemaFieldVo queryByCode(String code) {
+        LambdaQueryWrapper<KnowledgeSchemaField> lqw = Wrappers.lambdaQuery();
+        lqw.eq(KnowledgeSchemaField::getCode, code);
+        return baseMapper.selectVoOne(lqw);
+    }
+
+    /**
+     * 根据模式ID和字段编码查询字段信息
+     */
+    @Override
+    public KnowledgeSchemaFieldVo queryBySchemaIdAndCode(Long schemaId, String code) {
+        LambdaQueryWrapper<KnowledgeSchemaField> lqw = Wrappers.lambdaQuery();
+        lqw.eq(KnowledgeSchemaField::getSchemaId, schemaId);
+        lqw.eq(KnowledgeSchemaField::getCode, code);
+        return baseMapper.selectVoOne(lqw);
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/service/impl/KnowledgeSchemaGroupServiceImpl.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/service/impl/KnowledgeSchemaGroupServiceImpl.java
new file mode 100644
index 0000000..87a2a57
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/service/impl/KnowledgeSchemaGroupServiceImpl.java
@@ -0,0 +1,129 @@
+package org.dromara.knowledge.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.knowledge.domain.KnowledgeSchemaGroup;
+import org.dromara.knowledge.domain.bo.KnowledgeSchemaGroupBo;
+import org.dromara.knowledge.domain.vo.KnowledgeSchemaGroupVo;
+import org.dromara.knowledge.mapper.KnowledgeSchemaGroupMapper;
+import org.dromara.knowledge.service.KnowledgeSchemaGroupService;
+import org.springframework.stereotype.Service;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 知识库模式组Service业务层处理
+ *
+ * @author pengles
+ */
+@RequiredArgsConstructor
+@Service
+public class KnowledgeSchemaGroupServiceImpl extends ServiceImpl<KnowledgeSchemaGroupMapper, KnowledgeSchemaGroup> implements KnowledgeSchemaGroupService {
+
+    private final KnowledgeSchemaGroupMapper baseMapper;
+
+    /**
+     * 查询知识库模式组
+     */
+    @Override
+    public KnowledgeSchemaGroupVo queryById(Long id) {
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 查询知识库模式组列表
+     */
+    @Override
+    public TableDataInfo<KnowledgeSchemaGroupVo> queryPageList(KnowledgeSchemaGroupBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<KnowledgeSchemaGroup> lqw = buildQueryWrapper(bo);
+        Page<KnowledgeSchemaGroupVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询知识库模式组列表
+     */
+    @Override
+    public List<KnowledgeSchemaGroupVo> queryList(KnowledgeSchemaGroupBo bo) {
+        LambdaQueryWrapper<KnowledgeSchemaGroup> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<KnowledgeSchemaGroup> buildQueryWrapper(KnowledgeSchemaGroupBo bo) {
+        LambdaQueryWrapper<KnowledgeSchemaGroup> lqw = Wrappers.lambdaQuery();
+        lqw.like(StringUtils.isNotBlank(bo.getName()), KnowledgeSchemaGroup::getName, bo.getName());
+        lqw.eq(StringUtils.isNotBlank(bo.getCode()), KnowledgeSchemaGroup::getCode, bo.getCode());
+        lqw.eq(StringUtils.isNotBlank(bo.getIcon()), KnowledgeSchemaGroup::getIcon, bo.getIcon());
+        return lqw;
+    }
+
+    /**
+     * 新增知识库模式组
+     */
+    @Override
+    public Boolean insertByBo(KnowledgeSchemaGroupBo bo) {
+        KnowledgeSchemaGroup add = BeanUtil.toBean(bo, KnowledgeSchemaGroup.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改知识库模式组
+     */
+    @Override
+    public Boolean updateByBo(KnowledgeSchemaGroupBo bo) {
+        KnowledgeSchemaGroup update = BeanUtil.toBean(bo, KnowledgeSchemaGroup.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(KnowledgeSchemaGroup entity) {
+        // TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除知识库模式组
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if (isValid) {
+            // TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+
+    /**
+     * 根据编码查询模式组信息
+     */
+    @Override
+    public KnowledgeSchemaGroupVo queryByCode(String code) {
+        LambdaQueryWrapper<KnowledgeSchemaGroup> lqw = Wrappers.lambdaQuery();
+        lqw.eq(KnowledgeSchemaGroup::getCode, code);
+        return baseMapper.selectVoOne(lqw);
+    }
+
+    /**
+     * 根据名称查询模式组信息
+     */
+    @Override
+    public KnowledgeSchemaGroupVo queryByName(String name) {
+        LambdaQueryWrapper<KnowledgeSchemaGroup> lqw = Wrappers.lambdaQuery();
+        lqw.eq(KnowledgeSchemaGroup::getName, name);
+        return baseMapper.selectVoOne(lqw);
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/service/impl/KnowledgeSchemaServiceImpl.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/service/impl/KnowledgeSchemaServiceImpl.java
new file mode 100644
index 0000000..46349cf
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/service/impl/KnowledgeSchemaServiceImpl.java
@@ -0,0 +1,141 @@
+package org.dromara.knowledge.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.knowledge.domain.KnowledgeSchema;
+import org.dromara.knowledge.domain.bo.KnowledgeSchemaBo;
+import org.dromara.knowledge.domain.vo.KnowledgeSchemaVo;
+import org.dromara.knowledge.mapper.KnowledgeSchemaMapper;
+import org.dromara.knowledge.service.KnowledgeSchemaService;
+import org.springframework.stereotype.Service;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 知识库模式Service业务层处理
+ *
+ * @author pengles
+ */
+@RequiredArgsConstructor
+@Service
+public class KnowledgeSchemaServiceImpl extends ServiceImpl<KnowledgeSchemaMapper, KnowledgeSchema> implements KnowledgeSchemaService {
+
+    private final KnowledgeSchemaMapper baseMapper;
+
+    /**
+     * 查询知识库模式
+     */
+    @Override
+    public KnowledgeSchemaVo queryById(Long id) {
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 查询知识库模式列表
+     */
+    @Override
+    public TableDataInfo<KnowledgeSchemaVo> queryPageList(KnowledgeSchemaBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<KnowledgeSchema> lqw = buildQueryWrapper(bo);
+        Page<KnowledgeSchemaVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询知识库模式列表
+     */
+    @Override
+    public List<KnowledgeSchemaVo> queryList(KnowledgeSchemaBo bo) {
+        LambdaQueryWrapper<KnowledgeSchema> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<KnowledgeSchema> buildQueryWrapper(KnowledgeSchemaBo bo) {
+        LambdaQueryWrapper<KnowledgeSchema> lqw = Wrappers.lambdaQuery();
+        lqw.eq(ObjectUtil.isNotNull(bo.getSchemaGroupId()), KnowledgeSchema::getSchemaGroupId, bo.getSchemaGroupId());
+        lqw.like(StringUtils.isNotBlank(bo.getName()), KnowledgeSchema::getName, bo.getName());
+        lqw.eq(StringUtils.isNotBlank(bo.getCode()), KnowledgeSchema::getCode, bo.getCode());
+        lqw.eq(StringUtils.isNotBlank(bo.getTableName()), KnowledgeSchema::getTableName, bo.getTableName());
+        return lqw;
+    }
+
+    /**
+     * 新增知识库模式
+     */
+    @Override
+    public Boolean insertByBo(KnowledgeSchemaBo bo) {
+        KnowledgeSchema add = BeanUtil.toBean(bo, KnowledgeSchema.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改知识库模式
+     */
+    @Override
+    public Boolean updateByBo(KnowledgeSchemaBo bo) {
+        KnowledgeSchema update = BeanUtil.toBean(bo, KnowledgeSchema.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(KnowledgeSchema entity) {
+        // TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除知识库模式
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if (isValid) {
+            // TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+
+    /**
+     * 根据模式组ID查询模式列表
+     */
+    @Override
+    public List<KnowledgeSchemaVo> queryListBySchemaGroupId(Long schemaGroupId) {
+        LambdaQueryWrapper<KnowledgeSchema> lqw = Wrappers.lambdaQuery();
+        lqw.eq(KnowledgeSchema::getSchemaGroupId, schemaGroupId);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    /**
+     * 根据编码查询模式信息
+     */
+    @Override
+    public KnowledgeSchemaVo queryByCode(String code) {
+        LambdaQueryWrapper<KnowledgeSchema> lqw = Wrappers.lambdaQuery();
+        lqw.eq(KnowledgeSchema::getCode, code);
+        return baseMapper.selectVoOne(lqw);
+    }
+
+    /**
+     * 根据表名查询模式信息
+     */
+    @Override
+    public KnowledgeSchemaVo queryByTableName(String tableName) {
+        LambdaQueryWrapper<KnowledgeSchema> lqw = Wrappers.lambdaQuery();
+        lqw.eq(KnowledgeSchema::getTableName, tableName);
+        return baseMapper.selectVoOne(lqw);
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/service/impl/KnowledgeVectorServiceImpl.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/service/impl/KnowledgeVectorServiceImpl.java
new file mode 100644
index 0000000..3871e67
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/service/impl/KnowledgeVectorServiceImpl.java
@@ -0,0 +1,410 @@
+package org.dromara.knowledge.service.impl;
+
+import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.knowledge.domain.KnowledgeVector;
+import org.dromara.knowledge.domain.bo.KnowledgeVectorBo;
+import org.dromara.knowledge.domain.vo.KnowledgeSearchResultVo;
+import org.dromara.knowledge.domain.vo.KnowledgeVectorVo;
+import org.dromara.knowledge.mapper.KnowledgeVectorMapper;
+import org.dromara.knowledge.service.KnowledgeFragmentService;
+import org.dromara.knowledge.service.KnowledgeVectorService;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * 知识片段向量Service业务层处理
+ *
+ * @author pengles
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class KnowledgeVectorServiceImpl extends ServiceImpl<KnowledgeVectorMapper, KnowledgeVector> implements KnowledgeVectorService {
+
+    // 支持的向量模型列表
+    private static final List<String> AVAILABLE_MODELS = Arrays.asList(
+            "text-embedding-ada-002", "text-embedding-3-small", "text-embedding-3-large",
+            "bge-large-zh", "bge-base-zh", "m3e-base", "m3e-large"
+    );
+    private final KnowledgeVectorMapper baseMapper;
+    private final KnowledgeFragmentService knowledgeFragmentService;
+    private final org.dromara.knowledge.embedding.EmbeddingService embeddingService;
+    private final org.dromara.knowledge.vectorstore.VectorStoreManager vectorStoreManager;
+
+    /**
+     * 查询知识片段向量
+     */
+    @Override
+    public KnowledgeVectorVo queryById(Long id) {
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 查询知识片段向量列表
+     */
+    @Override
+    public TableDataInfo<KnowledgeVectorVo> queryPageList(KnowledgeVectorBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<KnowledgeVector> lqw = buildQueryWrapper(bo);
+        Page<KnowledgeVectorVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询知识片段向量列表
+     */
+    @Override
+    public List<KnowledgeVectorVo> queryList(KnowledgeVectorBo bo) {
+        LambdaQueryWrapper<KnowledgeVector> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<KnowledgeVector> buildQueryWrapper(KnowledgeVectorBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<KnowledgeVector> lqw = Wrappers.lambdaQuery();
+        lqw.eq(StringUtils.isNotBlank(bo.getKnowledgeId()), KnowledgeVector::getKnowledgeId, bo.getKnowledgeId());
+        lqw.eq(StringUtils.isNotBlank(bo.getDocId()), KnowledgeVector::getDocId, bo.getDocId());
+        lqw.eq(StringUtils.isNotBlank(bo.getFragmentId()), KnowledgeVector::getFragmentId, bo.getFragmentId());
+        lqw.eq(StringUtils.isNotBlank(bo.getVectorId()), KnowledgeVector::getVectorId, bo.getVectorId());
+        lqw.eq(bo.getDimension() != null, KnowledgeVector::getDimension, bo.getDimension());
+        lqw.like(StringUtils.isNotBlank(bo.getModelName()), KnowledgeVector::getModelName, bo.getModelName());
+        lqw.eq(bo.getStatus() != null, KnowledgeVector::getStatus, bo.getStatus());
+        return lqw;
+    }
+
+    /**
+     * 新增知识片段向量
+     */
+    @Override
+    public Boolean insertByBo(KnowledgeVectorBo bo) {
+        KnowledgeVector add = MapstructUtils.convert(bo, KnowledgeVector.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改知识片段向量
+     */
+    @Override
+    public Boolean updateByBo(KnowledgeVectorBo bo) {
+        KnowledgeVector update = MapstructUtils.convert(bo, KnowledgeVector.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(KnowledgeVector entity) {
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 批量删除知识片段向量
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if (isValid) {
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+
+    /**
+     * 根据向量ID查询知识片段向量
+     */
+    @Override
+    public KnowledgeVectorVo queryByVectorId(String vectorId) {
+        LambdaQueryWrapper<KnowledgeVector> lqw = Wrappers.lambdaQuery();
+        lqw.eq(KnowledgeVector::getVectorId, vectorId);
+        return baseMapper.selectVoOne(lqw);
+    }
+
+    /**
+     * 根据知识库ID查询知识片段向量列表
+     */
+    @Override
+    public List<KnowledgeVectorVo> queryByKnowledgeId(String knowledgeId) {
+        LambdaQueryWrapper<KnowledgeVector> lqw = Wrappers.lambdaQuery();
+        lqw.eq(KnowledgeVector::getKnowledgeId, knowledgeId);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    /**
+     * 根据文档ID查询知识片段向量列表
+     */
+    @Override
+    public List<KnowledgeVectorVo> queryByDocId(String docId) {
+        LambdaQueryWrapper<KnowledgeVector> lqw = Wrappers.lambdaQuery();
+        lqw.eq(KnowledgeVector::getDocId, docId);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    /**
+     * 根据知识片段ID查询知识片段向量列表
+     */
+    @Override
+    public List<KnowledgeVectorVo> queryByFragmentId(String fragmentId) {
+        LambdaQueryWrapper<KnowledgeVector> lqw = Wrappers.lambdaQuery();
+        lqw.eq(KnowledgeVector::getFragmentId, fragmentId);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    /**
+     * 根据模型名称查询知识片段向量列表
+     */
+    @Override
+    public List<KnowledgeVectorVo> queryByModelName(String modelName) {
+        LambdaQueryWrapper<KnowledgeVector> lqw = Wrappers.lambdaQuery();
+        lqw.eq(KnowledgeVector::getModelName, modelName);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    /**
+     * 根据状态查询知识片段向量列表
+     */
+    @Override
+    public List<KnowledgeVectorVo> queryByStatus(Integer status) {
+        LambdaQueryWrapper<KnowledgeVector> lqw = Wrappers.lambdaQuery();
+        lqw.eq(KnowledgeVector::getStatus, status);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    /**
+     * 批量更新知识片段向量状态
+     */
+    @Override
+    public Boolean updateStatusByIds(Collection<Long> ids, Integer status) {
+        LambdaQueryWrapper<KnowledgeVector> lqw = Wrappers.lambdaQuery();
+        lqw.in(KnowledgeVector::getId, ids);
+        KnowledgeVector update = new KnowledgeVector();
+        update.setStatus(status);
+        return baseMapper.update(update, lqw) > 0;
+    }
+
+    /**
+     * 根据知识库ID和状态查询知识片段向量列表
+     */
+    @Override
+    public List<KnowledgeVectorVo> queryByKnowledgeIdAndStatus(String knowledgeId, Integer status) {
+        LambdaQueryWrapper<KnowledgeVector> lqw = Wrappers.lambdaQuery();
+        lqw.eq(KnowledgeVector::getKnowledgeId, knowledgeId)
+                .eq(KnowledgeVector::getStatus, status);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    @Override
+    public String generateVector(String knowledgeId, String docId, String fragmentId, String content, String modelName) {
+        try {
+            // 验证模型是否可用
+            if (!isModelAvailable(modelName)) {
+                throw new ServiceException("不支持的向量模型: " + modelName);
+            }
+
+            double[] vectorData = embeddingService.embed(content, modelName);
+            String vectorId = IdUtil.fastSimpleUUID();
+            KnowledgeVector vector = new KnowledgeVector();
+            vector.setKnowledgeId(knowledgeId);
+            vector.setDocId(docId);
+            vector.setFragmentId(fragmentId);
+            vector.setVectorId(vectorId);
+            vector.setVectorData(Arrays.toString(vectorData));
+            vector.setDimension(vectorData.length);
+            vector.setModelName(modelName);
+            vector.setStatus(20);
+            LambdaQueryWrapper<KnowledgeVector> lqw = Wrappers.lambdaQuery();
+            lqw.eq(KnowledgeVector::getFragmentId, fragmentId).eq(KnowledgeVector::getModelName, modelName);
+            KnowledgeVector exist = baseMapper.selectOne(lqw);
+            if (exist == null) {
+                baseMapper.insert(vector);
+            } else {
+                exist.setVectorData(vector.getVectorData());
+                exist.setDimension(vector.getDimension());
+                exist.setStatus(20);
+                baseMapper.updateById(exist);
+                vectorId = exist.getVectorId();
+            }
+            vectorStoreManager.current().upsert(knowledgeId, docId, fragmentId, vectorId, vectorData, content, modelName);
+            log.info("为片段 {} 生成向量成功，向量ID: {}", fragmentId, vectorId);
+            return vectorId;
+        } catch (Exception e) {
+            log.error("生成向量失败: {}", e.getMessage(), e);
+            throw new ServiceException("生成向量失败: " + e.getMessage());
+        }
+    }
+
+    @Override
+    public List<String> batchGenerateVectors(String knowledgeId, String docId,
+                                             Map<String, String> fragmentContents, String modelName) {
+        List<String> successIds = new ArrayList<>();
+
+        for (Map.Entry<String, String> entry : fragmentContents.entrySet()) {
+            try {
+                String vectorId = generateVector(knowledgeId, docId, entry.getKey(), entry.getValue(), modelName);
+                successIds.add(entry.getKey());
+            } catch (Exception e) {
+                log.error("为片段 {} 生成向量失败: {}", entry.getKey(), e.getMessage());
+            }
+        }
+
+        log.info("批量生成向量完成，成功: {}/{}", successIds.size(), fragmentContents.size());
+        return successIds;
+    }
+
+    @Override
+    public List<KnowledgeSearchResultVo> vectorSimilaritySearch(String knowledgeId, String queryText,
+                                                                String modelName, Integer topK, Double threshold) {
+        try {
+            // 将查询文本转换为向量
+            double[] queryVector = embeddingService.embed(queryText, modelName);
+
+            // 获取知识库中的所有向量
+            return vectorStoreManager.current().search(knowledgeId, queryVector, modelName, topK, threshold);
+
+            // 计算相似度并排序
+
+
+        } catch (Exception e) {
+            log.error("向量搜索失败: {}", e.getMessage(), e);
+            throw new ServiceException("向量搜索失败: " + e.getMessage());
+        }
+    }
+
+    @Override
+    public double[] textToVector(String text, String modelName) {
+        return embeddingService.embed(text, modelName);
+    }
+
+    @Override
+    public double calculateSimilarity(double[] vector1, double[] vector2) {
+        if (vector1.length != vector2.length) {
+            throw new ServiceException("向量维度不匹配");
+        }
+
+        // 计算余弦相似度
+        double dotProduct = 0;
+        double norm1 = 0;
+        double norm2 = 0;
+
+        for (int i = 0; i < vector1.length; i++) {
+            dotProduct += vector1[i] * vector2[i];
+            norm1 += vector1[i] * vector1[i];
+            norm2 += vector2[i] * vector2[i];
+        }
+
+        if (norm1 == 0 || norm2 == 0) {
+            return 0;
+        }
+
+        return dotProduct / (Math.sqrt(norm1) * Math.sqrt(norm2));
+    }
+
+    @Override
+    public int deleteVectorsByKnowledgeId(String knowledgeId) {
+        LambdaQueryWrapper<KnowledgeVector> lqw = Wrappers.lambdaQuery();
+        lqw.eq(KnowledgeVector::getKnowledgeId, knowledgeId);
+        return baseMapper.delete(lqw);
+    }
+
+    @Override
+    public int deleteVectorsByDocId(String docId) {
+        LambdaQueryWrapper<KnowledgeVector> lqw = Wrappers.lambdaQuery();
+        lqw.eq(KnowledgeVector::getDocId, docId);
+        return baseMapper.delete(lqw);
+    }
+
+    @Override
+    public Map<String, Object> getVectorStatistics(String knowledgeId) {
+        Map<String, Object> stats = new HashMap<>();
+
+        LambdaQueryWrapper<KnowledgeVector> lqw = Wrappers.lambdaQuery();
+        lqw.eq(KnowledgeVector::getKnowledgeId, knowledgeId);
+
+        List<KnowledgeVector> vectors = baseMapper.selectList(lqw);
+
+        stats.put("totalVectors", vectors.size());
+        stats.put("completedVectors", vectors.stream().filter(v -> v.getStatus() == 20).count());
+        stats.put("processingVectors", vectors.stream().filter(v -> v.getStatus() == 15).count());
+        stats.put("failedVectors", vectors.stream().filter(v -> v.getStatus() == 30).count());
+
+        // 按模型统计
+        Map<String, Long> modelStats = vectors.stream()
+                .collect(Collectors.groupingBy(KnowledgeVector::getModelName, Collectors.counting()));
+        stats.put("modelStatistics", modelStats);
+
+        return stats;
+    }
+
+    @Override
+    public boolean isModelAvailable(String modelName) {
+        return AVAILABLE_MODELS.contains(modelName);
+    }
+
+    @Override
+    public List<String> getAvailableModels() {
+        return new ArrayList<>(AVAILABLE_MODELS);
+    }
+
+    /**
+     * 根据模型名称获取向量维度
+     */
+    private int getDimensionByModel(String modelName) {
+        switch (modelName) {
+            case "text-embedding-ada-002":
+                return 1536;
+            case "text-embedding-3-small":
+                return 1536;
+            case "text-embedding-3-large":
+                return 3072;
+            case "bge-large-zh":
+                return 1024;
+            case "bge-base-zh":
+                return 768;
+            case "m3e-base":
+                return 768;
+            case "m3e-large":
+                return 1024;
+            default:
+                return 768; // 默认维度
+        }
+    }
+
+    /**
+     * 解析向量数据字符串
+     */
+    private double[] parseVectorData(String vectorDataStr) {
+        try {
+            if (StrUtil.isBlank(vectorDataStr)) {
+                return null;
+            }
+            String cleanStr = vectorDataStr.replace("[", "").replace("]", "");
+            String[] parts = cleanStr.split(",");
+            double[] vector = new double[parts.length];
+            for (int i = 0; i < parts.length; i++) {
+                vector[i] = Double.parseDouble(parts[i].trim());
+            }
+            return vector;
+        } catch (Exception e) {
+            log.error("解析向量数据失败: {}", e.getMessage());
+            return null;
+        }
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/vectorstore/DbVectorStoreService.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/vectorstore/DbVectorStoreService.java
new file mode 100644
index 0000000..b1cc767
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/vectorstore/DbVectorStoreService.java
@@ -0,0 +1,94 @@
+package org.dromara.knowledge.vectorstore;
+
+import lombok.RequiredArgsConstructor;
+import org.dromara.knowledge.domain.KnowledgeFragment;
+import org.dromara.knowledge.domain.KnowledgeVector;
+import org.dromara.knowledge.domain.vo.KnowledgeSearchResultVo;
+import org.dromara.knowledge.mapper.KnowledgeVectorMapper;
+import org.dromara.knowledge.service.KnowledgeFragmentService;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Component
+@RequiredArgsConstructor
+public class DbVectorStoreService implements VectorStoreService {
+
+    private final KnowledgeVectorMapper mapper;
+    private final KnowledgeFragmentService fragmentService;
+
+    @Override
+    public void upsert(String knowledgeId, String docId, String fragmentId, String vectorId, double[] vector, String content, String modelName) {
+        KnowledgeVector kv = new KnowledgeVector();
+        kv.setKnowledgeId(knowledgeId);
+        kv.setDocId(docId);
+        kv.setFragmentId(fragmentId);
+        kv.setVectorId(vectorId);
+        kv.setVectorData(Arrays.toString(vector));
+        kv.setDimension(vector.length);
+        kv.setModelName(modelName);
+        kv.setStatus(20);
+        mapper.insert(kv);
+    }
+
+    @Override
+    public List<KnowledgeSearchResultVo> search(String knowledgeId, double[] queryVector, String modelName, Integer topK, Double threshold) {
+        List<KnowledgeVector> vectors = mapper.selectList(new com.baomidou.mybatisplus.core.conditions.query.QueryWrapper<KnowledgeVector>().lambda()
+                .eq(KnowledgeVector::getKnowledgeId, knowledgeId)
+                .eq(KnowledgeVector::getModelName, modelName));
+        List<KnowledgeSearchResultVo> results = new ArrayList<>();
+        for (KnowledgeVector v : vectors) {
+            double[] vec = parse(v.getVectorData());
+            if (vec == null || vec.length != queryVector.length) continue;
+            double sim = cosine(queryVector, vec);
+            if (threshold != null && sim < threshold) continue;
+            KnowledgeFragment frag = fragmentService.getById(v.getFragmentId());
+            if (frag == null) continue;
+            KnowledgeSearchResultVo r = new KnowledgeSearchResultVo();
+            r.setFragmentId(v.getFragmentId());
+            r.setDocId(v.getDocId());
+            r.setContent(frag.getContent());
+            r.setSimilarityScore(sim);
+            r.setFragmentIndex(frag.getIdx());
+            r.setCreateTime(frag.getCreateTime());
+            results.add(r);
+        }
+        results.sort((a, b) -> Double.compare(b.getSimilarityScore(), a.getSimilarityScore()));
+        for (int i = 0; i < results.size(); i++) results.get(i).setRanking(i + 1);
+        int limit = topK != null ? topK : 10;
+        return results.stream().limit(limit).collect(Collectors.toList());
+    }
+
+    @Override
+    public void deleteByKnowledgeId(String knowledgeId) {
+        mapper.delete(new com.baomidou.mybatisplus.core.conditions.query.QueryWrapper<KnowledgeVector>().lambda()
+                .eq(KnowledgeVector::getKnowledgeId, knowledgeId));
+    }
+
+    @Override
+    public void rebuildIndex(String knowledgeId) {
+    }
+
+    private double[] parse(String s) {
+        if (s == null || s.isBlank()) return null;
+        String clean = s.replace("[", "").replace("]", "");
+        String[] parts = clean.split(",");
+        double[] v = new double[parts.length];
+        for (int i = 0; i < parts.length; i++) v[i] = Double.parseDouble(parts[i].trim());
+        return v;
+    }
+
+    private double cosine(double[] a, double[] b) {
+        double dot = 0, n1 = 0, n2 = 0;
+        for (int i = 0; i < a.length; i++) {
+            dot += a[i] * b[i];
+            n1 += a[i] * a[i];
+            n2 += b[i] * b[i];
+        }
+        if (n1 == 0 || n2 == 0) return 0;
+        return dot / (Math.sqrt(n1) * Math.sqrt(n2));
+    }
+}
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/vectorstore/QdrantVectorStoreService.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/vectorstore/QdrantVectorStoreService.java
new file mode 100644
index 0000000..64f437b
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/vectorstore/QdrantVectorStoreService.java
@@ -0,0 +1,176 @@
+package org.dromara.knowledge.vectorstore;
+
+import cn.hutool.core.util.StrUtil;
+import okhttp3.*;
+import org.dromara.common.json.utils.JsonUtils;
+import org.dromara.knowledge.domain.KnowledgeFragment;
+import org.dromara.knowledge.domain.vo.KnowledgeSearchResultVo;
+import org.dromara.knowledge.service.KnowledgeFragmentService;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+import java.nio.charset.StandardCharsets;
+import java.util.*;
+
+@Component
+public class QdrantVectorStoreService implements VectorStoreService {
+    @Value("${ruoyi.ai.knowledge.vector-store.qdrant.base-url:http://localhost:6333}")
+    private String baseUrl;
+    @Value("${ruoyi.ai.knowledge.vector-store.qdrant.api-key:}")
+    private String apiKey;
+    @Value("${ruoyi.ai.knowledge.vector-store.qdrant.collection:knowledge_vectors}")
+    private String collection;
+    @Value("${ruoyi.ai.knowledge.vector-store.qdrant.distance:Cosine}")
+    private String distance;
+    @Value("${ruoyi.ai.knowledge.embedding.default-model:bge-large-zh}")
+    private String defaultModel;
+
+    private final OkHttpClient client = new OkHttpClient();
+    private final KnowledgeFragmentService fragmentService;
+
+    public QdrantVectorStoreService(KnowledgeFragmentService fragmentService) {
+        this.fragmentService = fragmentService;
+    }
+
+    @Override
+    public void upsert(String knowledgeId, String docId, String fragmentId, String vectorId, double[] vector, String content, String modelName) {
+        Map<String, Object> payload = new HashMap<>();
+        payload.put("knowledgeId", knowledgeId);
+        payload.put("docId", docId);
+        payload.put("fragmentId", fragmentId);
+        payload.put("content", content);
+        payload.put("model", modelName);
+        List<Double> vec = new ArrayList<>();
+        for (double v : vector) vec.add(v);
+        Map<String, Object> point = new HashMap<>();
+        point.put("id", vectorId);
+        point.put("vector", vec);
+        point.put("payload", payload);
+        Map<String, Object> body = new HashMap<>();
+        body.put("points", List.of(point));
+        post("/collections/" + collection + "/points?wait=true", JsonUtils.toJsonString(body));
+    }
+
+    @Override
+    public List<KnowledgeSearchResultVo> search(String knowledgeId, double[] queryVector, String modelName, Integer topK, Double threshold) {
+        List<Double> vec = new ArrayList<>();
+        for (double v : queryVector) vec.add(v);
+        Map<String, Object> filter = Map.of("must", List.of(Map.of("key", "knowledgeId", "match", Map.of("value", knowledgeId))));
+        Map<String, Object> body = new HashMap<>();
+        body.put("vector", vec);
+        body.put("filter", filter);
+        body.put("limit", topK != null ? topK : 10);
+        String resp = post("/collections/" + collection + "/points/search", JsonUtils.toJsonString(body));
+        List<KnowledgeSearchResultVo> results = new ArrayList<>();
+        Map<?, ?> parsed = JsonUtils.parseObject(resp, new com.fasterxml.jackson.core.type.TypeReference<Map<String, Object>>() {
+        });
+        Object r = parsed != null ? parsed.get("result") : null;
+        if (r instanceof List<?> list) {
+            int rank = 1;
+            for (Object item : list) {
+                if (!(item instanceof Map<?, ?> m)) continue;
+                Double score = toDouble(m.get("score"));
+                Map<?, ?> payload = (Map<?, ?>) m.get("payload");
+                if (threshold != null && score != null && score < threshold) continue;
+                KnowledgeSearchResultVo vo = new KnowledgeSearchResultVo();
+                if (payload != null) {
+                    String fragId = String.valueOf(payload.get("fragmentId"));
+                    vo.setFragmentId(fragId);
+                    vo.setDocId(String.valueOf(payload.get("docId")));
+                    Object c = payload.get("content");
+                    String content = c != null ? String.valueOf(c) : null;
+                    if (StrUtil.isBlank(content)) {
+                        var frag = fragmentService.getById(fragId);
+                        if (frag != null) {
+                            content = frag.getContent();
+                            vo.setFragmentIndex(frag.getIdx());
+                            vo.setCreateTime(frag.getCreateTime());
+                        }
+                    } else {
+                        KnowledgeFragment frag = fragmentService.getById(fragId);
+                        if (frag != null) {
+                            vo.setFragmentIndex(frag.getIdx());
+                            vo.setCreateTime(frag.getCreateTime());
+                        }
+                    }
+                    vo.setContent(content);
+                }
+                vo.setSimilarityScore(score != null ? score : 0);
+                vo.setRanking(rank++);
+                results.add(vo);
+            }
+        }
+        return results;
+    }
+
+    @Override
+    public void deleteByKnowledgeId(String knowledgeId) {
+        Map<String, Object> filter = Map.of("must", List.of(Map.of("key", "knowledgeId", "match", Map.of("value", knowledgeId))));
+        Map<String, Object> body = new HashMap<>();
+        body.put("filter", filter);
+        post("/collections/" + collection + "/points/delete", JsonUtils.toJsonString(body));
+    }
+
+    @Override
+    public void rebuildIndex(String knowledgeId) {
+        ensureCollection(1024);
+    }
+
+    private void ensureCollection(int size) {
+        String get = get("/collections/" + collection);
+        if (get == null || get.contains("\"status\":\"error\"")) {
+            Map<String, Object> vectors = Map.of("size", size, "distance", distance);
+            Map<String, Object> body = Map.of("vectors", vectors);
+            put("/collections/" + collection, JsonUtils.toJsonString(body));
+        }
+    }
+
+    private String get(String path) {
+        Request.Builder b = new Request.Builder().url(url(path)).get();
+        if (apiKey != null && !apiKey.isBlank()) b.header("api-key", apiKey);
+        try (Response resp = client.newCall(b.build()).execute()) {
+            if (resp.body() == null) return null;
+            return resp.body().string();
+        } catch (Exception e) {
+            return null;
+        }
+    }
+
+    private String put(String path, String json) {
+        Request.Builder b = new Request.Builder().url(url(path))
+                .put(RequestBody.create(MediaType.parse("application/json"), json.getBytes(StandardCharsets.UTF_8)));
+        if (apiKey != null && !apiKey.isBlank()) b.header("api-key", apiKey);
+        try (Response resp = client.newCall(b.build()).execute()) {
+            return Objects.requireNonNull(resp.body()).string();
+        } catch (Exception e) {
+            return null;
+        }
+    }
+
+    private String post(String path, String json) {
+        Request.Builder b = new Request.Builder().url(url(path))
+                .post(RequestBody.create(MediaType.parse("application/json"), json.getBytes(StandardCharsets.UTF_8)));
+        if (apiKey != null && !apiKey.isBlank()) b.header("api-key", apiKey);
+        try (Response resp = client.newCall(b.build()).execute()) {
+            return Objects.requireNonNull(resp.body()).string();
+        } catch (Exception e) {
+            return null;
+        }
+    }
+
+    private String url(String path) {
+        if (baseUrl.endsWith("/") && path.startsWith("/")) return baseUrl + path.substring(1);
+        if (!baseUrl.endsWith("/") && !path.startsWith("/")) return baseUrl + "/" + path;
+        return baseUrl + path;
+    }
+
+    private Double toDouble(Object o) {
+        try {
+            if (o == null) return null;
+            if (o instanceof Number n) return n.doubleValue();
+            return Double.parseDouble(String.valueOf(o));
+        } catch (Exception e) {
+            return null;
+        }
+    }
+}
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/vectorstore/VectorStoreManager.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/vectorstore/VectorStoreManager.java
new file mode 100644
index 0000000..a50b2d3
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/vectorstore/VectorStoreManager.java
@@ -0,0 +1,25 @@
+package org.dromara.knowledge.vectorstore;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+@Component
+public class VectorStoreManager {
+    private final VectorStoreService dbService;
+    private final QdrantVectorStoreService qdrantService;
+    private final WeaviateVectorStoreService weaviateService;
+    @Value("${ruoyi.ai.knowledge.vector-store.type:db}")
+    private String type;
+
+    public VectorStoreManager(DbVectorStoreService dbService, QdrantVectorStoreService qdrantService, WeaviateVectorStoreService weaviateService) {
+        this.dbService = dbService;
+        this.qdrantService = qdrantService;
+        this.weaviateService = weaviateService;
+    }
+
+    public VectorStoreService current() {
+        if ("qdrant".equalsIgnoreCase(type)) return qdrantService;
+        if ("weaviate".equalsIgnoreCase(type)) return weaviateService;
+        return dbService;
+    }
+}
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/vectorstore/VectorStoreService.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/vectorstore/VectorStoreService.java
new file mode 100644
index 0000000..f32b044
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/vectorstore/VectorStoreService.java
@@ -0,0 +1,15 @@
+package org.dromara.knowledge.vectorstore;
+
+import org.dromara.knowledge.domain.vo.KnowledgeSearchResultVo;
+
+import java.util.List;
+
+public interface VectorStoreService {
+    void upsert(String knowledgeId, String docId, String fragmentId, String vectorId, double[] vector, String content, String modelName);
+
+    List<KnowledgeSearchResultVo> search(String knowledgeId, double[] queryVector, String modelName, Integer topK, Double threshold);
+
+    void deleteByKnowledgeId(String knowledgeId);
+
+    void rebuildIndex(String knowledgeId);
+}
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/vectorstore/WeaviateVectorStoreService.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/vectorstore/WeaviateVectorStoreService.java
new file mode 100644
index 0000000..bd30e39
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/vectorstore/WeaviateVectorStoreService.java
@@ -0,0 +1,143 @@
+package org.dromara.knowledge.vectorstore;
+
+import okhttp3.*;
+import org.dromara.common.json.utils.JsonUtils;
+import org.dromara.knowledge.domain.KnowledgeFragment;
+import org.dromara.knowledge.domain.vo.KnowledgeSearchResultVo;
+import org.dromara.knowledge.service.KnowledgeFragmentService;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+import java.nio.charset.StandardCharsets;
+import java.util.*;
+
+@Component
+public class WeaviateVectorStoreService implements VectorStoreService {
+    @Value("${ruoyi.ai.knowledge.vector-store.weaviate.base-url:http://localhost:8080}")
+    private String baseUrl;
+    @Value("${ruoyi.ai.knowledge.vector-store.weaviate.api-key:}")
+    private String apiKey;
+    @Value("${ruoyi.ai.knowledge.vector-store.weaviate.class-name:KnowledgeVector}")
+    private String className;
+
+    private final OkHttpClient client = new OkHttpClient();
+    private final KnowledgeFragmentService fragmentService;
+
+    public WeaviateVectorStoreService(KnowledgeFragmentService fragmentService) {
+        this.fragmentService = fragmentService;
+    }
+
+    @Override
+    public void upsert(String knowledgeId, String docId, String fragmentId, String vectorId, double[] vector, String content, String modelName) {
+        Map<String, Object> obj = new HashMap<>();
+        obj.put("class", className);
+        obj.put("id", vectorId);
+        obj.put("properties", Map.of(
+                "knowledgeId", knowledgeId,
+                "docId", docId,
+                "fragmentId", fragmentId,
+                "content", content,
+                "model", modelName
+        ));
+        List<Double> vec = new ArrayList<>();
+        for (double v : vector) vec.add(v);
+        obj.put("vector", vec);
+        String body = JsonUtils.toJsonString(obj);
+        post("/v1/objects", body);
+    }
+
+    @Override
+    public List<KnowledgeSearchResultVo> search(String knowledgeId, double[] queryVector, String modelName, Integer topK, Double threshold) {
+        List<Double> vec = new ArrayList<>();
+        for (double v : queryVector) vec.add(v);
+        String gql = "{" +
+                "  Get {" +
+                "    " + className + "(nearVector: {vector: " + JsonUtils.toJsonString(vec) + "}, limit: " + (topK != null ? topK : 10) + ", where: {path: [\"knowledgeId\"], operator: Equal, valueString: \"" + knowledgeId + "\"}) {" +
+                "      fragmentId docId content _additional { distance id }" +
+                "    }" +
+                "  }" +
+                "}";
+        String body = JsonUtils.toJsonString(Map.of("query", gql));
+        String resp = post("/v1/graphql", body);
+        Map<?, ?> parsed = JsonUtils.parseObject(resp, new com.fasterxml.jackson.core.type.TypeReference<Map<String, Object>>() {
+        });
+        Map<?, ?> data = parsed != null ? (Map<?, ?>) parsed.get("data") : null;
+        Map<?, ?> get = data != null ? (Map<?, ?>) data.get("Get") : null;
+        List<?> list = get != null ? (List<?>) get.get(className) : null;
+        List<KnowledgeSearchResultVo> results = new ArrayList<>();
+        if (list != null) {
+            int rank = 1;
+            for (Object o : list) {
+                if (!(o instanceof Map<?, ?> m)) continue;
+                KnowledgeSearchResultVo vo = new KnowledgeSearchResultVo();
+                vo.setFragmentId(String.valueOf(m.get("fragmentId")));
+                vo.setDocId(String.valueOf(m.get("docId")));
+                String content = String.valueOf(m.get("content"));
+                if (content == null || content.equals("null")) {
+                    KnowledgeFragment frag = fragmentService.getById(vo.getFragmentId());
+                    if (frag != null) {
+                        content = frag.getContent();
+                        vo.setFragmentIndex(frag.getIdx());
+                        vo.setCreateTime(frag.getCreateTime());
+                    }
+                } else {
+                    KnowledgeFragment frag = fragmentService.getById(vo.getFragmentId());
+                    if (frag != null) {
+                        vo.setFragmentIndex(frag.getIdx());
+                        vo.setCreateTime(frag.getCreateTime());
+                    }
+                }
+                vo.setContent(content);
+                Map<?, ?> add = (Map<?, ?>) m.get("_additional");
+                Double dist = add != null ? toDouble(add.get("distance")) : null;
+                double score = dist != null ? (1.0 - Math.min(1.0, dist)) : 0.0;
+                if (threshold != null && score < threshold) continue;
+                vo.setSimilarityScore(score);
+                vo.setRanking(rank++);
+                results.add(vo);
+            }
+        }
+        return results;
+    }
+
+    @Override
+    public void deleteByKnowledgeId(String knowledgeId) {
+        String gql = "{ " +
+                "  Aggregate { " +
+                "    " + className + "(where: {path: [\"knowledgeId\"], operator: Equal, valueString: \"" + knowledgeId + "\"}) { meta { count } }" +
+                "  }" +
+                "}";
+        post("/v1/graphql", JsonUtils.toJsonString(Map.of("query", gql)));
+    }
+
+    @Override
+    public void rebuildIndex(String knowledgeId) {
+    }
+
+    private String post(String path, String json) {
+        Request.Builder b = new Request.Builder().url(url(path))
+                .post(RequestBody.create(MediaType.parse("application/json"), json.getBytes(StandardCharsets.UTF_8)));
+        if (apiKey != null && !apiKey.isBlank()) b.header("Authorization", "Bearer " + apiKey);
+        try (Response resp = client.newCall(b.build()).execute()) {
+            return Objects.requireNonNull(resp.body()).string();
+        } catch (Exception e) {
+            return null;
+        }
+    }
+
+    private String url(String path) {
+        if (baseUrl.endsWith("/") && path.startsWith("/")) return baseUrl + path.substring(1);
+        if (!baseUrl.endsWith("/") && !path.startsWith("/")) return baseUrl + "/" + path;
+        return baseUrl + path;
+    }
+
+    private Double toDouble(Object o) {
+        try {
+            if (o == null) return null;
+            if (o instanceof Number n) return n.doubleValue();
+            return Double.parseDouble(String.valueOf(o));
+        } catch (Exception e) {
+            return null;
+        }
+    }
+}
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/version/DefaultVersionManager.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/version/DefaultVersionManager.java
new file mode 100644
index 0000000..57b4511
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/version/DefaultVersionManager.java
@@ -0,0 +1,22 @@
+package org.dromara.knowledge.version;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+@Slf4j
+@Component
+public class DefaultVersionManager implements VersionManager {
+    @Override
+    public String createVersion(String knowledgeId, String remark) {
+        String versionId = java.util.UUID.randomUUID().toString();
+        log.info("创建知识库版本: {} remark={}", versionId, remark);
+        return versionId;
+    }
+
+    @Override
+    public boolean rollback(String knowledgeId, String versionId) {
+        log.info("回滚知识库 {} 到版本 {}", knowledgeId, versionId);
+        return true;
+    }
+}
+
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/version/VersionManager.java b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/version/VersionManager.java
new file mode 100644
index 0000000..3e93f7e
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/java/org/dromara/knowledge/version/VersionManager.java
@@ -0,0 +1,8 @@
+package org.dromara.knowledge.version;
+
+public interface VersionManager {
+    String createVersion(String knowledgeId, String remark);
+
+    boolean rollback(String knowledgeId, String versionId);
+}
+
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/resources/mapper/knowledge/KnowledgeAttachMapper.xml b/ruoyi-modules/ruoyi-knowledge/src/main/resources/mapper/knowledge/KnowledgeAttachMapper.xml
new file mode 100644
index 0000000..f3f4d2d
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/resources/mapper/knowledge/KnowledgeAttachMapper.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.knowledge.mapper.KnowledgeAttachMapper">
+
+    <resultMap type="org.dromara.knowledge.domain.KnowledgeAttach" id="KnowledgeAttachResult">
+        <result property="id" column="id"/>
+        <result property="knowledgeId" column="knowledge_id"/>
+        <result property="docId" column="doc_id"/>
+        <result property="docName" column="doc_name"/>
+        <result property="docType" column="doc_type"/>
+        <result property="ossId" column="oss_id"/>
+        <result property="picStatus" column="pic_status"/>
+        <result property="picAnysStatus" column="pic_anys_status"/>
+        <result property="vectorStatus" column="vector_status"/>
+        <result property="content" column="content"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="remark" column="remark"/>
+    </resultMap>
+
+    <sql id="selectKnowledgeAttachVo">
+        select id,
+               knowledge_id,
+               doc_id,
+               doc_name,
+               doc_type,
+               oss_id,
+               pic_status,
+               pic_anys_status,
+               vector_status,
+               content,
+               create_by,
+               create_time,
+               update_by,
+               update_time,
+               remark
+        from knowledge_attach
+    </sql>
+
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/resources/mapper/knowledge/KnowledgeFragmentMapper.xml b/ruoyi-modules/ruoyi-knowledge/src/main/resources/mapper/knowledge/KnowledgeFragmentMapper.xml
new file mode 100644
index 0000000..5149755
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/resources/mapper/knowledge/KnowledgeFragmentMapper.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.knowledge.mapper.KnowledgeFragmentMapper">
+
+    <resultMap type="org.dromara.knowledge.domain.KnowledgeFragment" id="KnowledgeFragmentResult">
+        <result property="id" column="id"/>
+        <result property="knowledgeId" column="knowledge_id"/>
+        <result property="docId" column="doc_id"/>
+        <result property="fid" column="fid"/>
+        <result property="idx" column="idx"/>
+        <result property="content" column="content"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="remark" column="remark"/>
+    </resultMap>
+
+    <sql id="selectKnowledgeFragmentVo">
+        select id,
+               knowledge_id,
+               doc_id,
+               fid,
+               idx,
+               content,
+               create_by,
+               create_time,
+               update_by,
+               update_time,
+               remark
+        from knowledge_fragment
+    </sql>
+
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/resources/mapper/knowledge/KnowledgeHitLogMapper.xml b/ruoyi-modules/ruoyi-knowledge/src/main/resources/mapper/knowledge/KnowledgeHitLogMapper.xml
new file mode 100644
index 0000000..7d78820
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/resources/mapper/knowledge/KnowledgeHitLogMapper.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.knowledge.mapper.KnowledgeHitLogMapper">
+
+    <resultMap type="org.dromara.knowledge.domain.KnowledgeHitLog" id="KnowledgeHitLogResult">
+        <result property="id" column="id"/>
+        <result property="knowledgeId" column="knowledge_id"/>
+        <result property="fragmentId" column="fragment_id"/>
+        <result property="userId" column="user_id"/>
+        <result property="sessionId" column="session_id"/>
+        <result property="query" column="query"/>
+        <result property="score" column="score"/>
+        <result property="hitTime" column="hit_time"/>
+        <result property="ip" column="ip"/>
+        <result property="userAgent" column="user_agent"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="remark" column="remark"/>
+    </resultMap>
+
+    <sql id="selectKnowledgeHitLogVo">
+        select id,
+               knowledge_id,
+               fragment_id,
+               user_id,
+               session_id,
+               query,
+               score,
+               hit_time,
+               ip,
+               user_agent,
+               create_by,
+               create_time,
+               update_by,
+               update_time,
+               remark
+        from knowledge_hit_log
+    </sql>
+
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/resources/mapper/knowledge/KnowledgeInfoMapper.xml b/ruoyi-modules/ruoyi-knowledge/src/main/resources/mapper/knowledge/KnowledgeInfoMapper.xml
new file mode 100644
index 0000000..fda6367
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/resources/mapper/knowledge/KnowledgeInfoMapper.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.knowledge.mapper.KnowledgeInfoMapper">
+
+    <resultMap type="org.dromara.knowledge.domain.KnowledgeInfo" id="KnowledgeInfoResult">
+        <result property="id" column="id"/>
+        <result property="userId" column="user_id"/>
+        <result property="knowledgeId" column="knowledge_id"/>
+        <result property="knowledgeName" column="knowledge_name"/>
+        <result property="share" column="share"/>
+        <result property="description" column="description"/>
+        <result property="knowledgeSeparator" column="knowledge_separator"/>
+        <result property="questionSeparator" column="question_separator"/>
+        <result property="overlapChar" column="overlap_char"/>
+        <result property="retrieveLimit" column="retrieve_limit"/>
+        <result property="textBlockSize" column="text_block_size"/>
+        <result property="vectorModelName" column="vector_model_name"/>
+        <result property="embeddingModelName" column="embedding_model_name"/>
+        <result property="systemPrompt" column="system_prompt"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="remark" column="remark"/>
+    </resultMap>
+
+    <sql id="selectKnowledgeInfoVo">
+        select id,
+               user_id,
+               knowledge_id,
+               knowledge_name,
+               share,
+               description,
+               knowledge_separator,
+               question_separator,
+               overlap_char,
+               retrieve_limit,
+               text_block_size,
+               vector_model_name,
+               embedding_model_name,
+               system_prompt,
+               create_by,
+               create_time,
+               update_by,
+               update_time,
+               remark
+        from knowledge_info
+    </sql>
+
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/resources/mapper/knowledge/KnowledgeJobMapper.xml b/ruoyi-modules/ruoyi-knowledge/src/main/resources/mapper/knowledge/KnowledgeJobMapper.xml
new file mode 100644
index 0000000..53bfa3a
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/resources/mapper/knowledge/KnowledgeJobMapper.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.knowledge.mapper.KnowledgeJobMapper">
+
+    <resultMap type="org.dromara.knowledge.domain.KnowledgeJob" id="KnowledgeJobResult">
+        <result property="id" column="id"/>
+        <result property="knowledgeId" column="knowledge_id"/>
+        <result property="jobType" column="job_type"/>
+        <result property="jobName" column="job_name"/>
+        <result property="jobParams" column="job_params"/>
+        <result property="status" column="status"/>
+        <result property="progress" column="progress"/>
+        <result property="startTime" column="start_time"/>
+        <result property="endTime" column="end_time"/>
+        <result property="errorMsg" column="error_msg"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="remark" column="remark"/>
+    </resultMap>
+
+    <sql id="selectKnowledgeJobVo">
+        select id,
+               knowledge_id,
+               job_type,
+               job_name,
+               job_params,
+               status,
+               progress,
+               start_time,
+               end_time,
+               error_msg,
+               create_by,
+               create_time,
+               update_by,
+               update_time,
+               remark
+        from knowledge_job
+    </sql>
+
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/resources/mapper/knowledge/KnowledgePromptTemplateMapper.xml b/ruoyi-modules/ruoyi-knowledge/src/main/resources/mapper/knowledge/KnowledgePromptTemplateMapper.xml
new file mode 100644
index 0000000..75bce77
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/resources/mapper/knowledge/KnowledgePromptTemplateMapper.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.knowledge.mapper.KnowledgePromptTemplateMapper">
+
+    <resultMap type="org.dromara.knowledge.domain.KnowledgePromptTemplate" id="KnowledgePromptTemplateResult">
+        <result property="id" column="id"/>
+        <result property="templateName" column="template_name"/>
+        <result property="templateContent" column="template_content"/>
+        <result property="category" column="category"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="remark" column="remark"/>
+        <result property="delFlag" column="del_flag"/>
+    </resultMap>
+
+    <sql id="selectKnowledgePromptTemplateVo">
+        select id,
+               template_name,
+               template_content,
+               category,
+               create_by,
+               create_time,
+               update_by,
+               update_time,
+               remark,
+               del_flag
+        from knowledge_prompt_template
+    </sql>
+
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/resources/mapper/knowledge/KnowledgeRoleGroupMapper.xml b/ruoyi-modules/ruoyi-knowledge/src/main/resources/mapper/knowledge/KnowledgeRoleGroupMapper.xml
new file mode 100644
index 0000000..3a4b309
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/resources/mapper/knowledge/KnowledgeRoleGroupMapper.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.knowledge.mapper.KnowledgeRoleGroupMapper">
+
+    <resultMap type="KnowledgeRoleGroup" id="KnowledgeRoleGroupResult">
+        <result property="id" column="id"/>
+        <result property="name" column="name"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="remark" column="remark"/>
+    </resultMap>
+
+    <sql id="selectKnowledgeRoleGroupVo">
+        select id,
+               name,
+               del_flag,
+               create_by,
+               create_time,
+               update_by,
+               update_time,
+               remark
+        from knowledge_role_group
+    </sql>
+
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/resources/mapper/knowledge/KnowledgeRoleMapper.xml b/ruoyi-modules/ruoyi-knowledge/src/main/resources/mapper/knowledge/KnowledgeRoleMapper.xml
new file mode 100644
index 0000000..76fc5ce
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/resources/mapper/knowledge/KnowledgeRoleMapper.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.knowledge.mapper.KnowledgeRoleMapper">
+
+    <resultMap type="KnowledgeRole" id="KnowledgeRoleResult">
+        <result property="id" column="id"/>
+        <result property="name" column="name"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="remark" column="remark"/>
+        <result property="groupId" column="group_id"/>
+    </resultMap>
+
+    <sql id="selectKnowledgeRoleVo">
+        select id,
+               name,
+               del_flag,
+               create_by,
+               create_time,
+               update_by,
+               update_time,
+               remark,
+               group_id
+        from knowledge_role
+    </sql>
+
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/resources/mapper/knowledge/KnowledgeRoleRelationMapper.xml b/ruoyi-modules/ruoyi-knowledge/src/main/resources/mapper/knowledge/KnowledgeRoleRelationMapper.xml
new file mode 100644
index 0000000..292ee3a
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/resources/mapper/knowledge/KnowledgeRoleRelationMapper.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.knowledge.mapper.KnowledgeRoleRelationMapper">
+
+    <resultMap type="KnowledgeRoleRelation" id="KnowledgeRoleRelationResult">
+        <result property="id" column="id"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="remark" column="remark"/>
+        <result property="knowledgeRoleId" column="knowledge_role_id"/>
+        <result property="knowledgeId" column="knowledge_id"/>
+    </resultMap>
+
+    <sql id="selectKnowledgeRoleRelationVo">
+        select id,
+               del_flag,
+               create_by,
+               create_time,
+               update_by,
+               update_time,
+               remark,
+               knowledge_role_id,
+               knowledge_id
+        from knowledge_role_relation
+    </sql>
+
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/resources/mapper/knowledge/KnowledgeSchemaFieldMapper.xml b/ruoyi-modules/ruoyi-knowledge/src/main/resources/mapper/knowledge/KnowledgeSchemaFieldMapper.xml
new file mode 100644
index 0000000..3031642
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/resources/mapper/knowledge/KnowledgeSchemaFieldMapper.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.knowledge.mapper.KnowledgeSchemaFieldMapper">
+
+    <resultMap type="org.dromara.knowledge.domain.KnowledgeSchemaField" id="KnowledgeSchemaFieldResult">
+        <result property="id" column="id"/>
+        <result property="schemaId" column="schema_id"/>
+        <result property="schemaName" column="schema_name"/>
+        <result property="name" column="name"/>
+        <result property="code" column="code"/>
+        <result property="type" column="type"/>
+        <result property="comment" column="comment"/>
+        <result property="isPk" column="is_pk"/>
+        <result property="isRequired" column="is_required"/>
+        <result property="isUnique" column="is_unique"/>
+        <result property="defaultValue" column="default_value"/>
+        <result property="length" column="length"/>
+        <result property="scale" column="scale"/>
+        <result property="isList" column="is_list"/>
+        <result property="isQuery" column="is_query"/>
+        <result property="isInsert" column="is_insert"/>
+        <result property="isEdit" column="is_edit"/>
+        <result property="queryType" column="query_type"/>
+        <result property="htmlType" column="html_type"/>
+        <result property="dictType" column="dict_type"/>
+        <result property="sort" column="sort"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="remark" column="remark"/>
+    </resultMap>
+
+    <sql id="selectKnowledgeSchemaFieldVo">
+        select id,
+               schema_id,
+               schema_name,
+               name,
+               code,
+               type,
+               comment,
+               is_pk,
+               is_required,
+               is_unique,
+               default_value,
+               length,
+               scale,
+               is_list,
+               is_query,
+               is_insert,
+               is_edit,
+               query_type,
+               html_type,
+               dict_type,
+               sort,
+               del_flag,
+               create_by,
+               create_time,
+               update_by,
+               update_time,
+               remark
+        from knowledge_schema_field
+    </sql>
+
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/resources/mapper/knowledge/KnowledgeSchemaGroupMapper.xml b/ruoyi-modules/ruoyi-knowledge/src/main/resources/mapper/knowledge/KnowledgeSchemaGroupMapper.xml
new file mode 100644
index 0000000..8bb42bf
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/resources/mapper/knowledge/KnowledgeSchemaGroupMapper.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.knowledge.mapper.KnowledgeSchemaGroupMapper">
+
+    <resultMap type="org.dromara.knowledge.domain.KnowledgeSchemaGroup" id="KnowledgeSchemaGroupResult">
+        <result property="id" column="id"/>
+        <result property="name" column="name"/>
+        <result property="code" column="code"/>
+        <result property="icon" column="icon"/>
+        <result property="remark" column="remark"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+    </resultMap>
+
+    <sql id="selectKnowledgeSchemaGroupVo">
+        select id,
+               name,
+               code,
+               icon,
+               remark,
+               del_flag,
+               create_by,
+               create_time,
+               update_by,
+               update_time
+        from knowledge_schema_group
+    </sql>
+
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/resources/mapper/knowledge/KnowledgeSchemaMapper.xml b/ruoyi-modules/ruoyi-knowledge/src/main/resources/mapper/knowledge/KnowledgeSchemaMapper.xml
new file mode 100644
index 0000000..66e7084
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/resources/mapper/knowledge/KnowledgeSchemaMapper.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.knowledge.mapper.KnowledgeSchemaMapper">
+
+    <resultMap type="org.dromara.knowledge.domain.KnowledgeSchema" id="KnowledgeSchemaResult">
+        <result property="id" column="id"/>
+        <result property="schemaGroupId" column="schema_group_id"/>
+        <result property="name" column="name"/>
+        <result property="code" column="code"/>
+        <result property="tableName" column="table_name"/>
+        <result property="remark" column="remark"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+    </resultMap>
+
+    <sql id="selectKnowledgeSchemaVo">
+        select id,
+               schema_group_id,
+               name,
+               code,
+               table_name,
+               remark,
+               del_flag,
+               create_by,
+               create_time,
+               update_by,
+               update_time
+        from knowledge_schema
+    </sql>
+
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-knowledge/src/main/resources/mapper/knowledge/KnowledgeVectorMapper.xml b/ruoyi-modules/ruoyi-knowledge/src/main/resources/mapper/knowledge/KnowledgeVectorMapper.xml
new file mode 100644
index 0000000..c50cb6d
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/main/resources/mapper/knowledge/KnowledgeVectorMapper.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.knowledge.mapper.KnowledgeVectorMapper">
+
+    <resultMap type="org.dromara.knowledge.domain.KnowledgeVector" id="KnowledgeVectorResult">
+        <result property="id" column="id"/>
+        <result property="knowledgeId" column="knowledge_id"/>
+        <result property="docId" column="doc_id"/>
+        <result property="fragmentId" column="fragment_id"/>
+        <result property="vectorId" column="vector_id"/>
+        <result property="vectorData" column="vector_data"/>
+        <result property="dimension" column="dimension"/>
+        <result property="modelName" column="model_name"/>
+        <result property="status" column="status"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="remark" column="remark"/>
+    </resultMap>
+
+    <sql id="selectKnowledgeVectorVo">
+        select id,
+               knowledge_id,
+               doc_id,
+               fragment_id,
+               vector_id,
+               vector_data,
+               dimension,
+               model_name,
+               status,
+               create_by,
+               create_time,
+               update_by,
+               update_time,
+               remark
+        from knowledge_vector
+    </sql>
+
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-knowledge/src/test/java/org/dromara/knowledge/integration/RagIntegrationTest.java b/ruoyi-modules/ruoyi-knowledge/src/test/java/org/dromara/knowledge/integration/RagIntegrationTest.java
new file mode 100644
index 0000000..79716d0
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/test/java/org/dromara/knowledge/integration/RagIntegrationTest.java
@@ -0,0 +1,7 @@
+package org.dromara.knowledge.integration;
+
+public class RagIntegrationTest {
+    public void smoke() {
+        if (!true) throw new RuntimeException("should not happen");
+    }
+}
diff --git a/ruoyi-modules/ruoyi-knowledge/src/test/java/org/dromara/knowledge/mock/MockDocs.java b/ruoyi-modules/ruoyi-knowledge/src/test/java/org/dromara/knowledge/mock/MockDocs.java
new file mode 100644
index 0000000..27170d2
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/test/java/org/dromara/knowledge/mock/MockDocs.java
@@ -0,0 +1,8 @@
+package org.dromara.knowledge.mock;
+
+public class MockDocs {
+    public static byte[] simple() {
+        return "hello knowledge".getBytes();
+    }
+}
+
diff --git a/ruoyi-modules/ruoyi-knowledge/src/test/java/org/dromara/knowledge/unit/RagContractsTest.java b/ruoyi-modules/ruoyi-knowledge/src/test/java/org/dromara/knowledge/unit/RagContractsTest.java
new file mode 100644
index 0000000..3d222aa
--- /dev/null
+++ b/ruoyi-modules/ruoyi-knowledge/src/test/java/org/dromara/knowledge/unit/RagContractsTest.java
@@ -0,0 +1,7 @@
+package org.dromara.knowledge.unit;
+
+public class RagContractsTest {
+    public void smoke() {
+        if (!true) throw new RuntimeException("should not happen");
+    }
+}
diff --git a/ruoyi-modules/ruoyi-mall/MODULE_STRUCTURE.md b/ruoyi-modules/ruoyi-mall/MODULE_STRUCTURE.md
new file mode 100644
index 0000000..4e41f91
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/MODULE_STRUCTURE.md
@@ -0,0 +1,1253 @@
+# 商城模块结构说明
+
+## 模块拆分
+
+根据 `MODULE_STRUCTURE_PLAN.md` 的要求，`ruoyi-mall` 模块已按照规划拆分为以下子模块：
+
+### 1. ruoyi-mall-product (商品中心)
+
+- **职责**: 商品(SPU)、SKU、分类、品牌、属性管理
+- **包名**: `org.dromara.mall.product`
+- **状态**: ✅ 核心功能已实现（商品管理✅、分类管理✅、品牌管理✅、属性管理✅）
+- **数据库表**: `mall_product`, `mall_sku`, `mall_category`, `mall_brand`, `mall_attribute_template`, `mall_attribute`, `mall_attribute_value`, `mall_product_attribute`
+
+### 2. ruoyi-mall-trade (交易中心)
+
+- **职责**: 购物车、订单、售后管理
+- **包名**: `org.dromara.mall.trade`
+- **状态**: ✅ 核心功能已实现（购物车✅、订单✅、售后✅、评价✅）
+- **数据库表**: `mall_cart`, `mall_order`, `mall_order_item`, `mall_after_sale`, `mall_order_evaluate`,
+  `mall_order_coupon`
+
+### 3. ruoyi-mall-coupon (优惠券中心)
+
+- **职责**: 优惠券发放、核销、过期处理
+- **包名**: `org.dromara.mall.coupon`
+- **状态**: ✅ 核心功能已实现（优惠券管理✅、用户优惠券✅）
+- **数据库表**: `mall_coupon`, `mall_coupon_user`
+
+### 4. ruoyi-mall-promotion (营销中心)
+
+- **职责**: 营销活动、拼团、秒杀、砍价
+- **包名**: `org.dromara.mall.promotion`
+- **状态**: ✅ 核心功能已实现（活动管理✅、秒杀✅、拼团✅、砍价✅）
+- **数据库表**: `mall_promotion`, `mall_group_buy`, `mall_group_buy_order`, `mall_seckill`, `mall_bargain`,
+  `mall_bargain_record`, `mall_bargain_help`
+
+### 5. ruoyi-mall-statistics (统计中心)
+
+- **职责**: 交易分析、会员分析、数据统计
+- **包名**: `org.dromara.mall.statistics`
+- **状态**: ✅ 交易统计功能已实现
+
+## 已完成工作
+
+### 1. 模块结构
+
+- ✅ 创建了所有子模块的目录结构
+- ✅ 创建了各子模块的 `pom.xml` 配置文件
+- ✅ 配置了模块依赖关系
+
+### 2. 自动配置
+
+- ✅ 创建了各子模块的 `AutoConfiguration` 类
+- ✅ 创建了 `spring.factories` 文件
+- ✅ 配置了组件扫描
+
+### 3. 数据库
+
+- ✅ 扩展了 `script/sql/ry_mall.sql` 文件
+- ✅ 添加了分类、品牌表
+- ✅ 添加了优惠券相关表
+- ✅ 添加了营销活动相关表（拼团、秒杀等）
+- ✅ 添加了商品属性相关表（属性模板、属性、属性值、商品属性关联）
+
+### 4. 文档
+
+- ✅ 创建了各子模块的 README.md 文件
+- ✅ 更新了主模块的 README.md 文件
+
+## 代码迁移说明
+
+### 当前状态
+
+- 现有代码位于 `ruoyi-mall/src/main/java/org/dromara/mall/` 目录下
+- 现有代码使用 `org.dromara.mall` 作为包名
+- 现有代码包含：商品、SKU、购物车、订单等功能
+
+### 迁移建议
+
+由于代码迁移涉及大量文件的包名修改，建议采用渐进式迁移：
+
+1. **保留现有代码**
+    - 现有代码继续保留在 `ruoyi-mall/src` 目录
+    - 保证现有功能正常运行
+
+2. **新功能开发**
+    - 新功能直接在新子模块中开发
+    - 使用新的包名结构（如 `org.dromara.mall.product`）
+
+3. **逐步迁移**
+    - 商品相关代码 → `ruoyi-mall-product`
+    - 交易相关代码 → `ruoyi-mall-trade`
+    - 优惠券功能 → `ruoyi-mall-coupon`
+    - 营销功能 → `ruoyi-mall-promotion`
+    - 统计功能 → `ruoyi-mall-statistics`
+
+
+## 模块依赖关系
+
+```
+ruoyi-mall (聚合模块)
+├── ruoyi-mall-product (商品中心)
+│   └── 依赖: ruoyi-common-*
+├── ruoyi-mall-trade (交易中心)
+│   ├── 依赖: ruoyi-mall-product
+│   └── 依赖: ruoyi-pay
+├── ruoyi-mall-coupon (优惠券中心)
+│   └── 依赖: ruoyi-common-*
+├── ruoyi-mall-promotion (营销中心)
+│   ├── 依赖: ruoyi-mall-product
+│   └── 依赖: ruoyi-mall-coupon
+└── ruoyi-mall-statistics (统计中心)
+    ├── 依赖: ruoyi-mall-product
+    └── 依赖: ruoyi-mall-trade
+```
+
+## 下一步工作
+
+1. **代码迁移** (可选)
+    - 将现有代码迁移到对应的子模块
+    - 修改包名以符合新的模块结构
+
+2. **功能实现**
+    - 实现各子模块的待实现功能
+    - 参考各子模块的 README.md
+
+3. **测试验证**
+    - 验证各子模块的自动配置
+    - 验证模块间的依赖关系
+
+## 数据库表结构说明
+
+### 1. ruoyi-mall-product (商品中心)
+
+#### 商品表 (mall_product)
+
+- **功能**: 存储商品(SPU)基本信息
+- **关键字段**: `name`, `category_id`, `brand_id`, `status`, `sales_count`, `view_count`, `cover_url`, `images`,
+  `description`, `detail`
+- **索引**: `category_id`, `brand_id`, `status`
+- **状态说明**:
+    - 0: 上架
+    - 1: 下架
+
+#### SKU表 (mall_sku)
+
+- **功能**: 存储商品SKU信息，包括价格、库存、规格等
+- **关键字段**: `product_id`, `sku_code`, `price`, `stock`, `specs`, `status`
+- **索引**: `product_id`, `sku_code`, `status`
+- **状态说明**:
+    - 0: 启用
+    - 1: 禁用
+
+#### 商品分类表 (mall_category)
+
+- **功能**: 商品分类树形结构
+- **关键字段**: `name`, `parent_id`, `level`, `sort`, `icon`, `status`
+- **索引**: `parent_id`, `status`
+- **状态说明**:
+    - 0: 启用
+    - 1: 禁用
+- **级别说明**:
+    - 1: 一级分类
+    - 2: 二级分类
+    - 3: 三级分类
+- **说明**: 支持三级分类，通过 `parent_id` 构建树形结构，`parent_id=0` 表示顶级分类
+
+#### 品牌表 (mall_brand)
+
+- **功能**: 商品品牌信息
+- **关键字段**: `name`, `logo`, `description`, `sort`, `status`
+- **索引**: `status`
+- **状态说明**:
+    - 0: 启用
+    - 1: 禁用
+
+#### 属性模板表 (mall_attribute_template)
+
+- **功能**: 属性模板定义，可绑定到分类
+- **关键字段**: `name`, `category_id`, `sort`, `status`
+- **索引**: `category_id`, `status`
+
+#### 属性表 (mall_attribute)
+
+- **功能**: 属性定义
+- **关键字段**: `template_id`, `name`, `type`, `required`, `sort`, `status`
+- **索引**: `template_id`, `status`
+- **类型说明**:
+    - 0: 文本
+    - 1: 数字
+    - 2: 日期
+    - 3: 枚举
+
+#### 属性值表 (mall_attribute_value)
+
+- **功能**: 属性的值（用于枚举类型属性）
+- **关键字段**: `attribute_id`, `value`, `sort`, `status`
+- **索引**: `attribute_id`, `status`
+
+#### 商品属性关联表 (mall_product_attribute)
+
+- **功能**: 商品关联的属性值
+- **关键字段**: `product_id`, `attribute_id`, `attribute_value_id`, `value`
+- **索引**: `product_id`, `attribute_id`, `attribute_value_id`
+
+### 2. ruoyi-mall-trade (交易中心)
+
+#### 购物车表 (mall_cart)
+
+- **功能**: 用户购物车信息
+- **关键字段**: `user_id`, `sku_id`, `quantity`, `selected`
+- **索引**: `user_id`, `uk_user_sku` (唯一索引)
+
+#### 订单表 (mall_order)
+
+- **功能**: 订单主表
+- **关键字段**: `order_no`, `user_id`, `total_amount`, `pay_amount`, `pay_status`, `order_status`, `delivery_status`,
+  `receiver_*`
+- **索引**: `order_no` (唯一), `user_id`, `pay_order_no`, `order_status`, `pay_status`
+- **状态说明**:
+    - `pay_status`:
+        - 0: 未支付
+        - 1: 已支付
+        - 2: 已退款
+    - `order_status`:
+        - 0: 待付款
+        - 1: 待发货
+        - 2: 待收货
+        - 3: 已完成
+        - 4: 已取消
+    - `delivery_status`:
+        - 0: 未发货
+        - 1: 已发货
+        - 2: 已收货
+
+#### 订单明细表 (mall_order_item)
+
+- **功能**: 订单商品明细
+- **关键字段**: `order_id`, `product_id`, `sku_id`, `price`, `quantity`, `total_amount`
+- **索引**: `order_id`, `order_no`, `product_id`, `sku_id`
+
+#### 收货地址表 (mall_address)
+
+- **功能**: 用户收货地址管理
+- **关键字段**: `user_id`, `receiver_name`, `receiver_phone`, `province`, `city`, `district`, `address`, `is_default`
+- **索引**: `user_id`, `is_default`
+- **状态说明**:
+    - `is_default`: 0-否，1-是
+
+#### 售后申请表 (mall_after_sale)
+
+- **功能**: 订单售后申请（退款、退货、换货）
+- **关键字段**: `after_sale_no`, `order_id`, `type`, `status`, `refund_amount`
+- **索引**: `after_sale_no` (唯一), `order_id`, `user_id`, `status`
+- **状态说明**:
+    - 0: 待审核
+    - 1: 已同意
+    - 2: 已拒绝
+    - 3: 待退货
+    - 4: 待收货
+    - 5: 已完成
+    - 6: 已取消
+- **类型说明**:
+    - 0: 退款
+    - 1: 退货
+    - 2: 换货
+
+#### 订单评价表 (mall_order_evaluate)
+
+- **功能**: 订单商品评价
+- **关键字段**: `order_id`, `order_item_id`, `product_id`, `user_id`, `score`, `content`, `images`
+- **索引**: `order_id`, `order_no`, `order_item_id`, `product_id`, `user_id`
+
+#### 订单优惠券使用记录表 (mall_order_coupon)
+
+- **功能**: 记录订单使用的优惠券信息
+- **关键字段**: `order_id`, `coupon_id`, `coupon_user_id`, `discount_amount`
+- **索引**: `order_id`, `order_no`, `coupon_id`, `coupon_user_id`
+
+### 3. ruoyi-mall-coupon (优惠券中心)
+
+#### 优惠券表 (mall_coupon)
+
+- **功能**: 优惠券模板定义
+- **关键字段**: `name`, `type`, `discount_amount`, `discount_rate`, `min_amount`, `valid_start_time`, `valid_end_time`
+- **索引**: `status`, `valid_time`
+- **类型说明**:
+    - 0: 满减券
+    - 1: 折扣券
+    - 2: 现金券
+
+#### 用户优惠券表 (mall_coupon_user)
+
+- **功能**: 用户领取的优惠券
+- **关键字段**: `user_id`, `coupon_id`, `status`, `used_time`, `order_id`
+- **索引**: `user_id`, `coupon_id`, `status`
+- **状态说明**:
+    - 0: 未使用
+    - 1: 已使用
+    - 2: 已过期
+
+### 4. ruoyi-mall-promotion (营销中心)
+
+#### 营销活动表 (mall_promotion)
+
+- **功能**: 营销活动主表
+- **关键字段**: `name`, `type`, `start_time`, `end_time`, `rules` (JSON)
+- **索引**: `type`, `status`, `time`
+- **类型说明**:
+    - 0: 普通活动
+    - 1: 拼团活动
+    - 2: 秒杀活动
+    - 3: 砍价活动
+
+#### 拼团表 (mall_group_buy)
+
+- **功能**: 拼团活动配置
+- **关键字段**: `promotion_id`, `sku_id`, `group_price`, `group_size`, `duration_hours`
+- **索引**: `promotion_id`, `sku_id`
+
+#### 拼团订单表 (mall_group_buy_order)
+
+- **功能**: 拼团订单记录
+- **关键字段**: `group_buy_id`, `group_no`, `order_id`, `user_id`, `status`, `expire_time`
+- **索引**: `group_buy_id`, `group_no`, `order_id`, `status`
+- **状态说明**:
+    - 0: 拼团中
+    - 1: 已成团
+    - 2: 已失败
+
+#### 秒杀表 (mall_seckill)
+
+- **功能**: 秒杀活动配置
+- **关键字段**: `promotion_id`, `sku_id`, `seckill_price`, `seckill_stock`, `start_time`, `end_time`
+- **索引**: `promotion_id`, `sku_id`, `time`
+
+#### 砍价活动表 (mall_bargain)
+
+- **功能**: 砍价活动配置
+- **关键字段**: `promotion_id`, `sku_id`, `bargain_price`, `original_price`, `min_price`, `help_count`
+- **索引**: `promotion_id`, `sku_id`
+
+#### 砍价记录表 (mall_bargain_record)
+
+- **功能**: 用户发起的砍价记录
+- **关键字段**: `bargain_id`, `bargain_no`, `user_id`, `current_price`, `status`, `expire_time`
+- **索引**: `bargain_id`, `bargain_no`, `user_id`, `status`
+- **状态说明**:
+    - 0: 进行中
+    - 1: 已成功
+    - 2: 已失败
+    - 3: 已下单
+
+#### 砍价助力记录表 (mall_bargain_help)
+
+- **功能**: 砍价助力记录
+- **关键字段**: `bargain_record_id`, `bargain_no`, `user_id`, `help_price`
+- **索引**: `bargain_record_id`, `bargain_no`, `user_id`
+
+### 5. ruoyi-mall-statistics (统计中心)
+
+统计模块主要基于现有业务表进行数据分析和统计，可根据需要创建统计汇总表。
+
+- **主要数据源表**:
+  - `mall_order`, `mall_order_item` - 订单和订单明细表（用于交易统计、商品销售统计）
+  - `mall_product` - 商品表（用于商品浏览统计，基于`view_count`字段）
+  - `mall_promotion`, `mall_group_buy`, `mall_seckill`, `mall_bargain` - 营销活动表（用于活动效果统计）
+  - `mall_coupon`, `mall_coupon_user`, `mall_order_coupon` - 优惠券相关表（用于优惠券使用统计）
+  - 用户表（通过`mall_order.user_id`关联，用于会员分析，需会员模块支持）
+
+## 功能清单
+
+### 1. ruoyi-mall-product (商品中心)
+
+#### 已实现功能 ✅
+
+##### 商品管理 (SPU)
+
+- ✅ 商品CRUD操作
+    - 商品列表查询（分页、条件筛选）
+    - 商品详情查询
+    - 商品新增/修改/删除
+    - 商品上架/下架
+- ✅ 商品浏览量和销量统计
+    - 浏览量自动统计
+    - 销量自动累计
+- ✅ 商品详情管理
+    - 商品描述和详情富文本支持
+    - 商品图片管理（封面、轮播图）
+
+##### SKU管理
+
+- ✅ SKU CRUD操作
+    - SKU列表查询（支持按商品ID查询）
+    - SKU详情查询
+    - SKU新增/修改/删除
+- ✅ SKU库存管理
+    - 库存数量管理
+    - 库存扣减和恢复
+- ✅ SKU规格属性管理
+    - 规格属性JSON格式存储
+    - 规格属性查询和展示
+
+##### 商品分类管理 ✅
+
+- ✅ 分类树形结构查询
+    - 支持三级分类树形结构
+    - 管理端和移动端分类树查询
+- ✅ 分类CRUD操作
+    - 分类列表查询（分页、条件筛选）
+    - 分类详情查询
+    - 分类新增/修改/删除
+    - 分类导出功能
+- ✅ 分类排序
+    - 支持自定义排序字段
+- ⏳ 分类图标管理
+    - 字段已支持，需前端集成文件上传功能
+
+##### 品牌管理 ✅
+
+- ✅ 品牌CRUD操作
+    - 品牌列表查询（分页、条件筛选）
+    - 品牌详情查询
+    - 品牌新增/修改/删除
+    - 品牌导出功能
+- ✅ 品牌描述管理
+    - 品牌描述字段支持
+- ✅ 品牌排序
+    - 支持自定义排序字段
+- ✅ 品牌状态管理
+    - 启用/禁用状态控制
+- ⏳ 品牌Logo上传
+    - 字段已支持，需前端集成文件上传功能
+
+##### 商品属性管理 ✅
+
+- ✅ 属性模板管理
+    - ✅ 属性模板CRUD操作
+    - ✅ 属性模板绑定分类（可选）
+    - ✅ 属性模板导出功能
+- ✅ 属性管理
+    - ✅ 属性CRUD操作
+    - ✅ 属性类型管理（文本、数字、日期、枚举）
+    - ✅ 属性绑定模板（可选）
+    - ✅ 属性必填设置
+    - ✅ 属性导出功能
+- ✅ 属性值管理
+    - ✅ 属性值CRUD操作
+    - ✅ 属性值绑定属性
+    - ✅ 属性值排序
+    - ✅ 属性值导出功能
+- ✅ 商品属性关联
+    - ✅ 商品关联属性值
+    - ✅ 批量保存商品属性
+    - ✅ 根据商品ID查询属性
+    - ✅ 支持枚举类型属性值选择
+    - ✅ 支持文本/数字/日期类型自定义值
+
+#### 待实现功能 ⏳
+
+- [ ] 商品规格模板系统增强
+    - ⏳ 规格模板独立管理（当前规格通过SKU的specs字段JSON存储）
+    - ⏳ 规格模板与属性模板区分管理
+    - ⏳ 规格值标准化管理
+    - ⏳ 规格模板可视化配置
+    - **说明**: 当前系统中，SKU规格通过`mall_sku.specs`字段以JSON格式存储。属性模板系统(`mall_attribute_template`)可用于管理商品属性，但规格模板作为独立的规格管理系统，可用于标准化管理商品SKU的规格组合（如颜色+尺寸等），支持规格模板定义、规格值管理和规格模板与商品关联等功能。
+- [ ] 商品搜索功能
+    - [ ] 全文搜索（集成Elasticsearch或类似方案）
+        - 商品名称、描述全文搜索
+        - 搜索关键词高亮
+        - 搜索排序优化（按相关度、销量、价格等）
+    - [ ] 商品筛选（按分类、品牌、价格等）
+        - 多条件组合筛选
+        - 属性值筛选
+        - 价格区间筛选
+        - 库存状态筛选
+        - 筛选结果统计
+
+### 2. ruoyi-mall-trade (交易中心)
+
+#### 已实现功能 ✅
+
+##### 购物车管理
+
+- ✅ 购物车添加/删除
+    - 添加商品到购物车
+    - 删除购物车商品
+    - 清空购物车
+- ✅ 购物车数量修改
+    - 修改购物车商品数量
+- ✅ 购物车选中状态管理
+    - 单个商品选中/取消选中
+    - 批量选中/取消选中
+- ✅ 购物车详情查询
+    - 购物车列表查询
+    - 购物车详情查询（包含商品和SKU完整信息）
+
+##### 订单管理
+
+- ✅ 订单创建
+    - 从购物车创建订单
+    - 直接购买创建订单
+    - 订单明细自动生成
+- ✅ 订单查询
+    - 订单列表查询（分页、状态筛选）
+    - 订单详情查询（包含订单明细）
+- ✅ 订单取消
+    - 用户主动取消订单
+    - 订单取消后库存自动恢复
+- ✅ 订单状态管理
+    - 订单状态流转（待付款、待发货、待收货、已完成、已取消）
+    - 支付状态管理
+    - 发货状态管理
+- ✅ 订单支付集成
+    - 与支付中心（ruoyi-pay）集成
+    - 支付回调处理
+    - 支付成功后订单状态自动更新
+    - 库存自动扣减
+
+#### 待实现功能 ⏳
+
+- [x] 售后管理 ✅
+    - [x] 订单退款申请 ✅
+    - [x] 退货申请 ✅
+    - [x] 换货申请 ✅
+    - [x] 售后审核 ✅
+    - [x] 售后状态跟踪 ✅
+    - [x] 退货物流跟踪 ✅
+    - [x] 商家确认收货 ✅
+    - [x] 完成售后处理 ✅
+    - [x] 取消售后申请 ✅
+- [x] 订单评价 ✅
+    - [x] 订单评价提交 ✅
+    - [x] 评价列表查询 ✅
+    - [x] 评价回复（商家） ✅
+    - [x] 评价审核 ✅
+    - [ ] 评价图片上传（字段已支持，需前端上传功能）
+- [x] 地址管理 ✅
+    - [x] 收货地址管理（实体类、Mapper、Service、Controller已实现）✅
+        - 收货地址CRUD操作
+        - 用户地址列表查询
+        - 默认地址查询
+        - 地址导出功能（管理端）
+    - [x] 默认地址设置 ✅
+        - 设置默认地址接口
+        - 自动取消其他默认地址
+- [x] 订单优惠券使用 ✅
+    - [x] 订单优惠券记录（实体类、Mapper、Service已实现）✅
+    - [x] 优惠券金额计算（已实现CouponCalculator工具类和MallOrderCouponService.calculateAndUseCoupon方法）✅
+        - 支持满减券、折扣券、现金券三种类型的金额计算
+        - 已实现订单创建时的优惠券计算和使用流程
+        - 已实现优惠金额统计方法（按订单ID、订单号、优惠券ID统计）
+
+### 3. ruoyi-mall-coupon (优惠券中心)
+
+#### 待实现功能 ⏳
+
+- [x] 优惠券管理 ✅
+    - [x] 优惠券CRUD操作 ✅
+    - [x] 优惠券类型管理（满减、折扣、现金） ✅
+    - [x] 优惠券发放规则配置 ✅
+    - [x] 优惠券有效期管理 ✅
+    - [x] 优惠券状态管理 ✅
+- [x] 用户优惠券 ✅
+    - [x] 用户领券 ✅
+    - [x] 用户优惠券列表查询 ✅
+    - [x] 优惠券使用（订单结算时） ✅
+    - [x] 优惠券退还（订单取消时） ✅
+    - [x] 优惠券过期处理（定时任务）✅
+        - [x] **实现状态**: `MallCouponJob.processExpiredCoupons()`定时任务已实现，每天凌晨2点执行 ✅
+- [x] 优惠券统计 ✅
+    - [x] 发放统计（已实现统计接口）✅
+    - [x] 使用统计（已实现统计接口）✅
+    - [x] 使用率统计（已实现统计接口）✅
+    - [ ] 核销金额统计（需集成订单优惠券使用记录表，当前返回0）
+
+### 4. ruoyi-mall-promotion (营销中心)
+
+#### 已实现功能 ✅
+
+- [x] 营销活动管理 ✅
+    - [x] 活动CRUD操作 ✅
+    - [x] 活动类型管理 ✅
+    - [x] 活动规则配置（JSON格式）✅
+    - [x] 活动时间管理 ✅
+    - [x] 活动状态管理 ✅
+- [x] 秒杀功能 ✅
+    - [x] 秒杀活动创建 ✅
+    - [x] 秒杀库存管理（扣减、恢复）✅
+    - [x] 秒杀活动查询 ✅
+    - [x] 秒杀活动状态管理 ✅
+    - [ ] 秒杀订单处理（需在交易中心集成）
+    - [ ] 秒杀库存预扣（需在交易中心集成）
+- [x] 拼团功能 ✅
+    - [x] 拼团活动创建 ✅
+    - [x] 拼团活动查询 ✅
+    - [x] 拼团活动状态管理 ✅
+    - [ ] 拼团订单创建（需在交易中心集成）
+    - [ ] 拼团加入（需在交易中心集成）
+    - [ ] 拼团成团处理（需在交易中心集成）
+    - [ ] 拼团过期处理（定时任务）
+- [x] 砍价功能 ✅
+    - [x] 砍价活动创建 ✅
+    - [x] 砍价活动查询 ✅
+    - [x] 砍价活动状态管理 ✅
+    - [ ] 砍价发起（需在交易中心集成）
+    - [ ] 砍价助力（需在交易中心集成）
+    - [ ] 砍价进度管理（需在交易中心集成）
+    - [ ] 砍价订单处理（需在交易中心集成）
+    - [ ] 砍价过期处理（定时任务）
+
+#### 待实现功能 ⏳
+
+- [ ] 订单集成（需在交易中心模块实现）
+    - [x] 秒杀订单处理（核心逻辑已实现，待订单服务集成）✅
+        - [x] **秒杀活动验证**（活动时间、库存、状态校验）✅
+            - 验证秒杀活动是否存在且状态为启用（status=0）
+            - 验证秒杀活动时间是否在有效期内（当前时间在start_time和end_time之间）
+            - 验证秒杀库存是否充足（seckill_stock >= 购买数量）
+            - 验证关联的营销活动（mall_promotion）是否启用
+        - [x] **秒杀价格计算**（使用秒杀价而非原价）✅
+            - 从`mall_seckill`表获取`seckill_price`（秒杀价，单位：分）
+            - 订单明细价格使用秒杀价，而非SKU原价
+            - 订单总金额基于秒杀价计算
+            - **实现状态**: `SeckillOrderService.getSeckillPrice()`方法已实现
+        - [x] **秒杀订单标记**（订单表记录活动类型和活动ID）✅
+            - 订单表（`mall_order`）需包含字段：`promotion_type`（活动类型，2=秒杀）、`promotion_id`（营销活动ID）、`seckill_id`（秒杀ID）
+            - SQL脚本已创建：`script/sql/mall_order_promotion_fields.sql`
+            - 订单创建时记录活动信息，便于后续查询和统计
+            - 订单明细表（`mall_order_item`）也建议记录活动价格信息
+            - **实现状态**: SQL脚本已准备，待订单实体类和服务实现后集成
+        - [x] **秒杀限购校验**（同一用户同一商品限购数量）✅
+            - 查询用户已购买的秒杀订单数量（同一秒杀活动、同一SKU）
+            - 校验是否超过限购数量（可从`mall_promotion.rules` JSON中读取限购规则，或默认每人限购1件）
+            - 仅统计已支付的订单，待支付/已取消订单不计入限购
+            - **实现状态**: `SeckillOrderService.validatePurchaseLimit()`方法已实现核心逻辑，但由于订单实体类尚未实现，限购查询部分待订单服务实现后完善
+        - [ ] **秒杀订单超时处理**（未支付订单自动取消）⏳
+            - 订单创建时记录创建时间，设置订单超时时间（如15分钟）
+            - 定时任务扫描未支付的秒杀订单（订单状态=待支付，创建时间超过超时时间）
+            - 自动取消订单并恢复预扣的秒杀库存
+            - 发送订单超时取消通知给用户
+            - **实现状态**: 待订单服务实现后添加定时任务
+    - [x] 秒杀库存预扣 ✅
+        - [x] **下单时预扣秒杀库存**（避免超卖）✅
+            - 订单创建时调用`SeckillOrderService.preDeductSeckillStock(seckillId, quantity)`预扣秒杀库存
+            - 使用数据库乐观锁（UPDATE ... WHERE seckill_stock >= quantity）确保并发安全
+            - 预扣成功后，订单状态为"待支付"，库存已预扣但未最终确认
+            - 如果预扣失败（库存不足），订单创建失败，返回库存不足提示
+            - **实现状态**: `SeckillOrderService.preDeductSeckillStock()`方法已实现，调用`MallSeckillService.reduceStock()`
+        - [x] **支付成功时确认库存扣减**✅
+            - 支付回调处理时，订单状态更新为"已支付"
+            - 预扣的秒杀库存此时正式扣减（预扣库存已在上一步完成，此处仅状态确认）
+            - 如果订单已标记为秒杀订单，确认秒杀库存扣减成功
+            - **实现状态**: 预扣逻辑已实现，支付确认需在订单服务的支付回调中调用
+        - [x] **订单取消时恢复秒杀库存**✅
+            - 用户主动取消订单或系统超时取消时，调用`SeckillOrderService.restoreSeckillStock(seckillId, quantity)`恢复秒杀库存
+            - 仅恢复"待支付"状态的订单预扣库存
+            - "已支付"订单取消需走退款流程，不恢复秒杀库存（秒杀商品通常不支持退款）
+            - **实现状态**: `SeckillOrderService.restoreSeckillStock()`方法已实现，调用`MallSeckillService.restoreStock()`
+        - [ ] **库存预扣超时释放机制**⏳
+            - 订单创建时记录预扣时间，设置预扣超时时间（如15分钟，与订单超时时间一致）
+            - 定时任务扫描预扣超时的订单（订单状态=待支付，创建时间超过超时时间）
+            - 自动释放预扣库存并取消订单
+            - 确保库存预扣和订单超时处理的一致性
+            - **实现状态**: 待订单服务实现后添加定时任务
+    - [ ] 拼团订单创建
+        - 拼团活动验证（活动时间、库存、状态校验）
+        - 创建拼团订单记录（`mall_group_buy_order`表）
+        - 生成拼团编号（`group_no`）
+        - 计算拼团过期时间（基于`duration_hours`）
+        - 拼团价格计算（使用拼团价）
+        - 拼团订单状态初始化（状态=0拼团中）
+    - [ ] 拼团加入
+        - 拼团编号验证（验证拼团是否存在且可加入）
+        - 拼团状态校验（仅拼团中状态可加入）
+        - 拼团人数校验（未达到成团人数）
+        - 拼团过期校验（未超过过期时间）
+        - 创建拼团订单记录（关联同一`group_no`）
+        - 拼团人数自动累加
+        - 自动检测成团条件（达到`group_size`人数）
+    - [ ] 拼团成团处理
+        - 成团条件判断（达到成团人数）
+        - 更新拼团订单状态（状态=1已成团）
+        - 记录成团时间（`success_time`）
+        - 成团通知（通知所有参与用户）
+        - 成团后订单状态流转（待发货等）
+    - [ ] 砍价发起
+        - 砍价活动验证（活动时间、库存、状态校验）
+        - 创建砍价记录（`mall_bargain_record`表）
+        - 生成砍价编号（`bargain_no`）
+        - 初始化砍价价格（`current_price`=原价，`bargain_price`=0）
+        - 计算砍价过期时间（基于`duration_hours`）
+        - 砍价状态初始化（状态=0进行中）
+        - 用户发起次数限制校验
+    - [ ] 砍价助力
+        - 砍价编号验证（验证砍价记录是否存在且有效）
+        - 砍价状态校验（仅进行中状态可助力）
+        - 砍价过期校验（未超过过期时间）
+        - 助力用户校验（不能为自己助力、不能重复助力）
+        - 计算助力金额（随机或固定算法，需达到最低价限制）
+        - 创建助力记录（`mall_bargain_help`表）
+        - 更新砍价进度（`current_price`、`bargain_price`、`help_count`）
+        - 检测砍价完成条件（达到最低价或完成助力次数）
+    - [ ] 砍价进度管理
+        - 砍价进度查询（当前价格、已砍金额、助力人数、进度百分比）
+        - 砍价列表查询（用户发起的砍价记录）
+        - 砍价详情查询（包含助力记录列表）
+        - 砍价状态更新（进行中、已成功、已失败、已下单）
+        - 砍价完成检测（自动检测是否达到最低价）
+    - [ ] 砍价订单处理
+        - 砍价完成验证（状态=已成功）
+        - 砍价价格使用（使用砍后价创建订单）
+        - 订单标记（记录砍价记录ID）
+        - 更新砍价状态（状态=3已下单）
+        - 砍价订单超时处理（未支付订单释放砍价资格）
+    - [x] 定时任务 ✅
+        - [x] 秒杀活动状态更新任务 ✅
+            - [x] 扫描即将开始的活动（`start_time` <= 当前时间 且 status=1禁用），自动启用（status=0）✅
+            - [x] 扫描已结束的活动（`end_time` < 当前时间 且 status=0启用），自动禁用（status=1）✅
+            - [x] 执行频率：每5分钟执行一次 ✅
+            - [x] **实现状态**: `MallPromotionJob.updateSeckillStatus()`方法已实现
+        - [ ] 拼团过期处理（定时任务）
+            - 扫描过期拼团（`expire_time` < 当前时间 且 状态=拼团中）
+            - 更新拼团状态（状态=2已失败）
+            - 取消关联订单（取消所有关联的未支付订单）
+            - 恢复库存（恢复拼团商品的库存）
+            - 发送失败通知（通知所有参与用户）
+            - 执行频率：建议每5-10分钟执行一次
+            - **实现状态**: 待创建MallGroupBuyOrderMapper和相关Service方法后实现
+        - [ ] 砍价过期处理（定时任务）
+            - 扫描过期砍价（`expire_time` < 当前时间 且 状态=进行中）
+            - 更新砍价状态（状态=2已失败）
+            - 清理未使用的砍价记录
+            - 发送失败通知（通知发起用户）
+            - 执行频率：建议每10-30分钟执行一次
+            - **实现状态**: 待创建MallBargainRecordMapper和相关Service方法后实现
+
+### 5. ruoyi-mall-statistics (统计中心)
+
+#### 已实现功能 ✅
+
+- [x] 交易分析 ✅
+    - [x] 订单统计（总订单数、总销售额） ✅
+    - [x] 已支付订单统计（已支付订单数、已支付金额） ✅
+    - [x] 退款金额统计 ✅
+    - [x] 今日统计（今日订单数、今日销售额） ✅
+    - [x] 商品销售排行（按销售金额排序） ✅
+    - [x] 交易趋势分析（按日期分组统计） ✅
+
+#### 待实现功能 ⏳
+
+- [ ] 会员分析（需会员模块支持，当前系统可通过订单表`mall_order.user_id`实现基础统计）
+    - [ ] 会员增长统计
+        - 总会员数统计（基于用户表或订单表去重用户数）
+        - 每日新增会员数统计（按注册时间或首次下单时间）
+        - 会员增长趋势分析（按日期统计新增会员数）
+        - 会员增长环比/同比增长分析
+    - [ ] 会员消费统计
+        - 会员总消费金额统计（按用户ID聚合订单金额）
+        - 会员平均消费金额（总消费/会员数）
+        - 会员消费排行（按消费金额排序）
+        - 会员消费分布分析（消费区间分布）
+        - 高价值会员识别（消费金额Top N会员）
+    - [ ] 会员活跃度分析
+        - 活跃会员数统计（有订单的会员数）
+        - 会员活跃度等级划分（根据下单频率、消费金额等）
+        - 会员留存率分析（新会员留存、老会员复购）
+        - 会员流失分析（长期未下单会员识别）
+- [ ] 商品分析（基于现有`mall_product`、`mall_order_item`表实现）
+    - [ ] 商品销售统计（部分功能可通过交易统计的商品排行实现）
+        - 商品销售金额统计（按商品ID聚合订单明细）
+        - 商品销售数量统计（按商品ID聚合订单数量）
+        - 商品销售趋势分析（按日期统计商品销售）
+        - 商品销售排行（按销售金额、销售数量排序）
+        - 商品分类销售统计（按商品分类聚合统计）
+        - 商品品牌销售统计（按品牌聚合统计）
+    - [ ] 商品浏览统计（商品表已有`view_count`字段，需商品模块支持浏览统计接口）
+        - 商品浏览量统计（基于`mall_product.view_count`字段）
+        - 商品浏览量排行（按浏览量排序）
+        - 商品浏览趋势分析（需记录浏览日志表或通过商品表`view_count`字段）
+        - 热门商品识别（浏览量Top N商品）
+        - 商品浏览与销售关联分析
+    - [ ] 商品转化率分析
+        - 商品转化率计算（订单数/浏览量，或销量/浏览量）
+        - 商品转化率排行（按转化率排序）
+        - 高转化率商品识别
+        - 低转化率商品分析（识别需优化商品）
+        - 商品浏览到下单转化漏斗分析
+- [ ] 营销分析（基于`mall_promotion`、`mall_coupon`、`mall_order`表实现）
+    - [ ] 活动效果统计（需营销模块支持，基于`mall_promotion`和订单表关联）
+        - 活动参与人数统计（参与活动的订单用户数）
+        - 活动订单数统计（按活动ID聚合订单）
+        - 活动销售额统计（活动订单的销售金额）
+        - 活动转化率分析（活动订单数/活动参与人数）
+        - 活动类型效果对比（拼团、秒杀、砍价等活动效果对比）
+        - 活动ROI分析（活动投入成本 vs 活动带来的销售额）
+        - 活动效果趋势分析（按日期统计活动效果）
+    - [ ] 优惠券使用统计（基于`mall_coupon`、`mall_coupon_user`、`mall_order_coupon`表）
+        - 优惠券发放统计（优惠券发放数量，基于`mall_coupon_user`表）
+        - 优惠券使用统计（优惠券使用数量，`mall_coupon_user.status=1`）
+        - 优惠券使用率统计（使用数/发放数）
+        - 优惠券核销金额统计（基于`mall_order_coupon.discount_amount`）
+        - 优惠券类型使用对比（满减、折扣、现金券使用情况）
+        - 优惠券使用趋势分析（按日期统计优惠券使用）
+        - 优惠券效果分析（优惠券带来的订单和销售额）
+    - [ ] 营销ROI分析
+        - 营销活动总投入统计（活动成本计算）
+        - 营销活动总产出统计（活动带来的销售额）
+        - 营销ROI计算（产出/投入）
+        - 各营销渠道ROI对比（活动、优惠券等）
+        - 营销效果评估（投入产出比分析）
+- [ ] 数据报表
+    - [ ] 数据报表导出
+        - 交易统计报表导出（Excel格式）
+        - 商品销售报表导出
+        - 会员统计报表导出
+        - 营销活动报表导出
+        - 自定义报表配置和导出
+    - [ ] 数据可视化接口
+        - 图表数据接口（支持折线图、柱状图、饼图等）
+        - 实时数据统计接口
+        - 数据大屏数据接口
+        - 数据导出格式支持（Excel、PDF、CSV等）
+
+## API接口详细说明
+
+### 1. ruoyi-mall-product (商品中心)
+
+#### 管理端接口
+
+##### 商品管理 (`/mall/product`)
+
+- `GET /mall/product/list` - 查询商品列表（分页）
+- `GET /mall/product/{id}` - 获取商品详情
+- `POST /mall/product` - 新增商品
+- `PUT /mall/product` - 修改商品
+- `DELETE /mall/product/{ids}` - 删除商品
+
+##### 商品分类管理 (`/mall/product/category`)
+
+- `GET /mall/product/category/list` - 查询商品分类列表（分页）
+- `GET /mall/product/category/tree` - 查询商品分类树形列表
+- `GET /mall/product/category/{id}` - 获取商品分类详情
+- `POST /mall/product/category` - 新增商品分类
+- `PUT /mall/product/category` - 修改商品分类
+- `DELETE /mall/product/category/{ids}` - 删除商品分类
+- `POST /mall/product/category/export` - 导出商品分类列表
+
+##### 品牌管理 (`/mall/product/brand`)
+
+- `GET /mall/product/brand/list` - 查询品牌列表（分页）
+- `GET /mall/product/brand/{id}` - 获取品牌详情
+- `POST /mall/product/brand` - 新增品牌
+- `PUT /mall/product/brand` - 修改品牌
+- `DELETE /mall/product/brand/{ids}` - 删除品牌
+- `POST /mall/product/brand/export` - 导出品牌列表
+
+##### 属性模板管理 (`/mall/product/attribute/template`)
+
+- `GET /mall/product/attribute/template/list` - 查询属性模板列表（分页）
+- `GET /mall/product/attribute/template/{id}` - 获取属性模板详情
+- `POST /mall/product/attribute/template` - 新增属性模板
+- `PUT /mall/product/attribute/template` - 修改属性模板
+- `DELETE /mall/product/attribute/template/{ids}` - 删除属性模板
+- `POST /mall/product/attribute/template/export` - 导出属性模板列表
+
+##### 属性管理 (`/mall/product/attribute`)
+
+- `GET /mall/product/attribute/list` - 查询属性列表（分页）
+- `GET /mall/product/attribute/{id}` - 获取属性详情
+- `GET /mall/product/attribute/template/{templateId}` - 根据模板ID查询属性列表
+- `POST /mall/product/attribute` - 新增属性
+- `PUT /mall/product/attribute` - 修改属性
+- `DELETE /mall/product/attribute/{ids}` - 删除属性
+- `POST /mall/product/attribute/export` - 导出属性列表
+
+##### 属性值管理 (`/mall/product/attribute/value`)
+
+- `GET /mall/product/attribute/value/list` - 查询属性值列表（分页）
+- `GET /mall/product/attribute/value/{id}` - 获取属性值详情
+- `GET /mall/product/attribute/value/attribute/{attributeId}` - 根据属性ID查询属性值列表
+- `POST /mall/product/attribute/value` - 新增属性值
+- `PUT /mall/product/attribute/value` - 修改属性值
+- `DELETE /mall/product/attribute/value/{ids}` - 删除属性值
+- `POST /mall/product/attribute/value/export` - 导出属性值列表
+
+##### 商品属性关联管理 (`/mall/product/attribute/product`)
+
+- `GET /mall/product/attribute/product/{id}` - 获取商品属性关联详情
+- `GET /mall/product/attribute/product/product/{productId}` - 根据商品ID查询商品属性关联列表
+- `POST /mall/product/attribute/product` - 新增商品属性关联
+- `POST /mall/product/attribute/product/batch` - 批量新增商品属性关联
+- `POST /mall/product/attribute/product/product/{productId}` - 保存商品属性关联（先删除旧的，再插入新的）
+- `PUT /mall/product/attribute/product` - 修改商品属性关联
+- `DELETE /mall/product/attribute/product/{ids}` - 删除商品属性关联
+- `DELETE /mall/product/attribute/product/product/{productId}` - 根据商品ID删除商品属性关联
+
+#### 移动端接口
+
+##### 商品分类 (`/app/mall/product/category`)
+
+- `GET /app/mall/product/category/tree` - 查询商品分类树形列表（仅启用分类）
+
+##### 品牌 (`/app/mall/product/brand`)
+
+- `GET /app/mall/product/brand/list` - 查询品牌列表（仅启用品牌）
+
+##### 商品 (`/app/mall/product`)
+
+- `GET /app/mall/product/list` - 查询商品列表（仅上架商品）
+- `GET /app/mall/product/{id}` - 获取商品详情（仅上架商品）
+
+### 2. ruoyi-mall-trade (交易中心)
+
+#### 管理端接口
+
+##### 订单管理 (`/mall/order`)
+
+- `GET /mall/order/list` - 查询订单列表（分页、条件筛选）
+- `GET /mall/order/{id}` - 获取订单详情
+- `PUT /mall/order` - 修改订单
+- `DELETE /mall/order/{ids}` - 删除订单
+- `PUT /mall/order/delivery/{id}` - 订单发货
+
+##### 售后申请管理 (`/mall/order/after-sale`)
+
+- `GET /mall/order/after-sale/list` - 查询售后申请列表（分页）
+- `GET /mall/order/after-sale/{id}` - 获取售后申请详情
+- `DELETE /mall/order/after-sale/{ids}` - 删除售后申请
+- `POST /mall/order/after-sale/export` - 导出售后申请列表
+- `PUT /mall/order/after-sale/audit/{id}` - 审核售后申请（同意/拒绝）
+- `PUT /mall/order/after-sale/receive/{id}` - 确认收货（商家确认收到退货）
+- `PUT /mall/order/after-sale/complete/{id}` - 完成售后
+
+##### 订单评价管理 (`/mall/order/evaluate`)
+
+- `GET /mall/order/evaluate/list` - 查询订单评价列表（分页）
+- `GET /mall/order/evaluate/{id}` - 获取订单评价详情
+- `DELETE /mall/order/evaluate/{ids}` - 删除订单评价
+- `POST /mall/order/evaluate/export` - 导出订单评价列表
+- `PUT /mall/order/evaluate/audit/{id}` - 审核评价（通过/驳回）
+- `PUT /mall/order/evaluate/reply/{id}` - 回复评价
+
+#### 移动端接口
+
+##### 购物车 (`/app/mall/cart`)
+
+- `GET /app/mall/cart/list` - 查询购物车列表
+- `GET /app/mall/cart/detail/list` - 查询购物车详情列表（包含商品信息）
+- `POST /app/mall/cart` - 添加购物车
+- `PUT /app/mall/cart` - 修改购物车
+- `DELETE /app/mall/cart/{ids}` - 删除购物车
+- `DELETE /app/mall/cart/clear` - 清空购物车
+- `PUT /app/mall/cart/selected/{id}` - 更新单个商品选中状态
+- `PUT /app/mall/cart/selected/batch` - 批量更新选中状态
+
+##### 订单 (`/app/mall/order`)
+
+- `POST /app/mall/order/submit` - 提交订单并发起支付
+- `GET /app/mall/order/list` - 查询订单列表
+- `GET /app/mall/order/{id}` - 查询订单详情
+- `PUT /app/mall/order/cancel/{id}` - 取消订单
+- `POST /app/mall/order/pay/notify` - 支付回调（由支付中心调用）
+
+##### 售后申请 (`/app/mall/order/after-sale`)
+
+- `GET /app/mall/order/after-sale/list` - 查询售后申请列表
+- `GET /app/mall/order/after-sale/order/{orderId}` - 根据订单ID查询售后申请列表
+- `GET /app/mall/order/after-sale/{id}` - 获取售后申请详情
+- `POST /app/mall/order/after-sale` - 新增售后申请（退款/退货/换货）
+- `PUT /app/mall/order/after-sale/logistics/{id}` - 填写退货物流信息
+- `PUT /app/mall/order/after-sale/cancel/{id}` - 取消售后申请
+
+##### 订单评价 (`/app/mall/order/evaluate`)
+
+- `GET /app/mall/order/evaluate/list` - 查询订单评价列表
+- `GET /app/mall/order/evaluate/order/{orderId}` - 根据订单ID查询评价列表
+- `GET /app/mall/order/evaluate/product/{productId}` - 根据商品ID查询评价列表（仅已审核）
+- `GET /app/mall/order/evaluate/{id}` - 获取订单评价详情
+- `POST /app/mall/order/evaluate` - 提交订单评价
+
+##### 优惠券 (`/app/mall/coupon`)
+
+- `GET /app/mall/coupon/available/list` - 查询可领取的优惠券列表
+- `GET /app/mall/coupon/{id}` - 获取优惠券详情
+
+##### 用户优惠券 (`/app/mall/coupon/user`)
+
+- `GET /app/mall/coupon/user/list` - 查询用户优惠券列表
+- `GET /app/mall/coupon/user/available/list` - 查询用户可用优惠券列表（未使用且未过期）
+- `GET /app/mall/coupon/user/{id}` - 获取用户优惠券详情
+- `POST /app/mall/coupon/user/receive/{couponId}` - 领取优惠券
+
+### 3. ruoyi-mall-coupon (优惠券中心)
+
+#### 管理端接口
+
+##### 优惠券管理 (`/mall/coupon`)
+
+- `GET /mall/coupon/list` - 查询优惠券列表（分页）
+- `GET /mall/coupon/{id}` - 获取优惠券详情
+- `POST /mall/coupon` - 新增优惠券
+- `PUT /mall/coupon` - 修改优惠券
+- `DELETE /mall/coupon/{ids}` - 删除优惠券
+- `POST /mall/coupon/export` - 导出优惠券列表
+- `PUT /mall/coupon/changeStatus/{id}` - 启用/禁用优惠券
+- `GET /mall/coupon/statistics` - 获取优惠券统计信息（发放数量、使用数量、使用率）
+
+##### 用户优惠券管理 (`/mall/coupon/user`)
+
+- `GET /mall/coupon/user/list` - 查询用户优惠券列表（分页）
+- `GET /mall/coupon/user/{id}` - 获取用户优惠券详情
+- `DELETE /mall/coupon/user/{ids}` - 删除用户优惠券
+- `POST /mall/coupon/user/export` - 导出用户优惠券列表
+
+### 4. ruoyi-mall-promotion (营销中心)
+
+#### 管理端接口
+
+##### 营销活动管理 (`/mall/promotion`)
+
+- `GET /mall/promotion/list` - 查询营销活动列表（分页）
+- `GET /mall/promotion/{id}` - 获取营销活动详情
+- `POST /mall/promotion` - 新增营销活动
+- `PUT /mall/promotion` - 修改营销活动
+- `DELETE /mall/promotion/{ids}` - 删除营销活动
+- `POST /mall/promotion/export` - 导出营销活动列表
+- `PUT /mall/promotion/changeStatus/{id}` - 启用/禁用营销活动
+
+##### 秒杀活动管理 (`/mall/seckill`)
+
+- `GET /mall/seckill/list` - 查询秒杀活动列表（分页）
+- `GET /mall/seckill/{id}` - 获取秒杀活动详情
+- `POST /mall/seckill` - 新增秒杀活动
+- `PUT /mall/seckill` - 修改秒杀活动
+- `DELETE /mall/seckill/{ids}` - 删除秒杀活动
+- `POST /mall/seckill/export` - 导出秒杀活动列表
+- `PUT /mall/seckill/changeStatus/{id}` - 启用/禁用秒杀活动
+
+##### 拼团活动管理 (`/mall/groupbuy`)
+
+- `GET /mall/groupbuy/list` - 查询拼团活动列表（分页）
+- `GET /mall/groupbuy/{id}` - 获取拼团活动详情
+- `POST /mall/groupbuy` - 新增拼团活动
+- `PUT /mall/groupbuy` - 修改拼团活动
+- `DELETE /mall/groupbuy/{ids}` - 删除拼团活动
+- `POST /mall/groupbuy/export` - 导出拼团活动列表
+- `PUT /mall/groupbuy/changeStatus/{id}` - 启用/禁用拼团活动
+
+##### 砍价活动管理 (`/mall/bargain`)
+
+- `GET /mall/bargain/list` - 查询砍价活动列表（分页）
+- `GET /mall/bargain/{id}` - 获取砍价活动详情
+- `POST /mall/bargain` - 新增砍价活动
+- `PUT /mall/bargain` - 修改砍价活动
+- `DELETE /mall/bargain/{ids}` - 删除砍价活动
+- `POST /mall/bargain/export` - 导出砍价活动列表
+- `PUT /mall/bargain/changeStatus/{id}` - 启用/禁用砍价活动
+
+#### 移动端接口
+
+##### 营销活动 (`/app/mall/promotion`)
+
+- `GET /app/mall/promotion/list` - 查询营销活动列表（可按类型筛选）
+- `GET /app/mall/promotion/{id}` - 获取营销活动详情
+
+##### 秒杀活动 (`/app/mall/seckill`)
+
+- `GET /app/mall/seckill/list` - 查询可用秒杀活动列表
+- `GET /app/mall/seckill/{id}` - 获取秒杀活动详情
+- `GET /app/mall/seckill/sku/{skuId}` - 根据SKU ID查询秒杀活动
+
+##### 拼团活动 (`/app/mall/groupbuy`)
+
+- `GET /app/mall/groupbuy/list` - 查询可用拼团活动列表
+- `GET /app/mall/groupbuy/{id}` - 获取拼团活动详情
+- `GET /app/mall/groupbuy/sku/{skuId}` - 根据SKU ID查询拼团活动
+
+##### 砍价活动 (`/app/mall/bargain`)
+
+- `GET /app/mall/bargain/list` - 查询可用砍价活动列表
+- `GET /app/mall/bargain/{id}` - 获取砍价活动详情
+- `GET /app/mall/bargain/sku/{skuId}` - 根据SKU ID查询砍价活动
+
+### 5. ruoyi-mall-statistics (统计中心)
+
+#### 管理端接口
+
+##### 统计数据 (`/mall/statistics`)
+
+- `GET /mall/statistics/transaction` - 获取交易统计数据
+  - 支持按日期范围查询（startDate, endDate）
+  - 支持设置商品销售排行数量限制（limit，默认10）
+  - 返回数据包括：总订单数、总销售额、已支付订单数、已支付金额、退款金额、今日统计、趋势数据、商品销售排行
+- `GET /mall/statistics/member` - 获取会员统计数据
+  - 支持按日期范围查询（startDate, endDate）
+  - 返回数据包括：总会员数、今日新增会员数、活跃会员数、增长趋势、消费统计
+  - ⚠️ 注意：会员统计功能需要会员模块支持，当前返回基础结构
+
+## 定时任务规划
+
+### 优惠券模块
+
+- [x] 优惠券过期处理任务 ✅
+    - **功能**: 定时扫描过期的用户优惠券，更新状态为已过期
+    - **执行频率**: 每天凌晨2点执行一次
+    - **实现位置**: `ruoyi-mall-coupon` 模块
+    - **方法**: `MallCouponJob.processExpiredCoupons()` (调用 `MallCouponUserService.processExpiredCoupons()`)
+
+### 营销模块
+
+- [ ] 拼团过期处理任务
+    - **功能**: 定时扫描过期的拼团订单，更新状态为已失败，处理退款
+    - **执行频率**: 每5分钟执行一次
+    - **实现位置**: `ruoyi-mall-promotion` 模块
+- [ ] 砍价过期处理任务
+    - **功能**: 定时扫描过期的砍价记录，更新状态为已失败
+    - **执行频率**: 每5分钟执行一次
+    - **实现位置**: `ruoyi-mall-promotion` 模块
+- [x] 秒杀活动状态更新任务 ✅
+    - **功能**: 定时更新秒杀活动状态（开始/结束）
+    - **执行频率**: 每5分钟执行一次
+    - **实现位置**: `ruoyi-mall-promotion` 模块
+    - **方法**: `MallPromotionJob.updateSeckillStatus()`
+
+### 订单模块（可选）
+
+- [ ] 订单自动取消任务
+    - **功能**: 定时扫描超时未支付的订单，自动取消并恢复库存
+    - **执行频率**: 每10分钟执行一次
+    - **实现位置**: `ruoyi-mall-trade` 模块
+
+## 技术栈与开发规范
+
+### 技术栈
+
+- **框架**: Spring Boot 3.x
+- **ORM**: MyBatis-Plus
+- **数据库**: MySQL 8.0+
+- **认证**: Sa-Token
+- **API文档**: Swagger/OpenAPI 3.0
+- **构建工具**: Maven
+
+### 开发规范
+
+#### 包结构规范
+
+- `controller` - 控制器层（分为 `admin` 和 `app` 两个子包）
+- `domain` - 实体类（包含 `bo` 业务对象和 `vo` 视图对象子包）
+- `mapper` - MyBatis Mapper 接口
+- `service` - 服务接口（实现类放在 `impl` 子包）
+- `config` - 配置类（自动配置类）
+- `enums` - 枚举类
+- `job` - 定时任务（可选）
+
+#### 代码规范
+
+- 统一使用 Lombok 简化代码
+- 统一异常处理，使用 `ServiceException` 抛出业务异常
+- 统一返回格式，使用 `R<T>` 封装返回结果
+- 统一分页查询，使用 `PageQuery` 和 `TableDataInfo<T>`
+- 统一日志记录，使用 `@Log` 注解记录操作日志
+- 统一权限控制，管理端接口使用 `@SaCheckPermission` 注解
+
+#### 数据库设计规范
+
+- 表名使用 `mall_` 前缀
+- 字段命名使用下划线命名法（snake_case）
+- 必须包含 `create_by`, `create_time`, `update_by`, `update_time` 字段
+- 删除标记使用逻辑删除（`deleted` 字段）
+- 状态字段统一使用 `status`，0表示启用/正常，1表示禁用/异常
+
+#### API设计规范
+
+- RESTful 风格设计
+- 管理端接口路径：`/mall/{module}/{resource}`
+- 移动端接口路径：`/app/mall/{module}/{resource}`
+- 使用 HTTP 标准方法：GET（查询）、POST（新增）、PUT（修改）、DELETE（删除）
+- 统一使用 JSON 格式进行数据交互
+- 使用 Swagger 注解完善接口文档
+
+## 模块集成说明
+
+### 支付中心集成 (ruoyi-pay)
+
+- **集成方式**: 通过 Feign 客户端或本地 Jar 依赖
+- **核心功能**:
+    - 订单提交时调用支付中心创建支付单
+    - 支付中心回调通知支付结果
+    - 订单状态与支付状态同步
+- **配置要求**: 在 `application.yml` 中配置 `pay-app-id` 和 `pay-notify-url`
+
+### 商品中心依赖关系
+
+- `ruoyi-mall-trade` 依赖 `ruoyi-mall-product`（查询商品和SKU信息）
+- `ruoyi-mall-promotion` 依赖 `ruoyi-mall-product`（营销活动关联商品）
+- `ruoyi-mall-statistics` 依赖 `ruoyi-mall-product` 和 `ruoyi-mall-trade`（数据统计分析）
+
+## 开发指南
+
+### 新增功能开发步骤
+
+1. **数据库设计**
+    - 在 `script/sql/ry_mall.sql` 中设计表结构
+    - 确保字段命名规范，包含必要的索引
+
+2. **创建实体类**
+    - 在对应模块的 `domain` 包下创建实体类
+    - 创建对应的 `Bo`（业务对象）和 `Vo`（视图对象）
+
+3. **创建 Mapper**
+    - 在 `mapper` 包下创建 Mapper 接口
+    - 如需复杂查询，在 `resources/mapper` 下创建 XML 文件
+
+4. **创建 Service**
+    - 在 `service` 包下创建 Service 接口
+    - 在 `service/impl` 包下创建 Service 实现类
+
+5. **创建 Controller**
+    - 管理端接口：在 `controller/admin` 包下创建
+    - 移动端接口：在 `controller/app` 包下创建
+    - 添加 Swagger 注解完善接口文档
+
+6. **测试验证**
+    - 编写单元测试（可选）
+    - 使用 Swagger UI 测试接口
+    - 验证业务逻辑正确性
+
+### 代码迁移指南
+
+如果要将现有代码迁移到新模块结构：
+
+1. **创建新模块结构**（如果尚未创建）
+2. **复制代码到新模块**
+3. **修改包名**（如 `org.dromara.mall.domain` → `org.dromara.mall.product.domain`）
+4. **更新导入语句**
+5. **更新 Mapper XML 文件中的命名空间**
+6. **测试验证功能正常**
+
+## 注意事项
+
+1. **包名冲突**: 如果同时保留现有代码和新模块代码，需要注意包名冲突问题
+2. **依赖管理**: 确保模块间的依赖关系正确配置，避免循环依赖
+3. **数据库迁移**: 执行 SQL 文件创建新表结构，注意数据迁移（如果需要）
+4. **配置管理**: 各子模块的配置通过 `spring.factories` 自动加载
+5. **事务管理**: 订单创建、支付回调等核心流程需要确保事务一致性
+6. **库存管理**: SKU库存扣减需要考虑并发问题，建议使用分布式锁或数据库锁（悲观锁/乐观锁）
+7. **支付集成**: 订单支付需要与 `ruoyi-pay` 模块集成，确保支付流程正确
+8. **数据统计**: 统计模块建议使用异步处理，避免影响业务性能
+9. **文件上传**: 商品图片、品牌Logo、分类图标等文件上传功能需要集成文件服务（如OSS）
+10. **缓存策略**: 商品列表、分类树等热点数据建议使用Redis缓存
+11. **幂等性**: 支付回调、订单创建等关键操作需要保证幂等性
+12. **数据一致性**: 订单创建、库存扣减等操作需要在同一事务中完成
diff --git a/ruoyi-modules/ruoyi-mall/README.md b/ruoyi-modules/ruoyi-mall/README.md
new file mode 100644
index 0000000..e8c703e
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/README.md
@@ -0,0 +1,264 @@
+# 电商模块 (ruoyi-mall)
+
+## 模块简介
+
+`ruoyi-mall` 是 PoJie 项目的电商核心业务模块，提供完整的电商功能，包括商品管理、购物车、订单管理、支付集成等。
+
+## 模块结构
+
+根据模块结构规划，`ruoyi-mall` 采用子模块拆分的方式，包含以下子模块：
+
+- `ruoyi-mall-product` - 商品中心 (SPU, SKU, 分类, 品牌, 属性)
+- `ruoyi-mall-trade` - 交易中心 (购物车, 订单, 售后)
+- `ruoyi-mall-promotion` - 营销中心 (活动, 拼团, 秒杀, 砍价)
+- `ruoyi-mall-coupon` - 优惠券中心 (独立拆分，便于复用)
+- `ruoyi-mall-statistics` - 统计中心 (交易分析, 会员分析)
+
+各子模块详细说明请参考对应的 README.md 文件。
+
+## 功能特性
+
+### 1. 商品管理
+
+- ✅ 商品CRUD操作
+- ✅ 商品上架/下架
+- ✅ 商品浏览量和销量统计
+- ✅ 商品详情管理
+
+### 2. SKU管理
+
+- ✅ SKU CRUD操作
+- ✅ 库存管理
+- ✅ 库存扣减和恢复
+- ✅ 规格属性管理
+
+### 3. 购物车管理
+
+- ✅ 添加/删除购物车
+- ✅ 购物车数量修改
+- ✅ 购物车选中状态管理
+- ✅ 购物车详情查询（包含商品和SKU信息）
+
+### 4. 订单管理
+
+- ✅ 订单创建
+- ✅ 订单查询（列表、详情）
+- ✅ 订单取消
+- ✅ 订单状态管理
+- ✅ 订单支付集成
+
+### 5. 支付集成
+
+- ✅ 与支付中心（ruoyi-pay）集成
+- ✅ 支付回调处理
+- ✅ 支付状态同步
+
+## 数据库表
+
+### 商品中心 (ruoyi-mall-product)
+
+- `mall_product` - 商品表
+- `mall_sku` - SKU表
+- `mall_category` - 商品分类表
+- `mall_brand` - 品牌表
+
+### 交易中心 (ruoyi-mall-trade)
+
+- `mall_cart` - 购物车表
+- `mall_order` - 订单表
+- `mall_order_item` - 订单明细表
+- `mall_after_sale` - 售后申请表
+- `mall_order_evaluate` - 订单评价表
+- `mall_order_coupon` - 订单优惠券使用记录表
+
+详细表结构请参考：`script/sql/ry_mall.sql`
+
+## 配置说明
+
+在 `application.yml` 中添加以下配置：
+
+```yaml
+ruoyi:
+  mall:
+    pay-app-id: 1  # 支付应用ID
+    pay-notify-url: https://your-domain.com/app/mall/pay/notify  # 支付回调地址
+```
+
+## API接口
+
+### 移动端接口
+
+#### 商品接口
+
+- `GET /app/mall/product/list` - 查询商品列表
+- `GET /app/mall/product/{id}` - 查询商品详情
+- `GET /app/mall/product/{productId}/skus` - 查询商品SKU列表
+
+#### 商品分类接口
+
+- `GET /app/mall/product/category/tree` - 查询商品分类树形列表（仅启用分类）
+
+#### 品牌接口
+
+- `GET /app/mall/product/brand/list` - 查询品牌列表（仅启用品牌）
+
+#### 购物车接口
+
+- `GET /app/mall/cart/list` - 查询购物车列表
+- `GET /app/mall/cart/detail/list` - 查询购物车详情列表（包含商品信息）
+- `POST /app/mall/cart` - 添加购物车
+- `PUT /app/mall/cart` - 修改购物车
+- `DELETE /app/mall/cart/{ids}` - 删除购物车
+- `DELETE /app/mall/cart/clear` - 清空购物车
+- `PUT /app/mall/cart/selected/{id}` - 更新选中状态
+- `PUT /app/mall/cart/selected/batch` - 批量更新选中状态
+
+#### 订单接口
+
+- `POST /app/mall/order/submit` - 提交订单并发起支付
+- `GET /app/mall/order/list` - 查询订单列表
+- `GET /app/mall/order/{id}` - 查询订单详情
+- `PUT /app/mall/order/cancel/{id}` - 取消订单
+- `POST /app/mall/order/pay/notify` - 支付回调（由支付中心调用）
+
+#### 优惠券接口
+
+- `GET /app/mall/coupon/available/list` - 查询可领取的优惠券列表
+- `GET /app/mall/coupon/{id}` - 获取优惠券详情
+- `GET /app/mall/coupon/user/list` - 查询用户优惠券列表
+- `GET /app/mall/coupon/user/available/list` - 查询用户可用优惠券列表
+- `GET /app/mall/coupon/user/{id}` - 获取用户优惠券详情
+- `POST /app/mall/coupon/user/receive/{couponId}` - 领取优惠券
+
+### 管理端接口
+
+#### 商品管理
+
+- `GET /mall/product/list` - 查询商品列表
+- `GET /mall/product/{id}` - 查询商品详情
+- `POST /mall/product` - 新增商品
+- `PUT /mall/product` - 修改商品
+- `DELETE /mall/product/{ids}` - 删除商品
+- `PUT /mall/product/status/{id}` - 上架/下架商品
+
+#### 商品分类管理
+
+- `GET /mall/product/category/list` - 查询商品分类列表（分页）
+- `GET /mall/product/category/tree` - 查询商品分类树形列表
+- `GET /mall/product/category/{id}` - 获取商品分类详情
+- `POST /mall/product/category` - 新增商品分类
+- `PUT /mall/product/category` - 修改商品分类
+- `DELETE /mall/product/category/{ids}` - 删除商品分类
+
+#### 优惠券管理
+
+- `GET /mall/coupon/list` - 查询优惠券列表（分页）
+- `GET /mall/coupon/{id}` - 获取优惠券详情
+- `POST /mall/coupon` - 新增优惠券
+- `PUT /mall/coupon` - 修改优惠券
+- `DELETE /mall/coupon/{ids}` - 删除优惠券
+- `POST /mall/coupon/export` - 导出优惠券列表
+- `PUT /mall/coupon/changeStatus/{id}` - 启用/禁用优惠券
+
+#### 用户优惠券管理
+
+- `GET /mall/coupon/user/list` - 查询用户优惠券列表（分页）
+- `GET /mall/coupon/user/{id}` - 获取用户优惠券详情
+- `DELETE /mall/coupon/user/{ids}` - 删除用户优惠券
+- `POST /mall/coupon/user/export` - 导出用户优惠券列表
+- `POST /mall/product/category/export` - 导出商品分类列表
+
+#### 品牌管理
+
+- `GET /mall/product/brand/list` - 查询品牌列表（分页）
+- `GET /mall/product/brand/{id}` - 获取品牌详情
+- `POST /mall/product/brand` - 新增品牌
+- `PUT /mall/product/brand` - 修改品牌
+- `DELETE /mall/product/brand/{ids}` - 删除品牌
+- `POST /mall/product/brand/export` - 导出品牌列表
+
+#### SKU管理
+
+- `GET /mall/sku/list` - 查询SKU列表
+- `GET /mall/sku/{id}` - 查询SKU详情
+- `GET /mall/sku/product/{productId}` - 根据商品ID查询SKU列表
+- `POST /mall/sku` - 新增SKU
+- `PUT /mall/sku` - 修改SKU
+- `DELETE /mall/sku/{ids}` - 删除SKU
+
+#### 订单管理
+
+- `GET /mall/order/list` - 查询订单列表
+- `GET /mall/order/{id}` - 查询订单详情
+- `PUT /mall/order` - 修改订单
+- `DELETE /mall/order/{ids}` - 删除订单
+- `PUT /mall/order/delivery/{id}` - 订单发货
+
+## 业务流程
+
+### 订单提交流程
+
+1. 用户选择商品（从购物车或直接购买）
+2. 调用 `/app/mall/order/submit` 提交订单
+3. 系统创建订单和订单明细
+4. 调用支付中心创建支付单
+5. 返回支付参数给前端
+6. 前端调起支付
+7. 支付成功后，支付中心回调 `/app/mall/order/pay/notify`
+8. 系统更新订单状态并扣减库存
+
+### 购物车流程
+
+1. 用户浏览商品，选择SKU
+2. 调用 `/app/mall/cart` 添加到购物车
+3. 如果购物车中已存在该SKU，则更新数量
+4. 用户可以在购物车中修改数量、选中状态
+5. 提交订单时，从购物车获取商品信息
+6. 订单创建成功后，删除购物车中的商品
+
+## 依赖模块
+
+- `ruoyi-pay` - 支付中心模块
+- `ruoyi-common-*` - 通用工具模块
+
+## 注意事项
+
+1. **库存管理**：订单支付成功后才扣减库存，避免超卖
+2. **幂等性**：支付回调需要保证幂等处理
+3. **地址管理**：当前版本地址信息简化处理，后续可扩展地址表
+4. **订单号生成**：使用时间戳+随机字符串生成唯一订单号
+
+## 待完善功能
+
+### 商品中心
+
+- [ ] 商品属性管理
+- [ ] 商品规格模板
+- [ ] 商品搜索功能
+
+### 交易中心
+
+- ✅ 订单评价功能
+- ✅ 售后管理功能（退款、退货、换货）
+- [ ] 地址管理模块（可考虑集成到会员模块）
+- [ ] 订单优惠券使用记录
+
+### 营销中心
+
+- [ ] 营销活动管理
+- [ ] 拼团功能
+- [ ] 秒杀功能
+- [ ] 砍价功能
+
+### 优惠券中心
+
+- [ ] 优惠券管理
+- [ ] 用户优惠券功能
+- [ ] 优惠券统计
+
+### 统计中心
+
+- [ ] 交易分析
+- [ ] 会员分析
+- [ ] 商品分析
+- [ ] 营销分析
diff --git a/ruoyi-modules/ruoyi-mall/pom.xml b/ruoyi-modules/ruoyi-mall/pom.xml
new file mode 100644
index 0000000..a2f7c4c
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/pom.xml
@@ -0,0 +1,27 @@
+<?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>
+        <groupId>org.dromara</groupId>
+        <artifactId>ruoyi-modules</artifactId>
+        <version>${revision}</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>ruoyi-mall</artifactId>
+    <packaging>pom</packaging>
+
+    <description>
+        ruoyi-mall 商城系统聚合模块
+    </description>
+
+    <modules>
+        <module>ruoyi-mall-product</module>
+        <module>ruoyi-mall-trade</module>
+        <module>ruoyi-mall-promotion</module>
+        <module>ruoyi-mall-coupon</module>
+        <module>ruoyi-mall-statistics</module>
+    </modules>
+
+</project>
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-coupon/README.md b/ruoyi-modules/ruoyi-mall/ruoyi-mall-coupon/README.md
new file mode 100644
index 0000000..334e972
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-coupon/README.md
@@ -0,0 +1,133 @@
+# 优惠券中心模块 (ruoyi-mall-coupon)
+
+## 模块简介
+
+`ruoyi-mall-coupon` 是商城系统的优惠券中心模块，提供独立的优惠券服务，支持发券、核销、过期处理等功能。
+
+## 功能特性
+
+### 1. 优惠券管理 ✅
+
+- ✅ 优惠券CRUD操作
+- ✅ 优惠券类型管理（满减、折扣、现金）
+- ✅ 优惠券发放规则配置
+- ✅ 优惠券有效期管理
+- ✅ 优惠券状态管理（启用/禁用）
+- ✅ 优惠券导出功能
+
+### 2. 用户优惠券 ✅
+
+- ✅ 用户领券
+- ✅ 用户优惠券列表查询
+- ✅ 优惠券使用（订单结算时调用）
+- ✅ 优惠券退还（订单取消时调用）
+- ✅ 优惠券过期处理（定时任务）✅
+
+### 3. 优惠券统计
+
+- [ ] 发放统计（可在管理端通过列表查询实现）
+- [ ] 使用统计（可在管理端通过列表查询实现）
+- [ ] 核销统计（可在管理端通过列表查询实现）
+
+## 数据库表
+
+- `mall_coupon` - 优惠券表
+- `mall_coupon_user` - 用户优惠券表
+
+详细表结构请参考：`script/sql/ry_mall.sql`
+
+## 模块结构
+
+```
+org.dromara.mall.coupon
+├── controller
+│   ├── admin          // 管理端API
+│   │   ├── AdminMallCouponController.java
+│   │   └── AdminMallCouponUserController.java
+│   └── app            // 用户端API
+│       ├── AppMallCouponController.java
+│       └── AppMallCouponUserController.java
+├── domain
+│   ├── MallCoupon.java
+│   ├── MallCouponUser.java
+│   ├── bo             // 业务对象
+│   │   ├── MallCouponBo.java
+│   │   └── MallCouponUserBo.java
+│   └── vo             // 视图对象
+│       ├── MallCouponVo.java
+│       └── MallCouponUserVo.java
+├── mapper
+│   ├── MallCouponMapper.java
+│   └── MallCouponUserMapper.java
+├── service
+│   ├── MallCouponService.java
+│   ├── MallCouponUserService.java
+│   └── impl
+│       ├── MallCouponServiceImpl.java
+│       └── MallCouponUserServiceImpl.java
+├── job                // 定时任务
+│   └── MallCouponJob.java
+└── config
+    └── MallCouponAutoConfiguration.java
+```
+
+## API接口
+
+### 管理端接口
+
+#### 优惠券管理 (`/mall/coupon`)
+
+- `GET /mall/coupon/list` - 查询优惠券列表（分页）
+- `GET /mall/coupon/{id}` - 获取优惠券详情
+- `POST /mall/coupon` - 新增优惠券
+- `PUT /mall/coupon` - 修改优惠券
+- `DELETE /mall/coupon/{ids}` - 删除优惠券
+- `POST /mall/coupon/export` - 导出优惠券列表
+- `PUT /mall/coupon/changeStatus/{id}` - 启用/禁用优惠券
+
+#### 用户优惠券管理 (`/mall/coupon/user`)
+
+- `GET /mall/coupon/user/list` - 查询用户优惠券列表（分页）
+- `GET /mall/coupon/user/{id}` - 获取用户优惠券详情
+- `DELETE /mall/coupon/user/{ids}` - 删除用户优惠券
+- `POST /mall/coupon/user/export` - 导出用户优惠券列表
+
+### 移动端接口
+
+#### 优惠券 (`/app/mall/coupon`)
+
+- `GET /app/mall/coupon/available/list` - 查询可领取的优惠券列表
+- `GET /app/mall/coupon/{id}` - 获取优惠券详情
+
+#### 用户优惠券 (`/app/mall/coupon/user`)
+
+- `GET /app/mall/coupon/user/list` - 查询用户优惠券列表
+- `GET /app/mall/coupon/user/available/list` - 查询用户可用优惠券列表（未使用且未过期）
+- `GET /app/mall/coupon/user/{id}` - 获取用户优惠券详情
+- `POST /app/mall/coupon/user/receive/{couponId}` - 领取优惠券
+
+## 优惠券类型说明
+
+- **0 - 满减券**: 需要设置优惠金额和使用门槛
+- **1 - 折扣券**: 需要设置折扣率（百分比）和使用门槛
+- **2 - 现金券**: 需要设置优惠金额，无使用门槛
+
+## 依赖模块
+
+- `ruoyi-common-*` - 通用工具模块
+- `ruoyi-common-excel` - Excel导出功能
+- `ruoyi-common-satoken` - 用户身份认证
+
+## 待实现功能
+
+- [ ] 优惠券统计功能（可在管理端通过列表查询和筛选实现）
+
+## 使用说明
+
+### 订单结算时使用优惠券
+
+在订单提交时，可以调用 `MallCouponUserService.useCoupon(couponUserId, orderId)` 来使用优惠券。
+
+### 订单取消时退还优惠券
+
+在订单取消时，可以调用 `MallCouponUserService.returnCoupon(couponUserId)` 来退还优惠券。
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-coupon/pom.xml b/ruoyi-modules/ruoyi-mall/ruoyi-mall-coupon/pom.xml
new file mode 100644
index 0000000..a44eb75
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-coupon/pom.xml
@@ -0,0 +1,67 @@
+<?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>
+        <groupId>org.dromara</groupId>
+        <artifactId>ruoyi-mall</artifactId>
+        <version>${revision}</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>ruoyi-mall-coupon</artifactId>
+
+    <description>
+        ruoyi-mall-coupon 优惠券中心模块
+    </description>
+
+    <dependencies>
+        <!-- 通用工具-->
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-core</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-doc</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-mybatis</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-security</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-web</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-log</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-redis</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-excel</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-satoken</artifactId>
+        </dependency>
+
+    </dependencies>
+
+</project>
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-coupon/src/main/java/org/dromara/mall/coupon/config/MallCouponAutoConfiguration.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-coupon/src/main/java/org/dromara/mall/coupon/config/MallCouponAutoConfiguration.java
new file mode 100644
index 0000000..d4eb66d
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-coupon/src/main/java/org/dromara/mall/coupon/config/MallCouponAutoConfiguration.java
@@ -0,0 +1,23 @@
+package org.dromara.mall.coupon.config;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * 优惠券中心自动配置类
+ * 主要用于扫描优惠券中心模块的组件
+ *
+ * @author pengles
+ */
+@Slf4j
+@Configuration
+@ComponentScan(basePackages = "org.dromara.mall.coupon")
+@ConditionalOnProperty(prefix = "ruoyi.mall.coupon", name = "enabled", havingValue = "true", matchIfMissing = true)
+public class MallCouponAutoConfiguration {
+
+    public MallCouponAutoConfiguration() {
+        log.info("优惠券中心模块已启用");
+    }
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-coupon/src/main/java/org/dromara/mall/coupon/controller/admin/AdminMallCouponController.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-coupon/src/main/java/org/dromara/mall/coupon/controller/admin/AdminMallCouponController.java
new file mode 100644
index 0000000..b9ba125
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-coupon/src/main/java/org/dromara/mall/coupon/controller/admin/AdminMallCouponController.java
@@ -0,0 +1,140 @@
+package org.dromara.mall.coupon.controller.admin;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.mall.coupon.domain.bo.MallCouponBo;
+import org.dromara.mall.coupon.domain.vo.CouponStatisticsVo;
+import org.dromara.mall.coupon.domain.vo.MallCouponVo;
+import org.dromara.mall.coupon.service.MallCouponService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 优惠券管理
+ *
+ * @author pengles
+ */
+@Tag(name = "管理端-优惠券管理", description = "优惠券管理接口")
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/mall/coupon")
+public class AdminMallCouponController extends BaseController {
+
+    private final MallCouponService mallCouponService;
+
+    /**
+     * 查询优惠券列表
+     */
+    @Operation(summary = "查询优惠券列表", description = "分页查询优惠券列表")
+    @SaCheckPermission("mall:coupon:list")
+    @GetMapping("/list")
+    public TableDataInfo<MallCouponVo> list(@Parameter(description = "优惠券查询条件") MallCouponBo bo,
+                                            @Parameter(description = "分页参数") PageQuery pageQuery) {
+        return mallCouponService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出售后申请列表
+     */
+    @Operation(summary = "导出优惠券列表", description = "导出优惠券到Excel")
+    @SaCheckPermission("mall:coupon:export")
+    @Log(title = "优惠券", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(@Parameter(description = "优惠券查询条件") MallCouponBo bo,
+                       @Parameter(description = "响应对象") HttpServletResponse response) {
+        List<MallCouponVo> list = mallCouponService.queryList(bo);
+        ExcelUtil.exportExcel(list, "优惠券", MallCouponVo.class, response);
+    }
+
+    /**
+     * 获取优惠券详细信息
+     */
+    @Operation(summary = "获取优惠券详情", description = "根据优惠券ID获取详细信息")
+    @SaCheckPermission("mall:coupon:query")
+    @GetMapping("/{id}")
+    public R<MallCouponVo> getInfo(@Parameter(description = "优惠券ID", required = true)
+                                   @NotNull(message = "主键不能为空")
+                                   @PathVariable Long id) {
+        return R.ok(mallCouponService.queryById(id));
+    }
+
+    /**
+     * 新增优惠券
+     */
+    @Operation(summary = "新增优惠券", description = "创建新的优惠券")
+    @SaCheckPermission("mall:coupon:add")
+    @Log(title = "优惠券", businessType = BusinessType.INSERT)
+    @PostMapping
+    public R<Void> add(@Parameter(description = "优惠券信息") @Validated @RequestBody MallCouponBo bo) {
+        return toAjax(mallCouponService.insertByBo(bo));
+    }
+
+    /**
+     * 修改优惠券
+     */
+    @Operation(summary = "修改优惠券", description = "更新优惠券信息")
+    @SaCheckPermission("mall:coupon:edit")
+    @Log(title = "优惠券", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public R<Void> edit(@Parameter(description = "优惠券信息") @Validated @RequestBody MallCouponBo bo) {
+        return toAjax(mallCouponService.updateByBo(bo));
+    }
+
+    /**
+     * 删除优惠券
+     */
+    @Operation(summary = "删除优惠券", description = "删除优惠券")
+    @SaCheckPermission("mall:coupon:remove")
+    @Log(title = "优惠券", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@Parameter(description = "优惠券ID数组", required = true)
+                          @NotNull(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(mallCouponService.deleteWithValidByIds(Arrays.asList(ids), true));
+    }
+
+    /**
+     * 启用/禁用优惠券
+     */
+    @Operation(summary = "启用/禁用优惠券", description = "更改优惠券状态")
+    @SaCheckPermission("mall:coupon:edit")
+    @Log(title = "优惠券", businessType = BusinessType.UPDATE)
+    @PutMapping("/changeStatus/{id}")
+    public R<Void> changeStatus(@Parameter(description = "优惠券ID", required = true)
+                                @NotNull(message = "主键不能为空")
+                                @PathVariable Long id,
+                                @Parameter(description = "状态", required = true)
+                                @NotNull(message = "状态不能为空")
+                                @RequestParam Integer status) {
+        return toAjax(mallCouponService.changeStatus(id, status));
+    }
+
+    /**
+     * 获取优惠券统计信息
+     */
+    @Operation(summary = "获取优惠券统计信息", description = "获取优惠券的发放、使用、核销等统计数据")
+    @SaCheckPermission("mall:coupon:query")
+    @GetMapping("/statistics")
+    public R<CouponStatisticsVo> getStatistics(
+            @Parameter(description = "优惠券ID，为空则统计所有优惠券")
+            @RequestParam(required = false) Long couponId) {
+        return R.ok(mallCouponService.getStatistics(couponId));
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-coupon/src/main/java/org/dromara/mall/coupon/controller/admin/AdminMallCouponUserController.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-coupon/src/main/java/org/dromara/mall/coupon/controller/admin/AdminMallCouponUserController.java
new file mode 100644
index 0000000..c479a52
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-coupon/src/main/java/org/dromara/mall/coupon/controller/admin/AdminMallCouponUserController.java
@@ -0,0 +1,89 @@
+package org.dromara.mall.coupon.controller.admin;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.mall.coupon.domain.bo.MallCouponUserBo;
+import org.dromara.mall.coupon.domain.vo.MallCouponUserVo;
+import org.dromara.mall.coupon.service.MallCouponUserService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 用户优惠券管理
+ *
+ * @author pengles
+ */
+@Tag(name = "管理端-用户优惠券管理", description = "用户优惠券管理接口")
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/mall/coupon/user")
+public class AdminMallCouponUserController extends BaseController {
+
+    private final MallCouponUserService mallCouponUserService;
+
+    /**
+     * 查询用户优惠券列表
+     */
+    @Operation(summary = "查询用户优惠券列表", description = "分页查询用户优惠券列表")
+    @SaCheckPermission("mall:coupon:user:list")
+    @GetMapping("/list")
+    public TableDataInfo<MallCouponUserVo> list(@Parameter(description = "用户优惠券查询条件") MallCouponUserBo bo,
+                                                @Parameter(description = "分页参数") PageQuery pageQuery) {
+        return mallCouponUserService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出用户优惠券列表
+     */
+    @Operation(summary = "导出用户优惠券列表", description = "导出用户优惠券到Excel")
+    @SaCheckPermission("mall:coupon:user:export")
+    @Log(title = "用户优惠券", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(@Parameter(description = "用户优惠券查询条件") MallCouponUserBo bo,
+                       @Parameter(description = "响应对象") HttpServletResponse response) {
+        List<MallCouponUserVo> list = mallCouponUserService.queryList(bo);
+        ExcelUtil.exportExcel(list, "用户优惠券", MallCouponUserVo.class, response);
+    }
+
+    /**
+     * 获取用户优惠券详细信息
+     */
+    @Operation(summary = "获取用户优惠券详情", description = "根据用户优惠券ID获取详细信息")
+    @SaCheckPermission("mall:coupon:user:query")
+    @GetMapping("/{id}")
+    public R<MallCouponUserVo> getInfo(@Parameter(description = "用户优惠券ID", required = true)
+                                       @NotNull(message = "主键不能为空")
+                                       @PathVariable Long id) {
+        return R.ok(mallCouponUserService.queryById(id));
+    }
+
+    /**
+     * 删除用户优惠券
+     */
+    @Operation(summary = "删除用户优惠券", description = "删除用户优惠券")
+    @SaCheckPermission("mall:coupon:user:remove")
+    @Log(title = "用户优惠券", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@Parameter(description = "用户优惠券ID数组", required = true)
+                          @NotNull(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(mallCouponUserService.deleteWithValidByIds(Arrays.asList(ids), true));
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-coupon/src/main/java/org/dromara/mall/coupon/controller/app/AppMallCouponController.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-coupon/src/main/java/org/dromara/mall/coupon/controller/app/AppMallCouponController.java
new file mode 100644
index 0000000..002e8be
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-coupon/src/main/java/org/dromara/mall/coupon/controller/app/AppMallCouponController.java
@@ -0,0 +1,50 @@
+package org.dromara.mall.coupon.controller.app;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.mall.coupon.domain.vo.MallCouponVo;
+import org.dromara.mall.coupon.service.MallCouponService;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * 优惠券（移动端）
+ *
+ * @author pengles
+ */
+@Tag(name = "移动端-优惠券", description = "优惠券接口")
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/app/mall/coupon")
+public class AppMallCouponController {
+
+    private final MallCouponService mallCouponService;
+
+    /**
+     * 查询可领取的优惠券列表
+     */
+    @Operation(summary = "查询可领取的优惠券列表", description = "查询用户可以领取的优惠券列表")
+    @GetMapping("/available/list")
+    public R<List<MallCouponVo>> getAvailableList() {
+        List<MallCouponVo> list = mallCouponService.queryAvailableList();
+        return R.ok(list);
+    }
+
+    /**
+     * 获取优惠券详情
+     */
+    @Operation(summary = "获取优惠券详情", description = "根据优惠券ID获取详细信息")
+    @GetMapping("/{id}")
+    public R<MallCouponVo> getInfo(@Parameter(description = "优惠券ID", required = true)
+                                   @PathVariable Long id) {
+        return R.ok(mallCouponService.queryById(id));
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-coupon/src/main/java/org/dromara/mall/coupon/controller/app/AppMallCouponUserController.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-coupon/src/main/java/org/dromara/mall/coupon/controller/app/AppMallCouponUserController.java
new file mode 100644
index 0000000..0fe20f2
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-coupon/src/main/java/org/dromara/mall/coupon/controller/app/AppMallCouponUserController.java
@@ -0,0 +1,78 @@
+package org.dromara.mall.coupon.controller.app;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.mall.coupon.domain.bo.MallCouponUserBo;
+import org.dromara.mall.coupon.domain.vo.MallCouponUserVo;
+import org.dromara.mall.coupon.service.MallCouponUserService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 用户优惠券（移动端）
+ *
+ * @author pengles
+ */
+@Tag(name = "移动端-用户优惠券", description = "用户优惠券接口")
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/app/mall/coupon/user")
+public class AppMallCouponUserController {
+
+    private final MallCouponUserService mallCouponUserService;
+
+    /**
+     * 查询用户优惠券列表
+     */
+    @Operation(summary = "查询用户优惠券列表", description = "查询当前用户的优惠券列表")
+    @GetMapping("/list")
+    public R<TableDataInfo<MallCouponUserVo>> list(@Parameter(description = "用户优惠券查询条件") MallCouponUserBo bo,
+                                                   @Parameter(description = "分页参数") PageQuery pageQuery) {
+        // 移动端只能查询当前用户的优惠券
+        TableDataInfo<MallCouponUserVo> result = mallCouponUserService.queryPageList(bo, pageQuery);
+        return R.ok(result);
+    }
+
+    /**
+     * 查询用户可用优惠券列表
+     */
+    @Operation(summary = "查询用户可用优惠券列表", description = "查询当前用户可用的优惠券列表（未使用且未过期）")
+    @GetMapping("/available/list")
+    public R<List<MallCouponUserVo>> getAvailableList() {
+        Long userId = org.dromara.common.satoken.utils.LoginHelper.getUserId();
+        List<MallCouponUserVo> list = mallCouponUserService.queryAvailableList(userId);
+        return R.ok(list);
+    }
+
+    /**
+     * 获取用户优惠券详情
+     */
+    @Operation(summary = "获取用户优惠券详情", description = "根据用户优惠券ID获取详细信息")
+    @GetMapping("/{id}")
+    public R<MallCouponUserVo> getInfo(@Parameter(description = "用户优惠券ID", required = true)
+                                       @NotNull(message = "主键不能为空")
+                                       @PathVariable Long id) {
+        return R.ok(mallCouponUserService.queryById(id));
+    }
+
+    /**
+     * 领取优惠券
+     */
+    @Operation(summary = "领取优惠券", description = "用户领取优惠券")
+    @PostMapping("/receive/{couponId}")
+    public R<Void> receiveCoupon(@Parameter(description = "优惠券ID", required = true)
+                                 @NotNull(message = "优惠券ID不能为空")
+                                 @PathVariable Long couponId) {
+        return R.ok(mallCouponUserService.receiveCoupon(couponId));
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-coupon/src/main/java/org/dromara/mall/coupon/domain/MallCoupon.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-coupon/src/main/java/org/dromara/mall/coupon/domain/MallCoupon.java
new file mode 100644
index 0000000..6472374
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-coupon/src/main/java/org/dromara/mall/coupon/domain/MallCoupon.java
@@ -0,0 +1,118 @@
+package org.dromara.mall.coupon.domain;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 优惠券对象 mall_coupon
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode
+@TableName("mall_coupon")
+public class MallCoupon implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 优惠券ID
+     */
+    @TableId
+    private Long id;
+
+    /**
+     * 优惠券名称
+     */
+    private String name;
+
+    /**
+     * 优惠券类型(0满减 1折扣 2现金)
+     */
+    private Integer type;
+
+    /**
+     * 优惠金额(分)
+     */
+    private Integer discountAmount;
+
+    /**
+     * 折扣率(%)
+     */
+    private BigDecimal discountRate;
+
+    /**
+     * 使用门槛(分)
+     */
+    private Integer minAmount;
+
+    /**
+     * 发放总数(null表示不限)
+     */
+    private Integer totalCount;
+
+    /**
+     * 已使用数量
+     */
+    private Integer usedCount;
+
+    /**
+     * 每人限领数量
+     */
+    private Integer perLimit;
+
+    /**
+     * 有效开始时间
+     */
+    private Date validStartTime;
+
+    /**
+     * 有效结束时间
+     */
+    private Date validEndTime;
+
+    /**
+     * 状态(0启用 1禁用)
+     */
+    private Integer status;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 创建者
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 更新者
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private String updateBy;
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-coupon/src/main/java/org/dromara/mall/coupon/domain/MallCouponUser.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-coupon/src/main/java/org/dromara/mall/coupon/domain/MallCouponUser.java
new file mode 100644
index 0000000..e11f6d5
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-coupon/src/main/java/org/dromara/mall/coupon/domain/MallCouponUser.java
@@ -0,0 +1,54 @@
+package org.dromara.mall.coupon.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 用户优惠券对象 mall_coupon_user
+ *
+ * @author pengles
+ */
+@Data
+@TableName("mall_coupon_user")
+public class MallCouponUser {
+
+    /**
+     * ID
+     */
+    @TableId
+    private Long id;
+
+    /**
+     * 用户ID
+     */
+    private Long userId;
+
+    /**
+     * 优惠券ID
+     */
+    private Long couponId;
+
+    /**
+     * 状态(0未使用 1已使用 2已过期)
+     */
+    private Integer status;
+
+    /**
+     * 使用时间
+     */
+    private Date usedTime;
+
+    /**
+     * 使用的订单ID
+     */
+    private Long orderId;
+
+    /**
+     * 领取时间
+     */
+    private Date createTime;
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-coupon/src/main/java/org/dromara/mall/coupon/domain/bo/MallCouponBo.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-coupon/src/main/java/org/dromara/mall/coupon/domain/bo/MallCouponBo.java
new file mode 100644
index 0000000..476713d
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-coupon/src/main/java/org/dromara/mall/coupon/domain/bo/MallCouponBo.java
@@ -0,0 +1,99 @@
+package org.dromara.mall.coupon.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.mall.coupon.domain.MallCoupon;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 优惠券业务对象 mall_coupon
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = MallCoupon.class, reverseConvertGenerate = false)
+public class MallCouponBo extends BaseEntity {
+
+    /**
+     * 优惠券ID
+     */
+    private Long id;
+
+    /**
+     * 优惠券名称
+     */
+    @NotBlank(message = "优惠券名称不能为空")
+    private String name;
+
+    /**
+     * 优惠券类型(0满减 1折扣 2现金)
+     */
+    @NotNull(message = "优惠券类型不能为空")
+    private Integer type;
+
+    /**
+     * 优惠金额(分)
+     */
+    @Min(value = 0, message = "优惠金额不能为负数")
+    private Integer discountAmount;
+
+    /**
+     * 折扣率(%)
+     */
+    @Min(value = 0, message = "折扣率不能为负数")
+    private BigDecimal discountRate;
+
+    /**
+     * 使用门槛(分)
+     */
+    @Min(value = 0, message = "使用门槛不能为负数")
+    private Integer minAmount;
+
+    /**
+     * 发放总数(null表示不限)
+     */
+    @Min(value = 1, message = "发放总数必须大于0")
+    private Integer totalCount;
+
+    /**
+     * 已使用数量
+     */
+    private Integer usedCount;
+
+    /**
+     * 每人限领数量
+     */
+    @Min(value = 1, message = "每人限领数量必须大于0")
+    private Integer perLimit;
+
+    /**
+     * 有效开始时间
+     */
+    @NotNull(message = "有效开始时间不能为空")
+    private Date validStartTime;
+
+    /**
+     * 有效结束时间
+     */
+    @NotNull(message = "有效结束时间不能为空")
+    private Date validEndTime;
+
+    /**
+     * 状态(0启用 1禁用)
+     */
+    private Integer status;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-coupon/src/main/java/org/dromara/mall/coupon/domain/bo/MallCouponUserBo.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-coupon/src/main/java/org/dromara/mall/coupon/domain/bo/MallCouponUserBo.java
new file mode 100644
index 0000000..d7b7cbc
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-coupon/src/main/java/org/dromara/mall/coupon/domain/bo/MallCouponUserBo.java
@@ -0,0 +1,51 @@
+package org.dromara.mall.coupon.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+import org.dromara.mall.coupon.domain.MallCouponUser;
+
+import java.util.Date;
+
+/**
+ * 用户优惠券业务对象 mall_coupon_user
+ *
+ * @author pengles
+ */
+@Data
+@AutoMapper(target = MallCouponUser.class, reverseConvertGenerate = false)
+public class MallCouponUserBo {
+
+    /**
+     * ID
+     */
+    private Long id;
+
+    /**
+     * 用户ID
+     */
+    @NotNull(message = "用户ID不能为空")
+    private Long userId;
+
+    /**
+     * 优惠券ID
+     */
+    @NotNull(message = "优惠券ID不能为空")
+    private Long couponId;
+
+    /**
+     * 状态(0未使用 1已使用 2已过期)
+     */
+    private Integer status;
+
+    /**
+     * 使用时间
+     */
+    private Date usedTime;
+
+    /**
+     * 使用的订单ID
+     */
+    private Long orderId;
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-coupon/src/main/java/org/dromara/mall/coupon/domain/vo/CouponStatisticsVo.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-coupon/src/main/java/org/dromara/mall/coupon/domain/vo/CouponStatisticsVo.java
new file mode 100644
index 0000000..61cfdd1
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-coupon/src/main/java/org/dromara/mall/coupon/domain/vo/CouponStatisticsVo.java
@@ -0,0 +1,49 @@
+package org.dromara.mall.coupon.domain.vo;
+
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 优惠券统计数据视图对象
+ *
+ * @author pengles
+ */
+@Data
+public class CouponStatisticsVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 优惠券ID
+     */
+    private Long couponId;
+
+    /**
+     * 优惠券名称
+     */
+    private String couponName;
+
+    /**
+     * 发放总数（已领取数量）
+     */
+    private Long issuedCount;
+
+    /**
+     * 使用数量（已使用数量）
+     */
+    private Long usedCount;
+
+    /**
+     * 使用率（使用数量/发放数量，百分比）
+     */
+    private Double usageRate;
+
+    /**
+     * 核销金额（分，基于订单优惠券使用记录表）
+     */
+    private Long redeemedAmount;
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-coupon/src/main/java/org/dromara/mall/coupon/domain/vo/MallCouponUserVo.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-coupon/src/main/java/org/dromara/mall/coupon/domain/vo/MallCouponUserVo.java
new file mode 100644
index 0000000..953c08b
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-coupon/src/main/java/org/dromara/mall/coupon/domain/vo/MallCouponUserVo.java
@@ -0,0 +1,63 @@
+package org.dromara.mall.coupon.domain.vo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.mall.coupon.domain.MallCouponUser;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 用户优惠券视图对象 mall_coupon_user
+ *
+ * @author pengles
+ */
+@Data
+@AutoMapper(target = MallCouponUser.class)
+public class MallCouponUserVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    private Long id;
+
+    /**
+     * 用户ID
+     */
+    private Long userId;
+
+    /**
+     * 优惠券ID
+     */
+    private Long couponId;
+
+    /**
+     * 状态(0未使用 1已使用 2已过期)
+     */
+    private Integer status;
+
+    /**
+     * 使用时间
+     */
+    private Date usedTime;
+
+    /**
+     * 使用的订单ID
+     */
+    private Long orderId;
+
+    /**
+     * 领取时间
+     */
+    private Date createTime;
+
+    /**
+     * 优惠券信息（关联查询）
+     */
+    private MallCouponVo couponInfo;
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-coupon/src/main/java/org/dromara/mall/coupon/domain/vo/MallCouponVo.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-coupon/src/main/java/org/dromara/mall/coupon/domain/vo/MallCouponVo.java
new file mode 100644
index 0000000..bfbbf77
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-coupon/src/main/java/org/dromara/mall/coupon/domain/vo/MallCouponVo.java
@@ -0,0 +1,99 @@
+package org.dromara.mall.coupon.domain.vo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.mall.coupon.domain.MallCoupon;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 优惠券视图对象 mall_coupon
+ *
+ * @author pengles
+ */
+@Data
+@AutoMapper(target = MallCoupon.class)
+public class MallCouponVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 优惠券ID
+     */
+    private Long id;
+
+    /**
+     * 优惠券名称
+     */
+    private String name;
+
+    /**
+     * 优惠券类型(0满减 1折扣 2现金)
+     */
+    private Integer type;
+
+    /**
+     * 优惠金额(分)
+     */
+    private Integer discountAmount;
+
+    /**
+     * 折扣率(%)
+     */
+    private BigDecimal discountRate;
+
+    /**
+     * 使用门槛(分)
+     */
+    private Integer minAmount;
+
+    /**
+     * 发放总数(null表示不限)
+     */
+    private Integer totalCount;
+
+    /**
+     * 已使用数量
+     */
+    private Integer usedCount;
+
+    /**
+     * 每人限领数量
+     */
+    private Integer perLimit;
+
+    /**
+     * 有效开始时间
+     */
+    private Date validStartTime;
+
+    /**
+     * 有效结束时间
+     */
+    private Date validEndTime;
+
+    /**
+     * 状态(0启用 1禁用)
+     */
+    private Integer status;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-coupon/src/main/java/org/dromara/mall/coupon/job/MallCouponJob.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-coupon/src/main/java/org/dromara/mall/coupon/job/MallCouponJob.java
new file mode 100644
index 0000000..50da65d
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-coupon/src/main/java/org/dromara/mall/coupon/job/MallCouponJob.java
@@ -0,0 +1,37 @@
+package org.dromara.mall.coupon.job;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.mall.coupon.service.MallCouponUserService;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+/**
+ * 优惠券定时任务
+ *
+ * @author pengles
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Component
+public class MallCouponJob {
+
+    private final MallCouponUserService couponUserService;
+
+    /**
+     * 优惠券过期处理任务
+     * 每天凌晨2点执行一次
+     * 处理所有已过期的优惠券，将状态更新为已过期（status=2）
+     */
+    @Scheduled(cron = "0 0 2 * * ?")
+    public void processExpiredCoupons() {
+        log.info("开始执行优惠券过期处理任务");
+        try {
+            couponUserService.processExpiredCoupons();
+            log.info("优惠券过期处理任务执行完成");
+        } catch (Exception e) {
+            log.error("优惠券过期处理任务执行失败", e);
+        }
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-coupon/src/main/java/org/dromara/mall/coupon/mapper/MallCouponMapper.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-coupon/src/main/java/org/dromara/mall/coupon/mapper/MallCouponMapper.java
new file mode 100644
index 0000000..f31cbe4
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-coupon/src/main/java/org/dromara/mall/coupon/mapper/MallCouponMapper.java
@@ -0,0 +1,16 @@
+package org.dromara.mall.coupon.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.mall.coupon.domain.MallCoupon;
+import org.dromara.mall.coupon.domain.vo.MallCouponVo;
+
+/**
+ * 优惠券Mapper接口
+ *
+ * @author pengles
+ */
+@Mapper
+public interface MallCouponMapper extends BaseMapperPlus<MallCoupon, MallCouponVo> {
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-coupon/src/main/java/org/dromara/mall/coupon/mapper/MallCouponUserMapper.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-coupon/src/main/java/org/dromara/mall/coupon/mapper/MallCouponUserMapper.java
new file mode 100644
index 0000000..194a551
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-coupon/src/main/java/org/dromara/mall/coupon/mapper/MallCouponUserMapper.java
@@ -0,0 +1,16 @@
+package org.dromara.mall.coupon.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.mall.coupon.domain.MallCouponUser;
+import org.dromara.mall.coupon.domain.vo.MallCouponUserVo;
+
+/**
+ * 用户优惠券Mapper接口
+ *
+ * @author pengles
+ */
+@Mapper
+public interface MallCouponUserMapper extends BaseMapperPlus<MallCouponUser, MallCouponUserVo> {
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-coupon/src/main/java/org/dromara/mall/coupon/service/MallCouponService.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-coupon/src/main/java/org/dromara/mall/coupon/service/MallCouponService.java
new file mode 100644
index 0000000..3517d51
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-coupon/src/main/java/org/dromara/mall/coupon/service/MallCouponService.java
@@ -0,0 +1,67 @@
+package org.dromara.mall.coupon.service;
+
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.mall.coupon.domain.bo.MallCouponBo;
+import org.dromara.mall.coupon.domain.vo.CouponStatisticsVo;
+import org.dromara.mall.coupon.domain.vo.MallCouponVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 优惠券Service接口
+ *
+ * @author pengles
+ */
+public interface MallCouponService {
+
+    /**
+     * 查询优惠券
+     */
+    MallCouponVo queryById(Long id);
+
+    /**
+     * 查询优惠券列表
+     */
+    TableDataInfo<MallCouponVo> queryPageList(MallCouponBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询优惠券列表
+     */
+    List<MallCouponVo> queryList(MallCouponBo bo);
+
+    /**
+     * 查询可领取的优惠券列表（移动端）
+     */
+    List<MallCouponVo> queryAvailableList();
+
+    /**
+     * 新增优惠券
+     */
+    Boolean insertByBo(MallCouponBo bo);
+
+    /**
+     * 修改优惠券
+     */
+    Boolean updateByBo(MallCouponBo bo);
+
+    /**
+     * 校验并批量删除优惠券信息
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    /**
+     * 启用/禁用优惠券
+     */
+    Boolean changeStatus(Long id, Integer status);
+
+    /**
+     * 获取优惠券统计信息
+     *
+     * @param couponId 优惠券ID，如果为空则统计所有优惠券
+     * @return 优惠券统计数据
+     */
+    CouponStatisticsVo getStatistics(Long couponId);
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-coupon/src/main/java/org/dromara/mall/coupon/service/MallCouponUserService.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-coupon/src/main/java/org/dromara/mall/coupon/service/MallCouponUserService.java
new file mode 100644
index 0000000..d36a484
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-coupon/src/main/java/org/dromara/mall/coupon/service/MallCouponUserService.java
@@ -0,0 +1,63 @@
+package org.dromara.mall.coupon.service;
+
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.mall.coupon.domain.bo.MallCouponUserBo;
+import org.dromara.mall.coupon.domain.vo.MallCouponUserVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 用户优惠券Service接口
+ *
+ * @author pengles
+ */
+public interface MallCouponUserService {
+
+    /**
+     * 查询用户优惠券
+     */
+    MallCouponUserVo queryById(Long id);
+
+    /**
+     * 查询用户优惠券列表
+     */
+    TableDataInfo<MallCouponUserVo> queryPageList(MallCouponUserBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询用户优惠券列表
+     */
+    List<MallCouponUserVo> queryList(MallCouponUserBo bo);
+
+    /**
+     * 查询用户可用优惠券列表
+     */
+    List<MallCouponUserVo> queryAvailableList(Long userId);
+
+    /**
+     * 用户领取优惠券
+     */
+    Boolean receiveCoupon(Long couponId);
+
+    /**
+     * 使用优惠券（订单结算时调用）
+     */
+    Boolean useCoupon(Long couponUserId, Long orderId);
+
+    /**
+     * 退还优惠券（订单取消时调用）
+     */
+    Boolean returnCoupon(Long couponUserId);
+
+    /**
+     * 批量删除用户优惠券信息
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    /**
+     * 处理过期优惠券（定时任务调用）
+     */
+    void processExpiredCoupons();
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-coupon/src/main/java/org/dromara/mall/coupon/service/impl/MallCouponServiceImpl.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-coupon/src/main/java/org/dromara/mall/coupon/service/impl/MallCouponServiceImpl.java
new file mode 100644
index 0000000..125cf01
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-coupon/src/main/java/org/dromara/mall/coupon/service/impl/MallCouponServiceImpl.java
@@ -0,0 +1,264 @@
+package org.dromara.mall.coupon.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.mall.coupon.domain.MallCoupon;
+import org.dromara.mall.coupon.domain.MallCouponUser;
+import org.dromara.mall.coupon.domain.bo.MallCouponBo;
+import org.dromara.mall.coupon.domain.vo.CouponStatisticsVo;
+import org.dromara.mall.coupon.domain.vo.MallCouponVo;
+import org.dromara.mall.coupon.mapper.MallCouponMapper;
+import org.dromara.mall.coupon.mapper.MallCouponUserMapper;
+import org.dromara.mall.coupon.service.MallCouponService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 优惠券Service业务层处理
+ *
+ * @author pengles
+ */
+@RequiredArgsConstructor
+@Service
+public class MallCouponServiceImpl implements MallCouponService {
+
+    private final MallCouponMapper baseMapper;
+    private final MallCouponUserMapper couponUserMapper;
+
+    /**
+     * 查询优惠券
+     */
+    @Override
+    public MallCouponVo queryById(Long id) {
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 查询优惠券列表
+     */
+    @Override
+    public TableDataInfo<MallCouponVo> queryPageList(MallCouponBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<MallCoupon> lqw = buildQueryWrapper(bo);
+        Page<MallCouponVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询优惠券列表
+     */
+    @Override
+    public List<MallCouponVo> queryList(MallCouponBo bo) {
+        LambdaQueryWrapper<MallCoupon> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    /**
+     * 查询可领取的优惠券列表（移动端）
+     */
+    @Override
+    public List<MallCouponVo> queryAvailableList() {
+        LambdaQueryWrapper<MallCoupon> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(MallCoupon::getStatus, 0); // 启用状态
+        Date now = new Date();
+        lqw.le(MallCoupon::getValidStartTime, now); // 已开始
+        lqw.ge(MallCoupon::getValidEndTime, now); // 未结束
+        // 发放总数未限制或已发放数量小于总数
+        lqw.and(wrapper -> wrapper
+                .isNull(MallCoupon::getTotalCount)
+                .or(wrapper2 -> wrapper2.apply("used_count < total_count"))
+        );
+        lqw.orderByDesc(MallCoupon::getCreateTime);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<MallCoupon> buildQueryWrapper(MallCouponBo bo) {
+        LambdaQueryWrapper<MallCoupon> lqw = new LambdaQueryWrapper<>();
+        lqw.like(StringUtils.isNotBlank(bo.getName()), MallCoupon::getName, bo.getName());
+        lqw.eq(bo.getType() != null, MallCoupon::getType, bo.getType());
+        lqw.eq(bo.getStatus() != null, MallCoupon::getStatus, bo.getStatus());
+        lqw.ge(bo.getValidStartTime() != null, MallCoupon::getValidStartTime, bo.getValidStartTime());
+        lqw.le(bo.getValidEndTime() != null, MallCoupon::getValidEndTime, bo.getValidEndTime());
+        lqw.orderByDesc(MallCoupon::getCreateTime);
+        return lqw;
+    }
+
+    /**
+     * 新增优惠券
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean insertByBo(MallCouponBo bo) {
+        MallCoupon add = MapstructUtils.convert(bo, MallCoupon.class);
+        validEntityBeforeSave(add);
+
+        // 设置默认值
+        if (add.getMinAmount() == null) {
+            add.setMinAmount(0);
+        }
+        if (add.getUsedCount() == null) {
+            add.setUsedCount(0);
+        }
+        if (add.getPerLimit() == null) {
+            add.setPerLimit(1);
+        }
+        if (add.getStatus() == null) {
+            add.setStatus(0); // 默认启用
+        }
+
+        // 校验优惠券类型和对应字段
+        validateCouponType(add);
+
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改优惠券
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean updateByBo(MallCouponBo bo) {
+        MallCoupon update = MapstructUtils.convert(bo, MallCoupon.class);
+        validEntityBeforeSave(update);
+
+        // 校验优惠券类型和对应字段
+        validateCouponType(update);
+
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(MallCoupon entity) {
+        // 校验有效期
+        if (entity.getValidStartTime() != null && entity.getValidEndTime() != null) {
+            if (entity.getValidEndTime().before(entity.getValidStartTime())) {
+                throw new ServiceException("有效结束时间不能早于开始时间");
+            }
+        }
+    }
+
+    /**
+     * 校验优惠券类型和对应字段
+     */
+    private void validateCouponType(MallCoupon entity) {
+        if (entity.getType() == null) {
+            return;
+        }
+        // 0-满减，1-折扣，2-现金
+        if (entity.getType() == 0) {
+            // 满减类型必须设置优惠金额
+            if (entity.getDiscountAmount() == null || entity.getDiscountAmount() <= 0) {
+                throw new ServiceException("满减类型优惠券必须设置优惠金额");
+            }
+        } else if (entity.getType() == 1) {
+            // 折扣类型必须设置折扣率
+            if (entity.getDiscountRate() == null || entity.getDiscountRate().compareTo(java.math.BigDecimal.ZERO) <= 0) {
+                throw new ServiceException("折扣类型优惠券必须设置折扣率");
+            }
+            if (entity.getDiscountRate().compareTo(new java.math.BigDecimal("100")) > 0) {
+                throw new ServiceException("折扣率不能大于100%");
+            }
+        } else if (entity.getType() == 2) {
+            // 现金类型必须设置优惠金额
+            if (entity.getDiscountAmount() == null || entity.getDiscountAmount() <= 0) {
+                throw new ServiceException("现金类型优惠券必须设置优惠金额");
+            }
+        }
+    }
+
+    /**
+     * 批量删除优惠券
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if (isValid) {
+            // 可以添加业务校验逻辑，如：已使用数量大于0的优惠券不能删除
+        }
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+
+    /**
+     * 启用/禁用优惠券
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean changeStatus(Long id, Integer status) {
+        MallCoupon coupon = baseMapper.selectById(id);
+        if (coupon == null) {
+            throw new ServiceException("优惠券不存在");
+        }
+        if (status != 0 && status != 1) {
+            throw new ServiceException("状态值不正确");
+        }
+        coupon.setStatus(status);
+        return baseMapper.updateById(coupon) > 0;
+    }
+
+    /**
+     * 获取优惠券统计信息
+     */
+    @Override
+    public CouponStatisticsVo getStatistics(Long couponId) {
+        CouponStatisticsVo vo = new CouponStatisticsVo();
+        vo.setCouponId(couponId);
+
+        // 如果指定了优惠券ID，获取优惠券信息
+        if (couponId != null) {
+            MallCouponVo couponVo = baseMapper.selectVoById(couponId);
+            if (couponVo != null) {
+                vo.setCouponName(couponVo.getName());
+            }
+        }
+
+        // 统计发放数量（已领取数量，即mall_coupon_user表中的总记录数）
+        LambdaQueryWrapper<MallCouponUser> issuedWrapper = new LambdaQueryWrapper<>();
+        if (couponId != null) {
+            issuedWrapper.eq(MallCouponUser::getCouponId, couponId);
+        }
+        Long issuedCount = couponUserMapper.selectCount(issuedWrapper);
+        vo.setIssuedCount(issuedCount != null ? issuedCount : 0L);
+
+        // 统计使用数量（status=1的记录数）
+        LambdaQueryWrapper<MallCouponUser> usedWrapper = new LambdaQueryWrapper<>();
+        if (couponId != null) {
+            usedWrapper.eq(MallCouponUser::getCouponId, couponId);
+        }
+        usedWrapper.eq(MallCouponUser::getStatus, 1); // 已使用
+        Long usedCount = couponUserMapper.selectCount(usedWrapper);
+        vo.setUsedCount(usedCount != null ? usedCount : 0L);
+
+        // 计算使用率
+        if (vo.getIssuedCount() > 0) {
+            double usageRate = (double) vo.getUsedCount() / vo.getIssuedCount() * 100;
+            vo.setUsageRate(Math.round(usageRate * 100.0) / 100.0);
+        } else {
+            vo.setUsageRate(0.0);
+        }
+
+        // 核销金额统计（基于mall_order_coupon表，需要在交易中心模块查询）
+        // 由于跨模块依赖问题，这里暂时设为0
+        // 如果需要在优惠券模块直接查询，可以考虑通过Feign调用交易中心模块的接口，或者将统计功能放在交易中心模块
+        // 当前实现：如果交易中心模块已实现订单优惠券记录，可以通过依赖注入MallOrderCouponService来查询
+        // TODO: 考虑通过服务间调用或事件机制来获取核销金额统计
+        vo.setRedeemedAmount(0L);
+
+        return vo;
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-coupon/src/main/java/org/dromara/mall/coupon/service/impl/MallCouponUserServiceImpl.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-coupon/src/main/java/org/dromara/mall/coupon/service/impl/MallCouponUserServiceImpl.java
new file mode 100644
index 0000000..8b48571
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-coupon/src/main/java/org/dromara/mall/coupon/service/impl/MallCouponUserServiceImpl.java
@@ -0,0 +1,296 @@
+package org.dromara.mall.coupon.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.mall.coupon.domain.MallCoupon;
+import org.dromara.mall.coupon.domain.MallCouponUser;
+import org.dromara.mall.coupon.domain.bo.MallCouponUserBo;
+import org.dromara.mall.coupon.domain.vo.MallCouponUserVo;
+import org.dromara.mall.coupon.domain.vo.MallCouponVo;
+import org.dromara.mall.coupon.mapper.MallCouponMapper;
+import org.dromara.mall.coupon.mapper.MallCouponUserMapper;
+import org.dromara.mall.coupon.service.MallCouponUserService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 用户优惠券Service业务层处理
+ *
+ * @author pengles
+ */
+@RequiredArgsConstructor
+@Service
+public class MallCouponUserServiceImpl implements MallCouponUserService {
+
+    private final MallCouponUserMapper baseMapper;
+    private final MallCouponMapper couponMapper;
+
+    /**
+     * 查询用户优惠券
+     */
+    @Override
+    public MallCouponUserVo queryById(Long id) {
+        MallCouponUserVo vo = baseMapper.selectVoById(id);
+        if (vo != null && vo.getCouponId() != null) {
+            // 关联查询优惠券信息
+            MallCouponVo couponVo = couponMapper.selectVoById(vo.getCouponId());
+            vo.setCouponInfo(couponVo);
+        }
+        return vo;
+    }
+
+    /**
+     * 查询用户优惠券列表
+     */
+    @Override
+    public TableDataInfo<MallCouponUserVo> queryPageList(MallCouponUserBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<MallCouponUser> lqw = buildQueryWrapper(bo);
+        Page<MallCouponUserVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+
+        // 关联查询优惠券信息
+        fillCouponInfo(result.getRecords());
+
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询用户优惠券列表
+     */
+    @Override
+    public List<MallCouponUserVo> queryList(MallCouponUserBo bo) {
+        LambdaQueryWrapper<MallCouponUser> lqw = buildQueryWrapper(bo);
+        List<MallCouponUserVo> list = baseMapper.selectVoList(lqw);
+
+        // 关联查询优惠券信息
+        fillCouponInfo(list);
+
+        return list;
+    }
+
+    /**
+     * 查询用户可用优惠券列表
+     */
+    @Override
+    public List<MallCouponUserVo> queryAvailableList(Long userId) {
+        LambdaQueryWrapper<MallCouponUser> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(MallCouponUser::getUserId, userId);
+        lqw.eq(MallCouponUser::getStatus, 0); // 未使用
+        lqw.orderByDesc(MallCouponUser::getCreateTime);
+
+        List<MallCouponUserVo> list = baseMapper.selectVoList(lqw);
+
+        // 过滤已过期的优惠券
+        Date now = new Date();
+        list = list.stream().filter(vo -> {
+            if (vo.getCouponId() == null) {
+                return false;
+            }
+            MallCouponVo couponVo = couponMapper.selectVoById(vo.getCouponId());
+            if (couponVo == null || couponVo.getStatus() != 0) {
+                return false;
+            }
+            return couponVo.getValidEndTime() != null && couponVo.getValidEndTime().after(now);
+        }).collect(Collectors.toList());
+
+        // 关联查询优惠券信息
+        fillCouponInfo(list);
+
+        return list;
+    }
+
+    /**
+     * 填充优惠券信息
+     */
+    private void fillCouponInfo(List<MallCouponUserVo> list) {
+        if (list == null || list.isEmpty()) {
+            return;
+        }
+        for (MallCouponUserVo vo : list) {
+            if (vo.getCouponId() != null) {
+                MallCouponVo couponVo = couponMapper.selectVoById(vo.getCouponId());
+                vo.setCouponInfo(couponVo);
+            }
+        }
+    }
+
+    private LambdaQueryWrapper<MallCouponUser> buildQueryWrapper(MallCouponUserBo bo) {
+        LambdaQueryWrapper<MallCouponUser> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(bo.getUserId() != null, MallCouponUser::getUserId, bo.getUserId());
+        lqw.eq(bo.getCouponId() != null, MallCouponUser::getCouponId, bo.getCouponId());
+        lqw.eq(bo.getStatus() != null, MallCouponUser::getStatus, bo.getStatus());
+        lqw.orderByDesc(MallCouponUser::getCreateTime);
+        return lqw;
+    }
+
+    /**
+     * 用户领取优惠券
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean receiveCoupon(Long couponId) {
+        Long userId = LoginHelper.getUserId();
+
+        // 查询优惠券信息
+        MallCoupon coupon = couponMapper.selectById(couponId);
+        if (coupon == null) {
+            throw new ServiceException("优惠券不存在");
+        }
+        if (coupon.getStatus() != 0) {
+            throw new ServiceException("优惠券已禁用");
+        }
+
+        // 校验有效期
+        Date now = new Date();
+        if (coupon.getValidStartTime().after(now) || coupon.getValidEndTime().before(now)) {
+            throw new ServiceException("优惠券不在有效期内");
+        }
+
+        // 校验发放数量
+        if (coupon.getTotalCount() != null) {
+            if (coupon.getUsedCount() >= coupon.getTotalCount()) {
+                throw new ServiceException("优惠券已发放完毕");
+            }
+        }
+
+        // 校验每人限领数量
+        LambdaQueryWrapper<MallCouponUser> countWrapper = new LambdaQueryWrapper<>();
+        countWrapper.eq(MallCouponUser::getUserId, userId);
+        countWrapper.eq(MallCouponUser::getCouponId, couponId);
+        Long receivedCount = baseMapper.selectCount(countWrapper);
+        if (receivedCount >= coupon.getPerLimit()) {
+            throw new ServiceException("已达到每人限领数量");
+        }
+
+        // 创建用户优惠券记录
+        MallCouponUser couponUser = new MallCouponUser();
+        couponUser.setUserId(userId);
+        couponUser.setCouponId(couponId);
+        couponUser.setStatus(0); // 未使用
+        couponUser.setCreateTime(now);
+
+        boolean flag = baseMapper.insert(couponUser) > 0;
+
+        if (flag) {
+            // 更新优惠券已发放数量（注意：这里used_count实际存储的是已发放数量，不是已使用数量）
+            // 如果业务需要区分，可以考虑增加字段
+            LambdaUpdateWrapper<MallCoupon> updateWrapper = new LambdaUpdateWrapper<>();
+            updateWrapper.eq(MallCoupon::getId, couponId);
+            updateWrapper.setSql("used_count = used_count + 1");
+            couponMapper.update(null, updateWrapper);
+        }
+
+        return flag;
+    }
+
+    /**
+     * 使用优惠券（订单结算时调用）
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean useCoupon(Long couponUserId, Long orderId) {
+        MallCouponUser couponUser = baseMapper.selectById(couponUserId);
+        if (couponUser == null) {
+            throw new ServiceException("用户优惠券不存在");
+        }
+        if (couponUser.getStatus() != 0) {
+            throw new ServiceException("优惠券已使用或已过期");
+        }
+
+        // 校验优惠券是否过期
+        MallCoupon coupon = couponMapper.selectById(couponUser.getCouponId());
+        if (coupon == null) {
+            throw new ServiceException("优惠券不存在");
+        }
+        Date now = new Date();
+        if (coupon.getValidEndTime().before(now)) {
+            throw new ServiceException("优惠券已过期");
+        }
+
+        // 更新用户优惠券状态
+        couponUser.setStatus(1); // 已使用
+        couponUser.setUsedTime(now);
+        couponUser.setOrderId(orderId);
+
+        return baseMapper.updateById(couponUser) > 0;
+    }
+
+    /**
+     * 退还优惠券（订单取消时调用）
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean returnCoupon(Long couponUserId) {
+        MallCouponUser couponUser = baseMapper.selectById(couponUserId);
+        if (couponUser == null) {
+            throw new ServiceException("用户优惠券不存在");
+        }
+        if (couponUser.getStatus() != 1) {
+            throw new ServiceException("优惠券状态不正确，无法退还");
+        }
+
+        // 校验优惠券是否过期
+        MallCoupon coupon = couponMapper.selectById(couponUser.getCouponId());
+        if (coupon == null) {
+            throw new ServiceException("优惠券不存在");
+        }
+        Date now = new Date();
+        if (coupon.getValidEndTime().before(now)) {
+            // 已过期，状态改为已过期
+            couponUser.setStatus(2);
+        } else {
+            // 未过期，状态改为未使用
+            couponUser.setStatus(0);
+        }
+        couponUser.setUsedTime(null);
+        couponUser.setOrderId(null);
+
+        return baseMapper.updateById(couponUser) > 0;
+    }
+
+    /**
+     * 批量删除用户优惠券
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if (isValid) {
+            // 可以添加业务校验逻辑
+        }
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+
+    /**
+     * 处理过期优惠券（定时任务调用）
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void processExpiredCoupons() {
+        Date now = new Date();
+
+        // 查询所有未使用的用户优惠券
+        LambdaQueryWrapper<MallCouponUser> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(MallCouponUser::getStatus, 0); // 未使用
+        List<MallCouponUser> list = baseMapper.selectList(lqw);
+
+        for (MallCouponUser couponUser : list) {
+            MallCoupon coupon = couponMapper.selectById(couponUser.getCouponId());
+            if (coupon != null && coupon.getValidEndTime().before(now)) {
+                // 优惠券已过期，更新状态
+                couponUser.setStatus(2); // 已过期
+                baseMapper.updateById(couponUser);
+            }
+        }
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-coupon/src/main/resources/META-INF/spring.factories b/ruoyi-modules/ruoyi-mall/ruoyi-mall-coupon/src/main/resources/META-INF/spring.factories
new file mode 100644
index 0000000..d8573c7
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-coupon/src/main/resources/META-INF/spring.factories
@@ -0,0 +1,3 @@
+# Auto Configure
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+org.dromara.mall.coupon.config.MallCouponAutoConfiguration
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/README.md b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/README.md
new file mode 100644
index 0000000..500ad9f
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/README.md
@@ -0,0 +1,223 @@
+# 商品中心模块 (ruoyi-mall-product)
+
+## 模块简介
+
+`ruoyi-mall-product` 是商城系统的商品中心模块，负责商品全生命周期管理，包括商品(SPU)、SKU、分类、品牌等核心功能。
+
+## 功能特性
+
+### 1. 商品管理 (SPU)
+
+- ✅ 商品CRUD操作
+- ✅ 商品上架/下架
+- ✅ 商品浏览量和销量统计
+- ✅ 商品详情管理
+
+### 2. SKU管理
+
+- ✅ SKU CRUD操作
+- ✅ 库存管理
+- ✅ 库存扣减和恢复
+- ✅ 规格属性管理
+
+### 3. 商品分类管理 ✅
+
+- ✅ 分类树形结构查询（支持三级分类）
+- ✅ 分类CRUD操作（列表、详情、新增、修改、删除）
+- ✅ 分类排序
+- ✅ 分类导出功能
+- ⏳ 分类图标管理（字段已支持，需前端集成文件上传功能）
+
+### 4. 品牌管理 ✅
+
+- ✅ 品牌CRUD操作（列表、详情、新增、修改、删除）
+- ✅ 品牌描述管理
+- ✅ 品牌排序
+- ✅ 品牌状态管理（启用/禁用）
+- ✅ 品牌导出功能
+- ⏳ 品牌Logo上传（字段已支持，需前端集成文件上传功能）
+
+## 数据库表
+
+- `mall_product` - 商品表
+- `mall_sku` - SKU表
+- `mall_category` - 商品分类表
+- `mall_brand` - 品牌表
+- `mall_attribute_template` - 属性模板表
+- `mall_attribute` - 属性表
+- `mall_attribute_value` - 属性值表
+- `mall_product_attribute` - 商品属性关联表
+
+详细表结构请参考：`script/sql/ry_mall.sql`
+
+## 模块结构
+
+```
+org.dromara.mall.product
+├── controller
+│   ├── admin          // 管理端API
+│   │   ├── AdminMallCategoryController.java
+│   │   ├── AdminMallBrandController.java
+│   │   ├── AdminMallAttributeTemplateController.java
+│   │   ├── AdminMallAttributeController.java
+│   │   ├── AdminMallAttributeValueController.java
+│   │   └── AdminMallProductAttributeController.java
+│   └── app            // 用户端API
+│       ├── AppMallCategoryController.java
+│       └── AppMallBrandController.java
+├── domain
+│   ├── MallCategory.java
+│   ├── MallBrand.java
+│   ├── MallAttributeTemplate.java
+│   ├── MallAttribute.java
+│   ├── MallAttributeValue.java
+│   ├── MallProductAttribute.java
+│   ├── bo             // 业务对象
+│   │   ├── MallCategoryBo.java
+│   │   ├── MallBrandBo.java
+│   │   ├── MallAttributeTemplateBo.java
+│   │   ├── MallAttributeBo.java
+│   │   ├── MallAttributeValueBo.java
+│   │   └── MallProductAttributeBo.java
+│   └── vo             // 视图对象
+│       ├── MallCategoryVo.java
+│       ├── MallBrandVo.java
+│       ├── MallAttributeTemplateVo.java
+│       ├── MallAttributeVo.java
+│       ├── MallAttributeValueVo.java
+│       └── MallProductAttributeVo.java
+├── mapper
+│   ├── MallCategoryMapper.java
+│   ├── MallBrandMapper.java
+│   ├── MallAttributeTemplateMapper.java
+│   ├── MallAttributeMapper.java
+│   ├── MallAttributeValueMapper.java
+│   └── MallProductAttributeMapper.java
+├── service
+│   ├── MallCategoryService.java
+│   ├── MallBrandService.java
+│   ├── MallAttributeTemplateService.java
+│   ├── MallAttributeService.java
+│   ├── MallAttributeValueService.java
+│   ├── MallProductAttributeService.java
+│   └── impl
+│       ├── MallCategoryServiceImpl.java
+│       ├── MallBrandServiceImpl.java
+│       ├── MallAttributeTemplateServiceImpl.java
+│       ├── MallAttributeServiceImpl.java
+│       ├── MallAttributeValueServiceImpl.java
+│       └── MallProductAttributeServiceImpl.java
+├── enums              // 枚举类
+│   └── AttributeType.java
+└── config
+    └── MallProductAutoConfiguration.java
+```
+
+## 依赖模块
+
+- `ruoyi-common-*` - 通用工具模块
+
+## API接口
+
+### 管理端接口
+
+#### 商品分类管理 (`/mall/product/category`)
+
+- `GET /mall/product/category/list` - 查询商品分类列表（分页）
+- `GET /mall/product/category/tree` - 查询商品分类树形列表
+- `GET /mall/product/category/{id}` - 获取商品分类详情
+- `POST /mall/product/category` - 新增商品分类
+- `PUT /mall/product/category` - 修改商品分类
+- `DELETE /mall/product/category/{ids}` - 删除商品分类
+- `POST /mall/product/category/export` - 导出商品分类列表
+
+#### 品牌管理 (`/mall/product/brand`)
+
+- `GET /mall/product/brand/list` - 查询品牌列表（分页）
+- `GET /mall/product/brand/{id}` - 获取品牌详情
+- `POST /mall/product/brand` - 新增品牌
+- `PUT /mall/product/brand` - 修改品牌
+- `DELETE /mall/product/brand/{ids}` - 删除品牌
+- `POST /mall/product/brand/export` - 导出品牌列表
+
+### 移动端接口
+
+#### 商品分类 (`/app/mall/product/category`)
+
+- `GET /app/mall/product/category/tree` - 查询商品分类树形列表（仅启用分类）
+
+#### 品牌 (`/app/mall/product/brand`)
+
+- `GET /app/mall/product/brand/list` - 查询品牌列表（仅启用品牌）
+
+#### 属性模板管理 (`/mall/product/attribute/template`)
+
+- `GET /mall/product/attribute/template/list` - 查询属性模板列表（分页）
+- `GET /mall/product/attribute/template/{id}` - 获取属性模板详情
+- `POST /mall/product/attribute/template` - 新增属性模板
+- `PUT /mall/product/attribute/template` - 修改属性模板
+- `DELETE /mall/product/attribute/template/{ids}` - 删除属性模板
+- `POST /mall/product/attribute/template/export` - 导出属性模板列表
+
+#### 属性管理 (`/mall/product/attribute`)
+
+- `GET /mall/product/attribute/list` - 查询属性列表（分页）
+- `GET /mall/product/attribute/{id}` - 获取属性详情
+- `GET /mall/product/attribute/template/{templateId}` - 根据模板ID查询属性列表
+- `POST /mall/product/attribute` - 新增属性
+- `PUT /mall/product/attribute` - 修改属性
+- `DELETE /mall/product/attribute/{ids}` - 删除属性
+- `POST /mall/product/attribute/export` - 导出属性列表
+
+#### 属性值管理 (`/mall/product/attribute/value`)
+
+- `GET /mall/product/attribute/value/list` - 查询属性值列表（分页）
+- `GET /mall/product/attribute/value/{id}` - 获取属性值详情
+- `GET /mall/product/attribute/value/attribute/{attributeId}` - 根据属性ID查询属性值列表
+- `POST /mall/product/attribute/value` - 新增属性值
+- `PUT /mall/product/attribute/value` - 修改属性值
+- `DELETE /mall/product/attribute/value/{ids}` - 删除属性值
+- `POST /mall/product/attribute/value/export` - 导出属性值列表
+
+#### 商品属性关联管理 (`/mall/product/attribute/product`)
+
+- `GET /mall/product/attribute/product/{id}` - 获取商品属性关联详情
+- `GET /mall/product/attribute/product/product/{productId}` - 根据商品ID查询商品属性关联列表
+- `POST /mall/product/attribute/product` - 新增商品属性关联
+- `POST /mall/product/attribute/product/batch` - 批量新增商品属性关联
+- `POST /mall/product/attribute/product/product/{productId}` - 保存商品属性关联（先删除旧的，再插入新的）
+- `PUT /mall/product/attribute/product` - 修改商品属性关联
+- `DELETE /mall/product/attribute/product/{ids}` - 删除商品属性关联
+- `DELETE /mall/product/attribute/product/product/{productId}` - 根据商品ID删除商品属性关联
+
+### 5. 商品属性管理 ✅
+
+- ✅ 属性模板管理
+    - ✅ 属性模板CRUD操作
+    - ✅ 属性模板绑定分类（可选）
+    - ✅ 属性模板导出功能
+- ✅ 属性管理
+    - ✅ 属性CRUD操作
+    - ✅ 属性类型管理（文本、数字、日期、枚举）
+    - ✅ 属性绑定模板（可选）
+    - ✅ 属性必填设置
+    - ✅ 属性导出功能
+- ✅ 属性值管理
+    - ✅ 属性值CRUD操作
+    - ✅ 属性值绑定属性
+    - ✅ 属性值排序
+    - ✅ 属性值导出功能
+- ✅ 商品属性关联
+    - ✅ 商品关联属性值
+    - ✅ 批量保存商品属性
+    - ✅ 根据商品ID查询属性
+    - ✅ 支持枚举类型属性值选择
+    - ✅ 支持文本/数字/日期类型自定义值
+
+## 待实现功能
+    - [ ] 规格模板定义
+    - [ ] 规格值管理
+    - [ ] 规格模板与商品关联
+- [ ] 商品搜索功能
+    - [ ] 全文搜索（集成Elasticsearch或类似方案）
+    - [ ] 商品筛选（按分类、品牌、价格等）
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/pom.xml b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/pom.xml
new file mode 100644
index 0000000..a2347f2
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/pom.xml
@@ -0,0 +1,61 @@
+<?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>
+        <groupId>org.dromara</groupId>
+        <artifactId>ruoyi-mall</artifactId>
+        <version>${revision}</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>ruoyi-mall-product</artifactId>
+
+    <description>
+        ruoyi-mall-product 商品中心模块
+    </description>
+
+    <dependencies>
+        <!-- 通用工具-->
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-core</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-doc</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-mybatis</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-security</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-web</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-log</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-redis</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-excel</artifactId>
+        </dependency>
+
+    </dependencies>
+
+</project>
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/config/MallProductAutoConfiguration.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/config/MallProductAutoConfiguration.java
new file mode 100644
index 0000000..36601e4
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/config/MallProductAutoConfiguration.java
@@ -0,0 +1,23 @@
+package org.dromara.mall.product.config;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * 商品中心自动配置类
+ * 主要用于扫描商品中心模块的组件
+ *
+ * @author pengles
+ */
+@Slf4j
+@Configuration
+@ComponentScan(basePackages = "org.dromara.mall.product")
+@ConditionalOnProperty(prefix = "ruoyi.mall.product", name = "enabled", havingValue = "true", matchIfMissing = true)
+public class MallProductAutoConfiguration {
+
+    public MallProductAutoConfiguration() {
+        log.info("商品中心模块已启用");
+    }
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/controller/admin/AdminMallAttributeController.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/controller/admin/AdminMallAttributeController.java
new file mode 100644
index 0000000..3b1276a
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/controller/admin/AdminMallAttributeController.java
@@ -0,0 +1,122 @@
+package org.dromara.mall.product.controller.admin;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.mall.product.domain.bo.MallAttributeBo;
+import org.dromara.mall.product.domain.vo.MallAttributeVo;
+import org.dromara.mall.product.service.MallAttributeService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 属性管理
+ *
+ * @author pengles
+ */
+@Tag(name = "管理端-属性管理", description = "属性管理接口")
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/mall/product/attribute")
+public class AdminMallAttributeController extends BaseController {
+
+    private final MallAttributeService mallAttributeService;
+
+    /**
+     * 查询属性列表
+     */
+    @Operation(summary = "查询属性列表", description = "分页查询属性列表")
+    @SaCheckPermission("mall:product:attribute:list")
+    @GetMapping("/list")
+    public TableDataInfo<MallAttributeVo> list(@Parameter(description = "属性查询条件") MallAttributeBo bo,
+                                                @Parameter(description = "分页参数") PageQuery pageQuery) {
+        return mallAttributeService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出属性列表
+     */
+    @Operation(summary = "导出属性列表", description = "导出属性到Excel")
+    @SaCheckPermission("mall:product:attribute:export")
+    @Log(title = "属性", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(@Parameter(description = "属性查询条件") MallAttributeBo bo,
+                       @Parameter(description = "响应对象") HttpServletResponse response) {
+        List<MallAttributeVo> list = mallAttributeService.queryList(bo);
+        ExcelUtil.exportExcel(list, "属性", MallAttributeVo.class, response);
+    }
+
+    /**
+     * 获取属性详细信息
+     */
+    @Operation(summary = "获取属性详情", description = "根据属性ID获取详细信息")
+    @SaCheckPermission("mall:product:attribute:query")
+    @GetMapping("/{id}")
+    public R<MallAttributeVo> getInfo(@Parameter(description = "属性ID", required = true)
+                                       @NotNull(message = "主键不能为空")
+                                       @PathVariable Long id) {
+        return R.ok(mallAttributeService.queryById(id));
+    }
+
+    /**
+     * 根据模板ID查询属性列表
+     */
+    @Operation(summary = "根据模板ID查询属性列表", description = "根据属性模板ID查询属性列表")
+    @SaCheckPermission("mall:product:attribute:list")
+    @GetMapping("/template/{templateId}")
+    public R<List<MallAttributeVo>> listByTemplateId(@Parameter(description = "模板ID", required = true)
+                                                       @NotNull(message = "模板ID不能为空")
+                                                       @PathVariable Long templateId) {
+        return R.ok(mallAttributeService.queryListByTemplateId(templateId));
+    }
+
+    /**
+     * 新增属性
+     */
+    @Operation(summary = "新增属性", description = "新增属性")
+    @SaCheckPermission("mall:product:attribute:add")
+    @Log(title = "属性", businessType = BusinessType.INSERT)
+    @PostMapping
+    public R<Void> add(@Parameter(description = "属性信息") @Validated @RequestBody MallAttributeBo bo) {
+        return toAjax(mallAttributeService.insertByBo(bo));
+    }
+
+    /**
+     * 修改属性
+     */
+    @Operation(summary = "修改属性", description = "修改属性")
+    @SaCheckPermission("mall:product:attribute:edit")
+    @Log(title = "属性", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public R<Void> edit(@Parameter(description = "属性信息") @Validated @RequestBody MallAttributeBo bo) {
+        return toAjax(mallAttributeService.updateByBo(bo));
+    }
+
+    /**
+     * 删除属性
+     */
+    @Operation(summary = "删除属性", description = "批量删除属性")
+    @SaCheckPermission("mall:product:attribute:remove")
+    @Log(title = "属性", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@Parameter(description = "属性ID数组", required = true)
+                          @NotNull(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(mallAttributeService.deleteWithValidByIds(Arrays.asList(ids), true));
+    }
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/controller/admin/AdminMallAttributeTemplateController.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/controller/admin/AdminMallAttributeTemplateController.java
new file mode 100644
index 0000000..2260b36
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/controller/admin/AdminMallAttributeTemplateController.java
@@ -0,0 +1,110 @@
+package org.dromara.mall.product.controller.admin;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.mall.product.domain.bo.MallAttributeTemplateBo;
+import org.dromara.mall.product.domain.vo.MallAttributeTemplateVo;
+import org.dromara.mall.product.service.MallAttributeTemplateService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 属性模板管理
+ *
+ * @author pengles
+ */
+@Tag(name = "管理端-属性模板管理", description = "属性模板管理接口")
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/mall/product/attribute/template")
+public class AdminMallAttributeTemplateController extends BaseController {
+
+    private final MallAttributeTemplateService mallAttributeTemplateService;
+
+    /**
+     * 查询属性模板列表
+     */
+    @Operation(summary = "查询属性模板列表", description = "分页查询属性模板列表")
+    @SaCheckPermission("mall:product:attribute:template:list")
+    @GetMapping("/list")
+    public TableDataInfo<MallAttributeTemplateVo> list(@Parameter(description = "属性模板查询条件") MallAttributeTemplateBo bo,
+                                                        @Parameter(description = "分页参数") PageQuery pageQuery) {
+        return mallAttributeTemplateService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出属性模板列表
+     */
+    @Operation(summary = "导出属性模板列表", description = "导出属性模板到Excel")
+    @SaCheckPermission("mall:product:attribute:template:export")
+    @Log(title = "属性模板", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(@Parameter(description = "属性模板查询条件") MallAttributeTemplateBo bo,
+                       @Parameter(description = "响应对象") HttpServletResponse response) {
+        List<MallAttributeTemplateVo> list = mallAttributeTemplateService.queryList(bo);
+        ExcelUtil.exportExcel(list, "属性模板", MallAttributeTemplateVo.class, response);
+    }
+
+    /**
+     * 获取属性模板详细信息
+     */
+    @Operation(summary = "获取属性模板详情", description = "根据属性模板ID获取详细信息")
+    @SaCheckPermission("mall:product:attribute:template:query")
+    @GetMapping("/{id}")
+    public R<MallAttributeTemplateVo> getInfo(@Parameter(description = "属性模板ID", required = true)
+                                               @NotNull(message = "主键不能为空")
+                                               @PathVariable Long id) {
+        return R.ok(mallAttributeTemplateService.queryById(id));
+    }
+
+    /**
+     * 新增属性模板
+     */
+    @Operation(summary = "新增属性模板", description = "新增属性模板")
+    @SaCheckPermission("mall:product:attribute:template:add")
+    @Log(title = "属性模板", businessType = BusinessType.INSERT)
+    @PostMapping
+    public R<Void> add(@Parameter(description = "属性模板信息") @Validated @RequestBody MallAttributeTemplateBo bo) {
+        return toAjax(mallAttributeTemplateService.insertByBo(bo));
+    }
+
+    /**
+     * 修改属性模板
+     */
+    @Operation(summary = "修改属性模板", description = "修改属性模板")
+    @SaCheckPermission("mall:product:attribute:template:edit")
+    @Log(title = "属性模板", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public R<Void> edit(@Parameter(description = "属性模板信息") @Validated @RequestBody MallAttributeTemplateBo bo) {
+        return toAjax(mallAttributeTemplateService.updateByBo(bo));
+    }
+
+    /**
+     * 删除属性模板
+     */
+    @Operation(summary = "删除属性模板", description = "批量删除属性模板")
+    @SaCheckPermission("mall:product:attribute:template:remove")
+    @Log(title = "属性模板", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@Parameter(description = "属性模板ID数组", required = true)
+                          @NotNull(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(mallAttributeTemplateService.deleteWithValidByIds(Arrays.asList(ids), true));
+    }
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/controller/admin/AdminMallAttributeValueController.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/controller/admin/AdminMallAttributeValueController.java
new file mode 100644
index 0000000..5b7dfc4
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/controller/admin/AdminMallAttributeValueController.java
@@ -0,0 +1,122 @@
+package org.dromara.mall.product.controller.admin;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.mall.product.domain.bo.MallAttributeValueBo;
+import org.dromara.mall.product.domain.vo.MallAttributeValueVo;
+import org.dromara.mall.product.service.MallAttributeValueService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 属性值管理
+ *
+ * @author pengles
+ */
+@Tag(name = "管理端-属性值管理", description = "属性值管理接口")
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/mall/product/attribute/value")
+public class AdminMallAttributeValueController extends BaseController {
+
+    private final MallAttributeValueService mallAttributeValueService;
+
+    /**
+     * 查询属性值列表
+     */
+    @Operation(summary = "查询属性值列表", description = "分页查询属性值列表")
+    @SaCheckPermission("mall:product:attribute:value:list")
+    @GetMapping("/list")
+    public TableDataInfo<MallAttributeValueVo> list(@Parameter(description = "属性值查询条件") MallAttributeValueBo bo,
+                                                     @Parameter(description = "分页参数") PageQuery pageQuery) {
+        return mallAttributeValueService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出属性值列表
+     */
+    @Operation(summary = "导出属性值列表", description = "导出属性值到Excel")
+    @SaCheckPermission("mall:product:attribute:value:export")
+    @Log(title = "属性值", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(@Parameter(description = "属性值查询条件") MallAttributeValueBo bo,
+                       @Parameter(description = "响应对象") HttpServletResponse response) {
+        List<MallAttributeValueVo> list = mallAttributeValueService.queryList(bo);
+        ExcelUtil.exportExcel(list, "属性值", MallAttributeValueVo.class, response);
+    }
+
+    /**
+     * 获取属性值详细信息
+     */
+    @Operation(summary = "获取属性值详情", description = "根据属性值ID获取详细信息")
+    @SaCheckPermission("mall:product:attribute:value:query")
+    @GetMapping("/{id}")
+    public R<MallAttributeValueVo> getInfo(@Parameter(description = "属性值ID", required = true)
+                                            @NotNull(message = "主键不能为空")
+                                            @PathVariable Long id) {
+        return R.ok(mallAttributeValueService.queryById(id));
+    }
+
+    /**
+     * 根据属性ID查询属性值列表
+     */
+    @Operation(summary = "根据属性ID查询属性值列表", description = "根据属性ID查询属性值列表")
+    @SaCheckPermission("mall:product:attribute:value:list")
+    @GetMapping("/attribute/{attributeId}")
+    public R<List<MallAttributeValueVo>> listByAttributeId(@Parameter(description = "属性ID", required = true)
+                                                             @NotNull(message = "属性ID不能为空")
+                                                             @PathVariable Long attributeId) {
+        return R.ok(mallAttributeValueService.queryListByAttributeId(attributeId));
+    }
+
+    /**
+     * 新增属性值
+     */
+    @Operation(summary = "新增属性值", description = "新增属性值")
+    @SaCheckPermission("mall:product:attribute:value:add")
+    @Log(title = "属性值", businessType = BusinessType.INSERT)
+    @PostMapping
+    public R<Void> add(@Parameter(description = "属性值信息") @Validated @RequestBody MallAttributeValueBo bo) {
+        return toAjax(mallAttributeValueService.insertByBo(bo));
+    }
+
+    /**
+     * 修改属性值
+     */
+    @Operation(summary = "修改属性值", description = "修改属性值")
+    @SaCheckPermission("mall:product:attribute:value:edit")
+    @Log(title = "属性值", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public R<Void> edit(@Parameter(description = "属性值信息") @Validated @RequestBody MallAttributeValueBo bo) {
+        return toAjax(mallAttributeValueService.updateByBo(bo));
+    }
+
+    /**
+     * 删除属性值
+     */
+    @Operation(summary = "删除属性值", description = "批量删除属性值")
+    @SaCheckPermission("mall:product:attribute:value:remove")
+    @Log(title = "属性值", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@Parameter(description = "属性值ID数组", required = true)
+                          @NotNull(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(mallAttributeValueService.deleteWithValidByIds(Arrays.asList(ids), true));
+    }
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/controller/admin/AdminMallBrandController.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/controller/admin/AdminMallBrandController.java
new file mode 100644
index 0000000..6430f0d
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/controller/admin/AdminMallBrandController.java
@@ -0,0 +1,110 @@
+package org.dromara.mall.product.controller.admin;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.mall.product.domain.bo.MallBrandBo;
+import org.dromara.mall.product.domain.vo.MallBrandVo;
+import org.dromara.mall.product.service.MallBrandService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 品牌管理
+ *
+ * @author pengles
+ */
+@Tag(name = "管理端-品牌管理", description = "品牌管理接口")
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/mall/product/brand")
+public class AdminMallBrandController extends BaseController {
+
+    private final MallBrandService mallBrandService;
+
+    /**
+     * 查询品牌列表
+     */
+    @Operation(summary = "查询品牌列表", description = "分页查询品牌列表")
+    @SaCheckPermission("mall:product:brand:list")
+    @GetMapping("/list")
+    public TableDataInfo<MallBrandVo> list(@Parameter(description = "品牌查询条件") MallBrandBo bo,
+                                           @Parameter(description = "分页参数") PageQuery pageQuery) {
+        return mallBrandService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出品牌列表
+     */
+    @Operation(summary = "导出品牌列表", description = "导出品牌到Excel")
+    @SaCheckPermission("mall:product:brand:export")
+    @Log(title = "品牌", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(@Parameter(description = "品牌查询条件") MallBrandBo bo,
+                       @Parameter(description = "响应对象") HttpServletResponse response) {
+        List<MallBrandVo> list = mallBrandService.queryList(bo);
+        ExcelUtil.exportExcel(list, "品牌", MallBrandVo.class, response);
+    }
+
+    /**
+     * 获取品牌详细信息
+     */
+    @Operation(summary = "获取品牌详情", description = "根据品牌ID获取详细信息")
+    @SaCheckPermission("mall:product:brand:query")
+    @GetMapping("/{id}")
+    public R<MallBrandVo> getInfo(@Parameter(description = "品牌ID", required = true)
+                                  @NotNull(message = "主键不能为空")
+                                  @PathVariable Long id) {
+        return R.ok(mallBrandService.queryById(id));
+    }
+
+    /**
+     * 新增品牌
+     */
+    @Operation(summary = "新增品牌", description = "新增品牌")
+    @SaCheckPermission("mall:product:brand:add")
+    @Log(title = "品牌", businessType = BusinessType.INSERT)
+    @PostMapping
+    public R<Void> add(@Parameter(description = "品牌信息") @Validated @RequestBody MallBrandBo bo) {
+        return toAjax(mallBrandService.insertByBo(bo));
+    }
+
+    /**
+     * 修改品牌
+     */
+    @Operation(summary = "修改品牌", description = "修改品牌")
+    @SaCheckPermission("mall:product:brand:edit")
+    @Log(title = "品牌", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public R<Void> edit(@Parameter(description = "品牌信息") @Validated @RequestBody MallBrandBo bo) {
+        return toAjax(mallBrandService.updateByBo(bo));
+    }
+
+    /**
+     * 删除品牌
+     */
+    @Operation(summary = "删除品牌", description = "删除品牌")
+    @SaCheckPermission("mall:product:brand:remove")
+    @Log(title = "品牌", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@Parameter(description = "品牌ID数组", required = true)
+                          @NotNull(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(mallBrandService.deleteWithValidByIds(Arrays.asList(ids), true));
+    }
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/controller/admin/AdminMallCategoryController.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/controller/admin/AdminMallCategoryController.java
new file mode 100644
index 0000000..a42519a
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/controller/admin/AdminMallCategoryController.java
@@ -0,0 +1,121 @@
+package org.dromara.mall.product.controller.admin;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.mall.product.domain.bo.MallCategoryBo;
+import org.dromara.mall.product.domain.vo.MallCategoryVo;
+import org.dromara.mall.product.service.MallCategoryService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 商品分类管理
+ *
+ * @author pengles
+ */
+@Tag(name = "管理端-商品分类管理", description = "商品分类管理接口")
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/mall/product/category")
+public class AdminMallCategoryController extends BaseController {
+
+    private final MallCategoryService mallCategoryService;
+
+    /**
+     * 查询商品分类列表
+     */
+    @Operation(summary = "查询商品分类列表", description = "分页查询商品分类列表")
+    @SaCheckPermission("mall:product:category:list")
+    @GetMapping("/list")
+    public TableDataInfo<MallCategoryVo> list(@Parameter(description = "分类查询条件") MallCategoryBo bo,
+                                              @Parameter(description = "分页参数") PageQuery pageQuery) {
+        return mallCategoryService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 查询商品分类树形列表
+     */
+    @Operation(summary = "查询商品分类树形列表", description = "查询商品分类树形结构")
+    @SaCheckPermission("mall:product:category:list")
+    @GetMapping("/tree")
+    public R<List<MallCategoryVo>> tree() {
+        List<MallCategoryVo> list = mallCategoryService.queryTreeList();
+        return R.ok(list);
+    }
+
+    /**
+     * 导出商品分类列表
+     */
+    @Operation(summary = "导出商品分类列表", description = "导出商品分类到Excel")
+    @SaCheckPermission("mall:product:category:export")
+    @Log(title = "商品分类", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(@Parameter(description = "分类查询条件") MallCategoryBo bo,
+                       @Parameter(description = "响应对象") HttpServletResponse response) {
+        List<MallCategoryVo> list = mallCategoryService.queryList(bo);
+        ExcelUtil.exportExcel(list, "商品分类", MallCategoryVo.class, response);
+    }
+
+    /**
+     * 获取商品分类详细信息
+     */
+    @Operation(summary = "获取商品分类详情", description = "根据分类ID获取详细信息")
+    @SaCheckPermission("mall:product:category:query")
+    @GetMapping("/{id}")
+    public R<MallCategoryVo> getInfo(@Parameter(description = "分类ID", required = true)
+                                     @NotNull(message = "主键不能为空")
+                                     @PathVariable Long id) {
+        return R.ok(mallCategoryService.queryById(id));
+    }
+
+    /**
+     * 新增商品分类
+     */
+    @Operation(summary = "新增商品分类", description = "新增商品分类")
+    @SaCheckPermission("mall:product:category:add")
+    @Log(title = "商品分类", businessType = BusinessType.INSERT)
+    @PostMapping
+    public R<Void> add(@Parameter(description = "分类信息") @Validated @RequestBody MallCategoryBo bo) {
+        return toAjax(mallCategoryService.insertByBo(bo));
+    }
+
+    /**
+     * 修改商品分类
+     */
+    @Operation(summary = "修改商品分类", description = "修改商品分类")
+    @SaCheckPermission("mall:product:category:edit")
+    @Log(title = "商品分类", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public R<Void> edit(@Parameter(description = "分类信息") @Validated @RequestBody MallCategoryBo bo) {
+        return toAjax(mallCategoryService.updateByBo(bo));
+    }
+
+    /**
+     * 删除商品分类
+     */
+    @Operation(summary = "删除商品分类", description = "删除商品分类")
+    @SaCheckPermission("mall:product:category:remove")
+    @Log(title = "商品分类", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@Parameter(description = "分类ID数组", required = true)
+                          @NotNull(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(mallCategoryService.deleteWithValidByIds(Arrays.asList(ids), true));
+    }
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/controller/admin/AdminMallProductAttributeController.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/controller/admin/AdminMallProductAttributeController.java
new file mode 100644
index 0000000..a2e348f
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/controller/admin/AdminMallProductAttributeController.java
@@ -0,0 +1,132 @@
+package org.dromara.mall.product.controller.admin;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.mall.product.domain.bo.MallProductAttributeBo;
+import org.dromara.mall.product.domain.vo.MallProductAttributeVo;
+import org.dromara.mall.product.service.MallProductAttributeService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 商品属性关联管理
+ *
+ * @author pengles
+ */
+@Tag(name = "管理端-商品属性关联管理", description = "商品属性关联管理接口")
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/mall/product/attribute/product")
+public class AdminMallProductAttributeController extends BaseController {
+
+    private final MallProductAttributeService mallProductAttributeService;
+
+    /**
+     * 获取商品属性关联详细信息
+     */
+    @Operation(summary = "获取商品属性关联详情", description = "根据商品属性关联ID获取详细信息")
+    @SaCheckPermission("mall:product:attribute:product:query")
+    @GetMapping("/{id}")
+    public R<MallProductAttributeVo> getInfo(@Parameter(description = "商品属性关联ID", required = true)
+                                              @NotNull(message = "主键不能为空")
+                                              @PathVariable Long id) {
+        return R.ok(mallProductAttributeService.queryById(id));
+    }
+
+    /**
+     * 根据商品ID查询商品属性关联列表
+     */
+    @Operation(summary = "根据商品ID查询商品属性关联列表", description = "根据商品ID查询商品属性关联列表")
+    @SaCheckPermission("mall:product:attribute:product:list")
+    @GetMapping("/product/{productId}")
+    public R<List<MallProductAttributeVo>> listByProductId(@Parameter(description = "商品ID", required = true)
+                                                             @NotNull(message = "商品ID不能为空")
+                                                             @PathVariable Long productId) {
+        return R.ok(mallProductAttributeService.queryListByProductId(productId));
+    }
+
+    /**
+     * 新增商品属性关联
+     */
+    @Operation(summary = "新增商品属性关联", description = "新增商品属性关联")
+    @SaCheckPermission("mall:product:attribute:product:add")
+    @Log(title = "商品属性关联", businessType = BusinessType.INSERT)
+    @PostMapping
+    public R<Void> add(@Parameter(description = "商品属性关联信息") @Validated @RequestBody MallProductAttributeBo bo) {
+        return toAjax(mallProductAttributeService.insertByBo(bo));
+    }
+
+    /**
+     * 批量新增商品属性关联
+     */
+    @Operation(summary = "批量新增商品属性关联", description = "批量新增商品属性关联")
+    @SaCheckPermission("mall:product:attribute:product:add")
+    @Log(title = "商品属性关联", businessType = BusinessType.INSERT)
+    @PostMapping("/batch")
+    public R<Void> addBatch(@Parameter(description = "商品属性关联信息列表") @Validated @RequestBody List<MallProductAttributeBo> list) {
+        return toAjax(mallProductAttributeService.insertBatch(list));
+    }
+
+    /**
+     * 保存商品属性关联（先删除旧的，再插入新的）
+     */
+    @Operation(summary = "保存商品属性关联", description = "保存商品属性关联，先删除旧的，再插入新的")
+    @SaCheckPermission("mall:product:attribute:product:edit")
+    @Log(title = "商品属性关联", businessType = BusinessType.UPDATE)
+    @PostMapping("/product/{productId}")
+    public R<Void> saveProductAttributes(@Parameter(description = "商品ID", required = true)
+                                          @NotNull(message = "商品ID不能为空")
+                                          @PathVariable Long productId,
+                                          @Parameter(description = "商品属性关联信息列表") @RequestBody List<MallProductAttributeBo> list) {
+        return toAjax(mallProductAttributeService.saveProductAttributes(productId, list));
+    }
+
+    /**
+     * 修改商品属性关联
+     */
+    @Operation(summary = "修改商品属性关联", description = "修改商品属性关联")
+    @SaCheckPermission("mall:product:attribute:product:edit")
+    @Log(title = "商品属性关联", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public R<Void> edit(@Parameter(description = "商品属性关联信息") @Validated @RequestBody MallProductAttributeBo bo) {
+        return toAjax(mallProductAttributeService.updateByBo(bo));
+    }
+
+    /**
+     * 删除商品属性关联
+     */
+    @Operation(summary = "删除商品属性关联", description = "批量删除商品属性关联")
+    @SaCheckPermission("mall:product:attribute:product:remove")
+    @Log(title = "商品属性关联", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@Parameter(description = "商品属性关联ID数组", required = true)
+                          @NotNull(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(mallProductAttributeService.deleteWithValidByIds(Arrays.asList(ids), true));
+    }
+
+    /**
+     * 根据商品ID删除商品属性关联
+     */
+    @Operation(summary = "根据商品ID删除商品属性关联", description = "根据商品ID删除商品属性关联")
+    @SaCheckPermission("mall:product:attribute:product:remove")
+    @Log(title = "商品属性关联", businessType = BusinessType.DELETE)
+    @DeleteMapping("/product/{productId}")
+    public R<Void> removeByProductId(@Parameter(description = "商品ID", required = true)
+                                      @NotNull(message = "商品ID不能为空")
+                                      @PathVariable Long productId) {
+        return toAjax(mallProductAttributeService.deleteByProductId(productId));
+    }
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/controller/admin/AdminMallProductController.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/controller/admin/AdminMallProductController.java
new file mode 100644
index 0000000..030dd75
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/controller/admin/AdminMallProductController.java
@@ -0,0 +1,94 @@
+package org.dromara.mall.product.controller.admin;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.mall.product.domain.bo.MallProductBo;
+import org.dromara.mall.product.domain.vo.MallProductVo;
+import org.dromara.mall.product.service.MallProductService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+
+/**
+ * 商品管理Controller
+ *
+ * @author pengles
+ */
+@Tag(name = "管理端-商品管理", description = "商品管理接口")
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/mall/product")
+public class AdminMallProductController extends BaseController {
+
+    private final MallProductService mallProductService;
+
+    /**
+     * 查询商品列表
+     */
+    @Operation(summary = "查询商品列表", description = "分页查询商品列表")
+    @SaCheckPermission("mall:product:list")
+    @GetMapping("/list")
+    public TableDataInfo<MallProductVo> list(@Parameter(description = "商品查询条件") MallProductBo bo,
+                                             @Parameter(description = "分页参数") PageQuery pageQuery) {
+        return mallProductService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 获取商品详细信息
+     */
+    @Operation(summary = "获取商品详细信息", description = "根据商品ID获取商品详细信息")
+    @SaCheckPermission("mall:product:query")
+    @GetMapping("/{id}")
+    public R<MallProductVo> getInfo(@Parameter(description = "商品ID", required = true)
+                                    @NotNull(message = "主键不能为空")
+                                    @PathVariable Long id) {
+        return R.ok(mallProductService.queryById(id));
+    }
+
+    /**
+     * 新增商品
+     */
+    @Operation(summary = "新增商品", description = "新增商品")
+    @SaCheckPermission("mall:product:add")
+    @Log(title = "商品管理", businessType = BusinessType.INSERT)
+    @PostMapping
+    public R<Void> add(@Parameter(description = "商品信息") @Validated @RequestBody MallProductBo bo) {
+        return toAjax(mallProductService.insertByBo(bo));
+    }
+
+    /**
+     * 修改商品
+     */
+    @Operation(summary = "修改商品", description = "修改商品")
+    @SaCheckPermission("mall:product:edit")
+    @Log(title = "商品管理", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public R<Void> edit(@Parameter(description = "商品信息") @Validated @RequestBody MallProductBo bo) {
+        return toAjax(mallProductService.updateByBo(bo));
+    }
+
+    /**
+     * 删除商品
+     */
+    @Operation(summary = "删除商品", description = "批量删除商品")
+    @SaCheckPermission("mall:product:remove")
+    @Log(title = "商品管理", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@Parameter(description = "商品ID数组", required = true)
+                          @NotNull(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(mallProductService.deleteWithValidByIds(Arrays.asList(ids), true));
+    }
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/controller/app/AppMallBrandController.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/controller/app/AppMallBrandController.java
new file mode 100644
index 0000000..0754831
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/controller/app/AppMallBrandController.java
@@ -0,0 +1,40 @@
+package org.dromara.mall.product.controller.app;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.mall.product.domain.bo.MallBrandBo;
+import org.dromara.mall.product.domain.vo.MallBrandVo;
+import org.dromara.mall.product.service.MallBrandService;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * 品牌（移动端）
+ *
+ * @author pengles
+ */
+@Tag(name = "移动端-品牌", description = "品牌查询接口")
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/app/mall/product/brand")
+public class AppMallBrandController {
+
+    private final MallBrandService mallBrandService;
+
+    /**
+     * 查询品牌列表（移动端）
+     */
+    @Operation(summary = "查询品牌列表", description = "查询启用的品牌列表")
+    @GetMapping("/list")
+    public R<List<MallBrandVo>> list() {
+        MallBrandBo bo = new MallBrandBo();
+        bo.setStatus(0); // 只查询启用的品牌
+        List<MallBrandVo> list = mallBrandService.queryList(bo);
+        return R.ok(list);
+    }
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/controller/app/AppMallCategoryController.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/controller/app/AppMallCategoryController.java
new file mode 100644
index 0000000..9f14bcd
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/controller/app/AppMallCategoryController.java
@@ -0,0 +1,37 @@
+package org.dromara.mall.product.controller.app;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.mall.product.domain.vo.MallCategoryVo;
+import org.dromara.mall.product.service.MallCategoryService;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * 商品分类（移动端）
+ *
+ * @author pengles
+ */
+@Tag(name = "移动端-商品分类", description = "商品分类查询接口")
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/app/mall/product/category")
+public class AppMallCategoryController {
+
+    private final MallCategoryService mallCategoryService;
+
+    /**
+     * 查询商品分类树形列表（移动端）
+     */
+    @Operation(summary = "查询商品分类树形列表", description = "查询启用的商品分类树形结构")
+    @GetMapping("/tree")
+    public R<List<MallCategoryVo>> tree() {
+        List<MallCategoryVo> list = mallCategoryService.queryTreeList();
+        return R.ok(list);
+    }
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/controller/app/AppMallProductController.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/controller/app/AppMallProductController.java
new file mode 100644
index 0000000..7e3a313
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/controller/app/AppMallProductController.java
@@ -0,0 +1,82 @@
+package org.dromara.mall.product.controller.app;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.mall.product.domain.bo.MallProductBo;
+import org.dromara.mall.product.domain.vo.MallProductVo;
+import org.dromara.mall.product.domain.vo.MallSkuVo;
+import org.dromara.mall.product.service.MallProductService;
+import org.dromara.mall.product.service.MallSkuService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * 商品（移动端）
+ *
+ * @author pengles
+ */
+@Tag(name = "移动端-商品", description = "商品查询接口")
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/app/mall/product")
+public class AppMallProductController {
+
+    private final MallProductService mallProductService;
+    private final MallSkuService mallSkuService;
+
+    /**
+     * 查询商品列表（移动端）
+     */
+    @Operation(summary = "查询商品列表", description = "查询上架的商品列表")
+    @GetMapping("/list")
+    public R<TableDataInfo<MallProductVo>> list(
+            @Parameter(description = "查询条件") MallProductBo bo,
+            @Parameter(description = "分页参数") @Validated PageQuery pageQuery) {
+        // 移动端只查询上架的商品
+        if (bo == null) {
+            bo = new MallProductBo();
+        }
+        bo.setStatus(0); // 0表示上架
+        TableDataInfo<MallProductVo> result = mallProductService.queryPageList(bo, pageQuery);
+        return R.ok(result);
+    }
+
+    /**
+     * 查询商品详情（移动端）
+     */
+    @Operation(summary = "查询商品详情", description = "根据商品ID查询商品详情")
+    @GetMapping("/{id}")
+    public R<MallProductVo> getInfo(
+            @Parameter(description = "商品ID", required = true) @PathVariable Long id) {
+        MallProductVo product = mallProductService.queryById(id);
+        if (product == null) {
+            return R.fail("商品不存在");
+        }
+        // 只有上架的商品才能查看
+        if (product.getStatus() != null && product.getStatus() != 0) {
+            return R.fail("商品已下架");
+        }
+        return R.ok(product);
+    }
+
+    /**
+     * 查询商品SKU列表（移动端）
+     */
+    @Operation(summary = "查询商品SKU列表", description = "根据商品ID查询SKU列表")
+    @GetMapping("/{productId}/skus")
+    public R<List<MallSkuVo>> getSkus(
+            @Parameter(description = "商品ID", required = true) @PathVariable Long productId) {
+        List<MallSkuVo> skus = mallSkuService.queryListByProductId(productId);
+        return R.ok(skus);
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/domain/MallAttribute.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/domain/MallAttribute.java
new file mode 100644
index 0000000..9f0ea88
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/domain/MallAttribute.java
@@ -0,0 +1,92 @@
+package org.dromara.mall.product.domain;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 属性对象 mall_attribute
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode
+@TableName("mall_attribute")
+public class MallAttribute implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 属性ID
+     */
+    @TableId
+    private Long id;
+
+    /**
+     * 模板ID(可选，绑定到模板)
+     */
+    private Long templateId;
+
+    /**
+     * 属性名称
+     */
+    private String name;
+
+    /**
+     * 属性类型(0文本 1数字 2日期 3枚举)
+     */
+    private Integer type;
+
+    /**
+     * 是否必填(0否 1是)
+     */
+    private Integer required;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    /**
+     * 状态(0启用 1禁用)
+     */
+    private Integer status;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 创建者
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 更新者
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private String updateBy;
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/domain/MallAttributeTemplate.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/domain/MallAttributeTemplate.java
new file mode 100644
index 0000000..9209bb7
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/domain/MallAttributeTemplate.java
@@ -0,0 +1,82 @@
+package org.dromara.mall.product.domain;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 属性模板对象 mall_attribute_template
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode
+@TableName("mall_attribute_template")
+public class MallAttributeTemplate implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 模板ID
+     */
+    @TableId
+    private Long id;
+
+    /**
+     * 模板名称
+     */
+    private String name;
+
+    /**
+     * 分类ID(可选，绑定到分类)
+     */
+    private Long categoryId;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    /**
+     * 状态(0启用 1禁用)
+     */
+    private Integer status;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 创建者
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 更新者
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private String updateBy;
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/domain/MallAttributeValue.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/domain/MallAttributeValue.java
new file mode 100644
index 0000000..4946721
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/domain/MallAttributeValue.java
@@ -0,0 +1,77 @@
+package org.dromara.mall.product.domain;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 属性值对象 mall_attribute_value
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode
+@TableName("mall_attribute_value")
+public class MallAttributeValue implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 属性值ID
+     */
+    @TableId
+    private Long id;
+
+    /**
+     * 属性ID
+     */
+    private Long attributeId;
+
+    /**
+     * 属性值
+     */
+    private String value;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    /**
+     * 状态(0启用 1禁用)
+     */
+    private Integer status;
+
+    /**
+     * 创建者
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 更新者
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private String updateBy;
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/domain/MallBrand.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/domain/MallBrand.java
new file mode 100644
index 0000000..8ab968d
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/domain/MallBrand.java
@@ -0,0 +1,82 @@
+package org.dromara.mall.product.domain;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 品牌对象 mall_brand
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode
+@TableName("mall_brand")
+public class MallBrand implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 品牌ID
+     */
+    @TableId
+    private Long id;
+
+    /**
+     * 品牌名称
+     */
+    private String name;
+
+    /**
+     * 品牌Logo
+     */
+    private String logo;
+
+    /**
+     * 品牌描述
+     */
+    private String description;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    /**
+     * 状态(0启用 1禁用)
+     */
+    private Integer status;
+
+    /**
+     * 创建者
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 更新者
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private String updateBy;
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/domain/MallCategory.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/domain/MallCategory.java
new file mode 100644
index 0000000..839475f
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/domain/MallCategory.java
@@ -0,0 +1,87 @@
+package org.dromara.mall.product.domain;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 商品分类对象 mall_category
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode
+@TableName("mall_category")
+public class MallCategory implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 分类ID
+     */
+    @TableId
+    private Long id;
+
+    /**
+     * 分类名称
+     */
+    private String name;
+
+    /**
+     * 父分类ID(0表示顶级)
+     */
+    private Long parentId;
+
+    /**
+     * 分类级别(1一级 2二级 3三级)
+     */
+    private Integer level;
+
+    /**
+     * 分类图标
+     */
+    private String icon;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    /**
+     * 状态(0启用 1禁用)
+     */
+    private Integer status;
+
+    /**
+     * 创建者
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 更新者
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private String updateBy;
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/domain/MallProduct.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/domain/MallProduct.java
new file mode 100644
index 0000000..a7f4263
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/domain/MallProduct.java
@@ -0,0 +1,107 @@
+package org.dromara.mall.product.domain;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 商品对象 mall_product
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode
+@TableName("mall_product")
+public class MallProduct {
+
+    /**
+     * 商品ID
+     */
+    @TableId
+    private Long id;
+
+    /**
+     * 商品名称
+     */
+    private String name;
+
+    /**
+     * 分类ID
+     */
+    private Long categoryId;
+
+    /**
+     * 品牌ID
+     */
+    private Long brandId;
+
+    /**
+     * 封面图片
+     */
+    private String coverUrl;
+
+    /**
+     * 商品图片(JSON数组)
+     */
+    private String images;
+
+    /**
+     * 商品描述
+     */
+    private String description;
+
+    /**
+     * 商品详情
+     */
+    private String detail;
+
+    /**
+     * 状态(0上架 1下架)
+     */
+    private Integer status;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    /**
+     * 销量
+     */
+    private Integer salesCount;
+
+    /**
+     * 浏览量
+     */
+    private Integer viewCount;
+
+    /**
+     * 创建者
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 更新者
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private String updateBy;
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/domain/MallProductAttribute.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/domain/MallProductAttribute.java
new file mode 100644
index 0000000..f0e9422
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/domain/MallProductAttribute.java
@@ -0,0 +1,77 @@
+package org.dromara.mall.product.domain;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 商品属性关联对象 mall_product_attribute
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode
+@TableName("mall_product_attribute")
+public class MallProductAttribute implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @TableId
+    private Long id;
+
+    /**
+     * 商品ID
+     */
+    private Long productId;
+
+    /**
+     * 属性ID
+     */
+    private Long attributeId;
+
+    /**
+     * 属性值ID(当属性类型为枚举时使用)
+     */
+    private Long attributeValueId;
+
+    /**
+     * 属性值(当属性类型为文本/数字/日期时使用，或自定义值)
+     */
+    private String value;
+
+    /**
+     * 创建者
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 更新者
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private String updateBy;
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/domain/MallSku.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/domain/MallSku.java
new file mode 100644
index 0000000..52e591a
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/domain/MallSku.java
@@ -0,0 +1,97 @@
+package org.dromara.mall.product.domain;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * SKU对象 mall_sku
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode
+@TableName("mall_sku")
+public class MallSku {
+
+    /**
+     * SKU ID
+     */
+    @TableId
+    private Long id;
+
+    /**
+     * 商品ID
+     */
+    private Long productId;
+
+    /**
+     * SKU编码
+     */
+    private String skuCode;
+
+    /**
+     * SKU名称
+     */
+    private String name;
+
+    /**
+     * 价格(分)
+     */
+    private Integer price;
+
+    /**
+     * 原价(分)
+     */
+    private Integer originalPrice;
+
+    /**
+     * 库存
+     */
+    private Integer stock;
+
+    /**
+     * SKU图片
+     */
+    private String image;
+
+    /**
+     * 规格属性(JSON)
+     */
+    private String specs;
+
+    /**
+     * 状态(0启用 1禁用)
+     */
+    private Integer status;
+
+    /**
+     * 创建者
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 更新者
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private String updateBy;
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/domain/bo/MallAttributeBo.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/domain/bo/MallAttributeBo.java
new file mode 100644
index 0000000..cbe832f
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/domain/bo/MallAttributeBo.java
@@ -0,0 +1,64 @@
+package org.dromara.mall.product.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.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.mall.product.domain.MallAttribute;
+
+/**
+ * 属性业务对象 mall_attribute
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = MallAttribute.class, reverseConvertGenerate = false)
+public class MallAttributeBo extends BaseEntity {
+
+    /**
+     * 属性ID
+     */
+    private Long id;
+
+    /**
+     * 模板ID(可选，绑定到模板)
+     */
+    private Long templateId;
+
+    /**
+     * 属性名称
+     */
+    @NotBlank(message = "属性名称不能为空")
+    private String name;
+
+    /**
+     * 属性类型(0文本 1数字 2日期 3枚举)
+     */
+    @NotNull(message = "属性类型不能为空")
+    private Integer type;
+
+    /**
+     * 是否必填(0否 1是)
+     */
+    private Integer required;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    /**
+     * 状态(0启用 1禁用)
+     */
+    @NotNull(message = "状态不能为空")
+    private Integer status;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/domain/bo/MallAttributeTemplateBo.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/domain/bo/MallAttributeTemplateBo.java
new file mode 100644
index 0000000..4ce7edd
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/domain/bo/MallAttributeTemplateBo.java
@@ -0,0 +1,53 @@
+package org.dromara.mall.product.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.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.mall.product.domain.MallAttributeTemplate;
+
+/**
+ * 属性模板业务对象 mall_attribute_template
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = MallAttributeTemplate.class, reverseConvertGenerate = false)
+public class MallAttributeTemplateBo extends BaseEntity {
+
+    /**
+     * 模板ID
+     */
+    private Long id;
+
+    /**
+     * 模板名称
+     */
+    @NotBlank(message = "模板名称不能为空")
+    private String name;
+
+    /**
+     * 分类ID(可选，绑定到分类)
+     */
+    private Long categoryId;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    /**
+     * 状态(0启用 1禁用)
+     */
+    @NotNull(message = "状态不能为空")
+    private Integer status;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/domain/bo/MallAttributeValueBo.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/domain/bo/MallAttributeValueBo.java
new file mode 100644
index 0000000..a2da404
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/domain/bo/MallAttributeValueBo.java
@@ -0,0 +1,49 @@
+package org.dromara.mall.product.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.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.mall.product.domain.MallAttributeValue;
+
+/**
+ * 属性值业务对象 mall_attribute_value
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = MallAttributeValue.class, reverseConvertGenerate = false)
+public class MallAttributeValueBo extends BaseEntity {
+
+    /**
+     * 属性值ID
+     */
+    private Long id;
+
+    /**
+     * 属性ID
+     */
+    @NotNull(message = "属性ID不能为空")
+    private Long attributeId;
+
+    /**
+     * 属性值
+     */
+    @NotBlank(message = "属性值不能为空")
+    private String value;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    /**
+     * 状态(0启用 1禁用)
+     */
+    @NotNull(message = "状态不能为空")
+    private Integer status;
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/domain/bo/MallBrandBo.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/domain/bo/MallBrandBo.java
new file mode 100644
index 0000000..570d3cc
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/domain/bo/MallBrandBo.java
@@ -0,0 +1,53 @@
+package org.dromara.mall.product.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.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.mall.product.domain.MallBrand;
+
+/**
+ * 品牌业务对象 mall_brand
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = MallBrand.class, reverseConvertGenerate = false)
+public class MallBrandBo extends BaseEntity {
+
+    /**
+     * 品牌ID
+     */
+    private Long id;
+
+    /**
+     * 品牌名称
+     */
+    @NotBlank(message = "品牌名称不能为空")
+    private String name;
+
+    /**
+     * 品牌Logo
+     */
+    private String logo;
+
+    /**
+     * 品牌描述
+     */
+    private String description;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    /**
+     * 状态(0启用 1禁用)
+     */
+    @NotNull(message = "状态不能为空")
+    private Integer status;
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/domain/bo/MallCategoryBo.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/domain/bo/MallCategoryBo.java
new file mode 100644
index 0000000..7ec42ca
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/domain/bo/MallCategoryBo.java
@@ -0,0 +1,58 @@
+package org.dromara.mall.product.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.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.mall.product.domain.MallCategory;
+
+/**
+ * 商品分类业务对象 mall_category
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = MallCategory.class, reverseConvertGenerate = false)
+public class MallCategoryBo extends BaseEntity {
+
+    /**
+     * 分类ID
+     */
+    private Long id;
+
+    /**
+     * 分类名称
+     */
+    @NotBlank(message = "分类名称不能为空")
+    private String name;
+
+    /**
+     * 父分类ID(0表示顶级)
+     */
+    private Long parentId;
+
+    /**
+     * 分类级别(1一级 2二级 3三级)
+     */
+    private Integer level;
+
+    /**
+     * 分类图标
+     */
+    private String icon;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    /**
+     * 状态(0启用 1禁用)
+     */
+    @NotNull(message = "状态不能为空")
+    private Integer status;
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/domain/bo/MallProductAttributeBo.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/domain/bo/MallProductAttributeBo.java
new file mode 100644
index 0000000..d2b1061
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/domain/bo/MallProductAttributeBo.java
@@ -0,0 +1,47 @@
+package org.dromara.mall.product.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.mall.product.domain.MallProductAttribute;
+
+/**
+ * 商品属性关联业务对象 mall_product_attribute
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = MallProductAttribute.class, reverseConvertGenerate = false)
+public class MallProductAttributeBo extends BaseEntity {
+
+    /**
+     * ID
+     */
+    private Long id;
+
+    /**
+     * 商品ID
+     */
+    @NotNull(message = "商品ID不能为空")
+    private Long productId;
+
+    /**
+     * 属性ID
+     */
+    @NotNull(message = "属性ID不能为空")
+    private Long attributeId;
+
+    /**
+     * 属性值ID(当属性类型为枚举时使用)
+     */
+    private Long attributeValueId;
+
+    /**
+     * 属性值(当属性类型为文本/数字/日期时使用，或自定义值)
+     */
+    private String value;
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/domain/bo/MallProductBo.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/domain/bo/MallProductBo.java
new file mode 100644
index 0000000..85c49e8
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/domain/bo/MallProductBo.java
@@ -0,0 +1,82 @@
+package org.dromara.mall.product.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.mall.product.domain.MallProduct;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 商品业务对象 mall_product
+ *
+ * @author pengles
+ */
+@Data
+@AutoMapper(target = MallProduct.class, reverseConvertGenerate = false)
+public class MallProductBo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 商品ID
+     */
+    private Long id;
+
+    /**
+     * 商品名称
+     */
+    private String name;
+
+    /**
+     * 分类ID
+     */
+    private Long categoryId;
+
+    /**
+     * 品牌ID
+     */
+    private Long brandId;
+
+    /**
+     * 封面图片
+     */
+    private String coverUrl;
+
+    /**
+     * 商品图片(JSON数组)
+     */
+    private String images;
+
+    /**
+     * 商品描述
+     */
+    private String description;
+
+    /**
+     * 商品详情
+     */
+    private String detail;
+
+    /**
+     * 状态(0上架 1下架)
+     */
+    private Integer status;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    /**
+     * 销量
+     */
+    private Integer salesCount;
+
+    /**
+     * 浏览量
+     */
+    private Integer viewCount;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/domain/bo/MallSkuBo.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/domain/bo/MallSkuBo.java
new file mode 100644
index 0000000..ba82196
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/domain/bo/MallSkuBo.java
@@ -0,0 +1,72 @@
+package org.dromara.mall.product.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.mall.product.domain.MallSku;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * SKU业务对象 mall_sku
+ *
+ * @author pengles
+ */
+@Data
+@AutoMapper(target = MallSku.class, reverseConvertGenerate = false)
+public class MallSkuBo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * SKU ID
+     */
+    private Long id;
+
+    /**
+     * 商品ID
+     */
+    private Long productId;
+
+    /**
+     * SKU编码
+     */
+    private String skuCode;
+
+    /**
+     * SKU名称
+     */
+    private String name;
+
+    /**
+     * 价格(分)
+     */
+    private Integer price;
+
+    /**
+     * 原价(分)
+     */
+    private Integer originalPrice;
+
+    /**
+     * 库存
+     */
+    private Integer stock;
+
+    /**
+     * SKU图片
+     */
+    private String image;
+
+    /**
+     * 规格属性(JSON)
+     */
+    private String specs;
+
+    /**
+     * 状态(0启用 1禁用)
+     */
+    private Integer status;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/domain/vo/MallAttributeTemplateVo.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/domain/vo/MallAttributeTemplateVo.java
new file mode 100644
index 0000000..5329c56
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/domain/vo/MallAttributeTemplateVo.java
@@ -0,0 +1,74 @@
+package org.dromara.mall.product.domain.vo;
+
+import cn.idev.excel.annotation.ExcelProperty;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import org.dromara.mall.product.domain.MallAttributeTemplate;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 属性模板视图对象 mall_attribute_template
+ *
+ * @author pengles
+ */
+@Data
+@AutoMapper(target = MallAttributeTemplate.class)
+public class MallAttributeTemplateVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 模板ID
+     */
+    @ExcelProperty(value = "模板ID")
+    private Long id;
+
+    /**
+     * 模板名称
+     */
+    @ExcelProperty(value = "模板名称")
+    private String name;
+
+    /**
+     * 分类ID(可选，绑定到分类)
+     */
+    @ExcelProperty(value = "分类ID")
+    private Long categoryId;
+
+    /**
+     * 排序
+     */
+    @ExcelProperty(value = "排序")
+    private Integer sort;
+
+    /**
+     * 状态(0启用 1禁用)
+     */
+    @ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "0=启用,1=禁用")
+    private Integer status;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "创建时间")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/domain/vo/MallAttributeValueVo.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/domain/vo/MallAttributeValueVo.java
new file mode 100644
index 0000000..fbc7374
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/domain/vo/MallAttributeValueVo.java
@@ -0,0 +1,68 @@
+package org.dromara.mall.product.domain.vo;
+
+import cn.idev.excel.annotation.ExcelProperty;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import org.dromara.mall.product.domain.MallAttributeValue;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 属性值视图对象 mall_attribute_value
+ *
+ * @author pengles
+ */
+@Data
+@AutoMapper(target = MallAttributeValue.class)
+public class MallAttributeValueVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 属性值ID
+     */
+    @ExcelProperty(value = "属性值ID")
+    private Long id;
+
+    /**
+     * 属性ID
+     */
+    @ExcelProperty(value = "属性ID")
+    private Long attributeId;
+
+    /**
+     * 属性值
+     */
+    @ExcelProperty(value = "属性值")
+    private String value;
+
+    /**
+     * 排序
+     */
+    @ExcelProperty(value = "排序")
+    private Integer sort;
+
+    /**
+     * 状态(0启用 1禁用)
+     */
+    @ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "0=启用,1=禁用")
+    private Integer status;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "创建时间")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/domain/vo/MallAttributeVo.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/domain/vo/MallAttributeVo.java
new file mode 100644
index 0000000..2b91151
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/domain/vo/MallAttributeVo.java
@@ -0,0 +1,88 @@
+package org.dromara.mall.product.domain.vo;
+
+import cn.idev.excel.annotation.ExcelProperty;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import org.dromara.mall.product.domain.MallAttribute;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 属性视图对象 mall_attribute
+ *
+ * @author pengles
+ */
+@Data
+@AutoMapper(target = MallAttribute.class)
+public class MallAttributeVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 属性ID
+     */
+    @ExcelProperty(value = "属性ID")
+    private Long id;
+
+    /**
+     * 模板ID(可选，绑定到模板)
+     */
+    @ExcelProperty(value = "模板ID")
+    private Long templateId;
+
+    /**
+     * 属性名称
+     */
+    @ExcelProperty(value = "属性名称")
+    private String name;
+
+    /**
+     * 属性类型(0文本 1数字 2日期 3枚举)
+     */
+    @ExcelProperty(value = "属性类型", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "0=文本,1=数字,2=日期,3=枚举")
+    private Integer type;
+
+    /**
+     * 是否必填(0否 1是)
+     */
+    @ExcelProperty(value = "是否必填", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "0=否,1=是")
+    private Integer required;
+
+    /**
+     * 排序
+     */
+    @ExcelProperty(value = "排序")
+    private Integer sort;
+
+    /**
+     * 状态(0启用 1禁用)
+     */
+    @ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "0=启用,1=禁用")
+    private Integer status;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "创建时间")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/domain/vo/MallBrandVo.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/domain/vo/MallBrandVo.java
new file mode 100644
index 0000000..f61c2c2
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/domain/vo/MallBrandVo.java
@@ -0,0 +1,63 @@
+package org.dromara.mall.product.domain.vo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.mall.product.domain.MallBrand;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 品牌视图对象 mall_brand
+ *
+ * @author pengles
+ */
+@Data
+@AutoMapper(target = MallBrand.class)
+public class MallBrandVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 品牌ID
+     */
+    private Long id;
+
+    /**
+     * 品牌名称
+     */
+    private String name;
+
+    /**
+     * 品牌Logo
+     */
+    private String logo;
+
+    /**
+     * 品牌描述
+     */
+    private String description;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    /**
+     * 状态(0启用 1禁用)
+     */
+    private Integer status;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/domain/vo/MallCategoryVo.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/domain/vo/MallCategoryVo.java
new file mode 100644
index 0000000..c84ec08
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/domain/vo/MallCategoryVo.java
@@ -0,0 +1,74 @@
+package org.dromara.mall.product.domain.vo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.mall.product.domain.MallCategory;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 商品分类视图对象 mall_category
+ *
+ * @author pengles
+ */
+@Data
+@AutoMapper(target = MallCategory.class)
+public class MallCategoryVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 分类ID
+     */
+    private Long id;
+
+    /**
+     * 分类名称
+     */
+    private String name;
+
+    /**
+     * 父分类ID(0表示顶级)
+     */
+    private Long parentId;
+
+    /**
+     * 分类级别(1一级 2二级 3三级)
+     */
+    private Integer level;
+
+    /**
+     * 分类图标
+     */
+    private String icon;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    /**
+     * 状态(0启用 1禁用)
+     */
+    private Integer status;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     * 子分类列表（用于树形结构）
+     */
+    private List<MallCategoryVo> children;
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/domain/vo/MallProductAttributeVo.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/domain/vo/MallProductAttributeVo.java
new file mode 100644
index 0000000..1081cf0
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/domain/vo/MallProductAttributeVo.java
@@ -0,0 +1,47 @@
+package org.dromara.mall.product.domain.vo;
+
+import lombok.Data;
+import org.dromara.mall.product.domain.MallProductAttribute;
+import io.github.linpeilie.annotations.AutoMapper;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 商品属性关联视图对象 mall_product_attribute
+ *
+ * @author pengles
+ */
+@Data
+@AutoMapper(target = MallProductAttribute.class)
+public class MallProductAttributeVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    private Long id;
+
+    /**
+     * 商品ID
+     */
+    private Long productId;
+
+    /**
+     * 属性ID
+     */
+    private Long attributeId;
+
+    /**
+     * 属性值ID(当属性类型为枚举时使用)
+     */
+    private Long attributeValueId;
+
+    /**
+     * 属性值(当属性类型为文本/数字/日期时使用，或自定义值)
+     */
+    private String value;
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/domain/vo/MallProductVo.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/domain/vo/MallProductVo.java
new file mode 100644
index 0000000..25da4eb
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/domain/vo/MallProductVo.java
@@ -0,0 +1,93 @@
+package org.dromara.mall.product.domain.vo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.mall.product.domain.MallProduct;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 商品视图对象 mall_product
+ *
+ * @author pengles
+ */
+@Data
+@AutoMapper(target = MallProduct.class)
+public class MallProductVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 商品ID
+     */
+    private Long id;
+
+    /**
+     * 商品名称
+     */
+    private String name;
+
+    /**
+     * 分类ID
+     */
+    private Long categoryId;
+
+    /**
+     * 品牌ID
+     */
+    private Long brandId;
+
+    /**
+     * 封面图片
+     */
+    private String coverUrl;
+
+    /**
+     * 商品图片(JSON数组)
+     */
+    private String images;
+
+    /**
+     * 商品描述
+     */
+    private String description;
+
+    /**
+     * 商品详情
+     */
+    private String detail;
+
+    /**
+     * 状态(0上架 1下架)
+     */
+    private Integer status;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    /**
+     * 销量
+     */
+    private Integer salesCount;
+
+    /**
+     * 浏览量
+     */
+    private Integer viewCount;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/domain/vo/MallSkuVo.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/domain/vo/MallSkuVo.java
new file mode 100644
index 0000000..71a22b6
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/domain/vo/MallSkuVo.java
@@ -0,0 +1,83 @@
+package org.dromara.mall.product.domain.vo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.mall.product.domain.MallSku;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * SKU视图对象 mall_sku
+ *
+ * @author pengles
+ */
+@Data
+@AutoMapper(target = MallSku.class)
+public class MallSkuVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * SKU ID
+     */
+    private Long id;
+
+    /**
+     * 商品ID
+     */
+    private Long productId;
+
+    /**
+     * SKU编码
+     */
+    private String skuCode;
+
+    /**
+     * SKU名称
+     */
+    private String name;
+
+    /**
+     * 价格(分)
+     */
+    private Integer price;
+
+    /**
+     * 原价(分)
+     */
+    private Integer originalPrice;
+
+    /**
+     * 库存
+     */
+    private Integer stock;
+
+    /**
+     * SKU图片
+     */
+    private String image;
+
+    /**
+     * 规格属性(JSON)
+     */
+    private String specs;
+
+    /**
+     * 状态(0启用 1禁用)
+     */
+    private Integer status;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/enums/AttributeType.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/enums/AttributeType.java
new file mode 100644
index 0000000..13c487d
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/enums/AttributeType.java
@@ -0,0 +1,57 @@
+package org.dromara.mall.product.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 属性类型枚举
+ *
+ * @author pengles
+ */
+@Getter
+@AllArgsConstructor
+public enum AttributeType {
+
+    /**
+     * 文本
+     */
+    TEXT(0, "文本"),
+
+    /**
+     * 数字
+     */
+    NUMBER(1, "数字"),
+
+    /**
+     * 日期
+     */
+    DATE(2, "日期"),
+
+    /**
+     * 枚举
+     */
+    ENUM(3, "枚举");
+
+    /**
+     * 类型值
+     */
+    private final Integer value;
+
+    /**
+     * 类型名称
+     */
+    private final String name;
+
+    /**
+     * 根据值获取枚举
+     */
+    public static AttributeType getByValue(Integer value) {
+        for (AttributeType type : values()) {
+            if (type.getValue().equals(value)) {
+                return type;
+            }
+        }
+        return null;
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/mapper/MallAttributeMapper.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/mapper/MallAttributeMapper.java
new file mode 100644
index 0000000..462f94f
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/mapper/MallAttributeMapper.java
@@ -0,0 +1,16 @@
+package org.dromara.mall.product.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.mall.product.domain.MallAttribute;
+import org.dromara.mall.product.domain.vo.MallAttributeVo;
+
+/**
+ * 属性Mapper接口
+ *
+ * @author pengles
+ */
+@Mapper
+public interface MallAttributeMapper extends BaseMapperPlus<MallAttribute, MallAttributeVo> {
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/mapper/MallAttributeTemplateMapper.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/mapper/MallAttributeTemplateMapper.java
new file mode 100644
index 0000000..0eddd5d
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/mapper/MallAttributeTemplateMapper.java
@@ -0,0 +1,16 @@
+package org.dromara.mall.product.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.mall.product.domain.MallAttributeTemplate;
+import org.dromara.mall.product.domain.vo.MallAttributeTemplateVo;
+
+/**
+ * 属性模板Mapper接口
+ *
+ * @author pengles
+ */
+@Mapper
+public interface MallAttributeTemplateMapper extends BaseMapperPlus<MallAttributeTemplate, MallAttributeTemplateVo> {
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/mapper/MallAttributeValueMapper.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/mapper/MallAttributeValueMapper.java
new file mode 100644
index 0000000..08efad5
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/mapper/MallAttributeValueMapper.java
@@ -0,0 +1,16 @@
+package org.dromara.mall.product.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.mall.product.domain.MallAttributeValue;
+import org.dromara.mall.product.domain.vo.MallAttributeValueVo;
+
+/**
+ * 属性值Mapper接口
+ *
+ * @author pengles
+ */
+@Mapper
+public interface MallAttributeValueMapper extends BaseMapperPlus<MallAttributeValue, MallAttributeValueVo> {
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/mapper/MallBrandMapper.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/mapper/MallBrandMapper.java
new file mode 100644
index 0000000..1730853
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/mapper/MallBrandMapper.java
@@ -0,0 +1,16 @@
+package org.dromara.mall.product.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.mall.product.domain.MallBrand;
+import org.dromara.mall.product.domain.vo.MallBrandVo;
+
+/**
+ * 品牌Mapper接口
+ *
+ * @author pengles
+ */
+@Mapper
+public interface MallBrandMapper extends BaseMapperPlus<MallBrand, MallBrandVo> {
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/mapper/MallCategoryMapper.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/mapper/MallCategoryMapper.java
new file mode 100644
index 0000000..75cd3ac
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/mapper/MallCategoryMapper.java
@@ -0,0 +1,16 @@
+package org.dromara.mall.product.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.mall.product.domain.MallCategory;
+import org.dromara.mall.product.domain.vo.MallCategoryVo;
+
+/**
+ * 商品分类Mapper接口
+ *
+ * @author pengles
+ */
+@Mapper
+public interface MallCategoryMapper extends BaseMapperPlus<MallCategory, MallCategoryVo> {
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/mapper/MallProductAttributeMapper.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/mapper/MallProductAttributeMapper.java
new file mode 100644
index 0000000..670858f
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/mapper/MallProductAttributeMapper.java
@@ -0,0 +1,16 @@
+package org.dromara.mall.product.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.mall.product.domain.MallProductAttribute;
+import org.dromara.mall.product.domain.vo.MallProductAttributeVo;
+
+/**
+ * 商品属性关联Mapper接口
+ *
+ * @author pengles
+ */
+@Mapper
+public interface MallProductAttributeMapper extends BaseMapperPlus<MallProductAttribute, MallProductAttributeVo> {
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/mapper/MallProductMapper.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/mapper/MallProductMapper.java
new file mode 100644
index 0000000..9f61e21
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/mapper/MallProductMapper.java
@@ -0,0 +1,16 @@
+package org.dromara.mall.product.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.mall.product.domain.MallProduct;
+import org.dromara.mall.product.domain.vo.MallProductVo;
+
+/**
+ * 商品Mapper接口
+ *
+ * @author pengles
+ */
+@Mapper
+public interface MallProductMapper extends BaseMapperPlus<MallProduct, MallProductVo> {
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/mapper/MallSkuMapper.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/mapper/MallSkuMapper.java
new file mode 100644
index 0000000..756a738
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/mapper/MallSkuMapper.java
@@ -0,0 +1,16 @@
+package org.dromara.mall.product.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.mall.product.domain.MallSku;
+import org.dromara.mall.product.domain.vo.MallSkuVo;
+
+/**
+ * SKU Mapper接口
+ *
+ * @author pengles
+ */
+@Mapper
+public interface MallSkuMapper extends BaseMapperPlus<MallSku, MallSkuVo> {
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/service/MallAttributeService.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/service/MallAttributeService.java
new file mode 100644
index 0000000..768995b
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/service/MallAttributeService.java
@@ -0,0 +1,53 @@
+package org.dromara.mall.product.service;
+
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.mall.product.domain.bo.MallAttributeBo;
+import org.dromara.mall.product.domain.vo.MallAttributeVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 属性Service接口
+ *
+ * @author pengles
+ */
+public interface MallAttributeService {
+
+    /**
+     * 查询属性
+     */
+    MallAttributeVo queryById(Long id);
+
+    /**
+     * 查询属性列表
+     */
+    TableDataInfo<MallAttributeVo> queryPageList(MallAttributeBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询属性列表
+     */
+    List<MallAttributeVo> queryList(MallAttributeBo bo);
+
+    /**
+     * 根据模板ID查询属性列表
+     */
+    List<MallAttributeVo> queryListByTemplateId(Long templateId);
+
+    /**
+     * 新增属性
+     */
+    Boolean insertByBo(MallAttributeBo bo);
+
+    /**
+     * 修改属性
+     */
+    Boolean updateByBo(MallAttributeBo bo);
+
+    /**
+     * 校验并批量删除属性信息
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/service/MallAttributeTemplateService.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/service/MallAttributeTemplateService.java
new file mode 100644
index 0000000..4ad51aa
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/service/MallAttributeTemplateService.java
@@ -0,0 +1,48 @@
+package org.dromara.mall.product.service;
+
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.mall.product.domain.bo.MallAttributeTemplateBo;
+import org.dromara.mall.product.domain.vo.MallAttributeTemplateVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 属性模板Service接口
+ *
+ * @author pengles
+ */
+public interface MallAttributeTemplateService {
+
+    /**
+     * 查询属性模板
+     */
+    MallAttributeTemplateVo queryById(Long id);
+
+    /**
+     * 查询属性模板列表
+     */
+    TableDataInfo<MallAttributeTemplateVo> queryPageList(MallAttributeTemplateBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询属性模板列表
+     */
+    List<MallAttributeTemplateVo> queryList(MallAttributeTemplateBo bo);
+
+    /**
+     * 新增属性模板
+     */
+    Boolean insertByBo(MallAttributeTemplateBo bo);
+
+    /**
+     * 修改属性模板
+     */
+    Boolean updateByBo(MallAttributeTemplateBo bo);
+
+    /**
+     * 校验并批量删除属性模板信息
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/service/MallAttributeValueService.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/service/MallAttributeValueService.java
new file mode 100644
index 0000000..ea77e09
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/service/MallAttributeValueService.java
@@ -0,0 +1,53 @@
+package org.dromara.mall.product.service;
+
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.mall.product.domain.bo.MallAttributeValueBo;
+import org.dromara.mall.product.domain.vo.MallAttributeValueVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 属性值Service接口
+ *
+ * @author pengles
+ */
+public interface MallAttributeValueService {
+
+    /**
+     * 查询属性值
+     */
+    MallAttributeValueVo queryById(Long id);
+
+    /**
+     * 查询属性值列表
+     */
+    TableDataInfo<MallAttributeValueVo> queryPageList(MallAttributeValueBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询属性值列表
+     */
+    List<MallAttributeValueVo> queryList(MallAttributeValueBo bo);
+
+    /**
+     * 根据属性ID查询属性值列表
+     */
+    List<MallAttributeValueVo> queryListByAttributeId(Long attributeId);
+
+    /**
+     * 新增属性值
+     */
+    Boolean insertByBo(MallAttributeValueBo bo);
+
+    /**
+     * 修改属性值
+     */
+    Boolean updateByBo(MallAttributeValueBo bo);
+
+    /**
+     * 校验并批量删除属性值信息
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/service/MallBrandService.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/service/MallBrandService.java
new file mode 100644
index 0000000..e94f70a
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/service/MallBrandService.java
@@ -0,0 +1,48 @@
+package org.dromara.mall.product.service;
+
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.mall.product.domain.bo.MallBrandBo;
+import org.dromara.mall.product.domain.vo.MallBrandVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 品牌Service接口
+ *
+ * @author pengles
+ */
+public interface MallBrandService {
+
+    /**
+     * 查询品牌
+     */
+    MallBrandVo queryById(Long id);
+
+    /**
+     * 查询品牌列表
+     */
+    TableDataInfo<MallBrandVo> queryPageList(MallBrandBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询品牌列表
+     */
+    List<MallBrandVo> queryList(MallBrandBo bo);
+
+    /**
+     * 新增品牌
+     */
+    Boolean insertByBo(MallBrandBo bo);
+
+    /**
+     * 修改品牌
+     */
+    Boolean updateByBo(MallBrandBo bo);
+
+    /**
+     * 校验并批量删除品牌信息
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/service/MallCategoryService.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/service/MallCategoryService.java
new file mode 100644
index 0000000..7009a6c
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/service/MallCategoryService.java
@@ -0,0 +1,53 @@
+package org.dromara.mall.product.service;
+
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.mall.product.domain.bo.MallCategoryBo;
+import org.dromara.mall.product.domain.vo.MallCategoryVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 商品分类Service接口
+ *
+ * @author pengles
+ */
+public interface MallCategoryService {
+
+    /**
+     * 查询商品分类
+     */
+    MallCategoryVo queryById(Long id);
+
+    /**
+     * 查询商品分类列表
+     */
+    TableDataInfo<MallCategoryVo> queryPageList(MallCategoryBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询商品分类列表
+     */
+    List<MallCategoryVo> queryList(MallCategoryBo bo);
+
+    /**
+     * 查询商品分类树形列表
+     */
+    List<MallCategoryVo> queryTreeList();
+
+    /**
+     * 新增商品分类
+     */
+    Boolean insertByBo(MallCategoryBo bo);
+
+    /**
+     * 修改商品分类
+     */
+    Boolean updateByBo(MallCategoryBo bo);
+
+    /**
+     * 校验并批量删除商品分类信息
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/service/MallProductAttributeService.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/service/MallProductAttributeService.java
new file mode 100644
index 0000000..ade05dd
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/service/MallProductAttributeService.java
@@ -0,0 +1,56 @@
+package org.dromara.mall.product.service;
+
+import org.dromara.mall.product.domain.bo.MallProductAttributeBo;
+import org.dromara.mall.product.domain.vo.MallProductAttributeVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 商品属性关联Service接口
+ *
+ * @author pengles
+ */
+public interface MallProductAttributeService {
+
+    /**
+     * 查询商品属性关联
+     */
+    MallProductAttributeVo queryById(Long id);
+
+    /**
+     * 根据商品ID查询商品属性关联列表
+     */
+    List<MallProductAttributeVo> queryListByProductId(Long productId);
+
+    /**
+     * 新增商品属性关联
+     */
+    Boolean insertByBo(MallProductAttributeBo bo);
+
+    /**
+     * 批量新增商品属性关联
+     */
+    Boolean insertBatch(List<MallProductAttributeBo> list);
+
+    /**
+     * 修改商品属性关联
+     */
+    Boolean updateByBo(MallProductAttributeBo bo);
+
+    /**
+     * 批量删除商品属性关联信息
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    /**
+     * 根据商品ID删除商品属性关联
+     */
+    Boolean deleteByProductId(Long productId);
+
+    /**
+     * 保存商品属性关联（先删除旧的，再插入新的）
+     */
+    Boolean saveProductAttributes(Long productId, List<MallProductAttributeBo> list);
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/service/MallProductService.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/service/MallProductService.java
new file mode 100644
index 0000000..35b56ce
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/service/MallProductService.java
@@ -0,0 +1,48 @@
+package org.dromara.mall.product.service;
+
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.mall.product.domain.bo.MallProductBo;
+import org.dromara.mall.product.domain.vo.MallProductVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 商品Service接口
+ *
+ * @author pengles
+ */
+public interface MallProductService {
+
+    /**
+     * 查询商品
+     */
+    MallProductVo queryById(Long id);
+
+    /**
+     * 查询商品列表
+     */
+    TableDataInfo<MallProductVo> queryPageList(MallProductBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询商品列表
+     */
+    List<MallProductVo> queryList(MallProductBo bo);
+
+    /**
+     * 新增商品
+     */
+    Boolean insertByBo(MallProductBo bo);
+
+    /**
+     * 修改商品
+     */
+    Boolean updateByBo(MallProductBo bo);
+
+    /**
+     * 校验并批量删除商品信息
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/service/MallSkuService.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/service/MallSkuService.java
new file mode 100644
index 0000000..82aad22
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/service/MallSkuService.java
@@ -0,0 +1,53 @@
+package org.dromara.mall.product.service;
+
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.mall.product.domain.bo.MallSkuBo;
+import org.dromara.mall.product.domain.vo.MallSkuVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * SKU Service接口
+ *
+ * @author pengles
+ */
+public interface MallSkuService {
+
+    /**
+     * 查询SKU
+     */
+    MallSkuVo queryById(Long id);
+
+    /**
+     * 查询SKU列表
+     */
+    TableDataInfo<MallSkuVo> queryPageList(MallSkuBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询SKU列表
+     */
+    List<MallSkuVo> queryList(MallSkuBo bo);
+
+    /**
+     * 根据商品ID查询SKU列表
+     */
+    List<MallSkuVo> queryListByProductId(Long productId);
+
+    /**
+     * 新增SKU
+     */
+    Boolean insertByBo(MallSkuBo bo);
+
+    /**
+     * 修改SKU
+     */
+    Boolean updateByBo(MallSkuBo bo);
+
+    /**
+     * 校验并批量删除SKU信息
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/service/impl/MallAttributeServiceImpl.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/service/impl/MallAttributeServiceImpl.java
new file mode 100644
index 0000000..d4bc66e
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/service/impl/MallAttributeServiceImpl.java
@@ -0,0 +1,167 @@
+package org.dromara.mall.product.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.mall.product.domain.MallAttribute;
+import org.dromara.mall.product.domain.bo.MallAttributeBo;
+import org.dromara.mall.product.domain.vo.MallAttributeVo;
+import org.dromara.mall.product.mapper.MallAttributeMapper;
+import org.dromara.mall.product.service.MallAttributeService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 属性Service业务层处理
+ *
+ * @author pengles
+ */
+@RequiredArgsConstructor
+@Service
+public class MallAttributeServiceImpl implements MallAttributeService {
+
+    private final MallAttributeMapper baseMapper;
+
+    /**
+     * 查询属性
+     */
+    @Override
+    public MallAttributeVo queryById(Long id) {
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 查询属性列表
+     */
+    @Override
+    public TableDataInfo<MallAttributeVo> queryPageList(MallAttributeBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<MallAttribute> lqw = buildQueryWrapper(bo);
+        Page<MallAttributeVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询属性列表
+     */
+    @Override
+    public List<MallAttributeVo> queryList(MallAttributeBo bo) {
+        LambdaQueryWrapper<MallAttribute> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    /**
+     * 根据模板ID查询属性列表
+     */
+    @Override
+    public List<MallAttributeVo> queryListByTemplateId(Long templateId) {
+        LambdaQueryWrapper<MallAttribute> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(MallAttribute::getTemplateId, templateId);
+        lqw.eq(MallAttribute::getStatus, 0);
+        lqw.orderByAsc(MallAttribute::getSort);
+        lqw.orderByAsc(MallAttribute::getId);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<MallAttribute> buildQueryWrapper(MallAttributeBo bo) {
+        LambdaQueryWrapper<MallAttribute> lqw = new LambdaQueryWrapper<>();
+        lqw.like(StringUtils.isNotBlank(bo.getName()), MallAttribute::getName, bo.getName());
+        lqw.eq(bo.getTemplateId() != null, MallAttribute::getTemplateId, bo.getTemplateId());
+        lqw.eq(bo.getType() != null, MallAttribute::getType, bo.getType());
+        lqw.eq(bo.getStatus() != null, MallAttribute::getStatus, bo.getStatus());
+        lqw.orderByAsc(MallAttribute::getSort);
+        lqw.orderByAsc(MallAttribute::getId);
+        return lqw;
+    }
+
+    /**
+     * 新增属性
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean insertByBo(MallAttributeBo bo) {
+        MallAttribute add = MapstructUtils.convert(bo, MallAttribute.class);
+        validEntityBeforeSave(add);
+
+        // 设置默认值
+        if (add.getRequired() == null) {
+            add.setRequired(0);
+        }
+        if (add.getSort() == null) {
+            add.setSort(0);
+        }
+        if (add.getStatus() == null) {
+            add.setStatus(0);
+        }
+
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改属性
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean updateByBo(MallAttributeBo bo) {
+        MallAttribute update = MapstructUtils.convert(bo, MallAttribute.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(MallAttribute entity) {
+        if (StringUtils.isBlank(entity.getName())) {
+            throw new ServiceException("属性名称不能为空");
+        }
+        if (entity.getType() == null) {
+            throw new ServiceException("属性类型不能为空");
+        }
+        if (entity.getType() < 0 || entity.getType() > 3) {
+            throw new ServiceException("属性类型不合法");
+        }
+        // 检查属性名称是否重复（在同一模板下）
+        LambdaQueryWrapper<MallAttribute> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(MallAttribute::getName, entity.getName());
+        if (entity.getTemplateId() != null) {
+            lqw.eq(MallAttribute::getTemplateId, entity.getTemplateId());
+        }
+        if (entity.getId() != null) {
+            lqw.ne(MallAttribute::getId, entity.getId());
+        }
+        Long count = baseMapper.selectCount(lqw);
+        if (count > 0) {
+            throw new ServiceException("属性名称已存在");
+        }
+    }
+
+    /**
+     * 批量删除属性
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if (isValid) {
+            for (Long id : ids) {
+                MallAttribute attribute = baseMapper.selectById(id);
+                if (attribute == null) {
+                    throw new ServiceException("属性不存在");
+                }
+                // 可以后续添加属性值表关联查询，检查是否有关联的属性值
+            }
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/service/impl/MallAttributeTemplateServiceImpl.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/service/impl/MallAttributeTemplateServiceImpl.java
new file mode 100644
index 0000000..e390f86
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/service/impl/MallAttributeTemplateServiceImpl.java
@@ -0,0 +1,141 @@
+package org.dromara.mall.product.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.mall.product.domain.MallAttributeTemplate;
+import org.dromara.mall.product.domain.bo.MallAttributeTemplateBo;
+import org.dromara.mall.product.domain.vo.MallAttributeTemplateVo;
+import org.dromara.mall.product.mapper.MallAttributeTemplateMapper;
+import org.dromara.mall.product.service.MallAttributeTemplateService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 属性模板Service业务层处理
+ *
+ * @author pengles
+ */
+@RequiredArgsConstructor
+@Service
+public class MallAttributeTemplateServiceImpl implements MallAttributeTemplateService {
+
+    private final MallAttributeTemplateMapper baseMapper;
+
+    /**
+     * 查询属性模板
+     */
+    @Override
+    public MallAttributeTemplateVo queryById(Long id) {
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 查询属性模板列表
+     */
+    @Override
+    public TableDataInfo<MallAttributeTemplateVo> queryPageList(MallAttributeTemplateBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<MallAttributeTemplate> lqw = buildQueryWrapper(bo);
+        Page<MallAttributeTemplateVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询属性模板列表
+     */
+    @Override
+    public List<MallAttributeTemplateVo> queryList(MallAttributeTemplateBo bo) {
+        LambdaQueryWrapper<MallAttributeTemplate> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<MallAttributeTemplate> buildQueryWrapper(MallAttributeTemplateBo bo) {
+        LambdaQueryWrapper<MallAttributeTemplate> lqw = new LambdaQueryWrapper<>();
+        lqw.like(StringUtils.isNotBlank(bo.getName()), MallAttributeTemplate::getName, bo.getName());
+        lqw.eq(bo.getCategoryId() != null, MallAttributeTemplate::getCategoryId, bo.getCategoryId());
+        lqw.eq(bo.getStatus() != null, MallAttributeTemplate::getStatus, bo.getStatus());
+        lqw.orderByAsc(MallAttributeTemplate::getSort);
+        lqw.orderByAsc(MallAttributeTemplate::getId);
+        return lqw;
+    }
+
+    /**
+     * 新增属性模板
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean insertByBo(MallAttributeTemplateBo bo) {
+        MallAttributeTemplate add = MapstructUtils.convert(bo, MallAttributeTemplate.class);
+        validEntityBeforeSave(add);
+
+        // 设置默认值
+        if (add.getSort() == null) {
+            add.setSort(0);
+        }
+        if (add.getStatus() == null) {
+            add.setStatus(0);
+        }
+
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改属性模板
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean updateByBo(MallAttributeTemplateBo bo) {
+        MallAttributeTemplate update = MapstructUtils.convert(bo, MallAttributeTemplate.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(MallAttributeTemplate entity) {
+        if (StringUtils.isBlank(entity.getName())) {
+            throw new ServiceException("模板名称不能为空");
+        }
+        // 检查模板名称是否重复
+        LambdaQueryWrapper<MallAttributeTemplate> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(MallAttributeTemplate::getName, entity.getName());
+        if (entity.getId() != null) {
+            lqw.ne(MallAttributeTemplate::getId, entity.getId());
+        }
+        Long count = baseMapper.selectCount(lqw);
+        if (count > 0) {
+            throw new ServiceException("模板名称已存在");
+        }
+    }
+
+    /**
+     * 批量删除属性模板
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if (isValid) {
+            for (Long id : ids) {
+                MallAttributeTemplate template = baseMapper.selectById(id);
+                if (template == null) {
+                    throw new ServiceException("属性模板不存在");
+                }
+                // 可以后续添加属性表关联查询，检查是否有关联的属性
+            }
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/service/impl/MallAttributeValueServiceImpl.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/service/impl/MallAttributeValueServiceImpl.java
new file mode 100644
index 0000000..23ec64b
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/service/impl/MallAttributeValueServiceImpl.java
@@ -0,0 +1,158 @@
+package org.dromara.mall.product.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.mall.product.domain.MallAttributeValue;
+import org.dromara.mall.product.domain.bo.MallAttributeValueBo;
+import org.dromara.mall.product.domain.vo.MallAttributeValueVo;
+import org.dromara.mall.product.mapper.MallAttributeValueMapper;
+import org.dromara.mall.product.service.MallAttributeValueService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 属性值Service业务层处理
+ *
+ * @author pengles
+ */
+@RequiredArgsConstructor
+@Service
+public class MallAttributeValueServiceImpl implements MallAttributeValueService {
+
+    private final MallAttributeValueMapper baseMapper;
+
+    /**
+     * 查询属性值
+     */
+    @Override
+    public MallAttributeValueVo queryById(Long id) {
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 查询属性值列表
+     */
+    @Override
+    public TableDataInfo<MallAttributeValueVo> queryPageList(MallAttributeValueBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<MallAttributeValue> lqw = buildQueryWrapper(bo);
+        Page<MallAttributeValueVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询属性值列表
+     */
+    @Override
+    public List<MallAttributeValueVo> queryList(MallAttributeValueBo bo) {
+        LambdaQueryWrapper<MallAttributeValue> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    /**
+     * 根据属性ID查询属性值列表
+     */
+    @Override
+    public List<MallAttributeValueVo> queryListByAttributeId(Long attributeId) {
+        LambdaQueryWrapper<MallAttributeValue> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(MallAttributeValue::getAttributeId, attributeId);
+        lqw.eq(MallAttributeValue::getStatus, 0);
+        lqw.orderByAsc(MallAttributeValue::getSort);
+        lqw.orderByAsc(MallAttributeValue::getId);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<MallAttributeValue> buildQueryWrapper(MallAttributeValueBo bo) {
+        LambdaQueryWrapper<MallAttributeValue> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(bo.getAttributeId() != null, MallAttributeValue::getAttributeId, bo.getAttributeId());
+        lqw.like(StringUtils.isNotBlank(bo.getValue()), MallAttributeValue::getValue, bo.getValue());
+        lqw.eq(bo.getStatus() != null, MallAttributeValue::getStatus, bo.getStatus());
+        lqw.orderByAsc(MallAttributeValue::getSort);
+        lqw.orderByAsc(MallAttributeValue::getId);
+        return lqw;
+    }
+
+    /**
+     * 新增属性值
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean insertByBo(MallAttributeValueBo bo) {
+        MallAttributeValue add = MapstructUtils.convert(bo, MallAttributeValue.class);
+        validEntityBeforeSave(add);
+
+        // 设置默认值
+        if (add.getSort() == null) {
+            add.setSort(0);
+        }
+        if (add.getStatus() == null) {
+            add.setStatus(0);
+        }
+
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改属性值
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean updateByBo(MallAttributeValueBo bo) {
+        MallAttributeValue update = MapstructUtils.convert(bo, MallAttributeValue.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(MallAttributeValue entity) {
+        if (entity.getAttributeId() == null) {
+            throw new ServiceException("属性ID不能为空");
+        }
+        if (StringUtils.isBlank(entity.getValue())) {
+            throw new ServiceException("属性值不能为空");
+        }
+        // 检查属性值是否重复（在同一属性下）
+        LambdaQueryWrapper<MallAttributeValue> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(MallAttributeValue::getAttributeId, entity.getAttributeId());
+        lqw.eq(MallAttributeValue::getValue, entity.getValue());
+        if (entity.getId() != null) {
+            lqw.ne(MallAttributeValue::getId, entity.getId());
+        }
+        Long count = baseMapper.selectCount(lqw);
+        if (count > 0) {
+            throw new ServiceException("属性值已存在");
+        }
+    }
+
+    /**
+     * 批量删除属性值
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if (isValid) {
+            for (Long id : ids) {
+                MallAttributeValue value = baseMapper.selectById(id);
+                if (value == null) {
+                    throw new ServiceException("属性值不存在");
+                }
+                // 可以后续添加商品属性关联表查询，检查是否有关联的商品属性
+            }
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/service/impl/MallBrandServiceImpl.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/service/impl/MallBrandServiceImpl.java
new file mode 100644
index 0000000..8799dbf
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/service/impl/MallBrandServiceImpl.java
@@ -0,0 +1,141 @@
+package org.dromara.mall.product.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.mall.product.domain.MallBrand;
+import org.dromara.mall.product.domain.bo.MallBrandBo;
+import org.dromara.mall.product.domain.vo.MallBrandVo;
+import org.dromara.mall.product.mapper.MallBrandMapper;
+import org.dromara.mall.product.service.MallBrandService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 品牌Service业务层处理
+ *
+ * @author pengles
+ */
+@RequiredArgsConstructor
+@Service
+public class MallBrandServiceImpl implements MallBrandService {
+
+    private final MallBrandMapper baseMapper;
+
+    /**
+     * 查询品牌
+     */
+    @Override
+    public MallBrandVo queryById(Long id) {
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 查询品牌列表
+     */
+    @Override
+    public TableDataInfo<MallBrandVo> queryPageList(MallBrandBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<MallBrand> lqw = buildQueryWrapper(bo);
+        Page<MallBrandVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询品牌列表
+     */
+    @Override
+    public List<MallBrandVo> queryList(MallBrandBo bo) {
+        LambdaQueryWrapper<MallBrand> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<MallBrand> buildQueryWrapper(MallBrandBo bo) {
+        LambdaQueryWrapper<MallBrand> lqw = new LambdaQueryWrapper<>();
+        lqw.like(StringUtils.isNotBlank(bo.getName()), MallBrand::getName, bo.getName());
+        lqw.eq(bo.getStatus() != null, MallBrand::getStatus, bo.getStatus());
+        lqw.orderByAsc(MallBrand::getSort);
+        lqw.orderByAsc(MallBrand::getId);
+        return lqw;
+    }
+
+    /**
+     * 新增品牌
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean insertByBo(MallBrandBo bo) {
+        MallBrand add = MapstructUtils.convert(bo, MallBrand.class);
+        validEntityBeforeSave(add);
+
+        // 设置默认值
+        if (add.getSort() == null) {
+            add.setSort(0);
+        }
+        if (add.getStatus() == null) {
+            add.setStatus(0);
+        }
+
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改品牌
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean updateByBo(MallBrandBo bo) {
+        MallBrand update = MapstructUtils.convert(bo, MallBrand.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(MallBrand entity) {
+        if (StringUtils.isBlank(entity.getName())) {
+            throw new ServiceException("品牌名称不能为空");
+        }
+        // 检查品牌名称是否重复
+        LambdaQueryWrapper<MallBrand> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(MallBrand::getName, entity.getName());
+        if (entity.getId() != null) {
+            lqw.ne(MallBrand::getId, entity.getId());
+        }
+        Long count = baseMapper.selectCount(lqw);
+        if (count > 0) {
+            throw new ServiceException("品牌名称已存在");
+        }
+    }
+
+    /**
+     * 批量删除品牌
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if (isValid) {
+            // 检查是否有关联的商品（这里需要关联商品表查询，暂时跳过）
+            // 可以后续添加商品表关联查询
+            for (Long id : ids) {
+                MallBrand brand = baseMapper.selectById(id);
+                if (brand == null) {
+                    throw new ServiceException("品牌不存在");
+                }
+            }
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/service/impl/MallCategoryServiceImpl.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/service/impl/MallCategoryServiceImpl.java
new file mode 100644
index 0000000..2628e71
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/service/impl/MallCategoryServiceImpl.java
@@ -0,0 +1,250 @@
+package org.dromara.mall.product.service.impl;
+
+import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.mall.product.domain.MallCategory;
+import org.dromara.mall.product.domain.bo.MallCategoryBo;
+import org.dromara.mall.product.domain.vo.MallCategoryVo;
+import org.dromara.mall.product.mapper.MallCategoryMapper;
+import org.dromara.mall.product.service.MallCategoryService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * 商品分类Service业务层处理
+ *
+ * @author pengles
+ */
+@RequiredArgsConstructor
+@Service
+public class MallCategoryServiceImpl implements MallCategoryService {
+
+    private final MallCategoryMapper baseMapper;
+
+    /**
+     * 查询商品分类
+     */
+    @Override
+    public MallCategoryVo queryById(Long id) {
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 查询商品分类列表
+     */
+    @Override
+    public TableDataInfo<MallCategoryVo> queryPageList(MallCategoryBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<MallCategory> lqw = buildQueryWrapper(bo);
+        Page<MallCategoryVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询商品分类列表
+     */
+    @Override
+    public List<MallCategoryVo> queryList(MallCategoryBo bo) {
+        LambdaQueryWrapper<MallCategory> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    /**
+     * 查询商品分类树形列表
+     */
+    @Override
+    public List<MallCategoryVo> queryTreeList() {
+        MallCategoryBo bo = new MallCategoryBo();
+        bo.setStatus(0); // 只查询启用的分类
+        List<MallCategoryVo> list = queryList(bo);
+        return buildTree(list);
+    }
+
+    private LambdaQueryWrapper<MallCategory> buildQueryWrapper(MallCategoryBo bo) {
+        LambdaQueryWrapper<MallCategory> lqw = new LambdaQueryWrapper<>();
+        lqw.like(StringUtils.isNotBlank(bo.getName()), MallCategory::getName, bo.getName());
+        lqw.eq(bo.getParentId() != null, MallCategory::getParentId, bo.getParentId());
+        lqw.eq(bo.getLevel() != null, MallCategory::getLevel, bo.getLevel());
+        lqw.eq(bo.getStatus() != null, MallCategory::getStatus, bo.getStatus());
+        lqw.orderByAsc(MallCategory::getSort);
+        lqw.orderByAsc(MallCategory::getId);
+        return lqw;
+    }
+
+    /**
+     * 构建树形结构
+     */
+    private List<MallCategoryVo> buildTree(List<MallCategoryVo> list) {
+        if (CollUtil.isEmpty(list)) {
+            return new ArrayList<>();
+        }
+        // 按父ID分组
+        Map<Long, List<MallCategoryVo>> childrenMap = list.stream()
+                .filter(item -> item.getParentId() != null && item.getParentId() != 0)
+                .collect(Collectors.groupingBy(MallCategoryVo::getParentId));
+
+        // 设置子节点
+        list.forEach(item -> {
+            List<MallCategoryVo> children = childrenMap.get(item.getId());
+            item.setChildren(children != null ? children : new ArrayList<>());
+        });
+
+        // 返回顶级节点
+        return list.stream()
+                .filter(item -> item.getParentId() == null || item.getParentId() == 0)
+                .sorted(Comparator.comparing(MallCategoryVo::getSort, Comparator.nullsLast(Comparator.naturalOrder())))
+                .collect(Collectors.toList());
+    }
+
+    /**
+     * 新增商品分类
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean insertByBo(MallCategoryBo bo) {
+        MallCategory add = MapstructUtils.convert(bo, MallCategory.class);
+        validEntityBeforeSave(add);
+
+        // 设置父级ID和级别
+        if (add.getParentId() == null || add.getParentId() == 0) {
+            add.setParentId(0L);
+            add.setLevel(1);
+        } else {
+            // 查询父分类
+            MallCategory parent = baseMapper.selectById(add.getParentId());
+            if (parent == null) {
+                throw new ServiceException("父分类不存在");
+            }
+            if (parent.getStatus() != 0) {
+                throw new ServiceException("父分类已禁用，不能添加子分类");
+            }
+            if (parent.getLevel() >= 3) {
+                throw new ServiceException("分类级别不能超过3级");
+            }
+            add.setLevel(parent.getLevel() + 1);
+        }
+
+        // 设置默认值
+        if (add.getSort() == null) {
+            add.setSort(0);
+        }
+        if (add.getStatus() == null) {
+            add.setStatus(0);
+        }
+
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改商品分类
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean updateByBo(MallCategoryBo bo) {
+        MallCategory update = MapstructUtils.convert(bo, MallCategory.class);
+        validEntityBeforeSave(update);
+
+        // 不能将父分类设置为自己的子分类
+        if (update.getParentId() != null && update.getParentId() != 0) {
+            if (update.getId().equals(update.getParentId())) {
+                throw new ServiceException("不能将分类设置为自己的父分类");
+            }
+            // 检查是否会形成循环
+            if (hasCircularReference(update.getId(), update.getParentId())) {
+                throw new ServiceException("不能将分类设置为自己的子分类的子分类");
+            }
+
+            // 查询父分类
+            MallCategory parent = baseMapper.selectById(update.getParentId());
+            if (parent == null) {
+                throw new ServiceException("父分类不存在");
+            }
+            if (parent.getLevel() >= 3) {
+                throw new ServiceException("分类级别不能超过3级");
+            }
+            update.setLevel(parent.getLevel() + 1);
+        } else {
+            update.setParentId(0L);
+            update.setLevel(1);
+        }
+
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 检查是否存在循环引用
+     */
+    private boolean hasCircularReference(Long id, Long parentId) {
+        Long currentParentId = parentId;
+        Set<Long> visited = new HashSet<>();
+        visited.add(id);
+
+        while (currentParentId != null && currentParentId != 0) {
+            if (visited.contains(currentParentId)) {
+                return true;
+            }
+            visited.add(currentParentId);
+            MallCategory parent = baseMapper.selectById(currentParentId);
+            if (parent == null) {
+                break;
+            }
+            currentParentId = parent.getParentId();
+        }
+        return false;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(MallCategory entity) {
+        if (StringUtils.isBlank(entity.getName())) {
+            throw new ServiceException("分类名称不能为空");
+        }
+        // 检查同级分类名称是否重复
+        LambdaQueryWrapper<MallCategory> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(MallCategory::getName, entity.getName());
+        lqw.eq(entity.getParentId() != null, MallCategory::getParentId, entity.getParentId());
+        if (entity.getId() != null) {
+            lqw.ne(MallCategory::getId, entity.getId());
+        }
+        Long count = baseMapper.selectCount(lqw);
+        if (count > 0) {
+            throw new ServiceException("同级分类名称不能重复");
+        }
+    }
+
+    /**
+     * 批量删除商品分类
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if (isValid) {
+            // 检查是否存在子分类
+            for (Long id : ids) {
+                LambdaQueryWrapper<MallCategory> lqw = new LambdaQueryWrapper<>();
+                lqw.eq(MallCategory::getParentId, id);
+                Long count = baseMapper.selectCount(lqw);
+                if (count > 0) {
+                    throw new ServiceException("存在子分类，不能删除");
+                }
+                // 检查是否有关联的商品（这里需要关联商品表查询，暂时跳过）
+                // 可以后续添加商品表关联查询
+            }
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/service/impl/MallProductAttributeServiceImpl.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/service/impl/MallProductAttributeServiceImpl.java
new file mode 100644
index 0000000..80507e8
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/service/impl/MallProductAttributeServiceImpl.java
@@ -0,0 +1,163 @@
+package org.dromara.mall.product.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.mall.product.domain.MallProductAttribute;
+import org.dromara.mall.product.domain.bo.MallProductAttributeBo;
+import org.dromara.mall.product.domain.vo.MallProductAttributeVo;
+import org.dromara.mall.product.mapper.MallProductAttributeMapper;
+import org.dromara.mall.product.service.MallProductAttributeService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 商品属性关联Service业务层处理
+ *
+ * @author pengles
+ */
+@RequiredArgsConstructor
+@Service
+public class MallProductAttributeServiceImpl implements MallProductAttributeService {
+
+    private final MallProductAttributeMapper baseMapper;
+
+    /**
+     * 查询商品属性关联
+     */
+    @Override
+    public MallProductAttributeVo queryById(Long id) {
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 根据商品ID查询商品属性关联列表
+     */
+    @Override
+    public List<MallProductAttributeVo> queryListByProductId(Long productId) {
+        LambdaQueryWrapper<MallProductAttribute> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(MallProductAttribute::getProductId, productId);
+        lqw.orderByAsc(MallProductAttribute::getId);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    /**
+     * 新增商品属性关联
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean insertByBo(MallProductAttributeBo bo) {
+        MallProductAttribute add = MapstructUtils.convert(bo, MallProductAttribute.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 批量新增商品属性关联
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean insertBatch(List<MallProductAttributeBo> list) {
+        if (list == null || list.isEmpty()) {
+            return true;
+        }
+        List<MallProductAttribute> entities = MapstructUtils.convert(list, MallProductAttribute.class);
+        for (MallProductAttribute entity : entities) {
+            validEntityBeforeSave(entity);
+        }
+        // 批量插入
+        for (MallProductAttribute entity : entities) {
+            baseMapper.insert(entity);
+        }
+        return true;
+    }
+
+    /**
+     * 修改商品属性关联
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean updateByBo(MallProductAttributeBo bo) {
+        MallProductAttribute update = MapstructUtils.convert(bo, MallProductAttribute.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(MallProductAttribute entity) {
+        if (entity.getProductId() == null) {
+            throw new ServiceException("商品ID不能为空");
+        }
+        if (entity.getAttributeId() == null) {
+            throw new ServiceException("属性ID不能为空");
+        }
+        // 检查同一商品下是否已有相同的属性
+        LambdaQueryWrapper<MallProductAttribute> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(MallProductAttribute::getProductId, entity.getProductId());
+        lqw.eq(MallProductAttribute::getAttributeId, entity.getAttributeId());
+        if (entity.getId() != null) {
+            lqw.ne(MallProductAttribute::getId, entity.getId());
+        }
+        Long count = baseMapper.selectCount(lqw);
+        if (count > 0) {
+            throw new ServiceException("商品已存在该属性");
+        }
+    }
+
+    /**
+     * 批量删除商品属性关联
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if (isValid) {
+            for (Long id : ids) {
+                MallProductAttribute attribute = baseMapper.selectById(id);
+                if (attribute == null) {
+                    throw new ServiceException("商品属性关联不存在");
+                }
+            }
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+
+    /**
+     * 根据商品ID删除商品属性关联
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean deleteByProductId(Long productId) {
+        LambdaQueryWrapper<MallProductAttribute> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(MallProductAttribute::getProductId, productId);
+        return baseMapper.delete(lqw) >= 0;
+    }
+
+    /**
+     * 保存商品属性关联（先删除旧的，再插入新的）
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean saveProductAttributes(Long productId, List<MallProductAttributeBo> list) {
+        // 删除旧的关联
+        deleteByProductId(productId);
+        // 插入新的关联
+        if (list != null && !list.isEmpty()) {
+            for (MallProductAttributeBo bo : list) {
+                bo.setProductId(productId);
+            }
+            return insertBatch(list);
+        }
+        return true;
+    }
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/service/impl/MallProductServiceImpl.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/service/impl/MallProductServiceImpl.java
new file mode 100644
index 0000000..7d96871
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/service/impl/MallProductServiceImpl.java
@@ -0,0 +1,137 @@
+package org.dromara.mall.product.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.mall.product.domain.MallProduct;
+import org.dromara.mall.product.domain.bo.MallProductBo;
+import org.dromara.mall.product.domain.vo.MallProductVo;
+import org.dromara.mall.product.mapper.MallProductMapper;
+import org.dromara.mall.product.service.MallProductService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 商品Service业务层处理
+ *
+ * @author pengles
+ */
+@RequiredArgsConstructor
+@Service
+public class MallProductServiceImpl implements MallProductService {
+
+    private final MallProductMapper baseMapper;
+
+    /**
+     * 查询商品
+     */
+    @Override
+    public MallProductVo queryById(Long id) {
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 查询商品列表
+     */
+    @Override
+    public TableDataInfo<MallProductVo> queryPageList(MallProductBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<MallProduct> lqw = buildQueryWrapper(bo);
+        Page<MallProductVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询商品列表
+     */
+    @Override
+    public List<MallProductVo> queryList(MallProductBo bo) {
+        LambdaQueryWrapper<MallProduct> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<MallProduct> buildQueryWrapper(MallProductBo bo) {
+        LambdaQueryWrapper<MallProduct> lqw = new LambdaQueryWrapper<>();
+        lqw.like(StringUtils.isNotBlank(bo.getName()), MallProduct::getName, bo.getName());
+        lqw.eq(bo.getCategoryId() != null, MallProduct::getCategoryId, bo.getCategoryId());
+        lqw.eq(bo.getBrandId() != null, MallProduct::getBrandId, bo.getBrandId());
+        lqw.eq(bo.getStatus() != null, MallProduct::getStatus, bo.getStatus());
+        lqw.orderByDesc(MallProduct::getSort);
+        lqw.orderByDesc(MallProduct::getId);
+        return lqw;
+    }
+
+    /**
+     * 新增商品
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean insertByBo(MallProductBo bo) {
+        MallProduct add = MapstructUtils.convert(bo, MallProduct.class);
+        validEntityBeforeSave(add);
+
+        // 设置默认值
+        if (add.getSort() == null) {
+            add.setSort(0);
+        }
+        if (add.getStatus() == null) {
+            add.setStatus(0);
+        }
+        if (add.getSalesCount() == null) {
+            add.setSalesCount(0);
+        }
+        if (add.getViewCount() == null) {
+            add.setViewCount(0);
+        }
+
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改商品
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean updateByBo(MallProductBo bo) {
+        MallProduct update = MapstructUtils.convert(bo, MallProduct.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(MallProduct entity) {
+        if (StringUtils.isBlank(entity.getName())) {
+            throw new ServiceException("商品名称不能为空");
+        }
+    }
+
+    /**
+     * 批量删除商品
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if (isValid) {
+            for (Long id : ids) {
+                MallProduct product = baseMapper.selectById(id);
+                if (product == null) {
+                    throw new ServiceException("商品不存在");
+                }
+            }
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/service/impl/MallSkuServiceImpl.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/service/impl/MallSkuServiceImpl.java
new file mode 100644
index 0000000..32443f0
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/java/org/dromara/mall/product/service/impl/MallSkuServiceImpl.java
@@ -0,0 +1,158 @@
+package org.dromara.mall.product.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.mall.product.domain.MallSku;
+import org.dromara.mall.product.domain.bo.MallSkuBo;
+import org.dromara.mall.product.domain.vo.MallSkuVo;
+import org.dromara.mall.product.mapper.MallSkuMapper;
+import org.dromara.mall.product.service.MallSkuService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * SKU Service业务层处理
+ *
+ * @author pengles
+ */
+@RequiredArgsConstructor
+@Service
+public class MallSkuServiceImpl implements MallSkuService {
+
+    private final MallSkuMapper baseMapper;
+
+    /**
+     * 查询SKU
+     */
+    @Override
+    public MallSkuVo queryById(Long id) {
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 查询SKU列表
+     */
+    @Override
+    public TableDataInfo<MallSkuVo> queryPageList(MallSkuBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<MallSku> lqw = buildQueryWrapper(bo);
+        Page<MallSkuVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询SKU列表
+     */
+    @Override
+    public List<MallSkuVo> queryList(MallSkuBo bo) {
+        LambdaQueryWrapper<MallSku> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    /**
+     * 根据商品ID查询SKU列表
+     */
+    @Override
+    public List<MallSkuVo> queryListByProductId(Long productId) {
+        LambdaQueryWrapper<MallSku> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(MallSku::getProductId, productId);
+        lqw.eq(MallSku::getStatus, 0); // 只查询启用的SKU
+        lqw.orderByAsc(MallSku::getId);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<MallSku> buildQueryWrapper(MallSkuBo bo) {
+        LambdaQueryWrapper<MallSku> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(bo.getProductId() != null, MallSku::getProductId, bo.getProductId());
+        lqw.eq(StringUtils.isNotBlank(bo.getSkuCode()), MallSku::getSkuCode, bo.getSkuCode());
+        lqw.like(StringUtils.isNotBlank(bo.getName()), MallSku::getName, bo.getName());
+        lqw.eq(bo.getStatus() != null, MallSku::getStatus, bo.getStatus());
+        lqw.orderByAsc(MallSku::getId);
+        return lqw;
+    }
+
+    /**
+     * 新增SKU
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean insertByBo(MallSkuBo bo) {
+        MallSku add = MapstructUtils.convert(bo, MallSku.class);
+        validEntityBeforeSave(add);
+
+        // 设置默认值
+        if (add.getStock() == null) {
+            add.setStock(0);
+        }
+        if (add.getStatus() == null) {
+            add.setStatus(0);
+        }
+
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改SKU
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean updateByBo(MallSkuBo bo) {
+        MallSku update = MapstructUtils.convert(bo, MallSku.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(MallSku entity) {
+        if (entity.getProductId() == null) {
+            throw new ServiceException("商品ID不能为空");
+        }
+        if (StringUtils.isBlank(entity.getSkuCode())) {
+            throw new ServiceException("SKU编码不能为空");
+        }
+        if (entity.getPrice() == null) {
+            throw new ServiceException("价格不能为空");
+        }
+        // 检查SKU编码是否重复
+        LambdaQueryWrapper<MallSku> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(MallSku::getSkuCode, entity.getSkuCode());
+        if (entity.getId() != null) {
+            lqw.ne(MallSku::getId, entity.getId());
+        }
+        Long count = baseMapper.selectCount(lqw);
+        if (count > 0) {
+            throw new ServiceException("SKU编码已存在");
+        }
+    }
+
+    /**
+     * 批量删除SKU
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if (isValid) {
+            for (Long id : ids) {
+                MallSku sku = baseMapper.selectById(id);
+                if (sku == null) {
+                    throw new ServiceException("SKU不存在");
+                }
+            }
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/resources/META-INF/spring.factories b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/resources/META-INF/spring.factories
new file mode 100644
index 0000000..6c11263
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-product/src/main/resources/META-INF/spring.factories
@@ -0,0 +1,3 @@
+# Auto Configure
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+org.dromara.mall.product.config.MallProductAutoConfiguration
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/README.md b/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/README.md
new file mode 100644
index 0000000..8144f2a
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/README.md
@@ -0,0 +1,204 @@
+# 营销中心模块 (ruoyi-mall-promotion)
+
+## 模块简介
+
+`ruoyi-mall-promotion` 是商城系统的营销中心模块，提供多样化的营销活动功能，包括活动、拼团、秒杀、砍价等。
+
+## 功能特性
+
+### 1. 营销活动管理 ✅
+
+- ✅ 活动CRUD操作
+- ✅ 活动类型管理（普通活动、拼团、秒杀、砍价）
+- ✅ 活动规则配置（JSON格式）
+- ✅ 活动时间管理
+- ✅ 活动状态管理（启用/禁用）
+- ✅ 活动导出功能
+
+### 2. 拼团功能 ✅
+
+- ✅ 拼团活动创建
+- ✅ 拼团活动查询（按SKU、可用列表）
+- ✅ 拼团活动状态管理
+- ⏳ 拼团订单管理（需在交易中心模块集成）
+- ⏳ 拼团成团处理（需在交易中心模块集成）
+- ⏳ 拼团过期处理（需定时任务支持）
+
+### 3. 秒杀功能 ✅
+
+- ✅ 秒杀活动创建
+- ✅ 秒杀库存管理（扣减、恢复）
+- ✅ 秒杀活动查询（按SKU、可用列表）
+- ✅ 秒杀活动状态管理
+- ✅ 秒杀活动状态自动更新（定时任务）
+
+### 4. 砍价功能 ✅
+
+- ✅ 砍价活动创建
+- ✅ 砍价活动查询（按SKU、可用列表）
+- ✅ 砍价活动状态管理
+- ⏳ 砍价记录管理（需在交易中心模块集成）
+- ⏳ 砍价助力记录（需在交易中心模块集成）
+- ⏳ 砍价订单处理（需在交易中心模块集成）
+
+## 数据库表
+
+- `mall_promotion` - 营销活动表
+- `mall_group_buy` - 拼团表
+- `mall_group_buy_order` - 拼团订单表
+- `mall_seckill` - 秒杀表
+- `mall_bargain` - 砍价活动表
+- `mall_bargain_record` - 砍价记录表
+- `mall_bargain_help` - 砍价助力记录表
+
+详细表结构请参考：`script/sql/ry_mall.sql`
+
+## 模块结构
+
+```
+org.dromara.mall.promotion
+├── controller
+│   ├── admin          // 管理端API
+│   └── app            // 用户端API
+├── domain
+│   ├── bo             // 业务对象
+│   └── vo             // 视图对象
+├── mapper             // MyBatis Mapper
+├── service            // 业务逻辑层
+│   └── impl
+├── job                // 定时任务
+│   └── MallPromotionJob.java
+├── enums              // 枚举类
+└── config             // 配置类
+```
+
+## 依赖模块
+
+- `ruoyi-mall-product` - 商品中心模块
+- `ruoyi-mall-coupon` - 优惠券中心模块
+- `ruoyi-common-*` - 通用工具模块
+
+## API接口
+
+### 管理端接口
+
+#### 营销活动管理 (`/mall/promotion`)
+
+- `GET /mall/promotion/list` - 查询营销活动列表（分页）
+- `GET /mall/promotion/{id}` - 获取营销活动详情
+- `POST /mall/promotion` - 新增营销活动
+- `PUT /mall/promotion` - 修改营销活动
+- `DELETE /mall/promotion/{ids}` - 删除营销活动
+- `POST /mall/promotion/export` - 导出营销活动列表
+- `PUT /mall/promotion/changeStatus/{id}` - 启用/禁用营销活动
+
+### 移动端接口
+
+#### 营销活动 (`/app/mall/promotion`)
+
+- `GET /app/mall/promotion/list` - 查询营销活动列表（可按类型筛选）
+- `GET /app/mall/promotion/{id}` - 获取营销活动详情
+
+#### 秒杀活动管理 (`/mall/seckill`)
+
+- `GET /mall/seckill/list` - 查询秒杀活动列表（分页）
+- `GET /mall/seckill/{id}` - 获取秒杀活动详情
+- `POST /mall/seckill` - 新增秒杀活动
+- `PUT /mall/seckill` - 修改秒杀活动
+- `DELETE /mall/seckill/{ids}` - 删除秒杀活动
+- `POST /mall/seckill/export` - 导出秒杀活动列表
+- `PUT /mall/seckill/changeStatus/{id}` - 启用/禁用秒杀活动
+
+#### 秒杀活动 (`/app/mall/seckill`)
+
+- `GET /app/mall/seckill/list` - 查询可用秒杀活动列表
+- `GET /app/mall/seckill/{id}` - 获取秒杀活动详情
+- `GET /app/mall/seckill/sku/{skuId}` - 根据SKU ID查询秒杀活动
+
+#### 拼团活动管理 (`/mall/groupbuy`)
+
+- `GET /mall/groupbuy/list` - 查询拼团活动列表（分页）
+- `GET /mall/groupbuy/{id}` - 获取拼团活动详情
+- `POST /mall/groupbuy` - 新增拼团活动
+- `PUT /mall/groupbuy` - 修改拼团活动
+- `DELETE /mall/groupbuy/{ids}` - 删除拼团活动
+- `POST /mall/groupbuy/export` - 导出拼团活动列表
+- `PUT /mall/groupbuy/changeStatus/{id}` - 启用/禁用拼团活动
+
+#### 拼团活动 (`/app/mall/groupbuy`)
+
+- `GET /app/mall/groupbuy/list` - 查询可用拼团活动列表
+- `GET /app/mall/groupbuy/{id}` - 获取拼团活动详情
+- `GET /app/mall/groupbuy/sku/{skuId}` - 根据SKU ID查询拼团活动
+
+#### 砍价活动管理 (`/mall/bargain`)
+
+- `GET /mall/bargain/list` - 查询砍价活动列表（分页）
+- `GET /mall/bargain/{id}` - 获取砍价活动详情
+- `POST /mall/bargain` - 新增砍价活动
+- `PUT /mall/bargain` - 修改砍价活动
+- `DELETE /mall/bargain/{ids}` - 删除砍价活动
+- `POST /mall/bargain/export` - 导出砍价活动列表
+- `PUT /mall/bargain/changeStatus/{id}` - 启用/禁用砍价活动
+
+#### 砍价活动 (`/app/mall/bargain`)
+
+- `GET /app/mall/bargain/list` - 查询可用砍价活动列表
+- `GET /app/mall/bargain/{id}` - 获取砍价活动详情
+- `GET /app/mall/bargain/sku/{skuId}` - 根据SKU ID查询砍价活动
+
+## 待实现功能
+
+- [x] 营销活动管理功能 ✅
+- [x] 拼团功能 ✅（基础功能已完成，订单相关功能需在交易中心模块集成）
+- [x] 秒杀功能 ✅
+- [x] 砍价功能 ✅（基础功能已完成，记录和订单相关功能需在交易中心模块集成）
+- [ ] 活动统计功能
+- [ ] 拼团订单管理和成团处理（需在交易中心模块集成）
+- [ ] 砍价记录和助力记录管理（需在交易中心模块集成）
+
+## 使用说明
+
+### 秒杀库存管理
+
+秒杀库存使用独立的库存字段 `seckill_stock`，与商品SKU库存分离。在创建秒杀订单时，需要：
+
+1. 调用 `reduceStock` 方法扣减秒杀库存
+2. 如果订单取消，调用 `restoreStock` 方法恢复秒杀库存
+3. 秒杀库存扣减失败表示库存不足，订单创建失败
+
+## 使用说明
+
+### 秒杀库存管理
+
+秒杀库存使用独立的库存字段 `seckill_stock`，与商品SKU库存分离。在创建秒杀订单时，需要：
+
+1. 调用 `reduceStock` 方法扣减秒杀库存
+2. 如果订单取消，调用 `restoreStock` 方法恢复秒杀库存
+3. 秒杀库存扣减失败表示库存不足，订单创建失败
+
+### 拼团活动管理
+
+拼团活动配置包括：
+- `groupPrice`: 拼团价格（分）
+- `groupSize`: 成团人数（至少2人）
+- `durationHours`: 拼团有效期（小时，默认24小时）
+
+注意：拼团功能只实现了活动管理，实际的拼团订单创建、成团处理等逻辑需要在交易中心模块（ruoyi-mall-trade）中集成。
+
+### 砍价活动管理
+
+砍价活动配置包括：
+- `originalPrice`: 原价（分）
+- `bargainPrice`: 砍后价（分）
+- `minPrice`: 最低价（分）
+- `helpCount`: 需要助力人数（可选，默认0）
+- `bargainStock`: 砍价库存
+- `durationHours`: 砍价有效期（小时，默认24小时）
+
+价格校验规则：
+- 砍后价必须小于原价
+- 砍后价不能小于最低价
+- 最低价必须小于原价
+
+注意：砍价功能只实现了活动管理，实际的砍价记录、助力记录、订单创建等逻辑需要在交易中心模块（ruoyi-mall-trade）中集成。
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/pom.xml b/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/pom.xml
new file mode 100644
index 0000000..d558a86
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/pom.xml
@@ -0,0 +1,81 @@
+<?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>
+        <groupId>org.dromara</groupId>
+        <artifactId>ruoyi-mall</artifactId>
+        <version>${revision}</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>ruoyi-mall-promotion</artifactId>
+
+    <description>
+        ruoyi-mall-promotion 营销中心模块
+    </description>
+
+    <dependencies>
+        <!-- 通用工具-->
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-core</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-doc</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-mybatis</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-security</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-web</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-log</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-redis</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-excel</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-satoken</artifactId>
+        </dependency>
+
+        <!-- 商品中心模块 -->
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-mall-product</artifactId>
+            <version>${revision}</version>
+        </dependency>
+
+        <!-- 优惠券模块 -->
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-mall-coupon</artifactId>
+            <version>${revision}</version>
+        </dependency>
+
+    </dependencies>
+
+</project>
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/config/MallPromotionAutoConfiguration.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/config/MallPromotionAutoConfiguration.java
new file mode 100644
index 0000000..688e0e0
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/config/MallPromotionAutoConfiguration.java
@@ -0,0 +1,23 @@
+package org.dromara.mall.promotion.config;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * 营销中心自动配置类
+ * 主要用于扫描营销中心模块的组件
+ *
+ * @author pengles
+ */
+@Slf4j
+@Configuration
+@ComponentScan(basePackages = "org.dromara.mall.promotion")
+@ConditionalOnProperty(prefix = "ruoyi.mall.promotion", name = "enabled", havingValue = "true", matchIfMissing = true)
+public class MallPromotionAutoConfiguration {
+
+    public MallPromotionAutoConfiguration() {
+        log.info("营销中心模块已启用");
+    }
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/controller/admin/AdminMallBargainController.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/controller/admin/AdminMallBargainController.java
new file mode 100644
index 0000000..096920e
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/controller/admin/AdminMallBargainController.java
@@ -0,0 +1,126 @@
+package org.dromara.mall.promotion.controller.admin;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.mall.promotion.domain.bo.MallBargainBo;
+import org.dromara.mall.promotion.domain.vo.MallBargainVo;
+import org.dromara.mall.promotion.service.MallBargainService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 砍价活动管理
+ *
+ * @author pengles
+ */
+@Tag(name = "管理端-砍价活动管理", description = "砍价活动管理接口")
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/mall/bargain")
+public class AdminMallBargainController extends BaseController {
+
+    private final MallBargainService mallBargainService;
+
+    /**
+     * 查询砍价活动列表
+     */
+    @Operation(summary = "查询砍价活动列表", description = "分页查询砍价活动列表")
+    @SaCheckPermission("mall:bargain:list")
+    @GetMapping("/list")
+    public TableDataInfo<MallBargainVo> list(@Parameter(description = "砍价活动查询条件") MallBargainBo bo,
+                                             @Parameter(description = "分页参数") PageQuery pageQuery) {
+        return mallBargainService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出砍价活动列表
+     */
+    @Operation(summary = "导出砍价活动列表", description = "导出砍价活动到Excel")
+    @SaCheckPermission("mall:bargain:export")
+    @Log(title = "砍价活动", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(@Parameter(description = "砍价活动查询条件") MallBargainBo bo,
+                      @Parameter(description = "响应对象") HttpServletResponse response) {
+        List<MallBargainVo> list = mallBargainService.queryList(bo);
+        ExcelUtil.exportExcel(list, "砍价活动", MallBargainVo.class, response);
+    }
+
+    /**
+     * 获取砍价活动详细信息
+     */
+    @Operation(summary = "获取砍价活动详情", description = "根据砍价活动ID获取详细信息")
+    @SaCheckPermission("mall:bargain:query")
+    @GetMapping("/{id}")
+    public R<MallBargainVo> getInfo(@Parameter(description = "砍价活动ID", required = true)
+                                    @NotNull(message = "主键不能为空")
+                                    @PathVariable Long id) {
+        return R.ok(mallBargainService.queryById(id));
+    }
+
+    /**
+     * 新增砍价活动
+     */
+    @Operation(summary = "新增砍价活动", description = "创建新的砍价活动")
+    @SaCheckPermission("mall:bargain:add")
+    @Log(title = "砍价活动", businessType = BusinessType.INSERT)
+    @PostMapping
+    public R<Void> add(@Parameter(description = "砍价活动信息") @Validated @RequestBody MallBargainBo bo) {
+        return toAjax(mallBargainService.insertByBo(bo));
+    }
+
+    /**
+     * 修改砍价活动
+     */
+    @Operation(summary = "修改砍价活动", description = "更新砍价活动信息")
+    @SaCheckPermission("mall:bargain:edit")
+    @Log(title = "砍价活动", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public R<Void> edit(@Parameter(description = "砍价活动信息") @Validated @RequestBody MallBargainBo bo) {
+        return toAjax(mallBargainService.updateByBo(bo));
+    }
+
+    /**
+     * 删除砍价活动
+     */
+    @Operation(summary = "删除砍价活动", description = "删除砍价活动")
+    @SaCheckPermission("mall:bargain:remove")
+    @Log(title = "砍价活动", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@Parameter(description = "砍价活动ID数组", required = true)
+                         @NotNull(message = "主键不能为空")
+                         @PathVariable Long[] ids) {
+        return toAjax(mallBargainService.deleteWithValidByIds(Arrays.asList(ids), true));
+    }
+
+    /**
+     * 启用/禁用砍价活动
+     */
+    @Operation(summary = "启用/禁用砍价活动", description = "更改砍价活动状态")
+    @SaCheckPermission("mall:bargain:edit")
+    @Log(title = "砍价活动", businessType = BusinessType.UPDATE)
+    @PutMapping("/changeStatus/{id}")
+    public R<Void> changeStatus(@Parameter(description = "砍价活动ID", required = true)
+                               @NotNull(message = "主键不能为空")
+                               @PathVariable Long id,
+                               @Parameter(description = "状态(0启用 1禁用)", required = true)
+                               @RequestParam @NotNull(message = "状态不能为空") Integer status) {
+        return toAjax(mallBargainService.changeStatus(id, status));
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/controller/admin/AdminMallGroupBuyController.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/controller/admin/AdminMallGroupBuyController.java
new file mode 100644
index 0000000..9eb0f26
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/controller/admin/AdminMallGroupBuyController.java
@@ -0,0 +1,126 @@
+package org.dromara.mall.promotion.controller.admin;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.mall.promotion.domain.bo.MallGroupBuyBo;
+import org.dromara.mall.promotion.domain.vo.MallGroupBuyVo;
+import org.dromara.mall.promotion.service.MallGroupBuyService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 拼团活动管理
+ *
+ * @author pengles
+ */
+@Tag(name = "管理端-拼团活动管理", description = "拼团活动管理接口")
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/mall/groupbuy")
+public class AdminMallGroupBuyController extends BaseController {
+
+    private final MallGroupBuyService mallGroupBuyService;
+
+    /**
+     * 查询拼团活动列表
+     */
+    @Operation(summary = "查询拼团活动列表", description = "分页查询拼团活动列表")
+    @SaCheckPermission("mall:groupbuy:list")
+    @GetMapping("/list")
+    public TableDataInfo<MallGroupBuyVo> list(@Parameter(description = "拼团活动查询条件") MallGroupBuyBo bo,
+                                              @Parameter(description = "分页参数") PageQuery pageQuery) {
+        return mallGroupBuyService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出拼团活动列表
+     */
+    @Operation(summary = "导出拼团活动列表", description = "导出拼团活动到Excel")
+    @SaCheckPermission("mall:groupbuy:export")
+    @Log(title = "拼团活动", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(@Parameter(description = "拼团活动查询条件") MallGroupBuyBo bo,
+                      @Parameter(description = "响应对象") HttpServletResponse response) {
+        List<MallGroupBuyVo> list = mallGroupBuyService.queryList(bo);
+        ExcelUtil.exportExcel(list, "拼团活动", MallGroupBuyVo.class, response);
+    }
+
+    /**
+     * 获取拼团活动详细信息
+     */
+    @Operation(summary = "获取拼团活动详情", description = "根据拼团活动ID获取详细信息")
+    @SaCheckPermission("mall:groupbuy:query")
+    @GetMapping("/{id}")
+    public R<MallGroupBuyVo> getInfo(@Parameter(description = "拼团活动ID", required = true)
+                                     @NotNull(message = "主键不能为空")
+                                     @PathVariable Long id) {
+        return R.ok(mallGroupBuyService.queryById(id));
+    }
+
+    /**
+     * 新增拼团活动
+     */
+    @Operation(summary = "新增拼团活动", description = "创建新的拼团活动")
+    @SaCheckPermission("mall:groupbuy:add")
+    @Log(title = "拼团活动", businessType = BusinessType.INSERT)
+    @PostMapping
+    public R<Void> add(@Parameter(description = "拼团活动信息") @Validated @RequestBody MallGroupBuyBo bo) {
+        return toAjax(mallGroupBuyService.insertByBo(bo));
+    }
+
+    /**
+     * 修改拼团活动
+     */
+    @Operation(summary = "修改拼团活动", description = "更新拼团活动信息")
+    @SaCheckPermission("mall:groupbuy:edit")
+    @Log(title = "拼团活动", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public R<Void> edit(@Parameter(description = "拼团活动信息") @Validated @RequestBody MallGroupBuyBo bo) {
+        return toAjax(mallGroupBuyService.updateByBo(bo));
+    }
+
+    /**
+     * 删除拼团活动
+     */
+    @Operation(summary = "删除拼团活动", description = "删除拼团活动")
+    @SaCheckPermission("mall:groupbuy:remove")
+    @Log(title = "拼团活动", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@Parameter(description = "拼团活动ID数组", required = true)
+                         @NotNull(message = "主键不能为空")
+                         @PathVariable Long[] ids) {
+        return toAjax(mallGroupBuyService.deleteWithValidByIds(Arrays.asList(ids), true));
+    }
+
+    /**
+     * 启用/禁用拼团活动
+     */
+    @Operation(summary = "启用/禁用拼团活动", description = "更改拼团活动状态")
+    @SaCheckPermission("mall:groupbuy:edit")
+    @Log(title = "拼团活动", businessType = BusinessType.UPDATE)
+    @PutMapping("/changeStatus/{id}")
+    public R<Void> changeStatus(@Parameter(description = "拼团活动ID", required = true)
+                               @NotNull(message = "主键不能为空")
+                               @PathVariable Long id,
+                               @Parameter(description = "状态(0启用 1禁用)", required = true)
+                               @RequestParam @NotNull(message = "状态不能为空") Integer status) {
+        return toAjax(mallGroupBuyService.changeStatus(id, status));
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/controller/admin/AdminMallPromotionController.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/controller/admin/AdminMallPromotionController.java
new file mode 100644
index 0000000..5466ea6
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/controller/admin/AdminMallPromotionController.java
@@ -0,0 +1,126 @@
+package org.dromara.mall.promotion.controller.admin;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.mall.promotion.domain.bo.MallPromotionBo;
+import org.dromara.mall.promotion.domain.vo.MallPromotionVo;
+import org.dromara.mall.promotion.service.MallPromotionService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 营销活动管理
+ *
+ * @author pengles
+ */
+@Tag(name = "管理端-营销活动管理", description = "营销活动管理接口")
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/mall/promotion")
+public class AdminMallPromotionController extends BaseController {
+
+    private final MallPromotionService mallPromotionService;
+
+    /**
+     * 查询营销活动列表
+     */
+    @Operation(summary = "查询营销活动列表", description = "分页查询营销活动列表")
+    @SaCheckPermission("mall:promotion:list")
+    @GetMapping("/list")
+    public TableDataInfo<MallPromotionVo> list(@Parameter(description = "营销活动查询条件") MallPromotionBo bo,
+                                               @Parameter(description = "分页参数") PageQuery pageQuery) {
+        return mallPromotionService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出营销活动列表
+     */
+    @Operation(summary = "导出营销活动列表", description = "导出营销活动到Excel")
+    @SaCheckPermission("mall:promotion:export")
+    @Log(title = "营销活动", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(@Parameter(description = "营销活动查询条件") MallPromotionBo bo,
+                       @Parameter(description = "响应对象") HttpServletResponse response) {
+        List<MallPromotionVo> list = mallPromotionService.queryList(bo);
+        ExcelUtil.exportExcel(list, "营销活动", MallPromotionVo.class, response);
+    }
+
+    /**
+     * 获取营销活动详细信息
+     */
+    @Operation(summary = "获取营销活动详情", description = "根据营销活动ID获取详细信息")
+    @SaCheckPermission("mall:promotion:query")
+    @GetMapping("/{id}")
+    public R<MallPromotionVo> getInfo(@Parameter(description = "营销活动ID", required = true)
+                                      @NotNull(message = "主键不能为空")
+                                      @PathVariable Long id) {
+        return R.ok(mallPromotionService.queryById(id));
+    }
+
+    /**
+     * 新增营销活动
+     */
+    @Operation(summary = "新增营销活动", description = "创建新的营销活动")
+    @SaCheckPermission("mall:promotion:add")
+    @Log(title = "营销活动", businessType = BusinessType.INSERT)
+    @PostMapping
+    public R<Void> add(@Parameter(description = "营销活动信息") @Validated @RequestBody MallPromotionBo bo) {
+        return toAjax(mallPromotionService.insertByBo(bo));
+    }
+
+    /**
+     * 修改营销活动
+     */
+    @Operation(summary = "修改营销活动", description = "更新营销活动信息")
+    @SaCheckPermission("mall:promotion:edit")
+    @Log(title = "营销活动", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public R<Void> edit(@Parameter(description = "营销活动信息") @Validated @RequestBody MallPromotionBo bo) {
+        return toAjax(mallPromotionService.updateByBo(bo));
+    }
+
+    /**
+     * 删除营销活动
+     */
+    @Operation(summary = "删除营销活动", description = "删除营销活动")
+    @SaCheckPermission("mall:promotion:remove")
+    @Log(title = "营销活动", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@Parameter(description = "营销活动ID数组", required = true)
+                          @NotNull(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(mallPromotionService.deleteWithValidByIds(Arrays.asList(ids), true));
+    }
+
+    /**
+     * 启用/禁用营销活动
+     */
+    @Operation(summary = "启用/禁用营销活动", description = "更改营销活动状态")
+    @SaCheckPermission("mall:promotion:edit")
+    @Log(title = "营销活动", businessType = BusinessType.UPDATE)
+    @PutMapping("/changeStatus/{id}")
+    public R<Void> changeStatus(@Parameter(description = "营销活动ID", required = true)
+                                @NotNull(message = "主键不能为空")
+                                @PathVariable Long id,
+                                @Parameter(description = "状态(0启用 1禁用)", required = true)
+                                @RequestParam @NotNull(message = "状态不能为空") Integer status) {
+        return toAjax(mallPromotionService.changeStatus(id, status));
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/controller/admin/AdminMallSeckillController.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/controller/admin/AdminMallSeckillController.java
new file mode 100644
index 0000000..bceea3b
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/controller/admin/AdminMallSeckillController.java
@@ -0,0 +1,126 @@
+package org.dromara.mall.promotion.controller.admin;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.mall.promotion.domain.bo.MallSeckillBo;
+import org.dromara.mall.promotion.domain.vo.MallSeckillVo;
+import org.dromara.mall.promotion.service.MallSeckillService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 秒杀活动管理
+ *
+ * @author pengles
+ */
+@Tag(name = "管理端-秒杀活动管理", description = "秒杀活动管理接口")
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/mall/seckill")
+public class AdminMallSeckillController extends BaseController {
+
+    private final MallSeckillService mallSeckillService;
+
+    /**
+     * 查询秒杀活动列表
+     */
+    @Operation(summary = "查询秒杀活动列表", description = "分页查询秒杀活动列表")
+    @SaCheckPermission("mall:seckill:list")
+    @GetMapping("/list")
+    public TableDataInfo<MallSeckillVo> list(@Parameter(description = "秒杀活动查询条件") MallSeckillBo bo,
+                                             @Parameter(description = "分页参数") PageQuery pageQuery) {
+        return mallSeckillService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出秒杀活动列表
+     */
+    @Operation(summary = "导出秒杀活动列表", description = "导出秒杀活动到Excel")
+    @SaCheckPermission("mall:seckill:export")
+    @Log(title = "秒杀活动", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(@Parameter(description = "秒杀活动查询条件") MallSeckillBo bo,
+                       @Parameter(description = "响应对象") HttpServletResponse response) {
+        List<MallSeckillVo> list = mallSeckillService.queryList(bo);
+        ExcelUtil.exportExcel(list, "秒杀活动", MallSeckillVo.class, response);
+    }
+
+    /**
+     * 获取秒杀活动详细信息
+     */
+    @Operation(summary = "获取秒杀活动详情", description = "根据秒杀活动ID获取详细信息")
+    @SaCheckPermission("mall:seckill:query")
+    @GetMapping("/{id}")
+    public R<MallSeckillVo> getInfo(@Parameter(description = "秒杀活动ID", required = true)
+                                    @NotNull(message = "主键不能为空")
+                                    @PathVariable Long id) {
+        return R.ok(mallSeckillService.queryById(id));
+    }
+
+    /**
+     * 新增秒杀活动
+     */
+    @Operation(summary = "新增秒杀活动", description = "创建新的秒杀活动")
+    @SaCheckPermission("mall:seckill:add")
+    @Log(title = "秒杀活动", businessType = BusinessType.INSERT)
+    @PostMapping
+    public R<Void> add(@Parameter(description = "秒杀活动信息") @Validated @RequestBody MallSeckillBo bo) {
+        return toAjax(mallSeckillService.insertByBo(bo));
+    }
+
+    /**
+     * 修改秒杀活动
+     */
+    @Operation(summary = "修改秒杀活动", description = "更新秒杀活动信息")
+    @SaCheckPermission("mall:seckill:edit")
+    @Log(title = "秒杀活动", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public R<Void> edit(@Parameter(description = "秒杀活动信息") @Validated @RequestBody MallSeckillBo bo) {
+        return toAjax(mallSeckillService.updateByBo(bo));
+    }
+
+    /**
+     * 删除秒杀活动
+     */
+    @Operation(summary = "删除秒杀活动", description = "删除秒杀活动")
+    @SaCheckPermission("mall:seckill:remove")
+    @Log(title = "秒杀活动", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@Parameter(description = "秒杀活动ID数组", required = true)
+                          @NotNull(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(mallSeckillService.deleteWithValidByIds(Arrays.asList(ids), true));
+    }
+
+    /**
+     * 启用/禁用秒杀活动
+     */
+    @Operation(summary = "启用/禁用秒杀活动", description = "更改秒杀活动状态")
+    @SaCheckPermission("mall:seckill:edit")
+    @Log(title = "秒杀活动", businessType = BusinessType.UPDATE)
+    @PutMapping("/changeStatus/{id}")
+    public R<Void> changeStatus(@Parameter(description = "秒杀活动ID", required = true)
+                                @NotNull(message = "主键不能为空")
+                                @PathVariable Long id,
+                                @Parameter(description = "状态(0启用 1禁用)", required = true)
+                                @RequestParam @NotNull(message = "状态不能为空") Integer status) {
+        return toAjax(mallSeckillService.changeStatus(id, status));
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/controller/app/AppMallBargainController.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/controller/app/AppMallBargainController.java
new file mode 100644
index 0000000..7c39376
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/controller/app/AppMallBargainController.java
@@ -0,0 +1,64 @@
+package org.dromara.mall.promotion.controller.app;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.mall.promotion.domain.vo.MallBargainVo;
+import org.dromara.mall.promotion.service.MallBargainService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * 砍价活动（移动端）
+ *
+ * @author pengles
+ */
+@Tag(name = "移动端-砍价活动", description = "砍价活动接口")
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/app/mall/bargain")
+public class AppMallBargainController extends BaseController {
+
+    private final MallBargainService mallBargainService;
+
+    /**
+     * 查询可用砍价活动列表
+     */
+    @Operation(summary = "查询可用砍价活动列表", description = "查询当前可用的砍价活动列表")
+    @GetMapping("/list")
+    public R<List<MallBargainVo>> list() {
+        List<MallBargainVo> list = mallBargainService.queryAvailableList();
+        return R.ok(list);
+    }
+
+    /**
+     * 获取砍价活动详情
+     */
+    @Operation(summary = "获取砍价活动详情", description = "根据砍价活动ID获取详细信息")
+    @GetMapping("/{id}")
+    public R<MallBargainVo> getInfo(@Parameter(description = "砍价活动ID", required = true)
+                                     @PathVariable Long id) {
+        return R.ok(mallBargainService.queryById(id));
+    }
+
+    /**
+     * 根据SKU ID查询砍价活动
+     */
+    @Operation(summary = "根据SKU ID查询砍价活动", description = "查询指定SKU的砍价活动")
+    @GetMapping("/sku/{skuId}")
+    public R<MallBargainVo> getBySkuId(@Parameter(description = "SKU ID", required = true)
+                                        @PathVariable Long skuId) {
+        MallBargainVo vo = mallBargainService.queryBySkuId(skuId);
+        return R.ok(vo);
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/controller/app/AppMallGroupBuyController.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/controller/app/AppMallGroupBuyController.java
new file mode 100644
index 0000000..a1f5a73
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/controller/app/AppMallGroupBuyController.java
@@ -0,0 +1,64 @@
+package org.dromara.mall.promotion.controller.app;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.mall.promotion.domain.vo.MallGroupBuyVo;
+import org.dromara.mall.promotion.service.MallGroupBuyService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * 拼团活动（移动端）
+ *
+ * @author pengles
+ */
+@Tag(name = "移动端-拼团活动", description = "拼团活动接口")
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/app/mall/groupbuy")
+public class AppMallGroupBuyController extends BaseController {
+
+    private final MallGroupBuyService mallGroupBuyService;
+
+    /**
+     * 查询可用拼团活动列表
+     */
+    @Operation(summary = "查询可用拼团活动列表", description = "查询当前可用的拼团活动列表")
+    @GetMapping("/list")
+    public R<List<MallGroupBuyVo>> list() {
+        List<MallGroupBuyVo> list = mallGroupBuyService.queryAvailableList();
+        return R.ok(list);
+    }
+
+    /**
+     * 获取拼团活动详情
+     */
+    @Operation(summary = "获取拼团活动详情", description = "根据拼团活动ID获取详细信息")
+    @GetMapping("/{id}")
+    public R<MallGroupBuyVo> getInfo(@Parameter(description = "拼团活动ID", required = true)
+                                     @PathVariable Long id) {
+        return R.ok(mallGroupBuyService.queryById(id));
+    }
+
+    /**
+     * 根据SKU ID查询拼团活动
+     */
+    @Operation(summary = "根据SKU ID查询拼团活动", description = "查询指定SKU的拼团活动")
+    @GetMapping("/sku/{skuId}")
+    public R<MallGroupBuyVo> getBySkuId(@Parameter(description = "SKU ID", required = true)
+                                        @PathVariable Long skuId) {
+        MallGroupBuyVo vo = mallGroupBuyService.queryBySkuId(skuId);
+        return R.ok(vo);
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/controller/app/AppMallPromotionController.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/controller/app/AppMallPromotionController.java
new file mode 100644
index 0000000..a83e2f3
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/controller/app/AppMallPromotionController.java
@@ -0,0 +1,57 @@
+package org.dromara.mall.promotion.controller.app;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.mall.promotion.domain.bo.MallPromotionBo;
+import org.dromara.mall.promotion.domain.vo.MallPromotionVo;
+import org.dromara.mall.promotion.service.MallPromotionService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 营销活动（移动端）
+ *
+ * @author pengles
+ */
+@Tag(name = "移动端-营销活动", description = "营销活动接口")
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/app/mall/promotion")
+public class AppMallPromotionController extends BaseController {
+
+    private final MallPromotionService mallPromotionService;
+
+    /**
+     * 查询营销活动列表（按类型）
+     */
+    @Operation(summary = "查询营销活动列表", description = "根据活动类型查询启用的营销活动列表")
+    @GetMapping("/list")
+    public R<List<MallPromotionVo>> list(@Parameter(description = "活动类型(0普通活动 1拼团 2秒杀 3砍价)")
+                                         @RequestParam(required = false) Integer type) {
+        List<MallPromotionVo> list;
+        if (type != null) {
+            list = mallPromotionService.queryListByType(type);
+        } else {
+            list = mallPromotionService.queryList(new MallPromotionBo());
+        }
+        return R.ok(list);
+    }
+
+    /**
+     * 获取营销活动详情
+     */
+    @Operation(summary = "获取营销活动详情", description = "根据营销活动ID获取详细信息")
+    @GetMapping("/{id}")
+    public R<MallPromotionVo> getInfo(@Parameter(description = "营销活动ID", required = true)
+                                      @PathVariable Long id) {
+        return R.ok(mallPromotionService.queryById(id));
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/controller/app/AppMallSeckillController.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/controller/app/AppMallSeckillController.java
new file mode 100644
index 0000000..920f1ae
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/controller/app/AppMallSeckillController.java
@@ -0,0 +1,64 @@
+package org.dromara.mall.promotion.controller.app;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.mall.promotion.domain.vo.MallSeckillVo;
+import org.dromara.mall.promotion.service.MallSeckillService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * 秒杀活动（移动端）
+ *
+ * @author pengles
+ */
+@Tag(name = "移动端-秒杀活动", description = "秒杀活动接口")
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/app/mall/seckill")
+public class AppMallSeckillController extends BaseController {
+
+    private final MallSeckillService mallSeckillService;
+
+    /**
+     * 查询可用秒杀活动列表
+     */
+    @Operation(summary = "查询可用秒杀活动列表", description = "查询当前可用的秒杀活动列表")
+    @GetMapping("/list")
+    public R<List<MallSeckillVo>> list() {
+        List<MallSeckillVo> list = mallSeckillService.queryAvailableList();
+        return R.ok(list);
+    }
+
+    /**
+     * 获取秒杀活动详情
+     */
+    @Operation(summary = "获取秒杀活动详情", description = "根据秒杀活动ID获取详细信息")
+    @GetMapping("/{id}")
+    public R<MallSeckillVo> getInfo(@Parameter(description = "秒杀活动ID", required = true)
+                                    @PathVariable Long id) {
+        return R.ok(mallSeckillService.queryById(id));
+    }
+
+    /**
+     * 根据SKU ID查询秒杀活动
+     */
+    @Operation(summary = "根据SKU ID查询秒杀活动", description = "查询指定SKU的秒杀活动")
+    @GetMapping("/sku/{skuId}")
+    public R<MallSeckillVo> getBySkuId(@Parameter(description = "SKU ID", required = true)
+                                       @PathVariable Long skuId) {
+        MallSeckillVo vo = mallSeckillService.queryBySkuId(skuId);
+        return R.ok(vo);
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/domain/MallBargain.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/domain/MallBargain.java
new file mode 100644
index 0000000..592a4fa
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/domain/MallBargain.java
@@ -0,0 +1,102 @@
+package org.dromara.mall.promotion.domain;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 砍价活动对象 mall_bargain
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode
+@TableName("mall_bargain")
+public class MallBargain implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 砍价ID
+     */
+    @TableId
+    private Long id;
+
+    /**
+     * 活动ID
+     */
+    private Long promotionId;
+
+    /**
+     * SKU ID
+     */
+    private Long skuId;
+
+    /**
+     * 砍后价(分)
+     */
+    private Integer bargainPrice;
+
+    /**
+     * 原价(分)
+     */
+    private Integer originalPrice;
+
+    /**
+     * 砍价库存
+     */
+    private Integer bargainStock;
+
+    /**
+     * 最低价(分)
+     */
+    private Integer minPrice;
+
+    /**
+     * 需要助力人数
+     */
+    private Integer helpCount;
+
+    /**
+     * 砍价有效期(小时)
+     */
+    private Integer durationHours;
+
+    /**
+     * 状态(0启用 1禁用)
+     */
+    private Integer status;
+
+    /**
+     * 创建者
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 更新者
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private String updateBy;
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/domain/MallGroupBuy.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/domain/MallGroupBuy.java
new file mode 100644
index 0000000..84c6f67
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/domain/MallGroupBuy.java
@@ -0,0 +1,87 @@
+package org.dromara.mall.promotion.domain;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 拼团活动对象 mall_group_buy
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode
+@TableName("mall_group_buy")
+public class MallGroupBuy implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 拼团ID
+     */
+    @TableId
+    private Long id;
+
+    /**
+     * 活动ID
+     */
+    private Long promotionId;
+
+    /**
+     * SKU ID
+     */
+    private Long skuId;
+
+    /**
+     * 拼团价(分)
+     */
+    private Integer groupPrice;
+
+    /**
+     * 成团人数
+     */
+    private Integer groupSize;
+
+    /**
+     * 拼团有效期(小时)
+     */
+    private Integer durationHours;
+
+    /**
+     * 状态(0启用 1禁用)
+     */
+    private Integer status;
+
+    /**
+     * 创建者
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 更新者
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private String updateBy;
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/domain/MallGroupBuyOrder.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/domain/MallGroupBuyOrder.java
new file mode 100644
index 0000000..4f03cd7
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/domain/MallGroupBuyOrder.java
@@ -0,0 +1,71 @@
+package org.dromara.mall.promotion.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 拼团订单对象 mall_group_buy_order
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode
+@TableName("mall_group_buy_order")
+public class MallGroupBuyOrder implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @TableId
+    private Long id;
+
+    /**
+     * 拼团ID
+     */
+    private Long groupBuyId;
+
+    /**
+     * 拼团编号
+     */
+    private String groupNo;
+
+    /**
+     * 订单ID
+     */
+    private Long orderId;
+
+    /**
+     * 用户ID
+     */
+    private Long userId;
+
+    /**
+     * 状态(0拼团中 1已成团 2已失败)
+     */
+    private Integer status;
+
+    /**
+     * 成团时间
+     */
+    private Date successTime;
+
+    /**
+     * 过期时间
+     */
+    private Date expireTime;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/domain/MallPromotion.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/domain/MallPromotion.java
new file mode 100644
index 0000000..927b2b0
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/domain/MallPromotion.java
@@ -0,0 +1,92 @@
+package org.dromara.mall.promotion.domain;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 营销活动对象 mall_promotion
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode
+@TableName("mall_promotion")
+public class MallPromotion implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 活动ID
+     */
+    @TableId
+    private Long id;
+
+    /**
+     * 活动名称
+     */
+    private String name;
+
+    /**
+     * 活动类型(0普通活动 1拼团 2秒杀 3砍价)
+     */
+    private Integer type;
+
+    /**
+     * 开始时间
+     */
+    private Date startTime;
+
+    /**
+     * 结束时间
+     */
+    private Date endTime;
+
+    /**
+     * 活动规则(JSON)
+     */
+    private String rules;
+
+    /**
+     * 状态(0启用 1禁用)
+     */
+    private Integer status;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 创建者
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 更新者
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private String updateBy;
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/domain/MallSeckill.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/domain/MallSeckill.java
new file mode 100644
index 0000000..b424a98
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/domain/MallSeckill.java
@@ -0,0 +1,92 @@
+package org.dromara.mall.promotion.domain;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 秒杀活动对象 mall_seckill
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode
+@TableName("mall_seckill")
+public class MallSeckill implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 秒杀ID
+     */
+    @TableId
+    private Long id;
+
+    /**
+     * 活动ID
+     */
+    private Long promotionId;
+
+    /**
+     * SKU ID
+     */
+    private Long skuId;
+
+    /**
+     * 秒杀价(分)
+     */
+    private Integer seckillPrice;
+
+    /**
+     * 秒杀库存
+     */
+    private Integer seckillStock;
+
+    /**
+     * 开始时间
+     */
+    private Date startTime;
+
+    /**
+     * 结束时间
+     */
+    private Date endTime;
+
+    /**
+     * 状态(0启用 1禁用)
+     */
+    private Integer status;
+
+    /**
+     * 创建者
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 更新者
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private String updateBy;
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/domain/bo/MallBargainBo.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/domain/bo/MallBargainBo.java
new file mode 100644
index 0000000..6cf2510
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/domain/bo/MallBargainBo.java
@@ -0,0 +1,86 @@
+package org.dromara.mall.promotion.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.mall.promotion.domain.MallBargain;
+
+/**
+ * 砍价活动业务对象 mall_bargain
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = MallBargain.class, reverseConvertGenerate = false)
+public class MallBargainBo extends BaseEntity {
+
+    /**
+     * 砍价ID
+     */
+    @NotNull(message = "砍价ID不能为空", groups = {EditGroup.class})
+    private Long id;
+
+    /**
+     * 活动ID
+     */
+    @NotNull(message = "活动ID不能为空", groups = {AddGroup.class, EditGroup.class})
+    private Long promotionId;
+
+    /**
+     * SKU ID
+     */
+    @NotNull(message = "SKU ID不能为空", groups = {AddGroup.class, EditGroup.class})
+    private Long skuId;
+
+    /**
+     * 砍后价(分)
+     */
+    @NotNull(message = "砍后价不能为空", groups = {AddGroup.class, EditGroup.class})
+    @Min(value = 1, message = "砍后价必须大于0")
+    private Integer bargainPrice;
+
+    /**
+     * 原价(分)
+     */
+    @NotNull(message = "原价不能为空", groups = {AddGroup.class, EditGroup.class})
+    @Min(value = 1, message = "原价必须大于0")
+    private Integer originalPrice;
+
+    /**
+     * 砍价库存
+     */
+    @NotNull(message = "砍价库存不能为空", groups = {AddGroup.class, EditGroup.class})
+    @Min(value = 1, message = "砍价库存必须大于0")
+    private Integer bargainStock;
+
+    /**
+     * 最低价(分)
+     */
+    @NotNull(message = "最低价不能为空", groups = {AddGroup.class, EditGroup.class})
+    @Min(value = 1, message = "最低价必须大于0")
+    private Integer minPrice;
+
+    /**
+     * 需要助力人数
+     */
+    @Min(value = 0, message = "需要助力人数不能为负数")
+    private Integer helpCount;
+
+    /**
+     * 砍价有效期(小时)
+     */
+    @Min(value = 1, message = "砍价有效期必须大于0")
+    private Integer durationHours;
+
+    /**
+     * 状态(0启用 1禁用)
+     */
+    private Integer status;
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/domain/bo/MallGroupBuyBo.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/domain/bo/MallGroupBuyBo.java
new file mode 100644
index 0000000..f05f657
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/domain/bo/MallGroupBuyBo.java
@@ -0,0 +1,66 @@
+package org.dromara.mall.promotion.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.mall.promotion.domain.MallGroupBuy;
+
+/**
+ * 拼团活动业务对象 mall_group_buy
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = MallGroupBuy.class, reverseConvertGenerate = false)
+public class MallGroupBuyBo extends BaseEntity {
+
+    /**
+     * 拼团ID
+     */
+    @NotNull(message = "拼团ID不能为空", groups = {EditGroup.class})
+    private Long id;
+
+    /**
+     * 活动ID
+     */
+    @NotNull(message = "活动ID不能为空", groups = {AddGroup.class, EditGroup.class})
+    private Long promotionId;
+
+    /**
+     * SKU ID
+     */
+    @NotNull(message = "SKU ID不能为空", groups = {AddGroup.class, EditGroup.class})
+    private Long skuId;
+
+    /**
+     * 拼团价(分)
+     */
+    @NotNull(message = "拼团价不能为空", groups = {AddGroup.class, EditGroup.class})
+    @Min(value = 1, message = "拼团价必须大于0")
+    private Integer groupPrice;
+
+    /**
+     * 成团人数
+     */
+    @NotNull(message = "成团人数不能为空", groups = {AddGroup.class, EditGroup.class})
+    @Min(value = 2, message = "成团人数至少为2人")
+    private Integer groupSize;
+
+    /**
+     * 拼团有效期(小时)
+     */
+    @Min(value = 1, message = "拼团有效期必须大于0")
+    private Integer durationHours;
+
+    /**
+     * 状态(0启用 1禁用)
+     */
+    private Integer status;
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/domain/bo/MallPromotionBo.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/domain/bo/MallPromotionBo.java
new file mode 100644
index 0000000..9f23cbf
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/domain/bo/MallPromotionBo.java
@@ -0,0 +1,73 @@
+package org.dromara.mall.promotion.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.mall.promotion.domain.MallPromotion;
+
+import java.util.Date;
+
+/**
+ * 营销活动业务对象 mall_promotion
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = MallPromotion.class, reverseConvertGenerate = false)
+public class MallPromotionBo extends BaseEntity {
+
+    /**
+     * 活动ID
+     */
+    @NotNull(message = "活动ID不能为空", groups = {EditGroup.class})
+    private Long id;
+
+    /**
+     * 活动名称
+     */
+    @NotBlank(message = "活动名称不能为空", groups = {AddGroup.class, EditGroup.class})
+    @Size(max = 128, message = "活动名称长度不能超过128个字符")
+    private String name;
+
+    /**
+     * 活动类型(0普通活动 1拼团 2秒杀 3砍价)
+     */
+    @NotNull(message = "活动类型不能为空", groups = {AddGroup.class, EditGroup.class})
+    private Integer type;
+
+    /**
+     * 开始时间
+     */
+    @NotNull(message = "开始时间不能为空", groups = {AddGroup.class, EditGroup.class})
+    private Date startTime;
+
+    /**
+     * 结束时间
+     */
+    @NotNull(message = "结束时间不能为空", groups = {AddGroup.class, EditGroup.class})
+    private Date endTime;
+
+    /**
+     * 活动规则(JSON)
+     */
+    private String rules;
+
+    /**
+     * 状态(0启用 1禁用)
+     */
+    private Integer status;
+
+    /**
+     * 备注
+     */
+    @Size(max = 512, message = "备注长度不能超过512个字符")
+    private String remark;
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/domain/bo/MallSeckillBo.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/domain/bo/MallSeckillBo.java
new file mode 100644
index 0000000..f8901a4
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/domain/bo/MallSeckillBo.java
@@ -0,0 +1,74 @@
+package org.dromara.mall.promotion.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.mall.promotion.domain.MallSeckill;
+
+import java.util.Date;
+
+/**
+ * 秒杀活动业务对象 mall_seckill
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = MallSeckill.class, reverseConvertGenerate = false)
+public class MallSeckillBo extends BaseEntity {
+
+    /**
+     * 秒杀ID
+     */
+    @NotNull(message = "秒杀ID不能为空", groups = {EditGroup.class})
+    private Long id;
+
+    /**
+     * 活动ID
+     */
+    @NotNull(message = "活动ID不能为空", groups = {AddGroup.class, EditGroup.class})
+    private Long promotionId;
+
+    /**
+     * SKU ID
+     */
+    @NotNull(message = "SKU ID不能为空", groups = {AddGroup.class, EditGroup.class})
+    private Long skuId;
+
+    /**
+     * 秒杀价(分)
+     */
+    @NotNull(message = "秒杀价不能为空", groups = {AddGroup.class, EditGroup.class})
+    @Min(value = 1, message = "秒杀价必须大于0")
+    private Integer seckillPrice;
+
+    /**
+     * 秒杀库存
+     */
+    @NotNull(message = "秒杀库存不能为空", groups = {AddGroup.class, EditGroup.class})
+    @Min(value = 1, message = "秒杀库存必须大于0")
+    private Integer seckillStock;
+
+    /**
+     * 开始时间
+     */
+    @NotNull(message = "开始时间不能为空", groups = {AddGroup.class, EditGroup.class})
+    private Date startTime;
+
+    /**
+     * 结束时间
+     */
+    @NotNull(message = "结束时间不能为空", groups = {AddGroup.class, EditGroup.class})
+    private Date endTime;
+
+    /**
+     * 状态(0启用 1禁用)
+     */
+    private Integer status;
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/domain/vo/MallBargainVo.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/domain/vo/MallBargainVo.java
new file mode 100644
index 0000000..f901142
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/domain/vo/MallBargainVo.java
@@ -0,0 +1,98 @@
+package org.dromara.mall.promotion.domain.vo;
+
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.mall.promotion.domain.MallBargain;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 砍价活动视图对象 mall_bargain
+ *
+ * @author pengles
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = MallBargain.class)
+public class MallBargainVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 砍价ID
+     */
+    @ExcelProperty(value = "砍价ID")
+    private Long id;
+
+    /**
+     * 活动ID
+     */
+    @ExcelProperty(value = "活动ID")
+    private Long promotionId;
+
+    /**
+     * SKU ID
+     */
+    @ExcelProperty(value = "SKU ID")
+    private Long skuId;
+
+    /**
+     * 砍后价(分)
+     */
+    @ExcelProperty(value = "砍后价(分)")
+    private Integer bargainPrice;
+
+    /**
+     * 原价(分)
+     */
+    @ExcelProperty(value = "原价(分)")
+    private Integer originalPrice;
+
+    /**
+     * 砍价库存
+     */
+    @ExcelProperty(value = "砍价库存")
+    private Integer bargainStock;
+
+    /**
+     * 最低价(分)
+     */
+    @ExcelProperty(value = "最低价(分)")
+    private Integer minPrice;
+
+    /**
+     * 需要助力人数
+     */
+    @ExcelProperty(value = "需要助力人数")
+    private Integer helpCount;
+
+    /**
+     * 砍价有效期(小时)
+     */
+    @ExcelProperty(value = "砍价有效期(小时)")
+    private Integer durationHours;
+
+    /**
+     * 状态(0启用 1禁用)
+     */
+    @ExcelProperty(value = "状态")
+    private Integer status;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "创建时间")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @ExcelProperty(value = "更新时间")
+    private Date updateTime;
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/domain/vo/MallGroupBuyVo.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/domain/vo/MallGroupBuyVo.java
new file mode 100644
index 0000000..5e1ebf0
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/domain/vo/MallGroupBuyVo.java
@@ -0,0 +1,80 @@
+package org.dromara.mall.promotion.domain.vo;
+
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.mall.promotion.domain.MallGroupBuy;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 拼团活动视图对象 mall_group_buy
+ *
+ * @author pengles
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = MallGroupBuy.class)
+public class MallGroupBuyVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 拼团ID
+     */
+    @ExcelProperty(value = "拼团ID")
+    private Long id;
+
+    /**
+     * 活动ID
+     */
+    @ExcelProperty(value = "活动ID")
+    private Long promotionId;
+
+    /**
+     * SKU ID
+     */
+    @ExcelProperty(value = "SKU ID")
+    private Long skuId;
+
+    /**
+     * 拼团价(分)
+     */
+    @ExcelProperty(value = "拼团价(分)")
+    private Integer groupPrice;
+
+    /**
+     * 成团人数
+     */
+    @ExcelProperty(value = "成团人数")
+    private Integer groupSize;
+
+    /**
+     * 拼团有效期(小时)
+     */
+    @ExcelProperty(value = "拼团有效期(小时)")
+    private Integer durationHours;
+
+    /**
+     * 状态(0启用 1禁用)
+     */
+    @ExcelProperty(value = "状态")
+    private Integer status;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "创建时间")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @ExcelProperty(value = "更新时间")
+    private Date updateTime;
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/domain/vo/MallPromotionVo.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/domain/vo/MallPromotionVo.java
new file mode 100644
index 0000000..f9faf47
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/domain/vo/MallPromotionVo.java
@@ -0,0 +1,86 @@
+package org.dromara.mall.promotion.domain.vo;
+
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.mall.promotion.domain.MallPromotion;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 营销活动视图对象 mall_promotion
+ *
+ * @author pengles
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = MallPromotion.class)
+public class MallPromotionVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 活动ID
+     */
+    @ExcelProperty(value = "活动ID")
+    private Long id;
+
+    /**
+     * 活动名称
+     */
+    @ExcelProperty(value = "活动名称")
+    private String name;
+
+    /**
+     * 活动类型(0普通活动 1拼团 2秒杀 3砍价)
+     */
+    @ExcelProperty(value = "活动类型")
+    private Integer type;
+
+    /**
+     * 开始时间
+     */
+    @ExcelProperty(value = "开始时间")
+    private Date startTime;
+
+    /**
+     * 结束时间
+     */
+    @ExcelProperty(value = "结束时间")
+    private Date endTime;
+
+    /**
+     * 活动规则(JSON)
+     */
+    @ExcelProperty(value = "活动规则")
+    private String rules;
+
+    /**
+     * 状态(0启用 1禁用)
+     */
+    @ExcelProperty(value = "状态")
+    private Integer status;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "创建时间")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @ExcelProperty(value = "更新时间")
+    private Date updateTime;
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/domain/vo/MallSeckillVo.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/domain/vo/MallSeckillVo.java
new file mode 100644
index 0000000..c93aa5b
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/domain/vo/MallSeckillVo.java
@@ -0,0 +1,86 @@
+package org.dromara.mall.promotion.domain.vo;
+
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.mall.promotion.domain.MallSeckill;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 秒杀活动视图对象 mall_seckill
+ *
+ * @author pengles
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = MallSeckill.class)
+public class MallSeckillVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 秒杀ID
+     */
+    @ExcelProperty(value = "秒杀ID")
+    private Long id;
+
+    /**
+     * 活动ID
+     */
+    @ExcelProperty(value = "活动ID")
+    private Long promotionId;
+
+    /**
+     * SKU ID
+     */
+    @ExcelProperty(value = "SKU ID")
+    private Long skuId;
+
+    /**
+     * 秒杀价(分)
+     */
+    @ExcelProperty(value = "秒杀价(分)")
+    private Integer seckillPrice;
+
+    /**
+     * 秒杀库存
+     */
+    @ExcelProperty(value = "秒杀库存")
+    private Integer seckillStock;
+
+    /**
+     * 开始时间
+     */
+    @ExcelProperty(value = "开始时间")
+    private Date startTime;
+
+    /**
+     * 结束时间
+     */
+    @ExcelProperty(value = "结束时间")
+    private Date endTime;
+
+    /**
+     * 状态(0启用 1禁用)
+     */
+    @ExcelProperty(value = "状态")
+    private Integer status;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "创建时间")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @ExcelProperty(value = "更新时间")
+    private Date updateTime;
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/enums/PromotionType.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/enums/PromotionType.java
new file mode 100644
index 0000000..e6deeab
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/enums/PromotionType.java
@@ -0,0 +1,57 @@
+package org.dromara.mall.promotion.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 营销活动类型枚举
+ *
+ * @author pengles
+ */
+@Getter
+@AllArgsConstructor
+public enum PromotionType {
+
+    /**
+     * 普通活动
+     */
+    NORMAL(0, "普通活动"),
+
+    /**
+     * 拼团活动
+     */
+    GROUP_BUY(1, "拼团活动"),
+
+    /**
+     * 秒杀活动
+     */
+    SECKILL(2, "秒杀活动"),
+
+    /**
+     * 砍价活动
+     */
+    BARGAIN(3, "砍价活动");
+
+    /**
+     * 类型值
+     */
+    private final Integer value;
+
+    /**
+     * 类型名称
+     */
+    private final String name;
+
+    /**
+     * 根据值获取枚举
+     */
+    public static PromotionType getByValue(Integer value) {
+        for (PromotionType type : values()) {
+            if (type.getValue().equals(value)) {
+                return type;
+            }
+        }
+        return null;
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/job/MallPromotionJob.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/job/MallPromotionJob.java
new file mode 100644
index 0000000..5501039
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/job/MallPromotionJob.java
@@ -0,0 +1,78 @@
+package org.dromara.mall.promotion.job;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.mall.promotion.domain.MallSeckill;
+import org.dromara.mall.promotion.mapper.MallSeckillMapper;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 营销活动定时任务
+ *
+ * @author pengles
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Component
+public class MallPromotionJob {
+
+    private final MallSeckillMapper seckillMapper;
+
+    /**
+     * 秒杀活动状态更新任务
+     * 每5分钟执行一次
+     * - 扫描即将开始的活动（start_time <= 当前时间 且 status=1禁用），自动启用（status=0）
+     * - 扫描已结束的活动（end_time < 当前时间 且 status=0启用），自动禁用（status=1）
+     */
+    @Scheduled(cron = "0 0/5 * * * ?")
+    public void updateSeckillStatus() {
+        Date now = new Date();
+        int updatedCount = 0;
+
+        // 扫描即将开始的活动（start_time <= 当前时间 且 status=1禁用），自动启用
+        LambdaQueryWrapper<MallSeckill> startWrapper = new LambdaQueryWrapper<>();
+        startWrapper.le(MallSeckill::getStartTime, now);
+        startWrapper.gt(MallSeckill::getEndTime, now); // 还未结束
+        startWrapper.eq(MallSeckill::getStatus, 1); // 当前状态为禁用
+        List<MallSeckill> toStart = seckillMapper.selectList(startWrapper);
+
+        if (!toStart.isEmpty()) {
+            for (MallSeckill seckill : toStart) {
+                LambdaUpdateWrapper<MallSeckill> updateWrapper = new LambdaUpdateWrapper<>();
+                updateWrapper.eq(MallSeckill::getId, seckill.getId());
+                updateWrapper.set(MallSeckill::getStatus, 0); // 启用
+                seckillMapper.update(null, updateWrapper);
+                updatedCount++;
+                log.info("秒杀活动自动启用: id={}, promotionId={}", seckill.getId(), seckill.getPromotionId());
+            }
+        }
+
+        // 扫描已结束的活动（end_time < 当前时间 且 status=0启用），自动禁用
+        LambdaQueryWrapper<MallSeckill> endWrapper = new LambdaQueryWrapper<>();
+        endWrapper.lt(MallSeckill::getEndTime, now);
+        endWrapper.eq(MallSeckill::getStatus, 0); // 当前状态为启用
+        List<MallSeckill> toEnd = seckillMapper.selectList(endWrapper);
+
+        if (!toEnd.isEmpty()) {
+            for (MallSeckill seckill : toEnd) {
+                LambdaUpdateWrapper<MallSeckill> updateWrapper = new LambdaUpdateWrapper<>();
+                updateWrapper.eq(MallSeckill::getId, seckill.getId());
+                updateWrapper.set(MallSeckill::getStatus, 1); // 禁用
+                seckillMapper.update(null, updateWrapper);
+                updatedCount++;
+                log.info("秒杀活动自动禁用: id={}, promotionId={}", seckill.getId(), seckill.getPromotionId());
+            }
+        }
+
+        if (updatedCount > 0) {
+            log.info("秒杀活动状态更新完成，共更新{}个活动", updatedCount);
+        }
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/mapper/MallBargainMapper.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/mapper/MallBargainMapper.java
new file mode 100644
index 0000000..afe3dcf
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/mapper/MallBargainMapper.java
@@ -0,0 +1,16 @@
+package org.dromara.mall.promotion.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.mall.promotion.domain.MallBargain;
+import org.dromara.mall.promotion.domain.vo.MallBargainVo;
+
+/**
+ * 砍价活动Mapper接口
+ *
+ * @author pengles
+ */
+@Mapper
+public interface MallBargainMapper extends BaseMapperPlus<MallBargain, MallBargainVo> {
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/mapper/MallGroupBuyMapper.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/mapper/MallGroupBuyMapper.java
new file mode 100644
index 0000000..bf925c3
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/mapper/MallGroupBuyMapper.java
@@ -0,0 +1,16 @@
+package org.dromara.mall.promotion.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.mall.promotion.domain.MallGroupBuy;
+import org.dromara.mall.promotion.domain.vo.MallGroupBuyVo;
+
+/**
+ * 拼团活动Mapper接口
+ *
+ * @author pengles
+ */
+@Mapper
+public interface MallGroupBuyMapper extends BaseMapperPlus<MallGroupBuy, MallGroupBuyVo> {
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/mapper/MallPromotionMapper.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/mapper/MallPromotionMapper.java
new file mode 100644
index 0000000..16e36b5
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/mapper/MallPromotionMapper.java
@@ -0,0 +1,16 @@
+package org.dromara.mall.promotion.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.mall.promotion.domain.MallPromotion;
+import org.dromara.mall.promotion.domain.vo.MallPromotionVo;
+
+/**
+ * 营销活动Mapper接口
+ *
+ * @author pengles
+ */
+@Mapper
+public interface MallPromotionMapper extends BaseMapperPlus<MallPromotion, MallPromotionVo> {
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/mapper/MallSeckillMapper.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/mapper/MallSeckillMapper.java
new file mode 100644
index 0000000..eefe0d5
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/mapper/MallSeckillMapper.java
@@ -0,0 +1,35 @@
+package org.dromara.mall.promotion.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.mall.promotion.domain.MallSeckill;
+import org.dromara.mall.promotion.domain.vo.MallSeckillVo;
+
+/**
+ * 秒杀活动Mapper接口
+ *
+ * @author pengles
+ */
+@Mapper
+public interface MallSeckillMapper extends BaseMapperPlus<MallSeckill, MallSeckillVo> {
+
+    /**
+     * 扣减秒杀库存
+     *
+     * @param id       秒杀ID
+     * @param quantity 扣减数量
+     * @return 影响行数
+     */
+    int reduceStock(@Param("id") Long id, @Param("quantity") Integer quantity);
+
+    /**
+     * 恢复秒杀库存
+     *
+     * @param id       秒杀ID
+     * @param quantity 恢复数量
+     * @return 影响行数
+     */
+    int restoreStock(@Param("id") Long id, @Param("quantity") Integer quantity);
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/service/MallBargainService.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/service/MallBargainService.java
new file mode 100644
index 0000000..d528b0f
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/service/MallBargainService.java
@@ -0,0 +1,63 @@
+package org.dromara.mall.promotion.service;
+
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.mall.promotion.domain.bo.MallBargainBo;
+import org.dromara.mall.promotion.domain.vo.MallBargainVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 砍价活动Service接口
+ *
+ * @author pengles
+ */
+public interface MallBargainService {
+
+    /**
+     * 查询砍价活动
+     */
+    MallBargainVo queryById(Long id);
+
+    /**
+     * 查询砍价活动列表
+     */
+    TableDataInfo<MallBargainVo> queryPageList(MallBargainBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询砍价活动列表
+     */
+    List<MallBargainVo> queryList(MallBargainBo bo);
+
+    /**
+     * 查询可用的砍价活动列表（移动端）
+     */
+    List<MallBargainVo> queryAvailableList();
+
+    /**
+     * 根据SKU ID查询砍价活动
+     */
+    MallBargainVo queryBySkuId(Long skuId);
+
+    /**
+     * 新增砍价活动
+     */
+    Boolean insertByBo(MallBargainBo bo);
+
+    /**
+     * 修改砍价活动
+     */
+    Boolean updateByBo(MallBargainBo bo);
+
+    /**
+     * 校验并批量删除砍价活动信息
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    /**
+     * 启用/禁用砍价活动
+     */
+    Boolean changeStatus(Long id, Integer status);
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/service/MallGroupBuyService.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/service/MallGroupBuyService.java
new file mode 100644
index 0000000..a1b8052
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/service/MallGroupBuyService.java
@@ -0,0 +1,63 @@
+package org.dromara.mall.promotion.service;
+
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.mall.promotion.domain.bo.MallGroupBuyBo;
+import org.dromara.mall.promotion.domain.vo.MallGroupBuyVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 拼团活动Service接口
+ *
+ * @author pengles
+ */
+public interface MallGroupBuyService {
+
+    /**
+     * 查询拼团活动
+     */
+    MallGroupBuyVo queryById(Long id);
+
+    /**
+     * 查询拼团活动列表
+     */
+    TableDataInfo<MallGroupBuyVo> queryPageList(MallGroupBuyBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询拼团活动列表
+     */
+    List<MallGroupBuyVo> queryList(MallGroupBuyBo bo);
+
+    /**
+     * 查询可用的拼团活动列表（移动端）
+     */
+    List<MallGroupBuyVo> queryAvailableList();
+
+    /**
+     * 根据SKU ID查询拼团活动
+     */
+    MallGroupBuyVo queryBySkuId(Long skuId);
+
+    /**
+     * 新增拼团活动
+     */
+    Boolean insertByBo(MallGroupBuyBo bo);
+
+    /**
+     * 修改拼团活动
+     */
+    Boolean updateByBo(MallGroupBuyBo bo);
+
+    /**
+     * 校验并批量删除拼团活动信息
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    /**
+     * 启用/禁用拼团活动
+     */
+    Boolean changeStatus(Long id, Integer status);
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/service/MallPromotionService.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/service/MallPromotionService.java
new file mode 100644
index 0000000..35dc713
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/service/MallPromotionService.java
@@ -0,0 +1,60 @@
+package org.dromara.mall.promotion.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.mall.promotion.domain.MallPromotion;
+import org.dromara.mall.promotion.domain.bo.MallPromotionBo;
+import org.dromara.mall.promotion.domain.vo.MallPromotionVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 营销活动Service接口
+ *
+ * @author pengles
+ */
+public interface MallPromotionService extends IService<MallPromotion> {
+
+    /**
+     * 查询营销活动
+     */
+    MallPromotionVo queryById(Long id);
+
+    /**
+     * 查询营销活动列表
+     */
+    TableDataInfo<MallPromotionVo> queryPageList(MallPromotionBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询营销活动列表
+     */
+    List<MallPromotionVo> queryList(MallPromotionBo bo);
+
+    /**
+     * 新增营销活动
+     */
+    Boolean insertByBo(MallPromotionBo bo);
+
+    /**
+     * 修改营销活动
+     */
+    Boolean updateByBo(MallPromotionBo bo);
+
+    /**
+     * 校验并批量删除营销活动信息
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    /**
+     * 启用/禁用营销活动
+     */
+    Boolean changeStatus(Long id, Integer status);
+
+    /**
+     * 根据活动类型查询活动列表
+     */
+    List<MallPromotionVo> queryListByType(Integer type);
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/service/MallSeckillService.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/service/MallSeckillService.java
new file mode 100644
index 0000000..850f06a
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/service/MallSeckillService.java
@@ -0,0 +1,89 @@
+package org.dromara.mall.promotion.service;
+
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.mall.promotion.domain.bo.MallSeckillBo;
+import org.dromara.mall.promotion.domain.vo.MallSeckillVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 秒杀活动Service接口
+ *
+ * @author pengles
+ */
+public interface MallSeckillService {
+
+    /**
+     * 查询秒杀活动
+     */
+    MallSeckillVo queryById(Long id);
+
+    /**
+     * 查询秒杀活动列表
+     */
+    TableDataInfo<MallSeckillVo> queryPageList(MallSeckillBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询秒杀活动列表
+     */
+    List<MallSeckillVo> queryList(MallSeckillBo bo);
+
+    /**
+     * 查询可用的秒杀活动列表（移动端）
+     */
+    List<MallSeckillVo> queryAvailableList();
+
+    /**
+     * 根据SKU ID查询秒杀活动
+     */
+    MallSeckillVo queryBySkuId(Long skuId);
+
+    /**
+     * 新增秒杀活动
+     */
+    Boolean insertByBo(MallSeckillBo bo);
+
+    /**
+     * 修改秒杀活动
+     */
+    Boolean updateByBo(MallSeckillBo bo);
+
+    /**
+     * 校验并批量删除秒杀活动信息
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    /**
+     * 启用/禁用秒杀活动
+     */
+    Boolean changeStatus(Long id, Integer status);
+
+    /**
+     * 扣减秒杀库存
+     *
+     * @param id       秒杀ID
+     * @param quantity 扣减数量
+     * @return 是否成功
+     */
+    Boolean reduceStock(Long id, Integer quantity);
+
+    /**
+     * 恢复秒杀库存
+     *
+     * @param id       秒杀ID
+     * @param quantity 恢复数量
+     * @return 是否成功
+     */
+    Boolean restoreStock(Long id, Integer quantity);
+
+    /**
+     * 检查秒杀活动是否可用
+     *
+     * @param id 秒杀ID
+     * @return 是否可用
+     */
+    Boolean checkAvailable(Long id);
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/service/impl/MallBargainServiceImpl.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/service/impl/MallBargainServiceImpl.java
new file mode 100644
index 0000000..b596592
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/service/impl/MallBargainServiceImpl.java
@@ -0,0 +1,210 @@
+package org.dromara.mall.promotion.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.mall.promotion.domain.MallBargain;
+import org.dromara.mall.promotion.domain.MallPromotion;
+import org.dromara.mall.promotion.domain.bo.MallBargainBo;
+import org.dromara.mall.promotion.domain.vo.MallBargainVo;
+import org.dromara.mall.promotion.mapper.MallBargainMapper;
+import org.dromara.mall.promotion.mapper.MallPromotionMapper;
+import org.dromara.mall.promotion.service.MallBargainService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 砍价活动Service业务层处理
+ *
+ * @author pengles
+ */
+@RequiredArgsConstructor
+@Service
+public class MallBargainServiceImpl extends ServiceImpl<MallBargainMapper, MallBargain> implements MallBargainService {
+
+    private final MallBargainMapper baseMapper;
+    private final MallPromotionMapper promotionMapper;
+
+    /**
+     * 查询砍价活动
+     */
+    @Override
+    public MallBargainVo queryById(Long id) {
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 查询砍价活动列表
+     */
+    @Override
+    public TableDataInfo<MallBargainVo> queryPageList(MallBargainBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<MallBargain> lqw = buildQueryWrapper(bo);
+        Page<MallBargainVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询砍价活动列表
+     */
+    @Override
+    public List<MallBargainVo> queryList(MallBargainBo bo) {
+        LambdaQueryWrapper<MallBargain> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<MallBargain> buildQueryWrapper(MallBargainBo bo) {
+        LambdaQueryWrapper<MallBargain> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getPromotionId() != null, MallBargain::getPromotionId, bo.getPromotionId());
+        lqw.eq(bo.getSkuId() != null, MallBargain::getSkuId, bo.getSkuId());
+        lqw.eq(bo.getStatus() != null, MallBargain::getStatus, bo.getStatus());
+        lqw.orderByDesc(MallBargain::getCreateTime);
+        return lqw;
+    }
+
+    /**
+     * 查询可用的砍价活动列表（移动端）
+     */
+    @Override
+    public List<MallBargainVo> queryAvailableList() {
+        LambdaQueryWrapper<MallBargain> lqw = Wrappers.lambdaQuery();
+        lqw.eq(MallBargain::getStatus, 0); // 启用状态
+        lqw.gt(MallBargain::getBargainStock, 0); // 有库存
+        lqw.orderByDesc(MallBargain::getCreateTime);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    /**
+     * 根据SKU ID查询砍价活动
+     */
+    @Override
+    public MallBargainVo queryBySkuId(Long skuId) {
+        LambdaQueryWrapper<MallBargain> lqw = Wrappers.lambdaQuery();
+        lqw.eq(MallBargain::getSkuId, skuId);
+        lqw.eq(MallBargain::getStatus, 0); // 启用状态
+        lqw.gt(MallBargain::getBargainStock, 0); // 有库存
+        lqw.orderByDesc(MallBargain::getCreateTime);
+        lqw.last("LIMIT 1");
+        return baseMapper.selectVoOne(lqw);
+    }
+
+    /**
+     * 新增砍价活动
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean insertByBo(MallBargainBo bo) {
+        MallBargain add = MapstructUtils.convert(bo, MallBargain.class);
+        validEntityBeforeSave(add);
+
+        // 设置默认值
+        if (add.getStatus() == null) {
+            add.setStatus(0); // 默认启用
+        }
+        if (add.getDurationHours() == null) {
+            add.setDurationHours(24); // 默认24小时
+        }
+        if (add.getHelpCount() == null) {
+            add.setHelpCount(0); // 默认0人
+        }
+
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改砍价活动
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean updateByBo(MallBargainBo bo) {
+        MallBargain update = MapstructUtils.convert(bo, MallBargain.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(MallBargain entity) {
+        // TODO: 可以添加业务校验逻辑，如检查活动是否存在、SKU是否存在等
+        if (entity.getOriginalPrice() != null && entity.getBargainPrice() != null) {
+            if (entity.getBargainPrice() >= entity.getOriginalPrice()) {
+                throw new ServiceException("砍后价必须小于原价");
+            }
+        }
+        if (entity.getMinPrice() != null && entity.getBargainPrice() != null) {
+            if (entity.getBargainPrice() < entity.getMinPrice()) {
+                throw new ServiceException("砍后价不能小于最低价");
+            }
+        }
+        if (entity.getMinPrice() != null && entity.getOriginalPrice() != null) {
+            if (entity.getMinPrice() >= entity.getOriginalPrice()) {
+                throw new ServiceException("最低价必须小于原价");
+            }
+        }
+    }
+
+    /**
+     * 批量删除砍价活动
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if (isValid) {
+            Date now = new Date();
+            for (Long id : ids) {
+                MallBargain bargain = baseMapper.selectById(id);
+                if (bargain == null) {
+                    continue;
+                }
+                
+                // 检查关联的营销活动是否正在进行中
+                if (bargain.getPromotionId() != null) {
+                    MallPromotion promotion = promotionMapper.selectById(bargain.getPromotionId());
+                    if (promotion != null && promotion.getStartTime() != null && promotion.getEndTime() != null) {
+                        // 判断当前时间是否在活动时间范围内（开始时间 <= 当前时间 <= 结束时间）
+                        if (!promotion.getStartTime().after(now) && !promotion.getEndTime().before(now)) {
+                            throw new ServiceException("砍价活动ID[" + id + "]关联的营销活动正在进行中，不能删除");
+                        }
+                    }
+                }
+                
+                // 注意：如果有砍价记录表(mall_bargain_record)，还可以检查是否有进行中的砍价记录(status=0)
+                // 但由于当前模块中可能还未实现MallBargainRecordMapper，此处暂不添加该检查
+                // 如需添加，可注入MallBargainRecordMapper，然后查询count(bargain_id=? AND status=0) > 0
+            }
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+
+    /**
+     * 启用/禁用砍价活动
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean changeStatus(Long id, Integer status) {
+        MallBargain bargain = baseMapper.selectById(id);
+        if (bargain == null) {
+            throw new ServiceException("砍价活动不存在");
+        }
+
+        MallBargain update = new MallBargain();
+        update.setId(id);
+        update.setStatus(status);
+        return baseMapper.updateById(update) > 0;
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/service/impl/MallGroupBuyServiceImpl.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/service/impl/MallGroupBuyServiceImpl.java
new file mode 100644
index 0000000..d75857f
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/service/impl/MallGroupBuyServiceImpl.java
@@ -0,0 +1,169 @@
+package org.dromara.mall.promotion.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.mall.promotion.domain.MallGroupBuy;
+import org.dromara.mall.promotion.domain.bo.MallGroupBuyBo;
+import org.dromara.mall.promotion.domain.vo.MallGroupBuyVo;
+import org.dromara.mall.promotion.mapper.MallGroupBuyMapper;
+import org.dromara.mall.promotion.service.MallGroupBuyService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 拼团活动Service业务层处理
+ *
+ * @author pengles
+ */
+@RequiredArgsConstructor
+@Service
+public class MallGroupBuyServiceImpl extends ServiceImpl<MallGroupBuyMapper, MallGroupBuy> implements MallGroupBuyService {
+
+    private final MallGroupBuyMapper baseMapper;
+
+    /**
+     * 查询拼团活动
+     */
+    @Override
+    public MallGroupBuyVo queryById(Long id) {
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 查询拼团活动列表
+     */
+    @Override
+    public TableDataInfo<MallGroupBuyVo> queryPageList(MallGroupBuyBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<MallGroupBuy> lqw = buildQueryWrapper(bo);
+        Page<MallGroupBuyVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询拼团活动列表
+     */
+    @Override
+    public List<MallGroupBuyVo> queryList(MallGroupBuyBo bo) {
+        LambdaQueryWrapper<MallGroupBuy> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<MallGroupBuy> buildQueryWrapper(MallGroupBuyBo bo) {
+        LambdaQueryWrapper<MallGroupBuy> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getPromotionId() != null, MallGroupBuy::getPromotionId, bo.getPromotionId());
+        lqw.eq(bo.getSkuId() != null, MallGroupBuy::getSkuId, bo.getSkuId());
+        lqw.eq(bo.getStatus() != null, MallGroupBuy::getStatus, bo.getStatus());
+        lqw.orderByDesc(MallGroupBuy::getCreateTime);
+        return lqw;
+    }
+
+    /**
+     * 查询可用的拼团活动列表（移动端）
+     */
+    @Override
+    public List<MallGroupBuyVo> queryAvailableList() {
+        LambdaQueryWrapper<MallGroupBuy> lqw = Wrappers.lambdaQuery();
+        lqw.eq(MallGroupBuy::getStatus, 0); // 启用状态
+        lqw.orderByDesc(MallGroupBuy::getCreateTime);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    /**
+     * 根据SKU ID查询拼团活动
+     */
+    @Override
+    public MallGroupBuyVo queryBySkuId(Long skuId) {
+        LambdaQueryWrapper<MallGroupBuy> lqw = Wrappers.lambdaQuery();
+        lqw.eq(MallGroupBuy::getSkuId, skuId);
+        lqw.eq(MallGroupBuy::getStatus, 0); // 启用状态
+        lqw.orderByDesc(MallGroupBuy::getCreateTime);
+        lqw.last("LIMIT 1");
+        return baseMapper.selectVoOne(lqw);
+    }
+
+    /**
+     * 新增拼团活动
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean insertByBo(MallGroupBuyBo bo) {
+        MallGroupBuy add = MapstructUtils.convert(bo, MallGroupBuy.class);
+        validEntityBeforeSave(add);
+
+        // 设置默认值
+        if (add.getStatus() == null) {
+            add.setStatus(0); // 默认启用
+        }
+        if (add.getDurationHours() == null) {
+            add.setDurationHours(24); // 默认24小时
+        }
+
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改拼团活动
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean updateByBo(MallGroupBuyBo bo) {
+        MallGroupBuy update = MapstructUtils.convert(bo, MallGroupBuy.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(MallGroupBuy entity) {
+        // TODO: 可以添加业务校验逻辑，如检查活动是否存在、SKU是否存在等
+        if (entity.getGroupSize() != null && entity.getGroupSize() < 2) {
+            throw new ServiceException("成团人数至少为2人");
+        }
+    }
+
+    /**
+     * 批量删除拼团活动
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if (isValid) {
+            // TODO: 可以添加业务校验逻辑，如检查是否有进行中的拼团活动等
+        }
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+
+    /**
+     * 启用/禁用拼团活动
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean changeStatus(Long id, Integer status) {
+        MallGroupBuy groupBuy = baseMapper.selectById(id);
+        if (groupBuy == null) {
+            throw new ServiceException("拼团活动不存在");
+        }
+
+        MallGroupBuy update = new MallGroupBuy();
+        update.setId(id);
+        update.setStatus(status);
+        return baseMapper.updateById(update) > 0;
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/service/impl/MallPromotionServiceImpl.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/service/impl/MallPromotionServiceImpl.java
new file mode 100644
index 0000000..ecc2d34
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/service/impl/MallPromotionServiceImpl.java
@@ -0,0 +1,173 @@
+package org.dromara.mall.promotion.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.mall.promotion.domain.MallPromotion;
+import org.dromara.mall.promotion.domain.bo.MallPromotionBo;
+import org.dromara.mall.promotion.domain.vo.MallPromotionVo;
+import org.dromara.mall.promotion.mapper.MallPromotionMapper;
+import org.dromara.mall.promotion.service.MallPromotionService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 营销活动Service业务层处理
+ *
+ * @author pengles
+ */
+@Service
+public class MallPromotionServiceImpl extends ServiceImpl<MallPromotionMapper, MallPromotion> implements MallPromotionService {
+
+    /**
+     * 查询营销活动
+     */
+    @Override
+    public MallPromotionVo queryById(Long id) {
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 查询营销活动列表
+     */
+    @Override
+    public TableDataInfo<MallPromotionVo> queryPageList(MallPromotionBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<MallPromotion> lqw = buildQueryWrapper(bo);
+        Page<MallPromotionVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询营销活动列表
+     */
+    @Override
+    public List<MallPromotionVo> queryList(MallPromotionBo bo) {
+        LambdaQueryWrapper<MallPromotion> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<MallPromotion> buildQueryWrapper(MallPromotionBo bo) {
+        LambdaQueryWrapper<MallPromotion> lqw = Wrappers.lambdaQuery();
+        lqw.like(StringUtils.isNotBlank(bo.getName()), MallPromotion::getName, bo.getName());
+        lqw.eq(bo.getType() != null, MallPromotion::getType, bo.getType());
+        lqw.eq(bo.getStatus() != null, MallPromotion::getStatus, bo.getStatus());
+        lqw.ge(bo.getStartTime() != null, MallPromotion::getStartTime, bo.getStartTime());
+        lqw.le(bo.getEndTime() != null, MallPromotion::getEndTime, bo.getEndTime());
+        lqw.orderByDesc(MallPromotion::getCreateTime);
+        return lqw;
+    }
+
+    /**
+     * 新增营销活动
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean insertByBo(MallPromotionBo bo) {
+        MallPromotion add = MapstructUtils.convert(bo, MallPromotion.class);
+        validEntityBeforeSave(add);
+
+        // 设置默认状态
+        if (add.getStatus() == null) {
+            add.setStatus(0); // 默认启用
+        }
+
+        // 校验时间
+        validateTimeRange(add.getStartTime(), add.getEndTime());
+
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改营销活动
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean updateByBo(MallPromotionBo bo) {
+        MallPromotion update = MapstructUtils.convert(bo, MallPromotion.class);
+        validEntityBeforeSave(update);
+
+        // 校验时间
+        if (update.getStartTime() != null && update.getEndTime() != null) {
+            validateTimeRange(update.getStartTime(), update.getEndTime());
+        }
+
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(MallPromotion entity) {
+        // TODO: 可以添加业务校验逻辑，如活动类型校验等
+    }
+
+    /**
+     * 校验时间范围
+     */
+    private void validateTimeRange(Date startTime, Date endTime) {
+        if (startTime != null && endTime != null) {
+            if (startTime.after(endTime)) {
+                throw new ServiceException("开始时间不能晚于结束时间");
+            }
+        }
+    }
+
+    /**
+     * 批量删除营销活动
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if (isValid) {
+            // TODO: 可以添加业务校验逻辑，如检查是否有进行中的活动等
+        }
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+
+    /**
+     * 启用/禁用营销活动
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean changeStatus(Long id, Integer status) {
+        MallPromotion promotion = baseMapper.selectById(id);
+        if (promotion == null) {
+            throw new ServiceException("营销活动不存在");
+        }
+
+        MallPromotion update = new MallPromotion();
+        update.setId(id);
+        update.setStatus(status);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 根据活动类型查询活动列表
+     */
+    @Override
+    public List<MallPromotionVo> queryListByType(Integer type) {
+        LambdaQueryWrapper<MallPromotion> lqw = Wrappers.lambdaQuery();
+        lqw.eq(MallPromotion::getType, type);
+        lqw.eq(MallPromotion::getStatus, 0); // 只查询启用的活动
+        Date now = new Date();
+        lqw.le(MallPromotion::getStartTime, now); // 开始时间已到
+        lqw.ge(MallPromotion::getEndTime, now); // 结束时间未到
+        lqw.orderByDesc(MallPromotion::getCreateTime);
+        return baseMapper.selectVoList(lqw);
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/service/impl/MallSeckillServiceImpl.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/service/impl/MallSeckillServiceImpl.java
new file mode 100644
index 0000000..71af697
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/java/org/dromara/mall/promotion/service/impl/MallSeckillServiceImpl.java
@@ -0,0 +1,263 @@
+package org.dromara.mall.promotion.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.mall.promotion.domain.MallSeckill;
+import org.dromara.mall.promotion.domain.bo.MallSeckillBo;
+import org.dromara.mall.promotion.domain.vo.MallSeckillVo;
+import org.dromara.mall.promotion.mapper.MallSeckillMapper;
+import org.dromara.mall.promotion.service.MallSeckillService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 秒杀活动Service业务层处理
+ *
+ * @author pengles
+ */
+@RequiredArgsConstructor
+@Service
+public class MallSeckillServiceImpl implements MallSeckillService {
+
+    private final MallSeckillMapper baseMapper;
+
+    /**
+     * 查询秒杀活动
+     */
+    @Override
+    public MallSeckillVo queryById(Long id) {
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 查询秒杀活动列表
+     */
+    @Override
+    public TableDataInfo<MallSeckillVo> queryPageList(MallSeckillBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<MallSeckill> lqw = buildQueryWrapper(bo);
+        Page<MallSeckillVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询秒杀活动列表
+     */
+    @Override
+    public List<MallSeckillVo> queryList(MallSeckillBo bo) {
+        LambdaQueryWrapper<MallSeckill> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<MallSeckill> buildQueryWrapper(MallSeckillBo bo) {
+        LambdaQueryWrapper<MallSeckill> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getPromotionId() != null, MallSeckill::getPromotionId, bo.getPromotionId());
+        lqw.eq(bo.getSkuId() != null, MallSeckill::getSkuId, bo.getSkuId());
+        lqw.eq(bo.getStatus() != null, MallSeckill::getStatus, bo.getStatus());
+        lqw.ge(bo.getStartTime() != null, MallSeckill::getStartTime, bo.getStartTime());
+        lqw.le(bo.getEndTime() != null, MallSeckill::getEndTime, bo.getEndTime());
+        lqw.orderByDesc(MallSeckill::getCreateTime);
+        return lqw;
+    }
+
+    /**
+     * 查询可用的秒杀活动列表（移动端）
+     */
+    @Override
+    public List<MallSeckillVo> queryAvailableList() {
+        LambdaQueryWrapper<MallSeckill> lqw = Wrappers.lambdaQuery();
+        lqw.eq(MallSeckill::getStatus, 0); // 启用状态
+        Date now = new Date();
+        lqw.le(MallSeckill::getStartTime, now); // 已开始
+        lqw.ge(MallSeckill::getEndTime, now); // 未结束
+        lqw.gt(MallSeckill::getSeckillStock, 0); // 有库存
+        lqw.orderByDesc(MallSeckill::getCreateTime);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    /**
+     * 根据SKU ID查询秒杀活动
+     */
+    @Override
+    public MallSeckillVo queryBySkuId(Long skuId) {
+        LambdaQueryWrapper<MallSeckill> lqw = Wrappers.lambdaQuery();
+        lqw.eq(MallSeckill::getSkuId, skuId);
+        lqw.eq(MallSeckill::getStatus, 0); // 启用状态
+        Date now = new Date();
+        lqw.le(MallSeckill::getStartTime, now); // 已开始
+        lqw.ge(MallSeckill::getEndTime, now); // 未结束
+        lqw.gt(MallSeckill::getSeckillStock, 0); // 有库存
+        lqw.orderByDesc(MallSeckill::getCreateTime);
+        lqw.last("LIMIT 1");
+        return baseMapper.selectVoOne(lqw);
+    }
+
+    /**
+     * 新增秒杀活动
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean insertByBo(MallSeckillBo bo) {
+        MallSeckill add = MapstructUtils.convert(bo, MallSeckill.class);
+        validEntityBeforeSave(add);
+
+        // 设置默认状态
+        if (add.getStatus() == null) {
+            add.setStatus(0); // 默认启用
+        }
+
+        // 校验时间
+        validateTimeRange(add.getStartTime(), add.getEndTime());
+
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改秒杀活动
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean updateByBo(MallSeckillBo bo) {
+        MallSeckill update = MapstructUtils.convert(bo, MallSeckill.class);
+        validEntityBeforeSave(update);
+
+        // 校验时间
+        if (update.getStartTime() != null && update.getEndTime() != null) {
+            validateTimeRange(update.getStartTime(), update.getEndTime());
+        }
+
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(MallSeckill entity) {
+        // TODO: 可以添加业务校验逻辑，如检查活动是否存在、SKU是否存在等
+    }
+
+    /**
+     * 校验时间范围
+     */
+    private void validateTimeRange(Date startTime, Date endTime) {
+        if (startTime != null && endTime != null) {
+            if (startTime.after(endTime)) {
+                throw new ServiceException("开始时间不能晚于结束时间");
+            }
+        }
+    }
+
+    /**
+     * 批量删除秒杀活动
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if (isValid) {
+            // TODO: 可以添加业务校验逻辑，如检查是否有进行中的秒杀活动等
+        }
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+
+    /**
+     * 启用/禁用秒杀活动
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean changeStatus(Long id, Integer status) {
+        MallSeckill seckill = baseMapper.selectById(id);
+        if (seckill == null) {
+            throw new ServiceException("秒杀活动不存在");
+        }
+
+        MallSeckill update = new MallSeckill();
+        update.setId(id);
+        update.setStatus(status);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 扣减秒杀库存
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean reduceStock(Long id, Integer quantity) {
+        if (quantity == null || quantity <= 0) {
+            throw new ServiceException("扣减数量必须大于0");
+        }
+
+        MallSeckill seckill = baseMapper.selectById(id);
+        if (seckill == null) {
+            throw new ServiceException("秒杀活动不存在");
+        }
+
+        if (seckill.getSeckillStock() < quantity) {
+            throw new ServiceException("秒杀库存不足");
+        }
+
+        int rows = baseMapper.reduceStock(id, quantity);
+        return rows > 0;
+    }
+
+    /**
+     * 恢复秒杀库存
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean restoreStock(Long id, Integer quantity) {
+        if (quantity == null || quantity <= 0) {
+            throw new ServiceException("恢复数量必须大于0");
+        }
+
+        MallSeckill seckill = baseMapper.selectById(id);
+        if (seckill == null) {
+            throw new ServiceException("秒杀活动不存在");
+        }
+
+        int rows = baseMapper.restoreStock(id, quantity);
+        return rows > 0;
+    }
+
+    /**
+     * 检查秒杀活动是否可用
+     */
+    @Override
+    public Boolean checkAvailable(Long id) {
+        MallSeckill seckill = baseMapper.selectById(id);
+        if (seckill == null) {
+            return false;
+        }
+
+        // 检查状态
+        if (seckill.getStatus() != 0) {
+            return false;
+        }
+
+        // 检查时间
+        Date now = new Date();
+        if (seckill.getStartTime().after(now) || seckill.getEndTime().before(now)) {
+            return false;
+        }
+
+        // 检查库存
+        if (seckill.getSeckillStock() <= 0) {
+            return false;
+        }
+
+        return true;
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/resources/META-INF/spring.factories b/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/resources/META-INF/spring.factories
new file mode 100644
index 0000000..5a3f956
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/resources/META-INF/spring.factories
@@ -0,0 +1,3 @@
+# Auto Configure
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+org.dromara.mall.promotion.config.MallPromotionAutoConfiguration
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/resources/mapper/promotion/MallSeckillMapper.xml b/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/resources/mapper/promotion/MallSeckillMapper.xml
new file mode 100644
index 0000000..2f21ec9
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-promotion/src/main/resources/mapper/promotion/MallSeckillMapper.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.mall.promotion.mapper.MallSeckillMapper">
+
+    <resultMap type="org.dromara.mall.promotion.domain.MallSeckill" id="MallSeckillResult">
+        <id property="id" column="id"/>
+        <result property="promotionId" column="promotion_id"/>
+        <result property="skuId" column="sku_id"/>
+        <result property="seckillPrice" column="seckill_price"/>
+        <result property="seckillStock" column="seckill_stock"/>
+        <result property="startTime" column="start_time"/>
+        <result property="endTime" column="end_time"/>
+        <result property="status" column="status"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+    </resultMap>
+
+    <resultMap type="org.dromara.mall.promotion.domain.vo.MallSeckillVo" id="MallSeckillVoResult">
+        <id property="id" column="id"/>
+        <result property="promotionId" column="promotion_id"/>
+        <result property="skuId" column="sku_id"/>
+        <result property="seckillPrice" column="seckill_price"/>
+        <result property="seckillStock" column="seckill_stock"/>
+        <result property="startTime" column="start_time"/>
+        <result property="endTime" column="end_time"/>
+        <result property="status" column="status"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+    </resultMap>
+
+    <!-- 扣减秒杀库存 -->
+    <update id="reduceStock">
+        UPDATE mall_seckill
+        SET seckill_stock = seckill_stock - #{quantity}
+        WHERE id = #{id}
+          AND seckill_stock >= #{quantity}
+    </update>
+
+    <!-- 恢复秒杀库存 -->
+    <update id="restoreStock">
+        UPDATE mall_seckill
+        SET seckill_stock = seckill_stock + #{quantity}
+        WHERE id = #{id}
+    </update>
+
+</mapper>
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-statistics/README.md b/ruoyi-modules/ruoyi-mall/ruoyi-mall-statistics/README.md
new file mode 100644
index 0000000..bb5c283
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-statistics/README.md
@@ -0,0 +1,109 @@
+# 统计中心模块 (ruoyi-mall-statistics)
+
+## 模块简介
+
+`ruoyi-mall-statistics` 是商城系统的统计中心模块，提供交易分析、会员分析等数据统计功能。
+
+## 功能特性
+
+### 1. 交易分析 ✅
+
+- ✅ 订单统计（总订单数、已支付订单数）
+- ✅ 销售额统计（总销售额、已支付金额、退款金额）
+- ✅ 今日统计（今日订单数、今日销售额）
+- ✅ 商品销售排行（按销售金额排序）
+- ✅ 交易趋势分析（按日期统计）
+
+### 2. 会员分析 ⏳
+
+- ⏳ 会员增长统计（需会员模块支持）
+- ⏳ 会员消费统计（需会员模块支持）
+- ⏳ 会员活跃度分析（需会员模块支持）
+
+### 3. 商品分析 ⏳
+
+- ⏳ 商品销售统计（可通过交易统计的商品排行实现）
+- ⏳ 商品浏览统计（需商品模块支持浏览统计）
+- ⏳ 商品转化率分析（需商品模块支持）
+
+### 4. 营销分析 ⏳
+
+- ⏳ 活动效果统计（需营销模块支持）
+- ⏳ 优惠券使用统计（需优惠券模块支持）
+- ⏳ 营销ROI分析（需营销模块支持）
+
+## 数据库表
+
+统计模块主要基于现有业务表进行数据分析和统计，可根据需要创建统计汇总表。
+
+## 模块结构
+
+```
+org.dromara.mall.statistics
+├── controller
+│   ├── admin          // 管理端API
+│   └── app            // 用户端API（可选）
+├── domain
+│   ├── bo             // 业务对象
+│   └── vo             // 视图对象
+├── mapper             // MyBatis Mapper
+├── service            // 业务逻辑层
+│   └── impl
+├── enums              // 枚举类
+└── config             // 配置类
+```
+
+## 依赖模块
+
+- `ruoyi-mall-product` - 商品中心模块
+- `ruoyi-mall-trade` - 交易中心模块
+- `ruoyi-common-*` - 通用工具模块
+
+## API接口
+
+### 管理端接口
+
+#### 统计数据 (`/mall/statistics`)
+
+- `GET /mall/statistics/transaction` - 获取交易统计数据
+  - 支持按日期范围查询（startDate, endDate）
+  - 支持设置商品销售排行数量限制（limit，默认10）
+  - 返回数据包括：总订单数、总销售额、已支付订单数、已支付金额、退款金额、今日统计、趋势数据、商品销售排行
+  
+- `GET /mall/statistics/member` - 获取会员统计数据
+  - 支持按日期范围查询（startDate, endDate）
+  - 返回数据包括：总会员数、今日新增会员数、活跃会员数、增长趋势、消费统计
+  - ⚠️ 注意：会员统计功能需要会员模块支持，当前返回基础结构
+
+## 待实现功能
+
+- [x] 交易统计分析 ✅
+  - [x] 订单统计 ✅
+  - [x] 销售额统计 ✅
+  - [x] 商品销售排行 ✅
+  - [x] 交易趋势分析 ✅
+- [ ] 会员统计分析（需会员模块支持）
+- [ ] 商品统计分析（部分功能可通过交易统计实现）
+- [ ] 营销效果分析（需营销模块支持）
+- [ ] 数据报表导出
+
+## 使用说明
+
+### 交易统计
+
+交易统计基于 `mall_order` 和 `mall_order_item` 表进行数据聚合分析：
+
+1. **订单统计**：统计指定时间范围内的订单总数和总金额
+2. **已支付统计**：统计已支付（pay_status=1）的订单数和金额
+3. **退款统计**：统计已完成的退款金额（基于 `mall_after_sale` 表，status=5）
+4. **今日统计**：当未指定日期范围时，自动计算今日的订单和销售额
+5. **趋势数据**：按日期分组统计订单数和销售额
+6. **商品销售排行**：按销售金额排序，支持限制返回数量
+
+### 查询参数
+
+- `startDate`: 开始日期（格式：yyyy-MM-dd），可选
+- `endDate`: 结束日期（格式：yyyy-MM-dd），可选
+- `limit`: 商品销售排行数量限制，默认10，可选
+
+**注意**：如果不指定日期范围，统计的是全部数据；如果指定了日期范围，则只统计该范围内的数据。
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-statistics/pom.xml b/ruoyi-modules/ruoyi-mall/ruoyi-mall-statistics/pom.xml
new file mode 100644
index 0000000..fde9d37
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-statistics/pom.xml
@@ -0,0 +1,71 @@
+<?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>
+        <groupId>org.dromara</groupId>
+        <artifactId>ruoyi-mall</artifactId>
+        <version>${revision}</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>ruoyi-mall-statistics</artifactId>
+
+    <description>
+        ruoyi-mall-statistics 统计中心模块
+    </description>
+
+    <dependencies>
+        <!-- 通用工具-->
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-core</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-doc</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-mybatis</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-security</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-web</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-log</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-redis</artifactId>
+        </dependency>
+
+        <!-- 商品中心模块 -->
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-mall-product</artifactId>
+            <version>${revision}</version>
+        </dependency>
+
+        <!-- 交易中心模块 -->
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-mall-trade</artifactId>
+            <version>${revision}</version>
+        </dependency>
+
+    </dependencies>
+
+</project>
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-statistics/src/main/java/org/dromara/mall/statistics/config/MallStatisticsAutoConfiguration.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-statistics/src/main/java/org/dromara/mall/statistics/config/MallStatisticsAutoConfiguration.java
new file mode 100644
index 0000000..3b712ae
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-statistics/src/main/java/org/dromara/mall/statistics/config/MallStatisticsAutoConfiguration.java
@@ -0,0 +1,23 @@
+package org.dromara.mall.statistics.config;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * 统计中心自动配置类
+ * 主要用于扫描统计中心模块的组件
+ *
+ * @author pengles
+ */
+@Slf4j
+@Configuration
+@ComponentScan(basePackages = "org.dromara.mall.statistics")
+@ConditionalOnProperty(prefix = "ruoyi.mall.statistics", name = "enabled", havingValue = "true", matchIfMissing = true)
+public class MallStatisticsAutoConfiguration {
+
+    public MallStatisticsAutoConfiguration() {
+        log.info("统计中心模块已启用");
+    }
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-statistics/src/main/java/org/dromara/mall/statistics/controller/admin/AdminMallStatisticsController.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-statistics/src/main/java/org/dromara/mall/statistics/controller/admin/AdminMallStatisticsController.java
new file mode 100644
index 0000000..4d85eac
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-statistics/src/main/java/org/dromara/mall/statistics/controller/admin/AdminMallStatisticsController.java
@@ -0,0 +1,82 @@
+package org.dromara.mall.statistics.controller.admin;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.mall.statistics.domain.bo.StatisticsQueryBo;
+import org.dromara.mall.statistics.domain.vo.MemberStatisticsVo;
+import org.dromara.mall.statistics.domain.vo.TransactionStatisticsVo;
+import org.dromara.mall.statistics.service.MallStatisticsService;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Date;
+
+/**
+ * 统计管理控制器
+ *
+ * @author pengles
+ */
+@Tag(name = "管理端-统计数据", description = "统计数据查询接口")
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/mall/statistics")
+public class AdminMallStatisticsController extends BaseController {
+
+    private final MallStatisticsService statisticsService;
+
+    /**
+     * 获取交易统计
+     */
+    @Operation(summary = "获取交易统计", description = "获取交易统计数据，包括订单统计、销售额统计、商品销售排行等")
+    @SaCheckPermission("mall:statistics:query")
+    @GetMapping("/transaction")
+    public R<TransactionStatisticsVo> getTransactionStatistics(
+            @Parameter(description = "开始日期") 
+            @RequestParam(required = false) 
+            @DateTimeFormat(pattern = "yyyy-MM-dd") Date startDate,
+            @Parameter(description = "结束日期") 
+            @RequestParam(required = false) 
+            @DateTimeFormat(pattern = "yyyy-MM-dd") Date endDate,
+            @Parameter(description = "商品销售排行限制数量") 
+            @RequestParam(required = false, defaultValue = "10") Integer limit) {
+        StatisticsQueryBo queryBo = new StatisticsQueryBo();
+        queryBo.setStartDate(startDate);
+        queryBo.setEndDate(endDate);
+        queryBo.setLimit(limit);
+        
+        TransactionStatisticsVo result = statisticsService.getTransactionStatistics(queryBo);
+        return R.ok(result);
+    }
+
+    /**
+     * 获取会员统计
+     */
+    @Operation(summary = "获取会员统计", description = "获取会员统计数据，包括会员增长、消费统计等")
+    @SaCheckPermission("mall:statistics:query")
+    @GetMapping("/member")
+    public R<MemberStatisticsVo> getMemberStatistics(
+            @Parameter(description = "开始日期") 
+            @RequestParam(required = false) 
+            @DateTimeFormat(pattern = "yyyy-MM-dd") Date startDate,
+            @Parameter(description = "结束日期") 
+            @RequestParam(required = false) 
+            @DateTimeFormat(pattern = "yyyy-MM-dd") Date endDate) {
+        StatisticsQueryBo queryBo = new StatisticsQueryBo();
+        queryBo.setStartDate(startDate);
+        queryBo.setEndDate(endDate);
+        
+        MemberStatisticsVo result = statisticsService.getMemberStatistics(queryBo);
+        return R.ok(result);
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-statistics/src/main/java/org/dromara/mall/statistics/domain/bo/StatisticsQueryBo.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-statistics/src/main/java/org/dromara/mall/statistics/domain/bo/StatisticsQueryBo.java
new file mode 100644
index 0000000..cd1fc58
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-statistics/src/main/java/org/dromara/mall/statistics/domain/bo/StatisticsQueryBo.java
@@ -0,0 +1,50 @@
+package org.dromara.mall.statistics.domain.bo;
+
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 统计查询业务对象
+ *
+ * @author pengles
+ */
+@Data
+public class StatisticsQueryBo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 开始日期
+     */
+    private Date startDate;
+
+    /**
+     * 结束日期
+     */
+    private Date endDate;
+
+    /**
+     * 商品ID（可选）
+     */
+    private Long productId;
+
+    /**
+     * SKU ID（可选）
+     */
+    private Long skuId;
+
+    /**
+     * 用户ID（可选）
+     */
+    private Long userId;
+
+    /**
+     * 限制数量（用于排行）
+     */
+    private Integer limit;
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-statistics/src/main/java/org/dromara/mall/statistics/domain/vo/MemberStatisticsVo.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-statistics/src/main/java/org/dromara/mall/statistics/domain/vo/MemberStatisticsVo.java
new file mode 100644
index 0000000..c5eee02
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-statistics/src/main/java/org/dromara/mall/statistics/domain/vo/MemberStatisticsVo.java
@@ -0,0 +1,88 @@
+package org.dromara.mall.statistics.domain.vo;
+
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 会员统计视图对象
+ *
+ * @author pengles
+ */
+@Data
+public class MemberStatisticsVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 总会员数
+     */
+    private Long totalMemberCount;
+
+    /**
+     * 今日新增会员数
+     */
+    private Long todayNewMemberCount;
+
+    /**
+     * 活跃会员数（有订单的会员）
+     */
+    private Long activeMemberCount;
+
+    /**
+     * 会员增长趋势
+     */
+    private List<DailyMemberGrowthVo> growthTrend;
+
+    /**
+     * 会员消费统计
+     */
+    private List<MemberConsumptionVo> consumptionStats;
+
+    /**
+     * 每日会员增长
+     */
+    @Data
+    public static class DailyMemberGrowthVo implements Serializable {
+        @Serial
+        private static final long serialVersionUID = 1L;
+
+        /**
+         * 日期
+         */
+        private String date;
+
+        /**
+         * 新增会员数
+         */
+        private Long newMemberCount;
+    }
+
+    /**
+     * 会员消费统计
+     */
+    @Data
+    public static class MemberConsumptionVo implements Serializable {
+        @Serial
+        private static final long serialVersionUID = 1L;
+
+        /**
+         * 用户ID
+         */
+        private Long userId;
+
+        /**
+         * 订单数
+         */
+        private Integer orderCount;
+
+        /**
+         * 消费金额（分）
+         */
+        private Long consumptionAmount;
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-statistics/src/main/java/org/dromara/mall/statistics/domain/vo/TransactionStatisticsVo.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-statistics/src/main/java/org/dromara/mall/statistics/domain/vo/TransactionStatisticsVo.java
new file mode 100644
index 0000000..b5480d7
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-statistics/src/main/java/org/dromara/mall/statistics/domain/vo/TransactionStatisticsVo.java
@@ -0,0 +1,129 @@
+package org.dromara.mall.statistics.domain.vo;
+
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 交易统计视图对象
+ *
+ * @author pengles
+ */
+@Data
+public class TransactionStatisticsVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 总订单数
+     */
+    private Long totalOrderCount;
+
+    /**
+     * 总销售额（分）
+     */
+    private Long totalSalesAmount;
+
+    /**
+     * 已支付订单数
+     */
+    private Long paidOrderCount;
+
+    /**
+     * 已支付金额（分）
+     */
+    private Long paidAmount;
+
+    /**
+     * 退款金额（分）
+     */
+    private Long refundAmount;
+
+    /**
+     * 今日订单数
+     */
+    private Long todayOrderCount;
+
+    /**
+     * 今日销售额（分）
+     */
+    private Long todaySalesAmount;
+
+    /**
+     * 趋势数据（按日期）
+     */
+    private List<DailyStatisticsVo> trendData;
+
+    /**
+     * 商品销售排行
+     */
+    private List<ProductSalesRankVo> productSalesRank;
+
+    /**
+     * 每日统计
+     */
+    @Data
+    public static class DailyStatisticsVo implements Serializable {
+        @Serial
+        private static final long serialVersionUID = 1L;
+
+        /**
+         * 日期
+         */
+        private String date;
+
+        /**
+         * 订单数
+         */
+        private Long orderCount;
+
+        /**
+         * 销售额（分）
+         */
+        private Long salesAmount;
+    }
+
+    /**
+     * 商品销售排行
+     */
+    @Data
+    public static class ProductSalesRankVo implements Serializable {
+        @Serial
+        private static final long serialVersionUID = 1L;
+
+        /**
+         * 商品ID
+         */
+        private Long productId;
+
+        /**
+         * 商品名称
+         */
+        private String productName;
+
+        /**
+         * SKU ID
+         */
+        private Long skuId;
+
+        /**
+         * SKU名称
+         */
+        private String skuName;
+
+        /**
+         * 销售数量
+         */
+        private Integer salesQuantity;
+
+        /**
+         * 销售金额（分）
+         */
+        private Long salesAmount;
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-statistics/src/main/java/org/dromara/mall/statistics/mapper/MallStatisticsMapper.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-statistics/src/main/java/org/dromara/mall/statistics/mapper/MallStatisticsMapper.java
new file mode 100644
index 0000000..5a42f17
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-statistics/src/main/java/org/dromara/mall/statistics/mapper/MallStatisticsMapper.java
@@ -0,0 +1,50 @@
+package org.dromara.mall.statistics.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.dromara.mall.statistics.domain.vo.TransactionStatisticsVo;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 统计Mapper接口
+ *
+ * @author pengles
+ */
+@Mapper
+public interface MallStatisticsMapper {
+
+    /**
+     * 统计订单总数和总金额
+     */
+    Map<String, Object> countOrderStatistics(@Param("startDate") Date startDate, 
+                                             @Param("endDate") Date endDate);
+
+    /**
+     * 统计已支付订单数和金额
+     */
+    Map<String, Object> countPaidOrderStatistics(@Param("startDate") Date startDate, 
+                                                  @Param("endDate") Date endDate);
+
+    /**
+     * 统计退款金额
+     */
+    Long sumRefundAmount(@Param("startDate") Date startDate, 
+                        @Param("endDate") Date endDate);
+
+    /**
+     * 统计每日订单数据
+     */
+    List<TransactionStatisticsVo.DailyStatisticsVo> countDailyOrderStatistics(@Param("startDate") Date startDate, 
+                                                                               @Param("endDate") Date endDate);
+
+    /**
+     * 统计商品销售排行
+     */
+    List<TransactionStatisticsVo.ProductSalesRankVo> queryProductSalesRank(@Param("startDate") Date startDate, 
+                                                                            @Param("endDate") Date endDate,
+                                                                            @Param("limit") Integer limit);
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-statistics/src/main/java/org/dromara/mall/statistics/service/MallStatisticsService.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-statistics/src/main/java/org/dromara/mall/statistics/service/MallStatisticsService.java
new file mode 100644
index 0000000..7593ee6
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-statistics/src/main/java/org/dromara/mall/statistics/service/MallStatisticsService.java
@@ -0,0 +1,30 @@
+package org.dromara.mall.statistics.service;
+
+import org.dromara.mall.statistics.domain.bo.StatisticsQueryBo;
+import org.dromara.mall.statistics.domain.vo.MemberStatisticsVo;
+import org.dromara.mall.statistics.domain.vo.TransactionStatisticsVo;
+
+/**
+ * 统计服务接口
+ *
+ * @author pengles
+ */
+public interface MallStatisticsService {
+
+    /**
+     * 获取交易统计
+     *
+     * @param queryBo 查询条件
+     * @return 交易统计结果
+     */
+    TransactionStatisticsVo getTransactionStatistics(StatisticsQueryBo queryBo);
+
+    /**
+     * 获取会员统计
+     *
+     * @param queryBo 查询条件
+     * @return 会员统计结果
+     */
+    MemberStatisticsVo getMemberStatistics(StatisticsQueryBo queryBo);
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-statistics/src/main/java/org/dromara/mall/statistics/service/impl/MallStatisticsServiceImpl.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-statistics/src/main/java/org/dromara/mall/statistics/service/impl/MallStatisticsServiceImpl.java
new file mode 100644
index 0000000..2d5ee94
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-statistics/src/main/java/org/dromara/mall/statistics/service/impl/MallStatisticsServiceImpl.java
@@ -0,0 +1,128 @@
+package org.dromara.mall.statistics.service.impl;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateUtil;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.mall.statistics.domain.bo.StatisticsQueryBo;
+import org.dromara.mall.statistics.domain.vo.MemberStatisticsVo;
+import org.dromara.mall.statistics.domain.vo.TransactionStatisticsVo;
+import org.dromara.mall.statistics.mapper.MallStatisticsMapper;
+import org.dromara.mall.statistics.service.MallStatisticsService;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 统计服务实现类
+ *
+ * @author pengles
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class MallStatisticsServiceImpl implements MallStatisticsService {
+
+    private final MallStatisticsMapper statisticsMapper;
+
+    /**
+     * 获取交易统计
+     */
+    @Override
+    public TransactionStatisticsVo getTransactionStatistics(StatisticsQueryBo queryBo) {
+        Date startDate = queryBo != null ? queryBo.getStartDate() : null;
+        Date endDate = queryBo != null ? queryBo.getEndDate() : null;
+        Integer limit = queryBo != null && queryBo.getLimit() != null ? queryBo.getLimit() : 10;
+
+        TransactionStatisticsVo vo = new TransactionStatisticsVo();
+
+        // 统计总订单数和总金额
+        Map<String, Object> orderStats = statisticsMapper.countOrderStatistics(startDate, endDate);
+        if (orderStats != null) {
+            vo.setTotalOrderCount(getLongValue(orderStats, "totalOrderCount"));
+            vo.setTotalSalesAmount(getLongValue(orderStats, "totalSalesAmount"));
+        }
+
+        // 统计已支付订单数和金额
+        Map<String, Object> paidStats = statisticsMapper.countPaidOrderStatistics(startDate, endDate);
+        if (paidStats != null) {
+            vo.setPaidOrderCount(getLongValue(paidStats, "paidOrderCount"));
+            vo.setPaidAmount(getLongValue(paidStats, "paidAmount"));
+        }
+
+        // 统计退款金额
+        Long refundAmount = statisticsMapper.sumRefundAmount(startDate, endDate);
+        vo.setRefundAmount(refundAmount != null ? refundAmount : 0L);
+
+        // 今日统计（如果没有指定日期范围，计算今日）
+        if (startDate == null && endDate == null) {
+            Date todayStart = DateUtil.beginOfDay(new Date());
+            Date todayEnd = DateUtil.endOfDay(new Date());
+
+            Map<String, Object> todayOrderStats = statisticsMapper.countOrderStatistics(todayStart, todayEnd);
+            if (todayOrderStats != null) {
+                vo.setTodayOrderCount(getLongValue(todayOrderStats, "totalOrderCount"));
+                vo.setTodaySalesAmount(getLongValue(todayOrderStats, "totalSalesAmount"));
+            } else {
+                vo.setTodayOrderCount(0L);
+                vo.setTodaySalesAmount(0L);
+            }
+        } else {
+            // 如果指定了日期范围，今日统计为0或null
+            vo.setTodayOrderCount(0L);
+            vo.setTodaySalesAmount(0L);
+        }
+
+        // 趋势数据
+        List<TransactionStatisticsVo.DailyStatisticsVo> trendData = statisticsMapper.countDailyOrderStatistics(startDate, endDate);
+        vo.setTrendData(trendData != null ? trendData : CollUtil.newArrayList());
+
+        // 商品销售排行
+        List<TransactionStatisticsVo.ProductSalesRankVo> productRank = statisticsMapper.queryProductSalesRank(startDate, endDate, limit);
+        vo.setProductSalesRank(productRank != null ? productRank : CollUtil.newArrayList());
+
+        return vo;
+    }
+
+    /**
+     * 获取会员统计
+     */
+    @Override
+    public MemberStatisticsVo getMemberStatistics(StatisticsQueryBo queryBo) {
+        // TODO: 实现会员统计功能
+        // 由于会员模块可能不在mall模块中，这里先返回基础结构
+        MemberStatisticsVo vo = new MemberStatisticsVo();
+        vo.setTotalMemberCount(0L);
+        vo.setTodayNewMemberCount(0L);
+        vo.setActiveMemberCount(0L);
+        vo.setGrowthTrend(CollUtil.newArrayList());
+        vo.setConsumptionStats(CollUtil.newArrayList());
+        return vo;
+    }
+
+    /**
+     * 从Map中获取Long值
+     */
+    private Long getLongValue(Map<String, Object> map, String key) {
+        Object value = map.get(key);
+        if (value == null) {
+            return 0L;
+        }
+        if (value instanceof Long) {
+            return (Long) value;
+        }
+        if (value instanceof Number) {
+            return ((Number) value).longValue();
+        }
+        try {
+            return Long.parseLong(value.toString());
+        } catch (Exception e) {
+            log.warn("无法转换值 {} 为Long类型: {}", value, e.getMessage());
+            return 0L;
+        }
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-statistics/src/main/resources/META-INF/spring.factories b/ruoyi-modules/ruoyi-mall/ruoyi-mall-statistics/src/main/resources/META-INF/spring.factories
new file mode 100644
index 0000000..fa3ef3b
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-statistics/src/main/resources/META-INF/spring.factories
@@ -0,0 +1,3 @@
+# Auto Configure
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+org.dromara.mall.statistics.config.MallStatisticsAutoConfiguration
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-statistics/src/main/resources/mapper/statistics/MallStatisticsMapper.xml b/ruoyi-modules/ruoyi-mall/ruoyi-mall-statistics/src/main/resources/mapper/statistics/MallStatisticsMapper.xml
new file mode 100644
index 0000000..d88aa62
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-statistics/src/main/resources/mapper/statistics/MallStatisticsMapper.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.mall.statistics.mapper.MallStatisticsMapper">
+
+    <!-- 统计订单总数和总金额 -->
+    <select id="countOrderStatistics" resultType="java.util.HashMap">
+        SELECT
+            COUNT(*) as totalOrderCount,
+            IFNULL(SUM(total_amount), 0) as totalSalesAmount
+        FROM mall_order
+        <where>
+            <if test="startDate != null">
+                AND create_time &gt;= #{startDate}
+            </if>
+            <if test="endDate != null">
+                AND create_time &lt;= #{endDate}
+            </if>
+        </where>
+    </select>
+
+    <!-- 统计已支付订单数和金额 -->
+    <select id="countPaidOrderStatistics" resultType="java.util.HashMap">
+        SELECT
+            COUNT(*) as paidOrderCount,
+            IFNULL(SUM(pay_amount), 0) as paidAmount
+        FROM mall_order
+        <where>
+            pay_status = 1
+            <if test="startDate != null">
+                AND create_time &gt;= #{startDate}
+            </if>
+            <if test="endDate != null">
+                AND create_time &lt;= #{endDate}
+            </if>
+        </where>
+    </select>
+
+    <!-- 统计退款金额 -->
+    <select id="sumRefundAmount" resultType="java.lang.Long">
+        SELECT IFNULL(SUM(refund_amount), 0)
+        FROM mall_after_sale
+        <where>
+            status = 5
+            <if test="startDate != null">
+                AND refund_time &gt;= #{startDate}
+            </if>
+            <if test="endDate != null">
+                AND refund_time &lt;= #{endDate}
+            </if>
+        </where>
+    </select>
+
+    <!-- 统计每日订单数据 -->
+    <select id="countDailyOrderStatistics" resultType="org.dromara.mall.statistics.domain.vo.TransactionStatisticsVo$DailyStatisticsVo">
+        SELECT
+            DATE_FORMAT(create_time, '%Y-%m-%d') as date,
+            COUNT(*) as orderCount,
+            IFNULL(SUM(total_amount), 0) as salesAmount
+        FROM mall_order
+        <where>
+            <if test="startDate != null">
+                AND create_time &gt;= #{startDate}
+            </if>
+            <if test="endDate != null">
+                AND create_time &lt;= #{endDate}
+            </if>
+        </where>
+        GROUP BY DATE_FORMAT(create_time, '%Y-%m-%d')
+        ORDER BY date ASC
+    </select>
+
+    <!-- 统计商品销售排行 -->
+    <select id="queryProductSalesRank" resultType="org.dromara.mall.statistics.domain.vo.TransactionStatisticsVo$ProductSalesRankVo">
+        SELECT
+            oi.product_id as productId,
+            oi.product_name as productName,
+            oi.sku_id as skuId,
+            oi.sku_name as skuName,
+            SUM(oi.quantity) as salesQuantity,
+            IFNULL(SUM(oi.total_amount), 0) as salesAmount
+        FROM mall_order_item oi
+        INNER JOIN mall_order o ON oi.order_id = o.id
+        <where>
+            o.pay_status = 1
+            <if test="startDate != null">
+                AND o.create_time &gt;= #{startDate}
+            </if>
+            <if test="endDate != null">
+                AND o.create_time &lt;= #{endDate}
+            </if>
+        </where>
+        GROUP BY oi.product_id, oi.product_name, oi.sku_id, oi.sku_name
+        ORDER BY salesAmount DESC
+        <if test="limit != null and limit > 0">
+            LIMIT #{limit}
+        </if>
+    </select>
+
+</mapper>
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/README.md b/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/README.md
new file mode 100644
index 0000000..6abbbb5
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/README.md
@@ -0,0 +1,201 @@
+# 交易中心模块 (ruoyi-mall-trade)
+
+## 模块简介
+
+`ruoyi-mall-trade` 是商城系统的交易中心模块，负责交易流程的核心功能，包括购物车、订单、售后等。
+
+## 功能特性
+
+### 1. 购物车管理
+
+- ✅ 添加/删除购物车
+- ✅ 购物车数量修改
+- ✅ 购物车选中状态管理
+- ✅ 购物车详情查询
+
+### 2. 订单管理
+
+- ✅ 订单创建
+- ✅ 订单查询（列表、详情）
+- ✅ 订单取消
+- ✅ 订单状态管理
+- ✅ 订单支付集成
+
+### 3. 售后管理 ✅
+
+- ✅ 订单退款申请
+- ✅ 退货申请
+- ✅ 换货申请
+- ✅ 售后审核（同意/拒绝）
+- ✅ 售后状态跟踪
+- ✅ 退货物流信息填写
+- ✅ 商家确认收货
+- ✅ 完成售后处理
+- ✅ 取消售后申请
+
+### 4. 订单评价 ✅
+
+- ✅ 订单评价提交
+- ✅ 评价列表查询（支持按订单、商品查询）
+- ✅ 评价审核（通过/驳回）
+- ✅ 评价回复（商家回复）
+- ✅ 评价导出功能
+
+### 5. 地址管理 ✅
+
+- ✅ 收货地址CRUD操作
+- ✅ 用户地址列表查询
+- ✅ 默认地址查询
+- ✅ 设置默认地址
+- ✅ 地址导出功能（管理端）
+
+## 数据库表
+
+- `mall_cart` - 购物车表
+- `mall_order` - 订单表
+- `mall_order_item` - 订单明细表
+- `mall_after_sale` - 售后申请表
+- `mall_order_evaluate` - 订单评价表
+- `mall_order_coupon` - 订单优惠券使用记录表
+- `mall_address` - 收货地址表
+
+详细表结构请参考：`script/sql/ry_mall.sql`
+
+## 模块结构
+
+```
+org.dromara.mall.trade
+├── controller
+│   ├── admin          // 管理端API
+│   └── app            // 用户端API
+├── domain
+│   ├── bo             // 业务对象
+│   └── vo             // 视图对象
+├── mapper             // MyBatis Mapper
+├── service            // 业务逻辑层
+│   └── impl
+├── enums              // 枚举类
+└── config             // 配置类
+```
+
+## 依赖模块
+
+- `ruoyi-mall-product` - 商品中心模块
+- `ruoyi-pay` - 支付中心模块
+- `ruoyi-common-*` - 通用工具模块
+
+## 业务流程
+
+### 订单提交流程
+
+1. 用户选择商品（从购物车或直接购买）
+2. 调用订单提交接口
+3. 系统创建订单和订单明细
+4. 调用支付中心创建支付单
+5. 返回支付参数给前端
+6. 前端调起支付
+7. 支付成功后，支付中心回调
+8. 系统更新订单状态并扣减库存
+
+## 模块结构
+
+```
+org.dromara.mall.trade
+├── controller
+│   ├── admin          // 管理端API
+│   │   ├── AdminMallAfterSaleController.java
+│   │   ├── AdminMallOrderEvaluateController.java
+│   │   └── AdminMallAddressController.java
+│   └── app            // 用户端API
+│       ├── AppMallAfterSaleController.java
+│       ├── AppMallOrderEvaluateController.java
+│       └── AppMallAddressController.java
+├── domain
+│   ├── MallAfterSale.java
+│   ├── MallOrderEvaluate.java
+│   ├── MallOrderCoupon.java
+│   ├── MallAddress.java
+│   ├── bo             // 业务对象
+│   │   ├── MallAfterSaleBo.java
+│   │   ├── MallOrderEvaluateBo.java
+│   │   ├── MallOrderCouponBo.java
+│   │   └── MallAddressBo.java
+│   └── vo             // 视图对象
+│       ├── MallAfterSaleVo.java
+│       ├── MallOrderEvaluateVo.java
+│       ├── MallOrderCouponVo.java
+│       └── MallAddressVo.java
+├── mapper
+│   ├── MallAfterSaleMapper.java
+│   ├── MallOrderEvaluateMapper.java
+│   ├── MallOrderCouponMapper.java
+│   └── MallAddressMapper.java
+├── service
+│   ├── MallAfterSaleService.java
+│   ├── MallOrderEvaluateService.java
+│   ├── MallOrderCouponService.java
+│   ├── MallAddressService.java
+│   ├── SeckillOrderService.java
+│   └── impl
+│       ├── MallAfterSaleServiceImpl.java
+│       ├── MallOrderEvaluateServiceImpl.java
+│       ├── MallOrderCouponServiceImpl.java
+│       ├── MallAddressServiceImpl.java
+│       └── SeckillOrderServiceImpl.java
+├── utils
+│   └── CouponCalculator.java
+└── config
+    └── MallTradeAutoConfiguration.java
+```
+
+## API接口
+
+### 管理端接口
+
+#### 售后申请管理 (`/mall/order/after-sale`)
+
+- `GET /mall/order/after-sale/list` - 查询售后申请列表（分页）
+- `GET /mall/order/after-sale/{id}` - 获取售后申请详情
+- `DELETE /mall/order/after-sale/{ids}` - 删除售后申请
+- `POST /mall/order/after-sale/export` - 导出售后申请列表
+- `PUT /mall/order/after-sale/audit/{id}` - 审核售后申请（同意/拒绝）
+- `PUT /mall/order/after-sale/receive/{id}` - 确认收货（商家确认收到退货）
+- `PUT /mall/order/after-sale/complete/{id}` - 完成售后
+
+#### 订单评价管理 (`/mall/order/evaluate`)
+
+- `GET /mall/order/evaluate/list` - 查询订单评价列表（分页）
+- `GET /mall/order/evaluate/{id}` - 获取订单评价详情
+- `DELETE /mall/order/evaluate/{ids}` - 删除订单评价
+- `POST /mall/order/evaluate/export` - 导出订单评价列表
+- `PUT /mall/order/evaluate/audit/{id}` - 审核评价（通过/驳回）
+- `PUT /mall/order/evaluate/reply/{id}` - 回复评价
+
+### 移动端接口
+
+#### 售后申请 (`/app/mall/order/after-sale`)
+
+- `GET /app/mall/order/after-sale/list` - 查询售后申请列表
+- `GET /app/mall/order/after-sale/order/{orderId}` - 根据订单ID查询售后申请列表
+- `GET /app/mall/order/after-sale/{id}` - 获取售后申请详情
+- `POST /app/mall/order/after-sale` - 新增售后申请（退款/退货/换货）
+- `PUT /app/mall/order/after-sale/logistics/{id}` - 填写退货物流信息
+- `PUT /app/mall/order/after-sale/cancel/{id}` - 取消售后申请
+
+#### 订单评价 (`/app/mall/order/evaluate`)
+
+- `GET /app/mall/order/evaluate/list` - 查询订单评价列表
+- `GET /app/mall/order/evaluate/order/{orderId}` - 根据订单ID查询评价列表
+- `GET /app/mall/order/evaluate/product/{productId}` - 根据商品ID查询评价列表（仅已审核）
+- `GET /app/mall/order/evaluate/{id}` - 获取订单评价详情
+- `POST /app/mall/order/evaluate` - 提交订单评价
+
+#### 收货地址 (`/app/mall/address`)
+
+- `GET /app/mall/address/list` - 查询收货地址列表
+- `GET /app/mall/address/default` - 获取默认收货地址
+- `GET /app/mall/address/{id}` - 获取收货地址详情
+- `POST /app/mall/address` - 新增收货地址
+- `PUT /app/mall/address` - 修改收货地址
+- `DELETE /app/mall/address/{ids}` - 删除收货地址
+- `PUT /app/mall/address/default/{id}` - 设置默认地址
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/pom.xml b/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/pom.xml
new file mode 100644
index 0000000..5c8a516
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/pom.xml
@@ -0,0 +1,105 @@
+<?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>
+        <groupId>org.dromara</groupId>
+        <artifactId>ruoyi-mall</artifactId>
+        <version>${revision}</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>ruoyi-mall-trade</artifactId>
+
+    <description>
+        ruoyi-mall-trade 交易中心模块
+    </description>
+
+    <dependencies>
+        <!-- 通用工具-->
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-core</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-json</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-doc</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-mybatis</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-security</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-web</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-log</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-excel</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-idempotent</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-redis</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-satoken</artifactId>
+        </dependency>
+
+        <!-- 商品中心模块 -->
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-mall-product</artifactId>
+            <version>${revision}</version>
+        </dependency>
+
+        <!-- 支付模块 -->
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-pay</artifactId>
+            <version>${revision}</version>
+        </dependency>
+
+        <!-- 营销中心模块 -->
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-mall-promotion</artifactId>
+            <version>${revision}</version>
+        </dependency>
+
+        <!-- 优惠券中心模块 -->
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-mall-coupon</artifactId>
+            <version>${revision}</version>
+        </dependency>
+
+    </dependencies>
+
+</project>
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/src/main/java/org/dromara/mall/trade/config/MallTradeAutoConfiguration.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/src/main/java/org/dromara/mall/trade/config/MallTradeAutoConfiguration.java
new file mode 100644
index 0000000..327ead6
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/src/main/java/org/dromara/mall/trade/config/MallTradeAutoConfiguration.java
@@ -0,0 +1,23 @@
+package org.dromara.mall.trade.config;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * 交易中心自动配置类
+ * 主要用于扫描交易中心模块的组件
+ *
+ * @author pengles
+ */
+@Slf4j
+@Configuration
+@ComponentScan(basePackages = "org.dromara.mall.trade")
+@ConditionalOnProperty(prefix = "ruoyi.mall.trade", name = "enabled", havingValue = "true", matchIfMissing = true)
+public class MallTradeAutoConfiguration {
+
+    public MallTradeAutoConfiguration() {
+        log.info("交易中心模块已启用");
+    }
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/src/main/java/org/dromara/mall/trade/controller/admin/AdminMallAddressController.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/src/main/java/org/dromara/mall/trade/controller/admin/AdminMallAddressController.java
new file mode 100644
index 0000000..2b31152
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/src/main/java/org/dromara/mall/trade/controller/admin/AdminMallAddressController.java
@@ -0,0 +1,111 @@
+package org.dromara.mall.trade.controller.admin;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.mall.trade.domain.bo.MallAddressBo;
+import org.dromara.mall.trade.domain.vo.MallAddressVo;
+import org.dromara.mall.trade.service.MallAddressService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 收货地址管理
+ *
+ * @author pengles
+ */
+@Tag(name = "管理端-收货地址管理", description = "收货地址管理接口")
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/mall/address")
+public class AdminMallAddressController extends BaseController {
+
+    private final MallAddressService mallAddressService;
+
+    /**
+     * 查询收货地址列表
+     */
+    @Operation(summary = "查询收货地址列表", description = "分页查询收货地址列表")
+    @SaCheckPermission("mall:address:list")
+    @GetMapping("/list")
+    public TableDataInfo<MallAddressVo> list(@Parameter(description = "收货地址查询条件") MallAddressBo bo,
+                                             @Parameter(description = "分页参数") PageQuery pageQuery) {
+        return mallAddressService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出收货地址列表
+     */
+    @Operation(summary = "导出收货地址列表", description = "导出收货地址到Excel")
+    @SaCheckPermission("mall:address:export")
+    @Log(title = "收货地址", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(@Parameter(description = "收货地址查询条件") MallAddressBo bo,
+                       @Parameter(description = "响应对象") HttpServletResponse response) {
+        List<MallAddressVo> list = mallAddressService.queryList(bo);
+        ExcelUtil.exportExcel(list, "收货地址", MallAddressVo.class, response);
+    }
+
+    /**
+     * 获取收货地址详细信息
+     */
+    @Operation(summary = "获取收货地址详情", description = "根据地址ID获取详细信息")
+    @SaCheckPermission("mall:address:query")
+    @GetMapping("/{id}")
+    public R<MallAddressVo> getInfo(@Parameter(description = "地址ID", required = true)
+                                    @NotNull(message = "主键不能为空")
+                                    @PathVariable Long id) {
+        return R.ok(mallAddressService.queryById(id));
+    }
+
+    /**
+     * 新增收货地址
+     */
+    @Operation(summary = "新增收货地址", description = "创建新的收货地址")
+    @SaCheckPermission("mall:address:add")
+    @Log(title = "收货地址", businessType = BusinessType.INSERT)
+    @PostMapping
+    public R<Void> add(@Parameter(description = "收货地址信息") @Validated @RequestBody MallAddressBo bo) {
+        return toAjax(mallAddressService.insertByBo(bo));
+    }
+
+    /**
+     * 修改收货地址
+     */
+    @Operation(summary = "修改收货地址", description = "更新收货地址信息")
+    @SaCheckPermission("mall:address:edit")
+    @Log(title = "收货地址", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public R<Void> edit(@Parameter(description = "收货地址信息") @Validated @RequestBody MallAddressBo bo) {
+        return toAjax(mallAddressService.updateByBo(bo));
+    }
+
+    /**
+     * 删除收货地址
+     */
+    @Operation(summary = "删除收货地址", description = "删除收货地址")
+    @SaCheckPermission("mall:address:remove")
+    @Log(title = "收货地址", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@Parameter(description = "地址ID数组", required = true)
+                          @NotNull(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(mallAddressService.deleteWithValidByIds(Arrays.asList(ids), true));
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/src/main/java/org/dromara/mall/trade/controller/admin/AdminMallAfterSaleController.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/src/main/java/org/dromara/mall/trade/controller/admin/AdminMallAfterSaleController.java
new file mode 100644
index 0000000..6f25e1b
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/src/main/java/org/dromara/mall/trade/controller/admin/AdminMallAfterSaleController.java
@@ -0,0 +1,132 @@
+package org.dromara.mall.trade.controller.admin;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.mall.trade.domain.bo.MallAfterSaleBo;
+import org.dromara.mall.trade.domain.vo.MallAfterSaleVo;
+import org.dromara.mall.trade.service.MallAfterSaleService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 售后申请管理
+ *
+ * @author pengles
+ */
+@Tag(name = "管理端-售后申请管理", description = "售后申请管理接口")
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/mall/order/after-sale")
+public class AdminMallAfterSaleController extends BaseController {
+
+    private final MallAfterSaleService mallAfterSaleService;
+
+    /**
+     * 查询售后申请列表
+     */
+    @Operation(summary = "查询售后申请列表", description = "分页查询售后申请列表")
+    @SaCheckPermission("mall:order:after-sale:list")
+    @GetMapping("/list")
+    public TableDataInfo<MallAfterSaleVo> list(@Parameter(description = "售后申请查询条件") MallAfterSaleBo bo,
+                                               @Parameter(description = "分页参数") PageQuery pageQuery) {
+        return mallAfterSaleService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出售后申请列表
+     */
+    @Operation(summary = "导出售后申请列表", description = "导出售后申请到Excel")
+    @SaCheckPermission("mall:order:after-sale:export")
+    @Log(title = "售后申请", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(@Parameter(description = "售后申请查询条件") MallAfterSaleBo bo,
+                       @Parameter(description = "响应对象") HttpServletResponse response) {
+        List<MallAfterSaleVo> list = mallAfterSaleService.queryList(bo);
+        ExcelUtil.exportExcel(list, "售后申请", MallAfterSaleVo.class, response);
+    }
+
+    /**
+     * 获取售后申请详细信息
+     */
+    @Operation(summary = "获取售后申请详情", description = "根据售后申请ID获取详细信息")
+    @SaCheckPermission("mall:order:after-sale:query")
+    @GetMapping("/{id}")
+    public R<MallAfterSaleVo> getInfo(@Parameter(description = "售后申请ID", required = true)
+                                      @NotNull(message = "主键不能为空")
+                                      @PathVariable Long id) {
+        return R.ok(mallAfterSaleService.queryById(id));
+    }
+
+    /**
+     * 删除售后申请
+     */
+    @Operation(summary = "删除售后申请", description = "删除售后申请")
+    @SaCheckPermission("mall:order:after-sale:remove")
+    @Log(title = "售后申请", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@Parameter(description = "售后申请ID数组", required = true)
+                          @NotNull(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(mallAfterSaleService.deleteWithValidByIds(Arrays.asList(ids), true));
+    }
+
+    /**
+     * 审核售后申请（同意/拒绝）
+     */
+    @Operation(summary = "审核售后申请", description = "审核售后申请，1-同意，2-拒绝")
+    @SaCheckPermission("mall:order:after-sale:audit")
+    @Log(title = "售后申请", businessType = BusinessType.UPDATE)
+    @PutMapping("/audit/{id}")
+    public R<Void> audit(@Parameter(description = "售后申请ID", required = true)
+                         @NotNull(message = "主键不能为空")
+                         @PathVariable Long id,
+                         @Parameter(description = "审核状态", required = true)
+                         @NotNull(message = "审核状态不能为空")
+                         @RequestParam Integer status,
+                         @Parameter(description = "拒绝原因")
+                         @RequestParam(required = false) String refuseReason) {
+        return toAjax(mallAfterSaleService.audit(id, status, refuseReason));
+    }
+
+    /**
+     * 确认收货（商家确认收到退货）
+     */
+    @Operation(summary = "确认收货", description = "商家确认收到退货商品")
+    @SaCheckPermission("mall:order:after-sale:receive")
+    @Log(title = "售后申请", businessType = BusinessType.UPDATE)
+    @PutMapping("/receive/{id}")
+    public R<Void> confirmReceive(@Parameter(description = "售后申请ID", required = true)
+                                  @NotNull(message = "主键不能为空")
+                                  @PathVariable Long id) {
+        return toAjax(mallAfterSaleService.confirmReceive(id));
+    }
+
+    /**
+     * 完成售后（退款完成或换货完成）
+     */
+    @Operation(summary = "完成售后", description = "完成售后申请（退款完成或换货完成）")
+    @SaCheckPermission("mall:order:after-sale:complete")
+    @Log(title = "售后申请", businessType = BusinessType.UPDATE)
+    @PutMapping("/complete/{id}")
+    public R<Void> complete(@Parameter(description = "售后申请ID", required = true)
+                            @NotNull(message = "主键不能为空")
+                            @PathVariable Long id) {
+        return toAjax(mallAfterSaleService.complete(id));
+    }
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/src/main/java/org/dromara/mall/trade/controller/admin/AdminMallOrderEvaluateController.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/src/main/java/org/dromara/mall/trade/controller/admin/AdminMallOrderEvaluateController.java
new file mode 100644
index 0000000..339aa40
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/src/main/java/org/dromara/mall/trade/controller/admin/AdminMallOrderEvaluateController.java
@@ -0,0 +1,120 @@
+package org.dromara.mall.trade.controller.admin;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.mall.trade.domain.bo.MallOrderEvaluateBo;
+import org.dromara.mall.trade.domain.vo.MallOrderEvaluateVo;
+import org.dromara.mall.trade.service.MallOrderEvaluateService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 订单评价管理
+ *
+ * @author pengles
+ */
+@Tag(name = "管理端-订单评价管理", description = "订单评价管理接口")
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/mall/order/evaluate")
+public class AdminMallOrderEvaluateController extends BaseController {
+
+    private final MallOrderEvaluateService mallOrderEvaluateService;
+
+    /**
+     * 查询订单评价列表
+     */
+    @Operation(summary = "查询订单评价列表", description = "分页查询订单评价列表")
+    @SaCheckPermission("mall:order:evaluate:list")
+    @GetMapping("/list")
+    public TableDataInfo<MallOrderEvaluateVo> list(@Parameter(description = "评价查询条件") MallOrderEvaluateBo bo,
+                                                   @Parameter(description = "分页参数") PageQuery pageQuery) {
+        return mallOrderEvaluateService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出订单评价列表
+     */
+    @Operation(summary = "导出订单评价列表", description = "导出订单评价到Excel")
+    @SaCheckPermission("mall:order:evaluate:export")
+    @Log(title = "订单评价", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(@Parameter(description = "评价查询条件") MallOrderEvaluateBo bo,
+                       @Parameter(description = "响应对象") HttpServletResponse response) {
+        List<MallOrderEvaluateVo> list = mallOrderEvaluateService.queryList(bo);
+        ExcelUtil.exportExcel(list, "订单评价", MallOrderEvaluateVo.class, response);
+    }
+
+    /**
+     * 获取订单评价详细信息
+     */
+    @Operation(summary = "获取订单评价详情", description = "根据评价ID获取详细信息")
+    @SaCheckPermission("mall:order:evaluate:query")
+    @GetMapping("/{id}")
+    public R<MallOrderEvaluateVo> getInfo(@Parameter(description = "评价ID", required = true)
+                                          @NotNull(message = "主键不能为空")
+                                          @PathVariable Long id) {
+        return R.ok(mallOrderEvaluateService.queryById(id));
+    }
+
+    /**
+     * 删除订单评价
+     */
+    @Operation(summary = "删除订单评价", description = "删除订单评价")
+    @SaCheckPermission("mall:order:evaluate:remove")
+    @Log(title = "订单评价", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@Parameter(description = "评价ID数组", required = true)
+                          @NotNull(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(mallOrderEvaluateService.deleteWithValidByIds(Arrays.asList(ids), true));
+    }
+
+    /**
+     * 审核评价（通过/驳回）
+     */
+    @Operation(summary = "审核评价", description = "审核评价，1-通过，2-驳回")
+    @SaCheckPermission("mall:order:evaluate:audit")
+    @Log(title = "订单评价", businessType = BusinessType.UPDATE)
+    @PutMapping("/audit/{id}")
+    public R<Void> audit(@Parameter(description = "评价ID", required = true)
+                         @NotNull(message = "主键不能为空")
+                         @PathVariable Long id,
+                         @Parameter(description = "审核状态", required = true)
+                         @NotNull(message = "审核状态不能为空")
+                         @RequestParam Integer status) {
+        return toAjax(mallOrderEvaluateService.audit(id, status));
+    }
+
+    /**
+     * 回复评价
+     */
+    @Operation(summary = "回复评价", description = "商家回复评价")
+    @SaCheckPermission("mall:order:evaluate:reply")
+    @Log(title = "订单评价", businessType = BusinessType.UPDATE)
+    @PutMapping("/reply/{id}")
+    public R<Void> reply(@Parameter(description = "评价ID", required = true)
+                         @NotNull(message = "主键不能为空")
+                         @PathVariable Long id,
+                         @Parameter(description = "回复内容", required = true)
+                         @NotNull(message = "回复内容不能为空")
+                         @RequestParam String replyContent) {
+        return toAjax(mallOrderEvaluateService.reply(id, replyContent));
+    }
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/src/main/java/org/dromara/mall/trade/controller/app/AppMallAddressController.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/src/main/java/org/dromara/mall/trade/controller/app/AppMallAddressController.java
new file mode 100644
index 0000000..e5267fe
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/src/main/java/org/dromara/mall/trade/controller/app/AppMallAddressController.java
@@ -0,0 +1,106 @@
+package org.dromara.mall.trade.controller.app;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.mall.trade.domain.bo.MallAddressBo;
+import org.dromara.mall.trade.domain.vo.MallAddressVo;
+import org.dromara.mall.trade.service.MallAddressService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 收货地址（移动端）
+ *
+ * @author pengles
+ */
+@Tag(name = "移动端-收货地址", description = "收货地址接口")
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/app/mall/address")
+public class AppMallAddressController extends BaseController {
+
+    private final MallAddressService mallAddressService;
+
+    /**
+     * 查询收货地址列表
+     */
+    @Operation(summary = "查询收货地址列表", description = "查询用户的收货地址列表")
+    @GetMapping("/list")
+    public R<List<MallAddressVo>> list() {
+        Long userId = org.dromara.common.satoken.utils.LoginHelper.getUserId();
+        List<MallAddressVo> list = mallAddressService.queryListByUserId(userId);
+        return R.ok(list);
+    }
+
+    /**
+     * 获取默认收货地址
+     */
+    @Operation(summary = "获取默认收货地址", description = "查询用户的默认收货地址")
+    @GetMapping("/default")
+    public R<MallAddressVo> getDefault() {
+        Long userId = org.dromara.common.satoken.utils.LoginHelper.getUserId();
+        MallAddressVo address = mallAddressService.queryDefaultByUserId(userId);
+        return R.ok(address);
+    }
+
+    /**
+     * 获取收货地址详细信息
+     */
+    @Operation(summary = "获取收货地址详情", description = "根据地址ID获取详细信息")
+    @GetMapping("/{id}")
+    public R<MallAddressVo> getInfo(@Parameter(description = "地址ID", required = true)
+                                    @NotNull(message = "主键不能为空")
+                                    @PathVariable Long id) {
+        return R.ok(mallAddressService.queryById(id));
+    }
+
+    /**
+     * 新增收货地址
+     */
+    @Operation(summary = "新增收货地址", description = "创建新的收货地址")
+    @PostMapping
+    public R<Void> add(@Parameter(description = "收货地址信息") @Validated @RequestBody MallAddressBo bo) {
+        return toAjax(mallAddressService.insertByBo(bo));
+    }
+
+    /**
+     * 修改收货地址
+     */
+    @Operation(summary = "修改收货地址", description = "更新收货地址信息")
+    @PutMapping
+    public R<Void> edit(@Parameter(description = "收货地址信息") @Validated @RequestBody MallAddressBo bo) {
+        return toAjax(mallAddressService.updateByBo(bo));
+    }
+
+    /**
+     * 删除收货地址
+     */
+    @Operation(summary = "删除收货地址", description = "删除收货地址")
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@Parameter(description = "地址ID数组", required = true)
+                          @NotNull(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(mallAddressService.deleteWithValidByIds(Arrays.asList(ids), true));
+    }
+
+    /**
+     * 设置默认地址
+     */
+    @Operation(summary = "设置默认地址", description = "将指定地址设置为默认收货地址")
+    @PutMapping("/default/{id}")
+    public R<Void> setDefault(@Parameter(description = "地址ID", required = true)
+                              @NotNull(message = "主键不能为空")
+                              @PathVariable Long id) {
+        return toAjax(mallAddressService.setDefault(id));
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/src/main/java/org/dromara/mall/trade/controller/app/AppMallAfterSaleController.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/src/main/java/org/dromara/mall/trade/controller/app/AppMallAfterSaleController.java
new file mode 100644
index 0000000..9aa3d37
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/src/main/java/org/dromara/mall/trade/controller/app/AppMallAfterSaleController.java
@@ -0,0 +1,106 @@
+package org.dromara.mall.trade.controller.app;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.mall.trade.domain.bo.MallAfterSaleBo;
+import org.dromara.mall.trade.domain.vo.MallAfterSaleVo;
+import org.dromara.mall.trade.service.MallAfterSaleService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 售后申请（移动端）
+ *
+ * @author pengles
+ */
+@Tag(name = "移动端-售后申请", description = "售后申请接口")
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/app/mall/order/after-sale")
+public class AppMallAfterSaleController {
+
+    private final MallAfterSaleService mallAfterSaleService;
+
+    /**
+     * 查询售后申请列表（移动端）
+     */
+    @Operation(summary = "查询售后申请列表", description = "查询用户的售后申请列表")
+    @GetMapping("/list")
+    public R<TableDataInfo<MallAfterSaleVo>> list(@Parameter(description = "售后申请查询条件") MallAfterSaleBo bo,
+                                                  @Parameter(description = "分页参数") PageQuery pageQuery) {
+        TableDataInfo<MallAfterSaleVo> result = mallAfterSaleService.queryPageList(bo, pageQuery);
+        return R.ok(result);
+    }
+
+    /**
+     * 根据订单ID查询售后申请列表
+     */
+    @Operation(summary = "查询订单售后申请列表", description = "根据订单ID查询售后申请列表")
+    @GetMapping("/order/{orderId}")
+    public R<List<MallAfterSaleVo>> listByOrderId(@Parameter(description = "订单ID", required = true)
+                                                  @NotNull(message = "订单ID不能为空")
+                                                  @PathVariable Long orderId) {
+        MallAfterSaleBo bo = new MallAfterSaleBo();
+        bo.setOrderId(orderId);
+        List<MallAfterSaleVo> list = mallAfterSaleService.queryList(bo);
+        return R.ok(list);
+    }
+
+    /**
+     * 获取售后申请详细信息
+     */
+    @Operation(summary = "获取售后申请详情", description = "根据售后申请ID获取详细信息")
+    @GetMapping("/{id}")
+    public R<MallAfterSaleVo> getInfo(@Parameter(description = "售后申请ID", required = true)
+                                      @NotNull(message = "主键不能为空")
+                                      @PathVariable Long id) {
+        return R.ok(mallAfterSaleService.queryById(id));
+    }
+
+    /**
+     * 新增售后申请
+     */
+    @Operation(summary = "新增售后申请", description = "提交售后申请（退款/退货/换货）")
+    @PostMapping
+    public R<Void> add(@Parameter(description = "售后申请信息") @Validated @RequestBody MallAfterSaleBo bo) {
+        return R.ok(mallAfterSaleService.insertByBo(bo));
+    }
+
+    /**
+     * 用户填写退货物流信息
+     */
+    @Operation(summary = "填写退货物流信息", description = "用户填写退货物流信息（仅退货和换货类型）")
+    @PutMapping("/logistics/{id}")
+    public R<Void> fillLogistics(@Parameter(description = "售后申请ID", required = true)
+                                 @NotNull(message = "主键不能为空")
+                                 @PathVariable Long id,
+                                 @Parameter(description = "物流公司", required = true)
+                                 @NotBlank(message = "物流公司不能为空")
+                                 @RequestParam String logisticsCompany,
+                                 @Parameter(description = "物流单号", required = true)
+                                 @NotBlank(message = "物流单号不能为空")
+                                 @RequestParam String logisticsNo) {
+        return R.ok(mallAfterSaleService.fillLogistics(id, logisticsCompany, logisticsNo));
+    }
+
+    /**
+     * 取消售后申请
+     */
+    @Operation(summary = "取消售后申请", description = "用户取消售后申请")
+    @PutMapping("/cancel/{id}")
+    public R<Void> cancel(@Parameter(description = "售后申请ID", required = true)
+                          @NotNull(message = "主键不能为空")
+                          @PathVariable Long id) {
+        return R.ok(mallAfterSaleService.cancel(id));
+    }
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/src/main/java/org/dromara/mall/trade/controller/app/AppMallOrderEvaluateController.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/src/main/java/org/dromara/mall/trade/controller/app/AppMallOrderEvaluateController.java
new file mode 100644
index 0000000..df7ccea
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/src/main/java/org/dromara/mall/trade/controller/app/AppMallOrderEvaluateController.java
@@ -0,0 +1,93 @@
+package org.dromara.mall.trade.controller.app;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.mall.trade.domain.bo.MallOrderEvaluateBo;
+import org.dromara.mall.trade.domain.vo.MallOrderEvaluateVo;
+import org.dromara.mall.trade.service.MallOrderEvaluateService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 订单评价（移动端）
+ *
+ * @author pengles
+ */
+@Tag(name = "移动端-订单评价", description = "订单评价接口")
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/app/mall/order/evaluate")
+public class AppMallOrderEvaluateController {
+
+    private final MallOrderEvaluateService mallOrderEvaluateService;
+
+    /**
+     * 查询订单评价列表（移动端）
+     */
+    @Operation(summary = "查询订单评价列表", description = "查询订单评价列表")
+    @GetMapping("/list")
+    public R<TableDataInfo<MallOrderEvaluateVo>> list(@Parameter(description = "评价查询条件") MallOrderEvaluateBo bo,
+                                                      @Parameter(description = "分页参数") PageQuery pageQuery) {
+        TableDataInfo<MallOrderEvaluateVo> result = mallOrderEvaluateService.queryPageList(bo, pageQuery);
+        return R.ok(result);
+    }
+
+    /**
+     * 根据订单ID查询评价列表
+     */
+    @Operation(summary = "查询订单评价列表", description = "根据订单ID查询评价列表")
+    @GetMapping("/order/{orderId}")
+    public R<List<MallOrderEvaluateVo>> listByOrderId(@Parameter(description = "订单ID", required = true)
+                                                      @NotNull(message = "订单ID不能为空")
+                                                      @PathVariable Long orderId) {
+        MallOrderEvaluateBo bo = new MallOrderEvaluateBo();
+        bo.setOrderId(orderId);
+        List<MallOrderEvaluateVo> list = mallOrderEvaluateService.queryList(bo);
+        return R.ok(list);
+    }
+
+    /**
+     * 根据商品ID查询评价列表
+     */
+    @Operation(summary = "查询商品评价列表", description = "根据商品ID查询评价列表（仅已通过审核的）")
+    @GetMapping("/product/{productId}")
+    public R<TableDataInfo<MallOrderEvaluateVo>> listByProductId(@Parameter(description = "商品ID", required = true)
+                                                                 @NotNull(message = "商品ID不能为空")
+                                                                 @PathVariable Long productId,
+                                                                 @Parameter(description = "分页参数") PageQuery pageQuery) {
+        MallOrderEvaluateBo bo = new MallOrderEvaluateBo();
+        bo.setProductId(productId);
+        bo.setStatus(1); // 只查询已通过审核的评价
+        TableDataInfo<MallOrderEvaluateVo> result = mallOrderEvaluateService.queryPageList(bo, pageQuery);
+        return R.ok(result);
+    }
+
+    /**
+     * 获取订单评价详细信息
+     */
+    @Operation(summary = "获取订单评价详情", description = "根据评价ID获取详细信息")
+    @GetMapping("/{id}")
+    public R<MallOrderEvaluateVo> getInfo(@Parameter(description = "评价ID", required = true)
+                                          @NotNull(message = "主键不能为空")
+                                          @PathVariable Long id) {
+        return R.ok(mallOrderEvaluateService.queryById(id));
+    }
+
+    /**
+     * 新增订单评价
+     */
+    @Operation(summary = "新增订单评价", description = "提交订单评价")
+    @PostMapping
+    public R<Void> add(@Parameter(description = "评价信息") @Validated @RequestBody MallOrderEvaluateBo bo) {
+        return R.ok(mallOrderEvaluateService.insertByBo(bo));
+    }
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/src/main/java/org/dromara/mall/trade/domain/MallAddress.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/src/main/java/org/dromara/mall/trade/domain/MallAddress.java
new file mode 100644
index 0000000..ad24f6b
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/src/main/java/org/dromara/mall/trade/domain/MallAddress.java
@@ -0,0 +1,81 @@
+package org.dromara.mall.trade.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 收货地址对象 mall_address
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode
+@TableName("mall_address")
+public class MallAddress implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 地址ID
+     */
+    @TableId
+    private Long id;
+
+    /**
+     * 用户ID
+     */
+    private Long userId;
+
+    /**
+     * 收货人姓名
+     */
+    private String receiverName;
+
+    /**
+     * 收货人电话
+     */
+    private String receiverPhone;
+
+    /**
+     * 省份
+     */
+    private String province;
+
+    /**
+     * 城市
+     */
+    private String city;
+
+    /**
+     * 区/县
+     */
+    private String district;
+
+    /**
+     * 详细地址
+     */
+    private String address;
+
+    /**
+     * 是否默认地址(0否 1是)
+     */
+    private Integer isDefault;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/src/main/java/org/dromara/mall/trade/domain/MallAfterSale.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/src/main/java/org/dromara/mall/trade/domain/MallAfterSale.java
new file mode 100644
index 0000000..ff0f881
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/src/main/java/org/dromara/mall/trade/domain/MallAfterSale.java
@@ -0,0 +1,150 @@
+package org.dromara.mall.trade.domain;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 售后申请对象 mall_after_sale
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode
+@TableName("mall_after_sale")
+public class MallAfterSale implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 售后ID
+     */
+    @TableId
+    private Long id;
+
+    /**
+     * 售后单号
+     */
+    private String afterSaleNo;
+
+    /**
+     * 订单ID
+     */
+    private Long orderId;
+
+    /**
+     * 订单号
+     */
+    private String orderNo;
+
+    /**
+     * 订单明细ID
+     */
+    private Long orderItemId;
+
+    /**
+     * 用户ID
+     */
+    private Long userId;
+
+    /**
+     * 售后类型(0退款 1退货 2换货)
+     */
+    private Integer type;
+
+    /**
+     * 申请原因
+     */
+    private String reason;
+
+    /**
+     * 问题描述
+     */
+    private String description;
+
+    /**
+     * 凭证图片(JSON数组)
+     */
+    private String images;
+
+    /**
+     * 退款金额(分)
+     */
+    private Integer refundAmount;
+
+    /**
+     * 数量
+     */
+    private Integer quantity;
+
+    /**
+     * 状态(0待审核 1已同意 2已拒绝 3待退货 4待收货 5已完成 6已取消)
+     */
+    private Integer status;
+
+    /**
+     * 拒绝原因
+     */
+    private String refuseReason;
+
+    /**
+     * 退款单号
+     */
+    private String refundOrderNo;
+
+    /**
+     * 物流公司
+     */
+    private String logisticsCompany;
+
+    /**
+     * 物流单号
+     */
+    private String logisticsNo;
+
+    /**
+     * 申请时间
+     */
+    private Date applyTime;
+
+    /**
+     * 审核时间
+     */
+    private Date auditTime;
+
+    /**
+     * 退货时间
+     */
+    private Date returnTime;
+
+    /**
+     * 收货时间
+     */
+    private Date receiveTime;
+
+    /**
+     * 退款时间
+     */
+    private Date refundTime;
+
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/src/main/java/org/dromara/mall/trade/domain/MallOrderCoupon.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/src/main/java/org/dromara/mall/trade/domain/MallOrderCoupon.java
new file mode 100644
index 0000000..ee88c9d
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/src/main/java/org/dromara/mall/trade/domain/MallOrderCoupon.java
@@ -0,0 +1,61 @@
+package org.dromara.mall.trade.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 订单优惠券使用记录对象 mall_order_coupon
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode
+@TableName("mall_order_coupon")
+public class MallOrderCoupon implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @TableId
+    private Long id;
+
+    /**
+     * 订单ID
+     */
+    private Long orderId;
+
+    /**
+     * 订单号
+     */
+    private String orderNo;
+
+    /**
+     * 优惠券ID
+     */
+    private Long couponId;
+
+    /**
+     * 用户优惠券ID
+     */
+    private Long couponUserId;
+
+    /**
+     * 优惠金额(分)
+     */
+    private Integer discountAmount;
+
+    /**
+     * 使用时间
+     */
+    private Date createTime;
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/src/main/java/org/dromara/mall/trade/domain/MallOrderEvaluate.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/src/main/java/org/dromara/mall/trade/domain/MallOrderEvaluate.java
new file mode 100644
index 0000000..30bc658
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/src/main/java/org/dromara/mall/trade/domain/MallOrderEvaluate.java
@@ -0,0 +1,105 @@
+package org.dromara.mall.trade.domain;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 订单评价对象 mall_order_evaluate
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode
+@TableName("mall_order_evaluate")
+public class MallOrderEvaluate implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 评价ID
+     */
+    @TableId
+    private Long id;
+
+    /**
+     * 订单ID
+     */
+    private Long orderId;
+
+    /**
+     * 订单号
+     */
+    private String orderNo;
+
+    /**
+     * 订单明细ID
+     */
+    private Long orderItemId;
+
+    /**
+     * 商品ID
+     */
+    private Long productId;
+
+    /**
+     * SKU ID
+     */
+    private Long skuId;
+
+    /**
+     * 用户ID
+     */
+    private Long userId;
+
+    /**
+     * 评分(1-5)
+     */
+    private Integer score;
+
+    /**
+     * 评价内容
+     */
+    private String content;
+
+    /**
+     * 评价图片(JSON数组)
+     */
+    private String images;
+
+    /**
+     * 回复内容
+     */
+    private String replyContent;
+
+    /**
+     * 回复时间
+     */
+    private Date replyTime;
+
+    /**
+     * 状态(0待审核 1已通过 2已驳回)
+     */
+    private Integer status;
+
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/src/main/java/org/dromara/mall/trade/domain/bo/MallAddressBo.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/src/main/java/org/dromara/mall/trade/domain/bo/MallAddressBo.java
new file mode 100644
index 0000000..83868b0
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/src/main/java/org/dromara/mall/trade/domain/bo/MallAddressBo.java
@@ -0,0 +1,76 @@
+package org.dromara.mall.trade.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.mall.trade.domain.MallAddress;
+
+/**
+ * 收货地址业务对象 mall_address
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = MallAddress.class, reverseConvertGenerate = false)
+public class MallAddressBo extends BaseEntity {
+
+    /**
+     * 地址ID
+     */
+    private Long id;
+
+    /**
+     * 用户ID
+     */
+    private Long userId;
+
+    /**
+     * 收货人姓名
+     */
+    @NotBlank(message = "收货人姓名不能为空")
+    @Size(max = 64, message = "收货人姓名长度不能超过64个字符")
+    private String receiverName;
+
+    /**
+     * 收货人电话
+     */
+    @NotBlank(message = "收货人电话不能为空")
+    @Size(max = 32, message = "收货人电话长度不能超过32个字符")
+    private String receiverPhone;
+
+    /**
+     * 省份
+     */
+    @Size(max = 64, message = "省份长度不能超过64个字符")
+    private String province;
+
+    /**
+     * 城市
+     */
+    @Size(max = 64, message = "城市长度不能超过64个字符")
+    private String city;
+
+    /**
+     * 区/县
+     */
+    @Size(max = 64, message = "区/县长度不能超过64个字符")
+    private String district;
+
+    /**
+     * 详细地址
+     */
+    @NotBlank(message = "详细地址不能为空")
+    @Size(max = 512, message = "详细地址长度不能超过512个字符")
+    private String address;
+
+    /**
+     * 是否默认地址(0否 1是)
+     */
+    private Integer isDefault;
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/src/main/java/org/dromara/mall/trade/domain/bo/MallAfterSaleBo.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/src/main/java/org/dromara/mall/trade/domain/bo/MallAfterSaleBo.java
new file mode 100644
index 0000000..5cb6801
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/src/main/java/org/dromara/mall/trade/domain/bo/MallAfterSaleBo.java
@@ -0,0 +1,110 @@
+package org.dromara.mall.trade.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.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.mall.trade.domain.MallAfterSale;
+
+/**
+ * 售后申请业务对象 mall_after_sale
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = MallAfterSale.class, reverseConvertGenerate = false)
+public class MallAfterSaleBo extends BaseEntity {
+
+    /**
+     * 售后ID
+     */
+    private Long id;
+
+    /**
+     * 售后单号
+     */
+    private String afterSaleNo;
+
+    /**
+     * 订单ID
+     */
+    @NotNull(message = "订单ID不能为空")
+    private Long orderId;
+
+    /**
+     * 订单号
+     */
+    private String orderNo;
+
+    /**
+     * 订单明细ID
+     */
+    @NotNull(message = "订单明细ID不能为空")
+    private Long orderItemId;
+
+    /**
+     * 用户ID
+     */
+    private Long userId;
+
+    /**
+     * 售后类型(0退款 1退货 2换货)
+     */
+    @NotNull(message = "售后类型不能为空")
+    private Integer type;
+
+    /**
+     * 申请原因
+     */
+    @NotBlank(message = "申请原因不能为空")
+    private String reason;
+
+    /**
+     * 问题描述
+     */
+    private String description;
+
+    /**
+     * 凭证图片(JSON数组)
+     */
+    private String images;
+
+    /**
+     * 退款金额(分)
+     */
+    private Integer refundAmount;
+
+    /**
+     * 数量
+     */
+    private Integer quantity;
+
+    /**
+     * 状态(0待审核 1已同意 2已拒绝 3待退货 4待收货 5已完成 6已取消)
+     */
+    private Integer status;
+
+    /**
+     * 拒绝原因
+     */
+    private String refuseReason;
+
+    /**
+     * 退款单号
+     */
+    private String refundOrderNo;
+
+    /**
+     * 物流公司
+     */
+    private String logisticsCompany;
+
+    /**
+     * 物流单号
+     */
+    private String logisticsNo;
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/src/main/java/org/dromara/mall/trade/domain/bo/MallOrderCouponBo.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/src/main/java/org/dromara/mall/trade/domain/bo/MallOrderCouponBo.java
new file mode 100644
index 0000000..3b15673
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/src/main/java/org/dromara/mall/trade/domain/bo/MallOrderCouponBo.java
@@ -0,0 +1,56 @@
+package org.dromara.mall.trade.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.mall.trade.domain.MallOrderCoupon;
+
+/**
+ * 订单优惠券使用记录业务对象 mall_order_coupon
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = MallOrderCoupon.class, reverseConvertGenerate = false)
+public class MallOrderCouponBo extends BaseEntity {
+
+    /**
+     * ID
+     */
+    private Long id;
+
+    /**
+     * 订单ID
+     */
+    @NotNull(message = "订单ID不能为空")
+    private Long orderId;
+
+    /**
+     * 订单号
+     */
+    private String orderNo;
+
+    /**
+     * 优惠券ID
+     */
+    @NotNull(message = "优惠券ID不能为空")
+    private Long couponId;
+
+    /**
+     * 用户优惠券ID
+     */
+    @NotNull(message = "用户优惠券ID不能为空")
+    private Long couponUserId;
+
+    /**
+     * 优惠金额(分)
+     */
+    @NotNull(message = "优惠金额不能为空")
+    @Min(value = 0, message = "优惠金额不能为负数")
+    private Integer discountAmount;
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/src/main/java/org/dromara/mall/trade/domain/bo/MallOrderEvaluateBo.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/src/main/java/org/dromara/mall/trade/domain/bo/MallOrderEvaluateBo.java
new file mode 100644
index 0000000..fb8e043
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/src/main/java/org/dromara/mall/trade/domain/bo/MallOrderEvaluateBo.java
@@ -0,0 +1,87 @@
+package org.dromara.mall.trade.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.mall.trade.domain.MallOrderEvaluate;
+
+/**
+ * 订单评价业务对象 mall_order_evaluate
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = MallOrderEvaluate.class, reverseConvertGenerate = false)
+public class MallOrderEvaluateBo extends BaseEntity {
+
+    /**
+     * 评价ID
+     */
+    private Long id;
+
+    /**
+     * 订单ID
+     */
+    @NotNull(message = "订单ID不能为空")
+    private Long orderId;
+
+    /**
+     * 订单号
+     */
+    private String orderNo;
+
+    /**
+     * 订单明细ID
+     */
+    @NotNull(message = "订单明细ID不能为空")
+    private Long orderItemId;
+
+    /**
+     * 商品ID
+     */
+    private Long productId;
+
+    /**
+     * SKU ID
+     */
+    private Long skuId;
+
+    /**
+     * 用户ID
+     */
+    private Long userId;
+
+    /**
+     * 评分(1-5)
+     */
+    @NotNull(message = "评分不能为空")
+    @Min(value = 1, message = "评分不能小于1")
+    @Max(value = 5, message = "评分不能大于5")
+    private Integer score;
+
+    /**
+     * 评价内容
+     */
+    private String content;
+
+    /**
+     * 评价图片(JSON数组)
+     */
+    private String images;
+
+    /**
+     * 回复内容
+     */
+    private String replyContent;
+
+    /**
+     * 状态(0待审核 1已通过 2已驳回)
+     */
+    private Integer status;
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/src/main/java/org/dromara/mall/trade/domain/vo/MallAddressVo.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/src/main/java/org/dromara/mall/trade/domain/vo/MallAddressVo.java
new file mode 100644
index 0000000..86371ac
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/src/main/java/org/dromara/mall/trade/domain/vo/MallAddressVo.java
@@ -0,0 +1,98 @@
+package org.dromara.mall.trade.domain.vo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.mall.trade.domain.MallAddress;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 收货地址视图对象 mall_address
+ *
+ * @author pengles
+ */
+@Data
+@AutoMapper(target = MallAddress.class)
+public class MallAddressVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 地址ID
+     */
+    private Long id;
+
+    /**
+     * 用户ID
+     */
+    private Long userId;
+
+    /**
+     * 收货人姓名
+     */
+    private String receiverName;
+
+    /**
+     * 收货人电话
+     */
+    private String receiverPhone;
+
+    /**
+     * 省份
+     */
+    private String province;
+
+    /**
+     * 城市
+     */
+    private String city;
+
+    /**
+     * 区/县
+     */
+    private String district;
+
+    /**
+     * 详细地址
+     */
+    private String address;
+
+    /**
+     * 是否默认地址(0否 1是)
+     */
+    private Integer isDefault;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     * 完整地址（省份+城市+区/县+详细地址）
+     */
+    public String getFullAddress() {
+        StringBuilder fullAddress = new StringBuilder();
+        if (province != null && !province.isEmpty()) {
+            fullAddress.append(province);
+        }
+        if (city != null && !city.isEmpty()) {
+            fullAddress.append(city);
+        }
+        if (district != null && !district.isEmpty()) {
+            fullAddress.append(district);
+        }
+        if (address != null && !address.isEmpty()) {
+            fullAddress.append(address);
+        }
+        return fullAddress.toString();
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/src/main/java/org/dromara/mall/trade/domain/vo/MallAfterSaleVo.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/src/main/java/org/dromara/mall/trade/domain/vo/MallAfterSaleVo.java
new file mode 100644
index 0000000..ea32b17
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/src/main/java/org/dromara/mall/trade/domain/vo/MallAfterSaleVo.java
@@ -0,0 +1,143 @@
+package org.dromara.mall.trade.domain.vo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.mall.trade.domain.MallAfterSale;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 售后申请视图对象 mall_after_sale
+ *
+ * @author pengles
+ */
+@Data
+@AutoMapper(target = MallAfterSale.class)
+public class MallAfterSaleVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 售后ID
+     */
+    private Long id;
+
+    /**
+     * 售后单号
+     */
+    private String afterSaleNo;
+
+    /**
+     * 订单ID
+     */
+    private Long orderId;
+
+    /**
+     * 订单号
+     */
+    private String orderNo;
+
+    /**
+     * 订单明细ID
+     */
+    private Long orderItemId;
+
+    /**
+     * 用户ID
+     */
+    private Long userId;
+
+    /**
+     * 售后类型(0退款 1退货 2换货)
+     */
+    private Integer type;
+
+    /**
+     * 申请原因
+     */
+    private String reason;
+
+    /**
+     * 问题描述
+     */
+    private String description;
+
+    /**
+     * 凭证图片(JSON数组)
+     */
+    private String images;
+
+    /**
+     * 退款金额(分)
+     */
+    private Integer refundAmount;
+
+    /**
+     * 数量
+     */
+    private Integer quantity;
+
+    /**
+     * 状态(0待审核 1已同意 2已拒绝 3待退货 4待收货 5已完成 6已取消)
+     */
+    private Integer status;
+
+    /**
+     * 拒绝原因
+     */
+    private String refuseReason;
+
+    /**
+     * 退款单号
+     */
+    private String refundOrderNo;
+
+    /**
+     * 物流公司
+     */
+    private String logisticsCompany;
+
+    /**
+     * 物流单号
+     */
+    private String logisticsNo;
+
+    /**
+     * 申请时间
+     */
+    private Date applyTime;
+
+    /**
+     * 审核时间
+     */
+    private Date auditTime;
+
+    /**
+     * 退货时间
+     */
+    private Date returnTime;
+
+    /**
+     * 收货时间
+     */
+    private Date receiveTime;
+
+    /**
+     * 退款时间
+     */
+    private Date refundTime;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/src/main/java/org/dromara/mall/trade/domain/vo/MallOrderCouponVo.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/src/main/java/org/dromara/mall/trade/domain/vo/MallOrderCouponVo.java
new file mode 100644
index 0000000..8cb9dca
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/src/main/java/org/dromara/mall/trade/domain/vo/MallOrderCouponVo.java
@@ -0,0 +1,58 @@
+package org.dromara.mall.trade.domain.vo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.mall.trade.domain.MallOrderCoupon;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 订单优惠券使用记录视图对象 mall_order_coupon
+ *
+ * @author pengles
+ */
+@Data
+@AutoMapper(target = MallOrderCoupon.class)
+public class MallOrderCouponVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    private Long id;
+
+    /**
+     * 订单ID
+     */
+    private Long orderId;
+
+    /**
+     * 订单号
+     */
+    private String orderNo;
+
+    /**
+     * 优惠券ID
+     */
+    private Long couponId;
+
+    /**
+     * 用户优惠券ID
+     */
+    private Long couponUserId;
+
+    /**
+     * 优惠金额(分)
+     */
+    private Integer discountAmount;
+
+    /**
+     * 使用时间
+     */
+    private Date createTime;
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/src/main/java/org/dromara/mall/trade/domain/vo/MallOrderEvaluateVo.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/src/main/java/org/dromara/mall/trade/domain/vo/MallOrderEvaluateVo.java
new file mode 100644
index 0000000..0d5947d
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/src/main/java/org/dromara/mall/trade/domain/vo/MallOrderEvaluateVo.java
@@ -0,0 +1,98 @@
+package org.dromara.mall.trade.domain.vo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.mall.trade.domain.MallOrderEvaluate;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 订单评价视图对象 mall_order_evaluate
+ *
+ * @author pengles
+ */
+@Data
+@AutoMapper(target = MallOrderEvaluate.class)
+public class MallOrderEvaluateVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 评价ID
+     */
+    private Long id;
+
+    /**
+     * 订单ID
+     */
+    private Long orderId;
+
+    /**
+     * 订单号
+     */
+    private String orderNo;
+
+    /**
+     * 订单明细ID
+     */
+    private Long orderItemId;
+
+    /**
+     * 商品ID
+     */
+    private Long productId;
+
+    /**
+     * SKU ID
+     */
+    private Long skuId;
+
+    /**
+     * 用户ID
+     */
+    private Long userId;
+
+    /**
+     * 评分(1-5)
+     */
+    private Integer score;
+
+    /**
+     * 评价内容
+     */
+    private String content;
+
+    /**
+     * 评价图片(JSON数组)
+     */
+    private String images;
+
+    /**
+     * 回复内容
+     */
+    private String replyContent;
+
+    /**
+     * 回复时间
+     */
+    private Date replyTime;
+
+    /**
+     * 状态(0待审核 1已通过 2已驳回)
+     */
+    private Integer status;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/src/main/java/org/dromara/mall/trade/mapper/MallAddressMapper.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/src/main/java/org/dromara/mall/trade/mapper/MallAddressMapper.java
new file mode 100644
index 0000000..67898e8
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/src/main/java/org/dromara/mall/trade/mapper/MallAddressMapper.java
@@ -0,0 +1,16 @@
+package org.dromara.mall.trade.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.mall.trade.domain.MallAddress;
+import org.dromara.mall.trade.domain.vo.MallAddressVo;
+
+/**
+ * 收货地址Mapper接口
+ *
+ * @author pengles
+ */
+@Mapper
+public interface MallAddressMapper extends BaseMapperPlus<MallAddress, MallAddressVo> {
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/src/main/java/org/dromara/mall/trade/mapper/MallAfterSaleMapper.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/src/main/java/org/dromara/mall/trade/mapper/MallAfterSaleMapper.java
new file mode 100644
index 0000000..173e052
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/src/main/java/org/dromara/mall/trade/mapper/MallAfterSaleMapper.java
@@ -0,0 +1,16 @@
+package org.dromara.mall.trade.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.mall.trade.domain.MallAfterSale;
+import org.dromara.mall.trade.domain.vo.MallAfterSaleVo;
+
+/**
+ * 售后申请Mapper接口
+ *
+ * @author pengles
+ */
+@Mapper
+public interface MallAfterSaleMapper extends BaseMapperPlus<MallAfterSale, MallAfterSaleVo> {
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/src/main/java/org/dromara/mall/trade/mapper/MallOrderCouponMapper.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/src/main/java/org/dromara/mall/trade/mapper/MallOrderCouponMapper.java
new file mode 100644
index 0000000..397381b
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/src/main/java/org/dromara/mall/trade/mapper/MallOrderCouponMapper.java
@@ -0,0 +1,16 @@
+package org.dromara.mall.trade.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.mall.trade.domain.MallOrderCoupon;
+import org.dromara.mall.trade.domain.vo.MallOrderCouponVo;
+
+/**
+ * 订单优惠券使用记录Mapper接口
+ *
+ * @author pengles
+ */
+@Mapper
+public interface MallOrderCouponMapper extends BaseMapperPlus<MallOrderCoupon, MallOrderCouponVo> {
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/src/main/java/org/dromara/mall/trade/mapper/MallOrderEvaluateMapper.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/src/main/java/org/dromara/mall/trade/mapper/MallOrderEvaluateMapper.java
new file mode 100644
index 0000000..8ac5fc9
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/src/main/java/org/dromara/mall/trade/mapper/MallOrderEvaluateMapper.java
@@ -0,0 +1,16 @@
+package org.dromara.mall.trade.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.mall.trade.domain.MallOrderEvaluate;
+import org.dromara.mall.trade.domain.vo.MallOrderEvaluateVo;
+
+/**
+ * 订单评价Mapper接口
+ *
+ * @author pengles
+ */
+@Mapper
+public interface MallOrderEvaluateMapper extends BaseMapperPlus<MallOrderEvaluate, MallOrderEvaluateVo> {
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/src/main/java/org/dromara/mall/trade/service/MallAddressService.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/src/main/java/org/dromara/mall/trade/service/MallAddressService.java
new file mode 100644
index 0000000..911fc9d
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/src/main/java/org/dromara/mall/trade/service/MallAddressService.java
@@ -0,0 +1,63 @@
+package org.dromara.mall.trade.service;
+
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.mall.trade.domain.bo.MallAddressBo;
+import org.dromara.mall.trade.domain.vo.MallAddressVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 收货地址Service接口
+ *
+ * @author pengles
+ */
+public interface MallAddressService {
+
+    /**
+     * 查询收货地址
+     */
+    MallAddressVo queryById(Long id);
+
+    /**
+     * 查询收货地址列表
+     */
+    TableDataInfo<MallAddressVo> queryPageList(MallAddressBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询收货地址列表
+     */
+    List<MallAddressVo> queryList(MallAddressBo bo);
+
+    /**
+     * 查询用户的收货地址列表
+     */
+    List<MallAddressVo> queryListByUserId(Long userId);
+
+    /**
+     * 查询用户的默认地址
+     */
+    MallAddressVo queryDefaultByUserId(Long userId);
+
+    /**
+     * 新增收货地址
+     */
+    Boolean insertByBo(MallAddressBo bo);
+
+    /**
+     * 修改收货地址
+     */
+    Boolean updateByBo(MallAddressBo bo);
+
+    /**
+     * 校验并批量删除收货地址信息
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    /**
+     * 设置默认地址
+     */
+    Boolean setDefault(Long id);
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/src/main/java/org/dromara/mall/trade/service/MallAfterSaleService.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/src/main/java/org/dromara/mall/trade/service/MallAfterSaleService.java
new file mode 100644
index 0000000..7401a86
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/src/main/java/org/dromara/mall/trade/service/MallAfterSaleService.java
@@ -0,0 +1,78 @@
+package org.dromara.mall.trade.service;
+
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.mall.trade.domain.bo.MallAfterSaleBo;
+import org.dromara.mall.trade.domain.vo.MallAfterSaleVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 售后申请Service接口
+ *
+ * @author pengles
+ */
+public interface MallAfterSaleService {
+
+    /**
+     * 查询售后申请
+     */
+    MallAfterSaleVo queryById(Long id);
+
+    /**
+     * 根据售后单号查询
+     */
+    MallAfterSaleVo queryByAfterSaleNo(String afterSaleNo);
+
+    /**
+     * 查询售后申请列表
+     */
+    TableDataInfo<MallAfterSaleVo> queryPageList(MallAfterSaleBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询售后申请列表
+     */
+    List<MallAfterSaleVo> queryList(MallAfterSaleBo bo);
+
+    /**
+     * 新增售后申请
+     */
+    Boolean insertByBo(MallAfterSaleBo bo);
+
+    /**
+     * 修改售后申请
+     */
+    Boolean updateByBo(MallAfterSaleBo bo);
+
+    /**
+     * 校验并批量删除售后申请信息
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    /**
+     * 审核售后申请（同意/拒绝）
+     */
+    Boolean audit(Long id, Integer status, String refuseReason);
+
+    /**
+     * 用户填写退货物流信息
+     */
+    Boolean fillLogistics(Long id, String logisticsCompany, String logisticsNo);
+
+    /**
+     * 确认收货（商家确认收到退货）
+     */
+    Boolean confirmReceive(Long id);
+
+    /**
+     * 完成售后（退款完成或换货完成）
+     */
+    Boolean complete(Long id);
+
+    /**
+     * 取消售后申请
+     */
+    Boolean cancel(Long id);
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/src/main/java/org/dromara/mall/trade/service/MallOrderCouponService.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/src/main/java/org/dromara/mall/trade/service/MallOrderCouponService.java
new file mode 100644
index 0000000..7fcd731
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/src/main/java/org/dromara/mall/trade/service/MallOrderCouponService.java
@@ -0,0 +1,77 @@
+package org.dromara.mall.trade.service;
+
+import org.dromara.mall.trade.domain.bo.MallOrderCouponBo;
+import org.dromara.mall.trade.domain.vo.MallOrderCouponVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 订单优惠券使用记录Service接口
+ *
+ * @author pengles
+ */
+public interface MallOrderCouponService {
+
+    /**
+     * 查询订单优惠券使用记录
+     */
+    MallOrderCouponVo queryById(Long id);
+
+    /**
+     * 根据订单ID查询订单优惠券使用记录列表
+     */
+    List<MallOrderCouponVo> queryListByOrderId(Long orderId);
+
+    /**
+     * 根据订单号查询订单优惠券使用记录列表
+     */
+    List<MallOrderCouponVo> queryListByOrderNo(String orderNo);
+
+    /**
+     * 新增订单优惠券使用记录
+     */
+    Boolean insertByBo(MallOrderCouponBo bo);
+
+    /**
+     * 校验并批量删除订单优惠券使用记录信息
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    /**
+     * 计算并使用优惠券（订单创建时调用）
+     * 计算优惠券折扣金额，创建订单优惠券使用记录，并标记用户优惠券为已使用
+     *
+     * @param couponUserId 用户优惠券ID
+     * @param orderId 订单ID
+     * @param orderNo 订单号
+     * @param orderAmount 订单金额（单位：分）
+     * @return 优惠金额（单位：分）
+     */
+    Long calculateAndUseCoupon(Long couponUserId, Long orderId, String orderNo, Long orderAmount);
+
+    /**
+     * 根据订单ID统计优惠金额
+     *
+     * @param orderId 订单ID
+     * @return 优惠金额总和（单位：分）
+     */
+    Long sumDiscountAmountByOrderId(Long orderId);
+
+    /**
+     * 根据订单号统计优惠金额
+     *
+     * @param orderNo 订单号
+     * @return 优惠金额总和（单位：分）
+     */
+    Long sumDiscountAmountByOrderNo(String orderNo);
+
+    /**
+     * 根据优惠券ID统计核销金额
+     *
+     * @param couponId 优惠券ID
+     * @return 核销金额总和（单位：分）
+     */
+    Long sumDiscountAmountByCouponId(Long couponId);
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/src/main/java/org/dromara/mall/trade/service/MallOrderEvaluateService.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/src/main/java/org/dromara/mall/trade/service/MallOrderEvaluateService.java
new file mode 100644
index 0000000..38a2248
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/src/main/java/org/dromara/mall/trade/service/MallOrderEvaluateService.java
@@ -0,0 +1,58 @@
+package org.dromara.mall.trade.service;
+
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.mall.trade.domain.bo.MallOrderEvaluateBo;
+import org.dromara.mall.trade.domain.vo.MallOrderEvaluateVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 订单评价Service接口
+ *
+ * @author pengles
+ */
+public interface MallOrderEvaluateService {
+
+    /**
+     * 查询订单评价
+     */
+    MallOrderEvaluateVo queryById(Long id);
+
+    /**
+     * 查询订单评价列表
+     */
+    TableDataInfo<MallOrderEvaluateVo> queryPageList(MallOrderEvaluateBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询订单评价列表
+     */
+    List<MallOrderEvaluateVo> queryList(MallOrderEvaluateBo bo);
+
+    /**
+     * 新增订单评价
+     */
+    Boolean insertByBo(MallOrderEvaluateBo bo);
+
+    /**
+     * 修改订单评价
+     */
+    Boolean updateByBo(MallOrderEvaluateBo bo);
+
+    /**
+     * 校验并批量删除订单评价信息
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    /**
+     * 审核评价（通过/驳回）
+     */
+    Boolean audit(Long id, Integer status);
+
+    /**
+     * 回复评价（商家回复）
+     */
+    Boolean reply(Long id, String replyContent);
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/src/main/java/org/dromara/mall/trade/service/SeckillOrderService.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/src/main/java/org/dromara/mall/trade/service/SeckillOrderService.java
new file mode 100644
index 0000000..5ddaba8
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/src/main/java/org/dromara/mall/trade/service/SeckillOrderService.java
@@ -0,0 +1,102 @@
+package org.dromara.mall.trade.service;
+
+import java.util.Map;
+
+/**
+ * 秒杀订单处理Service接口
+ * 提供秒杀订单创建、验证、库存管理等核心业务逻辑
+ *
+ * @author pengles
+ */
+public interface SeckillOrderService {
+
+    /**
+     * 验证秒杀活动是否可用
+     *
+     * @param seckillId 秒杀活动ID
+     * @param quantity  购买数量
+     * @return 验证结果信息（包含是否可用、错误信息等）
+     */
+    SeckillValidationResult validateSeckillActivity(Long seckillId, Integer quantity);
+
+    /**
+     * 验证秒杀限购
+     *
+     * @param seckillId 秒杀活动ID
+     * @param userId    用户ID
+     * @param skuId     SKU ID
+     * @return 是否允许购买
+     */
+    Boolean validatePurchaseLimit(Long seckillId, Long userId, Long skuId);
+
+    /**
+     * 预扣秒杀库存
+     *
+     * @param seckillId 秒杀活动ID
+     * @param quantity  购买数量
+     * @return 是否成功
+     */
+    Boolean preDeductSeckillStock(Long seckillId, Integer quantity);
+
+    /**
+     * 恢复秒杀库存（订单取消时调用）
+     *
+     * @param seckillId 秒杀活动ID
+     * @param quantity  恢复数量
+     * @return 是否成功
+     */
+    Boolean restoreSeckillStock(Long seckillId, Integer quantity);
+
+    /**
+     * 获取秒杀价格
+     *
+     * @param seckillId 秒杀活动ID
+     * @return 秒杀价（分）
+     */
+    Integer getSeckillPrice(Long seckillId);
+
+    /**
+     * 秒杀验证结果
+     */
+    class SeckillValidationResult {
+        private Boolean valid;
+        private String errorMessage;
+        private Map<String, Object> data;
+
+        public SeckillValidationResult(Boolean valid, String errorMessage) {
+            this.valid = valid;
+            this.errorMessage = errorMessage;
+        }
+
+        public SeckillValidationResult(Boolean valid, String errorMessage, Map<String, Object> data) {
+            this.valid = valid;
+            this.errorMessage = errorMessage;
+            this.data = data;
+        }
+
+        public Boolean getValid() {
+            return valid;
+        }
+
+        public void setValid(Boolean valid) {
+            this.valid = valid;
+        }
+
+        public String getErrorMessage() {
+            return errorMessage;
+        }
+
+        public void setErrorMessage(String errorMessage) {
+            this.errorMessage = errorMessage;
+        }
+
+        public Map<String, Object> getData() {
+            return data;
+        }
+
+        public void setData(Map<String, Object> data) {
+            this.data = data;
+        }
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/src/main/java/org/dromara/mall/trade/service/impl/MallAddressServiceImpl.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/src/main/java/org/dromara/mall/trade/service/impl/MallAddressServiceImpl.java
new file mode 100644
index 0000000..51f8161
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/src/main/java/org/dromara/mall/trade/service/impl/MallAddressServiceImpl.java
@@ -0,0 +1,207 @@
+package org.dromara.mall.trade.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.mall.trade.domain.MallAddress;
+import org.dromara.mall.trade.domain.bo.MallAddressBo;
+import org.dromara.mall.trade.domain.vo.MallAddressVo;
+import org.dromara.mall.trade.mapper.MallAddressMapper;
+import org.dromara.mall.trade.service.MallAddressService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 收货地址Service业务层处理
+ *
+ * @author pengles
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class MallAddressServiceImpl implements MallAddressService {
+
+    private final MallAddressMapper baseMapper;
+
+    /**
+     * 查询收货地址
+     */
+    @Override
+    public MallAddressVo queryById(Long id) {
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 查询收货地址列表
+     */
+    @Override
+    public TableDataInfo<MallAddressVo> queryPageList(MallAddressBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<MallAddress> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoPage(pageQuery.build(), lqw);
+    }
+
+    /**
+     * 查询收货地址列表
+     */
+    @Override
+    public List<MallAddressVo> queryList(MallAddressBo bo) {
+        LambdaQueryWrapper<MallAddress> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    /**
+     * 查询用户的收货地址列表
+     */
+    @Override
+    public List<MallAddressVo> queryListByUserId(Long userId) {
+        LambdaQueryWrapper<MallAddress> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(MallAddress::getUserId, userId);
+        lqw.orderByDesc(MallAddress::getIsDefault);
+        lqw.orderByDesc(MallAddress::getCreateTime);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    /**
+     * 查询用户的默认地址
+     */
+    @Override
+    public MallAddressVo queryDefaultByUserId(Long userId) {
+        LambdaQueryWrapper<MallAddress> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(MallAddress::getUserId, userId);
+        lqw.eq(MallAddress::getIsDefault, 1);
+        lqw.last("LIMIT 1");
+        List<MallAddressVo> list = baseMapper.selectVoList(lqw);
+        return list.isEmpty() ? null : list.get(0);
+    }
+
+    private LambdaQueryWrapper<MallAddress> buildQueryWrapper(MallAddressBo bo) {
+        LambdaQueryWrapper<MallAddress> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(bo.getUserId() != null, MallAddress::getUserId, bo.getUserId());
+        lqw.like(StringUtils.isNotBlank(bo.getReceiverName()), MallAddress::getReceiverName, bo.getReceiverName());
+        lqw.eq(StringUtils.isNotBlank(bo.getReceiverPhone()), MallAddress::getReceiverPhone, bo.getReceiverPhone());
+        lqw.eq(bo.getIsDefault() != null, MallAddress::getIsDefault, bo.getIsDefault());
+        lqw.orderByDesc(MallAddress::getIsDefault);
+        lqw.orderByDesc(MallAddress::getCreateTime);
+        return lqw;
+    }
+
+    /**
+     * 新增收货地址
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean insertByBo(MallAddressBo bo) {
+        MallAddress add = MapstructUtils.convert(bo, MallAddress.class);
+        validEntityBeforeSave(add);
+
+        // 设置用户ID（移动端用户）
+        if (add.getUserId() == null) {
+            add.setUserId(LoginHelper.getUserId());
+        }
+
+        // 如果设置为默认地址，则取消其他默认地址
+        if (add.getIsDefault() != null && add.getIsDefault() == 1) {
+            cancelOtherDefaultAddress(add.getUserId());
+        } else {
+            add.setIsDefault(0);
+        }
+
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改收货地址
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean updateByBo(MallAddressBo bo) {
+        MallAddress update = MapstructUtils.convert(bo, MallAddress.class);
+        validEntityBeforeSave(update);
+
+        // 如果设置为默认地址，则取消其他默认地址
+        if (update.getIsDefault() != null && update.getIsDefault() == 1) {
+            cancelOtherDefaultAddress(update.getUserId(), update.getId());
+        }
+
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(MallAddress entity) {
+        // 可以添加业务校验逻辑，如手机号格式校验等
+    }
+
+    /**
+     * 取消其他默认地址
+     */
+    private void cancelOtherDefaultAddress(Long userId) {
+        cancelOtherDefaultAddress(userId, null);
+    }
+
+    /**
+     * 取消其他默认地址（排除指定地址ID）
+     */
+    private void cancelOtherDefaultAddress(Long userId, Long excludeId) {
+        LambdaUpdateWrapper<MallAddress> updateWrapper = new LambdaUpdateWrapper<>();
+        updateWrapper.eq(MallAddress::getUserId, userId);
+        updateWrapper.eq(MallAddress::getIsDefault, 1);
+        if (excludeId != null) {
+            updateWrapper.ne(MallAddress::getId, excludeId);
+        }
+        updateWrapper.set(MallAddress::getIsDefault, 0);
+        baseMapper.update(null, updateWrapper);
+    }
+
+    /**
+     * 批量删除收货地址信息
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if (isValid) {
+            // 可以添加业务校验逻辑
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+
+    /**
+     * 设置默认地址
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean setDefault(Long id) {
+        MallAddress address = baseMapper.selectById(id);
+        if (address == null) {
+            throw new ServiceException("收货地址不存在");
+        }
+
+        Long userId = address.getUserId();
+        if (userId == null) {
+            userId = LoginHelper.getUserId();
+        }
+
+        // 取消其他默认地址
+        cancelOtherDefaultAddress(userId, id);
+
+        // 设置当前地址为默认地址
+        address.setIsDefault(1);
+        return baseMapper.updateById(address) > 0;
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/src/main/java/org/dromara/mall/trade/service/impl/MallAfterSaleServiceImpl.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/src/main/java/org/dromara/mall/trade/service/impl/MallAfterSaleServiceImpl.java
new file mode 100644
index 0000000..31ac28d
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/src/main/java/org/dromara/mall/trade/service/impl/MallAfterSaleServiceImpl.java
@@ -0,0 +1,293 @@
+package org.dromara.mall.trade.service.impl;
+
+import cn.hutool.core.util.IdUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.mall.trade.domain.MallAfterSale;
+import org.dromara.mall.trade.domain.bo.MallAfterSaleBo;
+import org.dromara.mall.trade.domain.vo.MallAfterSaleVo;
+import org.dromara.mall.trade.mapper.MallAfterSaleMapper;
+import org.dromara.mall.trade.service.MallAfterSaleService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 售后申请Service业务层处理
+ *
+ * @author pengles
+ */
+@RequiredArgsConstructor
+@Service
+public class MallAfterSaleServiceImpl implements MallAfterSaleService {
+
+    private final MallAfterSaleMapper baseMapper;
+
+    /**
+     * 查询售后申请
+     */
+    @Override
+    public MallAfterSaleVo queryById(Long id) {
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 根据售后单号查询
+     */
+    @Override
+    public MallAfterSaleVo queryByAfterSaleNo(String afterSaleNo) {
+        LambdaQueryWrapper<MallAfterSale> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(MallAfterSale::getAfterSaleNo, afterSaleNo);
+        return baseMapper.selectVoOne(lqw);
+    }
+
+    /**
+     * 查询售后申请列表
+     */
+    @Override
+    public TableDataInfo<MallAfterSaleVo> queryPageList(MallAfterSaleBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<MallAfterSale> lqw = buildQueryWrapper(bo);
+        Page<MallAfterSaleVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询售后申请列表
+     */
+    @Override
+    public List<MallAfterSaleVo> queryList(MallAfterSaleBo bo) {
+        LambdaQueryWrapper<MallAfterSale> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<MallAfterSale> buildQueryWrapper(MallAfterSaleBo bo) {
+        LambdaQueryWrapper<MallAfterSale> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(StringUtils.isNotBlank(bo.getAfterSaleNo()), MallAfterSale::getAfterSaleNo, bo.getAfterSaleNo());
+        lqw.eq(bo.getOrderId() != null, MallAfterSale::getOrderId, bo.getOrderId());
+        lqw.eq(StringUtils.isNotBlank(bo.getOrderNo()), MallAfterSale::getOrderNo, bo.getOrderNo());
+        lqw.eq(bo.getOrderItemId() != null, MallAfterSale::getOrderItemId, bo.getOrderItemId());
+        lqw.eq(bo.getUserId() != null, MallAfterSale::getUserId, bo.getUserId());
+        lqw.eq(bo.getType() != null, MallAfterSale::getType, bo.getType());
+        lqw.eq(bo.getStatus() != null, MallAfterSale::getStatus, bo.getStatus());
+        lqw.orderByDesc(MallAfterSale::getCreateTime);
+        return lqw;
+    }
+
+    /**
+     * 生成售后单号
+     */
+    private String generateAfterSaleNo() {
+        return "AS" + System.currentTimeMillis() + IdUtil.fastSimpleUUID().substring(0, 6).toUpperCase();
+    }
+
+    /**
+     * 新增售后申请
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean insertByBo(MallAfterSaleBo bo) {
+        MallAfterSale add = MapstructUtils.convert(bo, MallAfterSale.class);
+        validEntityBeforeSave(add);
+
+        // 设置用户ID（移动端用户）
+        if (add.getUserId() == null) {
+            add.setUserId(LoginHelper.getUserId());
+        }
+
+        // 生成售后单号
+        if (StringUtils.isBlank(add.getAfterSaleNo())) {
+            add.setAfterSaleNo(generateAfterSaleNo());
+        }
+
+        // 设置默认状态为待审核
+        if (add.getStatus() == null) {
+            add.setStatus(0);
+        }
+
+        // 设置申请时间
+        if (add.getApplyTime() == null) {
+            add.setApplyTime(new Date());
+        }
+
+        // 设置默认数量
+        if (add.getQuantity() == null) {
+            add.setQuantity(1);
+        }
+
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改售后申请
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean updateByBo(MallAfterSaleBo bo) {
+        MallAfterSale update = MapstructUtils.convert(bo, MallAfterSale.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(MallAfterSale entity) {
+        // 可以添加业务校验逻辑
+    }
+
+    /**
+     * 批量删除售后申请
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if (isValid) {
+            // 可以添加业务校验逻辑
+        }
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+
+    /**
+     * 审核售后申请（同意/拒绝）
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean audit(Long id, Integer status, String refuseReason) {
+        MallAfterSale afterSale = baseMapper.selectById(id);
+        if (afterSale == null) {
+            throw new ServiceException("售后申请不存在");
+        }
+        if (afterSale.getStatus() != 0) {
+            throw new ServiceException("售后申请已审核，不能重复审核");
+        }
+        if (status == null || (status != 1 && status != 2)) {
+            throw new ServiceException("审核状态不正确");
+        }
+
+        afterSale.setStatus(status);
+        afterSale.setAuditTime(new Date());
+
+        if (status == 2) {
+            // 拒绝
+            if (StringUtils.isBlank(refuseReason)) {
+                throw new ServiceException("拒绝原因不能为空");
+            }
+            afterSale.setRefuseReason(refuseReason);
+        } else if (status == 1) {
+            // 同意
+            if (afterSale.getType() == 1 || afterSale.getType() == 2) {
+                // 退货或换货，状态变为待退货
+                afterSale.setStatus(3);
+            }
+            // 退款类型，状态保持为已同意，等待退款处理
+        }
+
+        return baseMapper.updateById(afterSale) > 0;
+    }
+
+    /**
+     * 用户填写退货物流信息
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean fillLogistics(Long id, String logisticsCompany, String logisticsNo) {
+        MallAfterSale afterSale = baseMapper.selectById(id);
+        if (afterSale == null) {
+            throw new ServiceException("售后申请不存在");
+        }
+        if (afterSale.getStatus() != 3) {
+            throw new ServiceException("当前状态不能填写物流信息");
+        }
+        if (afterSale.getType() == 0) {
+            throw new ServiceException("退款类型不需要填写物流信息");
+        }
+
+        afterSale.setLogisticsCompany(logisticsCompany);
+        afterSale.setLogisticsNo(logisticsNo);
+        afterSale.setReturnTime(new Date());
+        afterSale.setStatus(4); // 待收货
+
+        return baseMapper.updateById(afterSale) > 0;
+    }
+
+    /**
+     * 确认收货（商家确认收到退货）
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean confirmReceive(Long id) {
+        MallAfterSale afterSale = baseMapper.selectById(id);
+        if (afterSale == null) {
+            throw new ServiceException("售后申请不存在");
+        }
+        if (afterSale.getStatus() != 4) {
+            throw new ServiceException("当前状态不能确认收货");
+        }
+
+        afterSale.setReceiveTime(new Date());
+        // 状态变为已完成（退款或换货完成需要调用支付中心退款接口或换货接口）
+        // 这里暂时设置为已完成，实际业务中需要调用支付中心退款接口
+        afterSale.setStatus(5);
+
+        return baseMapper.updateById(afterSale) > 0;
+    }
+
+    /**
+     * 完成售后（退款完成或换货完成）
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean complete(Long id) {
+        MallAfterSale afterSale = baseMapper.selectById(id);
+        if (afterSale == null) {
+            throw new ServiceException("售后申请不存在");
+        }
+        if (afterSale.getStatus() == 5 || afterSale.getStatus() == 6) {
+            throw new ServiceException("售后申请已完成或已取消");
+        }
+
+        afterSale.setStatus(5);
+        if (afterSale.getType() == 0 || afterSale.getType() == 1) {
+            // 退款或退货，设置退款时间
+            afterSale.setRefundTime(new Date());
+        }
+
+        return baseMapper.updateById(afterSale) > 0;
+    }
+
+    /**
+     * 取消售后申请
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean cancel(Long id) {
+        MallAfterSale afterSale = baseMapper.selectById(id);
+        if (afterSale == null) {
+            throw new ServiceException("售后申请不存在");
+        }
+        if (afterSale.getStatus() == 5 || afterSale.getStatus() == 6) {
+            throw new ServiceException("售后申请已完成或已取消");
+        }
+        if (afterSale.getStatus() == 4) {
+            throw new ServiceException("商家已收货，不能取消");
+        }
+
+        afterSale.setStatus(6);
+        return baseMapper.updateById(afterSale) > 0;
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/src/main/java/org/dromara/mall/trade/service/impl/MallOrderCouponServiceImpl.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/src/main/java/org/dromara/mall/trade/service/impl/MallOrderCouponServiceImpl.java
new file mode 100644
index 0000000..156fbec
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/src/main/java/org/dromara/mall/trade/service/impl/MallOrderCouponServiceImpl.java
@@ -0,0 +1,227 @@
+package org.dromara.mall.trade.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.mall.coupon.domain.vo.MallCouponVo;
+import org.dromara.mall.coupon.service.MallCouponService;
+import org.dromara.mall.coupon.service.MallCouponUserService;
+import org.dromara.mall.trade.domain.MallOrderCoupon;
+import org.dromara.mall.trade.domain.bo.MallOrderCouponBo;
+import org.dromara.mall.trade.domain.vo.MallOrderCouponVo;
+import org.dromara.mall.trade.mapper.MallOrderCouponMapper;
+import org.dromara.mall.trade.service.MallOrderCouponService;
+import org.dromara.mall.trade.utils.CouponCalculator;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 订单优惠券使用记录Service业务层处理
+ *
+ * @author pengles
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class MallOrderCouponServiceImpl implements MallOrderCouponService {
+
+    private final MallOrderCouponMapper baseMapper;
+    private final MallCouponService couponService;
+    private final MallCouponUserService couponUserService;
+
+    /**
+     * 查询订单优惠券使用记录
+     */
+    @Override
+    public MallOrderCouponVo queryById(Long id) {
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 根据订单ID查询订单优惠券使用记录列表
+     */
+    @Override
+    public List<MallOrderCouponVo> queryListByOrderId(Long orderId) {
+        LambdaQueryWrapper<MallOrderCoupon> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(MallOrderCoupon::getOrderId, orderId);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    /**
+     * 根据订单号查询订单优惠券使用记录列表
+     */
+    @Override
+    public List<MallOrderCouponVo> queryListByOrderNo(String orderNo) {
+        LambdaQueryWrapper<MallOrderCoupon> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(MallOrderCoupon::getOrderNo, orderNo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    /**
+     * 新增订单优惠券使用记录
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean insertByBo(MallOrderCouponBo bo) {
+        MallOrderCoupon add = MapstructUtils.convert(bo, MallOrderCoupon.class);
+        validEntityBeforeSave(add);
+
+        // 设置使用时间
+        if (add.getCreateTime() == null) {
+            add.setCreateTime(new Date());
+        }
+
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(MallOrderCoupon entity) {
+        // 可以添加业务校验逻辑
+    }
+
+    /**
+     * 批量删除订单优惠券使用记录信息
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if (isValid) {
+            // 可以添加业务校验逻辑
+        }
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+
+    /**
+     * 计算并使用优惠券（订单创建时调用）
+     * 计算优惠券折扣金额，创建订单优惠券使用记录，并标记用户优惠券为已使用
+     *
+     * @param couponUserId 用户优惠券ID
+     * @param orderId 订单ID
+     * @param orderNo 订单号
+     * @param orderAmount 订单金额（单位：分）
+     * @return 优惠金额（单位：分）
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Long calculateAndUseCoupon(Long couponUserId, Long orderId, String orderNo, Long orderAmount) {
+        if (couponUserId == null) {
+            throw new ServiceException("用户优惠券ID不能为空");
+        }
+        if (orderId == null) {
+            throw new ServiceException("订单ID不能为空");
+        }
+        if (orderNo == null || orderNo.trim().isEmpty()) {
+            throw new ServiceException("订单号不能为空");
+        }
+        if (orderAmount == null || orderAmount <= 0) {
+            throw new ServiceException("订单金额必须大于0");
+        }
+
+        // 查询用户优惠券信息
+        org.dromara.mall.coupon.domain.vo.MallCouponUserVo couponUser = couponUserService.queryById(couponUserId);
+        if (couponUser == null) {
+            throw new ServiceException("用户优惠券不存在");
+        }
+        if (couponUser.getStatus() != 0) {
+            throw new ServiceException("优惠券已使用或已过期");
+        }
+
+        // 查询优惠券信息
+        MallCouponVo coupon = couponService.queryById(couponUser.getCouponId());
+        if (coupon == null) {
+            throw new ServiceException("优惠券不存在");
+        }
+
+        // 计算优惠金额
+        Long discountAmount = CouponCalculator.calculateDiscountAmount(coupon, orderAmount);
+        if (discountAmount <= 0) {
+            throw new ServiceException("订单金额不满足优惠券使用门槛");
+        }
+
+        // 标记用户优惠券为已使用（调用优惠券服务的useCoupon方法）
+        couponUserService.useCoupon(couponUserId, orderId);
+
+        // 创建订单优惠券使用记录
+        MallOrderCouponBo orderCouponBo = new MallOrderCouponBo();
+        orderCouponBo.setOrderId(orderId);
+        orderCouponBo.setOrderNo(orderNo);
+        orderCouponBo.setCouponId(coupon.getId());
+        orderCouponBo.setCouponUserId(couponUserId);
+        orderCouponBo.setDiscountAmount(discountAmount.intValue());
+
+        boolean flag = insertByBo(orderCouponBo);
+        if (!flag) {
+            throw new ServiceException("创建订单优惠券使用记录失败");
+        }
+
+        log.info("优惠券使用成功 - 用户优惠券ID: {}, 订单ID: {}, 订单号: {}, 优惠金额: {}", 
+                couponUserId, orderId, orderNo, discountAmount);
+        return discountAmount;
+    }
+
+    /**
+     * 根据订单ID统计优惠金额
+     *
+     * @param orderId 订单ID
+     * @return 优惠金额总和（单位：分）
+     */
+    @Override
+    public Long sumDiscountAmountByOrderId(Long orderId) {
+        if (orderId == null) {
+            return 0L;
+        }
+        List<MallOrderCouponVo> list = queryListByOrderId(orderId);
+        return list.stream()
+                .mapToLong(vo -> vo.getDiscountAmount() != null ? vo.getDiscountAmount().longValue() : 0L)
+                .sum();
+    }
+
+    /**
+     * 根据订单号统计优惠金额
+     *
+     * @param orderNo 订单号
+     * @return 优惠金额总和（单位：分）
+     */
+    @Override
+    public Long sumDiscountAmountByOrderNo(String orderNo) {
+        if (orderNo == null || orderNo.trim().isEmpty()) {
+            return 0L;
+        }
+        List<MallOrderCouponVo> list = queryListByOrderNo(orderNo);
+        return list.stream()
+                .mapToLong(vo -> vo.getDiscountAmount() != null ? vo.getDiscountAmount().longValue() : 0L)
+                .sum();
+    }
+
+    /**
+     * 根据优惠券ID统计核销金额
+     *
+     * @param couponId 优惠券ID
+     * @return 核销金额总和（单位：分）
+     */
+    @Override
+    public Long sumDiscountAmountByCouponId(Long couponId) {
+        if (couponId == null) {
+            return 0L;
+        }
+        LambdaQueryWrapper<MallOrderCoupon> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(MallOrderCoupon::getCouponId, couponId);
+        List<MallOrderCouponVo> list = baseMapper.selectVoList(lqw);
+        return list.stream()
+                .mapToLong(vo -> vo.getDiscountAmount() != null ? vo.getDiscountAmount().longValue() : 0L)
+                .sum();
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/src/main/java/org/dromara/mall/trade/service/impl/MallOrderEvaluateServiceImpl.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/src/main/java/org/dromara/mall/trade/service/impl/MallOrderEvaluateServiceImpl.java
new file mode 100644
index 0000000..dd180b1
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/src/main/java/org/dromara/mall/trade/service/impl/MallOrderEvaluateServiceImpl.java
@@ -0,0 +1,172 @@
+package org.dromara.mall.trade.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.mall.trade.domain.MallOrderEvaluate;
+import org.dromara.mall.trade.domain.bo.MallOrderEvaluateBo;
+import org.dromara.mall.trade.domain.vo.MallOrderEvaluateVo;
+import org.dromara.mall.trade.mapper.MallOrderEvaluateMapper;
+import org.dromara.mall.trade.service.MallOrderEvaluateService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 订单评价Service业务层处理
+ *
+ * @author pengles
+ */
+@RequiredArgsConstructor
+@Service
+public class MallOrderEvaluateServiceImpl implements MallOrderEvaluateService {
+
+    private final MallOrderEvaluateMapper baseMapper;
+
+    /**
+     * 查询订单评价
+     */
+    @Override
+    public MallOrderEvaluateVo queryById(Long id) {
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 查询订单评价列表
+     */
+    @Override
+    public TableDataInfo<MallOrderEvaluateVo> queryPageList(MallOrderEvaluateBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<MallOrderEvaluate> lqw = buildQueryWrapper(bo);
+        Page<MallOrderEvaluateVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询订单评价列表
+     */
+    @Override
+    public List<MallOrderEvaluateVo> queryList(MallOrderEvaluateBo bo) {
+        LambdaQueryWrapper<MallOrderEvaluate> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<MallOrderEvaluate> buildQueryWrapper(MallOrderEvaluateBo bo) {
+        LambdaQueryWrapper<MallOrderEvaluate> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(bo.getOrderId() != null, MallOrderEvaluate::getOrderId, bo.getOrderId());
+        lqw.eq(StringUtils.isNotBlank(bo.getOrderNo()), MallOrderEvaluate::getOrderNo, bo.getOrderNo());
+        lqw.eq(bo.getOrderItemId() != null, MallOrderEvaluate::getOrderItemId, bo.getOrderItemId());
+        lqw.eq(bo.getProductId() != null, MallOrderEvaluate::getProductId, bo.getProductId());
+        lqw.eq(bo.getSkuId() != null, MallOrderEvaluate::getSkuId, bo.getSkuId());
+        lqw.eq(bo.getUserId() != null, MallOrderEvaluate::getUserId, bo.getUserId());
+        lqw.eq(bo.getScore() != null, MallOrderEvaluate::getScore, bo.getScore());
+        lqw.eq(bo.getStatus() != null, MallOrderEvaluate::getStatus, bo.getStatus());
+        lqw.orderByDesc(MallOrderEvaluate::getCreateTime);
+        return lqw;
+    }
+
+    /**
+     * 新增订单评价
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean insertByBo(MallOrderEvaluateBo bo) {
+        MallOrderEvaluate add = MapstructUtils.convert(bo, MallOrderEvaluate.class);
+        validEntityBeforeSave(add);
+
+        // 设置用户ID（移动端用户）
+        if (add.getUserId() == null) {
+            add.setUserId(LoginHelper.getUserId());
+        }
+
+        // 设置默认状态为待审核
+        if (add.getStatus() == null) {
+            add.setStatus(0);
+        }
+
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改订单评价
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean updateByBo(MallOrderEvaluateBo bo) {
+        MallOrderEvaluate update = MapstructUtils.convert(bo, MallOrderEvaluate.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(MallOrderEvaluate entity) {
+        // 可以添加业务校验逻辑
+    }
+
+    /**
+     * 批量删除订单评价
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if (isValid) {
+            // 可以添加业务校验逻辑
+        }
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+
+    /**
+     * 审核评价（通过/驳回）
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean audit(Long id, Integer status) {
+        MallOrderEvaluate evaluate = baseMapper.selectById(id);
+        if (evaluate == null) {
+            throw new ServiceException("评价不存在");
+        }
+        if (evaluate.getStatus() != 0) {
+            throw new ServiceException("评价已审核，不能重复审核");
+        }
+        if (status == null || (status != 1 && status != 2)) {
+            throw new ServiceException("审核状态不正确");
+        }
+
+        evaluate.setStatus(status);
+        return baseMapper.updateById(evaluate) > 0;
+    }
+
+    /**
+     * 回复评价（商家回复）
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean reply(Long id, String replyContent) {
+        MallOrderEvaluate evaluate = baseMapper.selectById(id);
+        if (evaluate == null) {
+            throw new ServiceException("评价不存在");
+        }
+        if (evaluate.getStatus() != 1) {
+            throw new ServiceException("只有已通过审核的评价才能回复");
+        }
+
+        evaluate.setReplyContent(replyContent);
+        evaluate.setReplyTime(new Date());
+        return baseMapper.updateById(evaluate) > 0;
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/src/main/java/org/dromara/mall/trade/service/impl/SeckillOrderServiceImpl.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/src/main/java/org/dromara/mall/trade/service/impl/SeckillOrderServiceImpl.java
new file mode 100644
index 0000000..bebcf2b
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/src/main/java/org/dromara/mall/trade/service/impl/SeckillOrderServiceImpl.java
@@ -0,0 +1,175 @@
+package org.dromara.mall.trade.service.impl;
+
+import cn.hutool.core.lang.Dict;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.json.utils.JsonUtils;
+import org.dromara.mall.promotion.domain.MallPromotion;
+import org.dromara.mall.promotion.domain.vo.MallPromotionVo;
+import org.dromara.mall.promotion.domain.vo.MallSeckillVo;
+import org.dromara.mall.promotion.mapper.MallPromotionMapper;
+import org.dromara.mall.promotion.service.MallSeckillService;
+import org.dromara.mall.trade.service.SeckillOrderService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 秒杀订单处理Service业务层实现
+ *
+ * @author pengles
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class SeckillOrderServiceImpl implements SeckillOrderService {
+
+    private final MallSeckillService mallSeckillService;
+    private final MallPromotionMapper promotionMapper;
+
+    /**
+     * 活动类型：秒杀
+     */
+    private static final Integer PROMOTION_TYPE_SECKILL = 2;
+
+    /**
+     * 默认限购数量
+     */
+    private static final Integer DEFAULT_PURCHASE_LIMIT = 1;
+
+    /**
+     * 验证秒杀活动是否可用
+     */
+    @Override
+    public SeckillValidationResult validateSeckillActivity(Long seckillId, Integer quantity) {
+        // 查询秒杀活动
+        MallSeckillVo seckillVo = mallSeckillService.queryById(seckillId);
+        if (seckillVo == null) {
+            return new SeckillValidationResult(false, "秒杀活动不存在");
+        }
+
+        // 验证秒杀活动状态
+        if (seckillVo.getStatus() != 0) {
+            return new SeckillValidationResult(false, "秒杀活动已禁用");
+        }
+
+        // 验证秒杀活动时间
+        Date now = new Date();
+        if (seckillVo.getStartTime() != null && seckillVo.getStartTime().after(now)) {
+            return new SeckillValidationResult(false, "秒杀活动尚未开始");
+        }
+        if (seckillVo.getEndTime() != null && seckillVo.getEndTime().before(now)) {
+            return new SeckillValidationResult(false, "秒杀活动已结束");
+        }
+
+        // 验证秒杀库存
+        if (seckillVo.getSeckillStock() == null || seckillVo.getSeckillStock() < quantity) {
+            return new SeckillValidationResult(false, "秒杀库存不足");
+        }
+
+        // 验证关联的营销活动
+        if (seckillVo.getPromotionId() != null) {
+            MallPromotionVo promotionVo = promotionMapper.selectVoById(seckillVo.getPromotionId());
+            if (promotionVo == null) {
+                return new SeckillValidationResult(false, "关联的营销活动不存在");
+            }
+            if (promotionVo.getStatus() != 0) {
+                return new SeckillValidationResult(false, "关联的营销活动已禁用");
+            }
+            if (!PROMOTION_TYPE_SECKILL.equals(promotionVo.getType())) {
+                return new SeckillValidationResult(false, "关联的营销活动类型不正确");
+            }
+        }
+
+        // 返回验证通过的结果，包含秒杀信息
+        Map<String, Object> data = new HashMap<>();
+        data.put("seckillPrice", seckillVo.getSeckillPrice());
+        data.put("promotionId", seckillVo.getPromotionId());
+        data.put("skuId", seckillVo.getSkuId());
+
+        return new SeckillValidationResult(true, null, data);
+    }
+
+    /**
+     * 验证秒杀限购
+     */
+    @Override
+    public Boolean validatePurchaseLimit(Long seckillId, Long userId, Long skuId) {
+        // 查询秒杀活动信息
+        MallSeckillVo seckillVo = mallSeckillService.queryById(seckillId);
+        if (seckillVo == null) {
+            throw new ServiceException("秒杀活动不存在");
+        }
+
+        // 获取限购数量（从营销活动的rules JSON中读取，或使用默认值）
+        Integer purchaseLimit = DEFAULT_PURCHASE_LIMIT;
+        if (seckillVo.getPromotionId() != null) {
+            MallPromotion promotion = promotionMapper.selectById(seckillVo.getPromotionId());
+            if (promotion != null && promotion.getRules() != null) {
+                try {
+                    Dict rules = JsonUtils.parseMap(promotion.getRules());
+                    if (rules != null && rules.containsKey("purchaseLimit")) {
+                        Object limitObj = rules.get("purchaseLimit");
+                        if (limitObj instanceof Number) {
+                            purchaseLimit = ((Number) limitObj).intValue();
+                        }
+                    }
+                } catch (Exception e) {
+                    log.warn("解析营销活动规则JSON失败，使用默认限购数量: {}", e.getMessage());
+                }
+            }
+        }
+
+        // TODO: 查询用户已购买的秒杀订单数量
+        // 注意：由于订单实体类和服务尚未实现，这里暂时返回true（允许购买）
+        // 后续需要在订单服务中实现此逻辑：
+        // 1. 查询用户已购买的秒杀订单数量（同一秒杀活动、同一SKU，仅统计已支付的订单）
+        // 2. 校验是否超过限购数量
+        // 示例代码（需要等订单服务实现后）：
+        // LambdaQueryWrapper<MallOrder> lqw = new LambdaQueryWrapper<>();
+        // lqw.eq(MallOrder::getUserId, userId);
+        // lqw.eq(MallOrder::getSeckillId, seckillId);
+        // lqw.eq(MallOrder::getPayStatus, PAY_STATUS_PAID);
+        // lqw.ne(MallOrder::getOrderStatus, 4);
+        // Long purchasedCount = orderMapper.selectCount(lqw);
+        // return purchasedCount == null || purchasedCount < purchaseLimit;
+
+        log.info("秒杀限购校验 - 秒杀ID: {}, 用户ID: {}, SKU ID: {}, 限购数量: {} (待订单服务实现后完善)", seckillId, userId, skuId, purchaseLimit);
+        return true; // 临时返回true，待订单服务实现后完善
+    }
+
+    /**
+     * 预扣秒杀库存
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean preDeductSeckillStock(Long seckillId, Integer quantity) {
+        return mallSeckillService.reduceStock(seckillId, quantity);
+    }
+
+    /**
+     * 恢复秒杀库存（订单取消时调用）
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean restoreSeckillStock(Long seckillId, Integer quantity) {
+        return mallSeckillService.restoreStock(seckillId, quantity);
+    }
+
+    /**
+     * 获取秒杀价格
+     */
+    @Override
+    public Integer getSeckillPrice(Long seckillId) {
+        MallSeckillVo seckillVo = mallSeckillService.queryById(seckillId);
+        if (seckillVo == null) {
+            throw new ServiceException("秒杀活动不存在");
+        }
+        return seckillVo.getSeckillPrice();
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/src/main/java/org/dromara/mall/trade/utils/CouponCalculator.java b/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/src/main/java/org/dromara/mall/trade/utils/CouponCalculator.java
new file mode 100644
index 0000000..10cdd21
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/src/main/java/org/dromara/mall/trade/utils/CouponCalculator.java
@@ -0,0 +1,139 @@
+package org.dromara.mall.trade.utils;
+
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.mall.coupon.domain.vo.MallCouponVo;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+
+/**
+ * 优惠券计算工具类
+ * 用于计算优惠券的折扣金额
+ *
+ * @author pengles
+ */
+@Slf4j
+public class CouponCalculator {
+
+    /**
+     * 计算优惠券的折扣金额（单位：分）
+     *
+     * @param coupon 优惠券信息
+     * @param orderAmount 订单金额（单位：分）
+     * @return 折扣金额（单位：分），如果订单金额不满足使用门槛，返回0
+     */
+    public static Long calculateDiscountAmount(MallCouponVo coupon, Long orderAmount) {
+        if (coupon == null) {
+            throw new ServiceException("优惠券信息不能为空");
+        }
+        if (orderAmount == null || orderAmount <= 0) {
+            throw new ServiceException("订单金额必须大于0");
+        }
+
+        // 检查使用门槛
+        Integer minAmount = coupon.getMinAmount();
+        if (minAmount != null && minAmount > 0 && orderAmount < minAmount) {
+            log.debug("订单金额{}不满足优惠券{}的使用门槛{}", orderAmount, coupon.getId(), minAmount);
+            return 0L;
+        }
+
+        Integer type = coupon.getType();
+        if (type == null) {
+            throw new ServiceException("优惠券类型不能为空");
+        }
+
+        Long discountAmount = 0L;
+
+        // 0-满减，1-折扣，2-现金
+        if (type == 0 || type == 2) {
+            // 满减券或现金券：直接使用 discountAmount
+            Integer couponDiscountAmount = coupon.getDiscountAmount();
+            if (couponDiscountAmount == null || couponDiscountAmount <= 0) {
+                throw new ServiceException("优惠券优惠金额配置错误");
+            }
+            discountAmount = couponDiscountAmount.longValue();
+            // 确保折扣金额不超过订单金额
+            if (discountAmount > orderAmount) {
+                discountAmount = orderAmount;
+            }
+        } else if (type == 1) {
+            // 折扣券：使用 discountRate（百分比）
+            BigDecimal discountRate = coupon.getDiscountRate();
+            if (discountRate == null || discountRate.compareTo(BigDecimal.ZERO) <= 0) {
+                throw new ServiceException("优惠券折扣率配置错误");
+            }
+            if (discountRate.compareTo(new BigDecimal("100")) > 0) {
+                throw new ServiceException("折扣率不能大于100%");
+            }
+            // 计算折扣金额：订单金额 * (折扣率 / 100)
+            BigDecimal orderAmountDecimal = new BigDecimal(orderAmount);
+            BigDecimal discountAmountDecimal = orderAmountDecimal
+                    .multiply(discountRate)
+                    .divide(new BigDecimal("100"), 2, RoundingMode.HALF_UP);
+            discountAmount = discountAmountDecimal.setScale(0, RoundingMode.HALF_UP).longValue();
+            // 确保折扣金额不超过订单金额
+            if (discountAmount > orderAmount) {
+                discountAmount = orderAmount;
+            }
+        } else {
+            throw new ServiceException("不支持的优惠券类型: " + type);
+        }
+
+        log.debug("优惠券{}计算折扣金额: 订单金额={}, 折扣金额={}", coupon.getId(), orderAmount, discountAmount);
+        return discountAmount;
+    }
+
+    /**
+     * 计算优惠券的折扣金额（单位：分）
+     * 使用优惠券ID和订单金额，需要传入优惠券查询方法
+     *
+     * @param couponService 优惠券服务，用于查询优惠券信息
+     * @param couponId 优惠券ID
+     * @param orderAmount 订单金额（单位：分）
+     * @return 折扣金额（单位：分），如果订单金额不满足使用门槛或优惠券不存在，返回0
+     */
+    public static Long calculateDiscountAmount(
+            org.dromara.mall.coupon.service.MallCouponService couponService,
+            Long couponId,
+            Long orderAmount) {
+        if (couponService == null) {
+            throw new ServiceException("优惠券服务不能为空");
+        }
+        if (couponId == null) {
+            throw new ServiceException("优惠券ID不能为空");
+        }
+
+        org.dromara.mall.coupon.domain.vo.MallCouponVo coupon = couponService.queryById(couponId);
+        if (coupon == null) {
+            log.warn("优惠券{}不存在", couponId);
+            return 0L;
+        }
+
+        return calculateDiscountAmount(coupon, orderAmount);
+    }
+
+    /**
+     * 验证优惠券是否可用
+     *
+     * @param coupon 优惠券信息
+     * @param orderAmount 订单金额（单位：分）
+     * @return true表示可用，false表示不可用
+     */
+    public static boolean isValidCoupon(MallCouponVo coupon, Long orderAmount) {
+        if (coupon == null) {
+            return false;
+        }
+        // 检查状态
+        if (coupon.getStatus() != null && coupon.getStatus() != 0) {
+            return false;
+        }
+        // 检查使用门槛
+        Integer minAmount = coupon.getMinAmount();
+        if (minAmount != null && minAmount > 0 && orderAmount < minAmount) {
+            return false;
+        }
+        // 检查有效期（如果订单服务需要，可以添加时间校验）
+        return true;
+    }
+}
diff --git a/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/src/main/resources/META-INF/spring.factories b/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/src/main/resources/META-INF/spring.factories
new file mode 100644
index 0000000..e08a02f
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mall/ruoyi-mall-trade/src/main/resources/META-INF/spring.factories
@@ -0,0 +1,3 @@
+# Auto Configure
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+org.dromara.mall.trade.config.MallTradeAutoConfiguration
diff --git a/ruoyi-modules/ruoyi-member/MODULE_STRUCTURE.md b/ruoyi-modules/ruoyi-member/MODULE_STRUCTURE.md
new file mode 100644
index 0000000..cee8c20
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/MODULE_STRUCTURE.md
@@ -0,0 +1,935 @@
+# 会员模块结构说明
+
+## 模块概述
+
+`ruoyi-member` 模块是系统会员中心模块，负责 App 端用户管理、认证授权、设备管理、消息推送等核心功能。
+
+- **包名**: `org.dromara.member`
+- **状态**: ✅ 核心功能已实现
+
+## 已完成工作
+
+### 1. 模块结构
+
+- ✅ 创建了完整的模块目录结构
+- ✅ 创建了 `pom.xml` 配置文件
+- ✅ 配置了模块依赖关系
+
+### 2. 配置类
+
+- ✅ 创建了 JWT 过滤器配置 (`AppJwtFilter`)
+- ✅ 创建了 JWT Web 配置 (`AppJwtWebConfig`)
+- ✅ 配置了组件扫描和过滤器注册
+
+### 3. 数据库
+
+- ✅ 创建了所有业务表的实体类和 Mapper
+- ✅ 实现了数据库表的 CRUD 操作
+- ✅ 配置了逻辑删除和字段自动填充
+
+### 4. 核心功能
+
+- ✅ 用户管理（注册、登录、信息管理）
+- ✅ 角色管理（角色CRUD、用户角色关联）
+- ✅ 设备管理（设备绑定、推送令牌管理）
+- ✅ 文件管理（文件上传、下载、管理）
+- ✅ 消息管理（消息推送、通知管理）
+- ✅ 操作日志（日志记录、查询、统计）
+- ✅ 登录日志（登录日志记录、查询）
+- ✅ 版本管理（App版本管理、更新检查）
+- ✅ 社交认证（第三方登录、绑定）
+- ✅ JWT认证（令牌生成、刷新、验证）
+
+### 5. 异常处理
+
+- ✅ 创建了统一的异常处理类 (`AppExceptionHandler`)
+- ✅ 定义了业务异常类（`DeviceException`, `FileException`, `VersionException`）
+
+### 6. API接口
+
+- ✅ 实现了管理端接口（用户、角色、配置管理）
+- ✅ 实现了移动端接口（用户、角色、设备、文件、消息、日志、版本管理）
+- ✅ 实现了认证接口（JWT登录、注册、刷新）
+
+## 核心功能模块
+
+### 1. 用户管理 (AppUser)
+
+- **职责**: 用户注册、登录、信息管理、密码管理
+- **状态**: ✅ 核心功能已实现
+- **数据库表**: `app_user`, `app_user_role`
+
+### 2. 角色管理 (AppRole)
+
+- **职责**: 角色管理、用户角色关联
+- **状态**: ✅ 核心功能已实现
+- **数据库表**: `app_role`, `app_user_role`
+
+### 3. 设备管理 (AppDevice)
+
+- **职责**: 用户设备绑定、推送令牌管理、设备状态管理
+- **状态**: ✅ 核心功能已实现
+- **数据库表**: `app_device`
+
+### 4. 文件管理 (AppFile)
+
+- **职责**: 文件上传、下载、管理（头像、文档、图片等）
+- **状态**: ✅ 核心功能已实现
+- **数据库表**: `app_file`
+
+### 5. 消息管理 (AppMessage)
+
+- **职责**: 消息推送、通知管理、用户消息关联
+- **状态**: ✅ 核心功能已实现
+- **数据库表**: `app_message`, `app_user_message`
+
+### 6. 操作日志 (AppOperLog)
+
+- **职责**: 用户操作日志记录、查询、统计分析
+- **状态**: ✅ 核心功能已实现
+- **数据库表**: `app_oper_log`
+
+### 7. 登录日志 (AppLoginLog)
+
+- **职责**: 用户登录日志记录、查询
+- **状态**: ✅ 核心功能已实现
+- **数据库表**: `app_login_log`
+
+### 8. 版本管理 (AppVersion)
+
+- **职责**: App 版本管理、更新检查、强制更新
+- **状态**: ✅ 核心功能已实现
+- **数据库表**: `app_version`
+
+### 9. 社交认证 (AppSocialAuth)
+
+- **职责**: 第三方登录（微信、QQ、微博等）
+- **状态**: ✅ 核心功能已实现
+- **数据库表**: `app_social_auth`
+
+### 10. JWT认证 (JwtUtil)
+
+- **职责**: JWT 令牌生成、刷新、验证
+- **状态**: ✅ 核心功能已实现
+- **配置文件**: `AppJwtFilter`, `AppJwtWebConfig`
+
+## 数据库表结构说明
+
+### 1. 用户表 (app_user)
+
+- **功能**: 存储 App 端用户基本信息
+- **关键字段**: `user_id`, `user_name`, `nick_name`, `phone`, `email`, `password`, `status`, `avatar`, `sex`, `login_ip`, `login_date`, `register_time`
+- **索引**: `user_name` (唯一), `phone`, `email`
+- **状态说明**:
+  - `status`: 0-正常, 1-停用
+  - `sex`: 0-男, 1-女, 2-未知
+  - `del_flag`: 0-存在, 1-删除
+
+### 2. 角色表 (app_role)
+
+- **功能**: 存储 App 端角色信息
+- **关键字段**: `role_id`, `role_name`, `role_key`, `role_sort`, `status`
+- **索引**: `role_key` (唯一), `status`
+- **状态说明**:
+  - `status`: 0-正常, 1-停用
+  - `del_flag`: 0-存在, 1-删除
+
+### 3. 用户角色关联表 (app_user_role)
+
+- **功能**: 存储用户和角色的关联关系
+- **关键字段**: `user_id`, `role_id`
+- **索引**: `user_id`, `role_id`, `uk_user_role` (唯一索引)
+- **说明**: 多对多关系，一个用户可以有多个角色，一个角色可以分配给多个用户
+
+### 4. 设备表 (app_device)
+
+- **功能**: 存储用户绑定的设备信息
+- **关键字段**: `device_id`, `user_id`, `device_type`, `device_name`, `device_model`, `device_brand`, `os_version`, `app_version`, `push_token`, `is_active`, `last_active_time`
+- **索引**: `user_id`, `device_type`, `push_token`
+- **状态说明**:
+  - `device_type`: ios, android, h5
+  - `is_active`: 0-否, 1-是
+  - `del_flag`: 0-存在, 2-删除
+
+### 5. 文件表 (app_file)
+
+- **功能**: 存储用户上传的文件信息
+- **关键字段**: `file_id`, `user_id`, `file_name`, `original_name`, `file_path`, `file_url`, `file_size`, `file_type`, `file_suffix`, `file_category`, `storage_service`, `status`, `download_count`, `is_public`, `file_md5`
+- **索引**: `user_id`, `file_category`, `file_md5`, `status`
+- **状态说明**:
+  - `file_category`: 1-头像, 2-文档, 3-图片, 4-视频, 5-音频, 6-其他
+  - `status`: 0-正常, 1-删除
+  - `is_public`: 0-私有, 1-公开
+  - `del_flag`: 0-存在, 2-删除
+
+### 6. 消息表 (app_message)
+
+- **功能**: 存储系统消息和通知
+- **关键字段**: `message_id`, `title`, `content`, `message_type`, `target_type`, `target_ids`, `send_time`, `status`
+- **索引**: `message_type`, `target_type`, `status`, `send_time`
+- **状态说明**:
+  - `message_type`: system-系统消息, notice-通知, activity-活动
+  - `target_type`: all-全部用户, user-指定用户, role-指定角色
+  - `status`: 0-待发送, 1-已发送, 2-发送失败
+  - `del_flag`: 0-存在, 2-删除
+
+### 7. 用户消息关联表 (app_user_message)
+
+- **功能**: 存储用户消息的读取记录
+- **关键字段**: `id`, `user_id`, `message_id`, `is_read`, `read_time`
+- **索引**: `user_id`, `message_id`, `is_read`
+- **状态说明**:
+  - `is_read`: 0-未读, 1-已读
+  - `del_flag`: 0-存在, 2-删除
+
+### 8. 操作日志表 (app_oper_log)
+
+- **功能**: 存储用户操作日志
+- **关键字段**: `oper_id`, `title`, `business_type`, `method`, `request_method`, `oper_name`, `oper_url`, `oper_ip`, `oper_location`, `oper_param`, `json_result`, `status`, `error_msg`, `oper_time`, `cost_time`
+- **索引**: `oper_name`, `status`, `oper_time`, `business_type`
+- **状态说明**:
+  - `business_type`: 0-其它, 1-新增, 2-修改, 3-删除
+  - `status`: 0-正常, 1-异常
+
+### 9. 登录日志表 (app_login_log)
+
+- **功能**: 存储用户登录日志
+- **关键字段**: `info_id`, `user_name`, `status`, `ipaddr`, `login_location`, `browser`, `os`, `msg`, `login_time`
+- **索引**: `user_name`, `status`, `login_time`, `ipaddr`
+- **状态说明**:
+  - `status`: 0-成功, 1-失败
+
+### 10. 版本表 (app_version)
+
+- **功能**: 存储 App 版本信息
+- **关键字段**: `version_id`, `version_code`, `version_name`, `update_content`, `download_url`, `is_force`, `platform`
+- **索引**: `platform`, `version_code`
+- **状态说明**:
+  - `platform`: android, ios
+  - `is_force`: 0-否, 1-是
+  - `del_flag`: 0-存在, 2-删除
+
+### 11. 社交认证表 (app_social_auth)
+
+- **功能**: 存储第三方登录授权信息
+- **关键字段**: `id`, `user_id`, `platform`, `platform_uid`, `open_id`, `union_id`, `access_token`, `expire_in`, `refresh_token`, `scope`
+- **索引**: `user_id`, `platform`, `platform_uid`, `open_id`, `union_id`
+- **状态说明**:
+  - `platform`: wechat_mp-微信小程序, wechat_open-微信开放平台, qq-QQ, weibo-微博
+  - `del_flag`: 0-存在, 2-删除
+
+## 功能清单
+
+### 1. 用户管理
+
+#### 已实现功能 ✅
+
+##### 用户基础功能
+
+- ✅ 用户注册
+  - 账号注册（支持用户名、手机号、邮箱注册）
+  - 账号唯一性校验
+  - 手机号唯一性校验
+  - 邮箱唯一性校验
+  - 注册时自动分配默认角色
+- ✅ 用户登录
+  - 账号密码登录
+  - 手机号验证码登录 ✅（在 ruoyi-server 模块实现）
+  - 邮箱验证码登录 ✅（在 ruoyi-server 模块实现）
+  - 验证码发送（短信/邮箱）✅（在 ruoyi-server 模块实现）
+  - JWT 令牌生成
+  - 登录日志记录
+- ✅ 用户信息管理
+  - 用户列表查询（分页、条件筛选）
+  - 用户详情查询
+  - 用户新增/修改/删除
+  - 用户状态管理（启用/停用）
+  - 用户信息导出
+- ✅ 用户资料管理
+  - 用户资料查询
+  - 用户资料修改
+  - 头像管理（关联文件表）
+- ✅ 密码管理
+  - 修改密码（需验证旧密码）
+  - 重置密码（管理员操作）
+  - 密码加密（BCrypt）
+- ✅ 第三方账号绑定
+  - 第三方账号绑定/解绑 ✅（在 ruoyi-server 模块实现）
+  - 查询绑定列表 ✅
+
+#### 待实现功能 ⏳
+
+- [ ] 忘记密码（通过手机号/邮箱验证码找回密码）
+- [ ] 独立的手机号/邮箱绑定功能（当前可通过更新用户资料方式修改）
+- [ ] 用户等级体系
+  - 用户等级定义
+  - 用户等级升级规则
+  - 用户积分/经验值管理
+- [ ] 用户标签
+  - 用户标签管理
+  - 用户标签关联
+  - 标签筛选用户
+
+### 2. 角色管理
+
+#### 已实现功能 ✅
+
+- ✅ 角色CRUD操作
+  - 角色列表查询（分页、条件筛选）
+  - 角色详情查询
+  - 角色新增/修改/删除
+  - 角色导出功能
+- ✅ 角色状态管理
+  - 启用/禁用角色
+- ✅ 用户角色关联
+  - 查询用户已分配角色
+  - 查询用户未分配角色
+  - 分配角色给用户
+  - 取消用户角色关联
+  - 批量分配/取消角色
+
+#### 待实现功能 ⏳
+
+- [ ] 角色权限管理
+  - 角色权限配置
+  - 权限点管理
+  - 权限验证（需集成权限框架）
+- [ ] 角色数据权限
+  - 数据权限范围配置
+  - 数据权限过滤
+
+### 3. 设备管理
+
+#### 已实现功能 ✅
+
+- ✅ 设备绑定
+  - 设备信息绑定
+  - 设备信息更新
+- ✅ 设备查询
+  - 设备列表查询
+  - 设备详情查询
+  - 我的设备列表查询
+  - 活跃设备查询
+- ✅ 设备状态管理
+  - 设备活跃状态更新
+  - 推送令牌管理
+  - 设备心跳检测
+- ✅ 设备解绑
+  - 设备解绑功能
+
+#### 待实现功能 ⏳
+
+- [ ] 设备推送管理
+  - 消息推送（需集成推送服务）
+  - 推送记录查询
+  - 推送统计
+- [ ] 设备安全
+  - 设备指纹识别
+  - 异常设备检测
+  - 设备黑名单管理
+
+### 4. 文件管理
+
+#### 已实现功能 ✅
+
+- ✅ 文件上传
+  - 单文件上传
+  - 批量文件上传
+  - 头像上传
+- ✅ 文件查询
+  - 文件列表查询（分页）
+  - 文件详情查询
+  - 按分类查询文件
+  - 公开文件查询
+- ✅ 文件下载
+  - 文件下载
+  - 下载次数统计
+- ✅ 文件管理
+  - 文件信息修改
+  - 文件状态管理
+  - 文件公开/私有设置
+  - 文件删除
+- ✅ 文件校验
+  - 文件MD5校验（秒传功能）
+  - 文件统计
+
+#### 待实现功能 ⏳
+
+- [ ] 文件存储优化
+  - 文件存储服务商集成（OSS、COS等）
+  - 文件CDN加速
+  - 文件压缩处理
+- [ ] 文件预览
+  - 图片预览
+  - 文档预览（PDF、Office等）
+  - 视频播放
+- [ ] 文件分享
+  - 文件分享链接生成
+  - 分享链接访问控制
+  - 分享统计
+
+### 5. 消息管理
+
+#### 已实现功能 ✅
+
+- ✅ 消息管理
+  - 消息列表查询（分页）
+  - 消息详情查询
+  - 消息新增/修改/删除
+  - 消息导出
+- ✅ 用户消息
+  - 我的消息列表查询
+  - 未读消息数量查询
+  - 消息标记已读
+  - 批量标记已读
+  - 全部标记已读
+- ✅ 消息推送
+  - 系统消息发送
+  - 个人消息发送
+  - 消息推送（需集成推送服务）
+  - 消息广播
+
+#### 待实现功能 ⏳
+
+- [ ] 消息推送集成
+  - 推送服务集成（极光推送、个推等）
+  - 推送消息发送
+  - 推送结果回调
+  - 推送统计
+- [ ] 消息模板
+  - 消息模板管理
+  - 模板变量替换
+- [ ] 消息分类
+  - 消息分类管理
+  - 消息分类筛选
+- [ ] 消息设置
+  - 用户消息推送设置
+  - 消息免打扰时段
+  - 消息接收方式设置
+
+### 6. 操作日志
+
+#### 已实现功能 ✅
+
+- ✅ 日志记录
+  - 操作日志记录
+  - 批量操作日志记录
+- ✅ 日志查询
+  - 日志列表查询（分页、条件筛选）
+  - 我的操作日志查询
+  - 日志详情查询
+  - 日志导出
+- ✅ 日志统计
+  - 操作日志统计
+  - 行为分析
+  - 热门操作统计
+  - 错误操作统计
+- ✅ 日志清理
+  - 日志清理
+  - 按时间清理日志
+
+#### 待实现功能 ⏳
+
+- [ ] 日志分析
+  - 操作趋势分析
+  - 用户行为分析
+  - 异常操作分析
+- [ ] 日志告警
+  - 异常操作告警
+  - 告警规则配置
+
+### 7. 登录日志
+
+#### 已实现功能 ✅
+
+- ✅ 登录日志记录
+  - 登录成功/失败日志记录
+  - 登录IP、地点、浏览器等信息记录
+- ✅ 登录日志查询
+  - 登录日志列表查询（分页、条件筛选）
+  - 登录日志详情查询
+  - 登录日志导出
+
+#### 待实现功能 ⏳
+
+- [ ] 登录安全
+  - 异常登录检测
+  - 异地登录提醒
+  - 登录IP白名单/黑名单
+- [ ] 登录统计
+  - 登录统计报表
+  - 登录趋势分析
+  - 登录设备分析
+
+### 8. 版本管理
+
+#### 已实现功能 ✅
+
+- ✅ 版本管理
+  - 版本列表查询（分页）
+  - 版本详情查询
+  - 版本新增/修改/删除
+  - 版本导出
+- ✅ 版本检查
+  - 检查更新
+  - 获取最新版本
+  - 版本历史查询
+  - 强制更新检查
+  - 更新信息查询
+  - 版本对比
+- ✅ 版本统计
+  - 版本下载记录
+  - 版本安装记录
+
+#### 待实现功能 ⏳
+
+- [ ] 版本发布流程
+  - 版本发布审核
+  - 版本发布通知
+- [ ] 版本回退
+  - 版本回退功能
+  - 回退记录
+
+### 9. 社交认证
+
+#### 已实现功能 ✅
+
+- ✅ 第三方登录
+  - 微信小程序登录
+  - 微信开放平台登录
+  - QQ登录
+  - 微博登录
+- ✅ 授权管理
+  - 授权信息存储
+  - 授权信息查询
+  - 授权绑定/解绑 ✅（在 ruoyi-server 模块实现）
+
+#### 待实现功能 ⏳
+
+- [ ] 更多第三方登录
+  - 支付宝登录
+  - 抖音登录
+  - 苹果登录（Apple ID）
+- [ ] 授权管理增强
+  - 授权过期处理
+  - 授权刷新
+  - 授权撤销
+
+### 10. JWT认证
+
+#### 已实现功能 ✅
+
+- ✅ JWT令牌生成
+  - Access Token生成
+  - Refresh Token生成
+- ✅ JWT令牌验证
+  - Token验证过滤器
+  - Token有效性校验
+- ✅ JWT令牌刷新
+  - Token刷新接口
+- ✅ 用户登录/登出
+  - 登录接口（生成Token）
+  - 登出接口（Token失效）
+- ✅ 验证码
+  - 图形验证码生成
+
+#### 待实现功能 ⏳
+
+- [ ] Token安全增强
+  - Token黑名单（Redis存储）
+  - Token刷新策略优化
+  - Token过期时间配置
+- [ ] 多端登录管理
+  - 多设备登录控制
+  - 登录设备列表查询
+  - 强制下线功能
+
+## API接口详细说明
+
+### 管理端接口
+
+#### 用户管理 (`/admin/member/user`)
+
+- `GET /admin/member/user/list` - 查询用户列表（分页）
+- `GET /admin/member/user/{userId}` - 获取用户详情
+- `POST /admin/member/user` - 新增用户
+- `PUT /admin/member/user` - 修改用户
+- `DELETE /admin/member/user/{userIds}` - 删除用户
+- `POST /admin/member/user/export` - 导出用户列表
+- `GET /admin/member/user/profile` - 获取当前用户资料
+- `PUT /admin/member/user/profile` - 修改当前用户资料
+- `PUT /admin/member/user/resetPwd` - 重置用户密码
+- `PUT /admin/member/user/changeStatus` - 修改用户状态
+- `GET /admin/member/user/authRole/{userId}` - 查询用户角色
+- `GET /admin/member/user/deptTree` - 查询部门树（预留）
+
+#### 角色管理 (`/admin/member/role`)
+
+- `GET /admin/member/role/list` - 查询角色列表（分页）
+- `GET /admin/member/role/{roleId}` - 获取角色详情
+- `POST /admin/member/role` - 新增角色
+- `PUT /admin/member/role` - 修改角色
+- `DELETE /admin/member/role/{roleIds}` - 删除角色
+- `POST /admin/member/role/export` - 导出角色列表
+- `GET /admin/member/role/optionselect` - 查询角色选项列表
+- `GET /admin/member/role/authUser/allocatedList` - 查询已分配用户角色列表
+- `GET /admin/member/role/authUser/unallocatedList` - 查询未分配用户角色列表
+- `PUT /admin/member/role/authUser/cancelAll` - 取消授权用户所有角色
+- `PUT /admin/member/role/authUser/selectAll` - 批量选择授权用户角色
+
+#### 配置管理 (`/admin/member/config`)
+
+- `GET /admin/member/config/list` - 查询配置列表
+- `GET /admin/member/config/{configId}` - 获取配置详情
+- `POST /admin/member/config` - 新增配置
+- `PUT /admin/member/config` - 修改配置
+- `DELETE /admin/member/config/{configIds}` - 删除配置
+- `POST /admin/member/config/export` - 导出配置列表
+- `DELETE /admin/member/config/refreshCache` - 刷新配置缓存
+- `GET /admin/member/config/configKey/{configKey}` - 根据配置键查询配置值
+- `GET /admin/member/config/systemInfo` - 获取系统信息
+- `GET /admin/member/config/statistics` - 获取统计数据
+
+### 移动端接口
+
+#### 用户管理 (`/app/member/user`)
+
+- `GET /app/member/user/list` - 查询用户列表
+- `GET /app/member/user/{userId}` - 获取用户详情
+- `POST /app/member/user` - 新增用户
+- `PUT /app/member/user` - 修改用户
+- `DELETE /app/member/user/{userIds}` - 删除用户
+- `POST /app/member/user/export` - 导出用户列表
+- `PUT /app/member/user/resetPwd` - 重置密码
+- `PUT /app/member/user/changeStatus` - 修改状态
+- `GET /app/member/user/profile/{userId}` - 获取用户资料
+- `GET /app/member/user/getInfo` - 获取当前用户信息
+- `GET /app/member/user/profile` - 获取当前用户资料
+- `PUT /app/member/user/profile` - 修改用户资料
+- `PUT /app/member/user/profile/updatePwd` - 修改密码
+
+#### 角色管理 (`/app/member/role`)
+
+- `GET /app/member/role/list` - 查询角色列表
+- `GET /app/member/role/{roleId}` - 获取角色详情
+- `POST /app/member/role` - 新增角色
+- `PUT /app/member/role` - 修改角色
+- `DELETE /app/member/role/{roleIds}` - 删除角色
+- `POST /app/member/role/export` - 导出角色列表
+- `GET /app/member/role/optionselect` - 查询角色选项列表
+- `GET /app/member/role/authUser/allocatedList` - 查询已分配用户角色列表
+- `GET /app/member/role/authUser/unallocatedList` - 查询未分配用户角色列表
+- `PUT /app/member/role/authUser/cancel` - 取消授权用户角色
+- `PUT /app/member/role/authUser/cancelAll` - 取消授权用户所有角色
+- `PUT /app/member/role/authUser/selectAll` - 批量选择授权用户角色
+
+#### 设备管理 (`/app/member/device`)
+
+- `GET /app/member/device/list` - 查询设备列表
+- `GET /app/member/device/{deviceId}` - 获取设备详情
+- `POST /app/member/device/bind` - 绑定设备
+- `PUT /app/member/device` - 修改设备信息
+- `DELETE /app/member/device/{deviceId}` - 解绑设备
+- `GET /app/member/device/my` - 查询我的设备列表
+- `GET /app/member/device/active` - 查询活跃设备列表
+- `PUT /app/member/device/{deviceId}/status` - 更新设备状态
+- `PUT /app/member/device/{deviceId}/push-token` - 更新推送令牌
+- `POST /app/member/device/{deviceId}/heartbeat` - 设备心跳
+- `GET /app/member/device/by-push-token` - 根据推送令牌查询设备
+
+#### 文件管理 (`/app/member/file`)
+
+- `GET /app/member/file/list` - 查询文件列表
+- `GET /app/member/file/{fileId}` - 获取文件详情
+- `POST /app/member/file` - 新增文件记录
+- `PUT /app/member/file` - 修改文件信息
+- `DELETE /app/member/file/{fileIds}` - 删除文件
+- `POST /app/member/file/upload` - 上传文件
+- `POST /app/member/file/upload/avatar` - 上传头像
+- `POST /app/member/file/upload/batch` - 批量上传文件
+- `GET /app/member/file/category/{fileCategory}` - 按分类查询文件
+- `GET /app/member/file/download/{fileId}` - 下载文件
+- `PUT /app/member/file/status/{fileId}` - 更新文件状态
+- `PUT /app/member/file/public/{fileId}` - 更新文件公开状态
+- `GET /app/member/file/statistics` - 获取文件统计
+- `GET /app/member/file/check/{fileMd5}` - 检查文件是否存在
+- `GET /app/member/file/public/category/{fileCategory}` - 查询公开文件
+
+#### 消息管理 (`/app/member/message`)
+
+- `GET /app/member/message/list` - 查询消息列表
+- `GET /app/member/message/myMessages` - 查询我的消息列表
+- `GET /app/member/message/unreadCount` - 查询未读消息数量
+- `GET /app/member/message/{messageId}` - 获取消息详情
+- `POST /app/member/message` - 新增消息
+- `PUT /app/member/message` - 修改消息
+- `DELETE /app/member/message/{messageIds}` - 删除消息
+- `POST /app/member/message/export` - 导出消息列表
+- `PUT /app/member/message/markRead/{messageId}` - 标记消息已读
+- `PUT /app/member/message/markReadBatch` - 批量标记消息已读
+- `PUT /app/member/message/markAllRead` - 全部标记已读
+- `POST /app/member/message/sendSystem` - 发送系统消息
+- `POST /app/member/message/sendPersonal` - 发送个人消息
+- `POST /app/member/message/push` - 推送消息
+- `POST /app/member/message/broadcast` - 广播消息
+
+#### 操作日志 (`/app/member/operlog`)
+
+- `GET /app/member/operlog/list` - 查询操作日志列表
+- `GET /app/member/operlog/my` - 查询我的操作日志
+- `GET /app/member/operlog/{operId}` - 获取操作日志详情
+- `POST /app/member/operlog` - 新增操作日志
+- `PUT /app/member/operlog` - 修改操作日志
+- `DELETE /app/member/operlog/{operIds}` - 删除操作日志
+- `POST /app/member/operlog/export` - 导出操作日志列表
+- `DELETE /app/member/operlog/clean` - 清理操作日志
+- `DELETE /app/member/operlog/cleanByTime` - 按时间清理操作日志
+- `GET /app/member/operlog/statistics` - 获取操作日志统计
+- `GET /app/member/operlog/behavior` - 获取行为分析
+- `GET /app/member/operlog/popular` - 获取热门操作
+- `GET /app/member/operlog/errors` - 获取错误操作
+- `POST /app/member/operlog/record` - 记录操作
+- `POST /app/member/operlog/batchRecord` - 批量记录操作
+
+#### 版本管理 (`/app/member/version`)
+
+- `GET /app/member/version/list` - 查询版本列表
+- `GET /app/member/version/{versionId}` - 获取版本详情
+- `GET /app/member/version/checkUpdate` - 检查更新
+- `GET /app/member/version/latest` - 获取最新版本
+- `GET /app/member/version/history` - 获取版本历史
+- `GET /app/member/version/checkForceUpdate` - 检查强制更新
+- `GET /app/member/version/updateInfo` - 获取更新信息
+- `GET /app/member/version/compare` - 版本对比
+- `POST /app/member/version/download/{versionId}` - 记录下载
+- `POST /app/member/version/install/{versionId}` - 记录安装
+
+### 认证接口
+
+#### JWT认证 (`/app/jwt`)
+
+- `GET /app/jwt/captcha` - 获取验证码
+- `POST /app/jwt/register` - 用户注册
+- `POST /app/jwt/login` - 用户登录
+- `POST /app/jwt/refresh` - 刷新Token
+- `POST /app/jwt/logout` - 用户登出
+
+#### 第三方账号绑定 (`/app/auth`) - 在 ruoyi-server 模块
+
+- `POST /app/auth/bind/social` - 绑定第三方账号
+- `POST /app/auth/unbind/social` - 解绑第三方账号
+- `GET /app/auth/social/list` - 获取用户绑定的第三方账号列表
+- `GET /app/auth/binding/{source}` - 获取第三方登录跳转URL
+- `POST /app/auth/social/binding` - 社交账号绑定回调
+
+## 技术栈与开发规范
+
+### 技术栈
+
+- **框架**: Spring Boot 3.x
+- **ORM**: MyBatis-Plus
+- **数据库**: MySQL 8.0+
+- **认证**: Sa-Token + JWT
+- **API文档**: Swagger/OpenAPI 3.0
+- **构建工具**: Maven
+- **安全**: Spring Security Crypto (BCrypt)
+
+### 开发规范
+
+#### 包结构规范
+
+- `controller` - 控制器层（分为 `admin` 和 `app` 两个子包）
+- `domain` - 实体类（包含 `bo` 业务对象和 `vo` 视图对象子包）
+- `mapper` - MyBatis Mapper 接口
+- `service` - 服务接口（实现类放在 `impl` 子包）
+- `config` - 配置类（JWT过滤器、Web配置等）
+- `exception` - 异常处理类
+- `utils` - 工具类（JWT工具等）
+
+#### 代码规范
+
+- 统一使用 Lombok 简化代码
+- 统一异常处理，使用 `ServiceException` 抛出业务异常
+- 统一返回格式，使用 `R<T>` 封装返回结果
+- 统一分页查询，使用 `PageQuery` 和 `TableDataInfo<T>`
+- 统一日志记录，使用 `@Log` 注解记录操作日志
+- 统一权限控制，管理端接口使用 `@SaCheckPermission` 注解
+
+#### 数据库设计规范
+
+- 表名使用 `app_` 前缀
+- 字段命名使用下划线命名法（snake_case）
+- 必须包含 `create_by`, `create_time`, `update_by`, `update_time` 字段
+- 删除标记使用逻辑删除（`del_flag` 字段）
+- 状态字段统一使用 `status`，0表示启用/正常，1表示禁用/异常
+
+#### API设计规范
+
+- RESTful 风格设计
+- 管理端接口路径：`/admin/member/{module}/{resource}`
+- 移动端接口路径：`/app/member/{module}/{resource}`
+- 使用 HTTP 标准方法：GET（查询）、POST（新增）、PUT（修改）、DELETE（删除）
+- 统一使用 JSON 格式进行数据交互
+- 使用 Swagger 注解完善接口文档
+
+## 模块依赖关系
+
+```
+ruoyi-member (会员中心模块)
+├── 依赖: ruoyi-common-* (通用工具模块)
+│   ├── ruoyi-common-core (核心工具)
+│   ├── ruoyi-common-doc (API文档)
+│   ├── ruoyi-common-log (日志)
+│   ├── ruoyi-common-mybatis (MyBatis)
+│   ├── ruoyi-common-security (安全)
+│   ├── ruoyi-common-web (Web)
+│   ├── ruoyi-common-excel (Excel)
+│   ├── ruoyi-common-translation (翻译)
+│   ├── ruoyi-common-social (社交登录)
+│   ├── ruoyi-common-satoken (权限认证)
+│   └── ruoyi-common-oss (对象存储)
+├── 依赖: sa-token-spring-boot3-starter (Sa-Token)
+├── 依赖: sa-token-jwt (JWT支持)
+└── 依赖: spring-security-crypto (密码加密)
+```
+
+## 模块集成说明
+
+### 与 ruoyi-server 模块的集成
+
+- **登录功能集成**: 手机号登录、邮箱登录功能在 `ruoyi-server` 模块实现
+  - `AppSmsAuthStrategy` - 手机号登录策略
+  - `AppEmailAuthStrategy` - 邮箱登录策略
+  - `CaptchaController` - 验证码发送接口
+- **第三方账号绑定集成**: 第三方账号绑定/解绑功能在 `ruoyi-server` 模块实现
+  - `AppAuthController` - 提供绑定/解绑接口
+- **用户服务集成**: `ruoyi-server` 模块通过依赖 `ruoyi-member` 模块使用用户服务
+
+### 与其他模块的集成
+
+- **文件存储**: 依赖 `ruoyi-common-oss` 模块，支持对象存储服务集成（OSS、COS等）
+- **社交登录**: 依赖 `ruoyi-common-social` 模块，支持第三方登录（微信、QQ、微博等）
+- **权限认证**: 依赖 `ruoyi-common-satoken` 模块，使用 Sa-Token 进行权限管理
+
+## 下一步工作
+
+### 功能完善
+
+1. **用户管理增强**
+   - [x] 手机号/邮箱登录功能 ✅（已在 ruoyi-server 模块实现）
+   - [x] 第三方账号绑定/解绑功能 ✅（已在 ruoyi-server 模块实现）
+   - [ ] 忘记密码功能（通过手机号/邮箱验证码找回密码）
+   - [ ] 独立的手机号/邮箱绑定功能（当前可通过更新用户资料方式修改）
+   - [ ] 用户等级体系
+   - [ ] 用户标签管理
+
+2. **角色权限系统**
+   - [ ] 权限点管理
+   - [ ] 角色权限配置
+   - [ ] 数据权限管理
+
+3. **消息推送集成**
+   - [ ] 集成推送服务（极光推送、个推等）
+   - [ ] 消息推送功能完善
+   - [ ] 推送统计功能
+
+4. **文件管理增强**
+   - [ ] 文件存储服务集成（OSS、COS等）
+   - [ ] 文件预览功能
+   - [ ] 文件分享功能
+
+5. **安全增强**
+   - [ ] Token黑名单机制
+   - [ ] 多端登录管理
+   - [ ] 异常登录检测
+   - [ ] 登录IP白名单/黑名单
+
+6. **日志分析**
+   - [ ] 操作日志分析功能
+   - [ ] 登录日志分析功能
+   - [ ] 日志告警功能
+
+### 性能优化
+
+1. **缓存优化**
+   - [ ] 用户信息缓存（Redis）
+   - [ ] 角色权限缓存
+   - [ ] 配置信息缓存
+
+2. **数据库优化**
+   - [ ] 索引优化
+   - [ ] 查询优化
+   - [ ] 分表策略（日志表）
+
+### 测试验证
+
+1. **单元测试**
+   - [ ] Service层单元测试
+   - [ ] Controller层单元测试
+
+2. **集成测试**
+   - [ ] API接口测试
+   - [ ] 业务流程测试
+
+## 开发指南
+
+### 新增功能开发步骤
+
+1. **数据库设计**
+   - 设计表结构（遵循数据库设计规范）
+   - 确保字段命名规范，包含必要的索引
+   - 添加必要的状态字段和逻辑删除字段
+
+2. **创建实体类**
+   - 在 `domain` 包下创建实体类
+   - 创建对应的 `Bo`（业务对象）和 `Vo`（视图对象）
+   - 使用 Lombok 简化代码
+
+3. **创建 Mapper**
+   - 在 `mapper` 包下创建 Mapper 接口
+   - 继承 `BaseMapper<T>` 获得基础 CRUD 功能
+   - 如需复杂查询，在 `resources/mapper/member` 下创建 XML 文件
+
+4. **创建 Service**
+   - 在 `service` 包下创建 Service 接口
+   - 在 `service/impl` 包下创建 Service 实现类
+   - 实现业务逻辑，使用事务注解保证数据一致性
+
+5. **创建 Controller**
+   - 管理端接口：在 `controller/admin` 包下创建
+   - 移动端接口：在 `controller/app` 包下创建
+   - 添加 Swagger 注解完善接口文档
+   - 添加权限控制注解（管理端使用 `@SaCheckPermission`）
+
+6. **测试验证**
+   - 编写单元测试（可选）
+   - 使用 Swagger UI 测试接口
+   - 验证业务逻辑正确性
+
+### 代码迁移指南
+
+如果要将现有代码迁移到新的模块结构：
+
+1. **创建新模块结构**（如果尚未创建）
+2. **复制代码到新模块**
+3. **修改包名**（如需要）
+4. **更新导入语句**
+5. **更新 Mapper XML 文件中的命名空间**
+6. **测试验证功能正常**
+
+## 注意事项
+
+1. **登录功能**: 手机号登录、邮箱登录功能已在 `ruoyi-server` 模块实现（通过 `AppSmsAuthStrategy` 和 `AppEmailAuthStrategy`），验证码发送功能通过 `CaptchaController` 提供
+2. **密码安全**: 用户密码使用 BCrypt 加密，确保密码安全存储
+3. **Token安全**: JWT Token 需要设置合理的过期时间，建议使用 Refresh Token 机制
+4. **文件上传**: 文件上传需要限制文件大小和类型，防止恶意文件上传
+5. **消息推送**: 消息推送需要集成第三方推送服务，注意推送频率限制
+6. **日志管理**: 操作日志和登录日志会随着时间增长，建议定期清理或归档
+7. **设备管理**: 设备绑定需要考虑设备唯一性，避免重复绑定
+8. **社交登录**: 第三方登录需要配置相应的应用ID和密钥
+9. **数据一致性**: 用户删除需要考虑关联数据（设备、文件、消息等）的处理
+10. **并发安全**: 用户注册、登录等操作需要考虑并发安全性
+11. **异常处理**: 需要统一异常处理，避免敏感信息泄露
+12. **模块集成**: 注意与 `ruoyi-server` 模块的集成关系，部分功能（如登录、第三方绑定）在 server 模块实现
+13. **配置管理**: JWT 过滤器配置在 `AppJwtWebConfig` 中，需要正确配置过滤路径
+14. **权限控制**: 管理端接口需要添加权限控制，移动端接口需要添加登录验证
diff --git a/ruoyi-modules/ruoyi-member/pom.xml b/ruoyi-modules/ruoyi-member/pom.xml
new file mode 100644
index 0000000..2b18c65
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/pom.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>org.dromara</groupId>
+        <artifactId>ruoyi-modules</artifactId>
+        <version>${revision}</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>ruoyi-member</artifactId>
+
+    <description>
+        ruoyi-member 会员中心模块
+    </description>
+
+    <dependencies>
+
+        <!-- 通用工具-->
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-core</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-doc</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-log</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-mybatis</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-security</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-web</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-excel</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-translation</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-social</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-satoken</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-oss</artifactId>
+        </dependency>
+
+        <!-- Sa-Token 权限认证，在线文档：https://sa-token.cc -->
+        <dependency>
+            <groupId>cn.dev33</groupId>
+            <artifactId>sa-token-spring-boot3-starter</artifactId>
+        </dependency>
+
+        <!-- Sa-Token 整合 jwt -->
+        <dependency>
+            <groupId>cn.dev33</groupId>
+            <artifactId>sa-token-jwt</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-crypto</artifactId>
+        </dependency>
+
+    </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/config/AppJwtFilter.java b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/config/AppJwtFilter.java
new file mode 100644
index 0000000..cf76a6e
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/config/AppJwtFilter.java
@@ -0,0 +1,81 @@
+package org.dromara.member.config;
+
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.redis.utils.RedisUtils;
+import org.dromara.member.utils.JwtUtil;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+import org.springframework.web.filter.OncePerRequestFilter;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.Map;
+
+/**
+ * JWT过滤器
+ *
+ * @author pengles
+ */
+@Component
+@RequiredArgsConstructor
+public class AppJwtFilter extends OncePerRequestFilter {
+
+    @Value("${ruoyi.app.jwt.secret:ruoyi-secret}")
+    private String jwtSecret;
+    private static final String BLACKLIST_PREFIX = "APP:JWT:BLACKLIST:";
+
+    @Override
+    protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain)
+            throws ServletException, IOException {
+        String path = request.getRequestURI();
+        // 仅保护敏感接口
+        if (requiresAuth(path)) {
+            String auth = request.getHeader("Authorization");
+            if (auth == null || !auth.startsWith("Bearer ")) {
+                write401(response);
+                return;
+            }
+            String token = auth.substring("Bearer ".length()).trim();
+            JwtUtil jwt = new JwtUtil(jwtSecret);
+            if (!jwt.verify(token)) {
+                write401(response);
+                return;
+            }
+            Map<String, Object> payload = jwt.parsePayload(token);
+            Object expObj = payload.get("exp");
+            long now = java.time.Instant.now().getEpochSecond();
+            long exp = expObj instanceof Number ? ((Number) expObj).longValue() : now;
+            if (exp < now) {
+                write401(response);
+                return;
+            }
+            String jti = String.valueOf(payload.get("jti"));
+            String bl = RedisUtils.getCacheObject(BLACKLIST_PREFIX + jti);
+            if (bl != null) {
+                write401(response);
+                return;
+            }
+        }
+        filterChain.doFilter(request, response);
+    }
+
+    private boolean requiresAuth(String path) {
+        if (path == null) return false;
+        // 保护系统会话/消息/用户/文件等接口
+        return path.startsWith("/system/session")
+                || path.startsWith("/system/message")
+                || path.startsWith("/app/user")
+                || path.startsWith("/app/file");
+    }
+
+    private void write401(HttpServletResponse response) throws IOException {
+        response.setStatus(401);
+        response.setContentType("application/json");
+        response.getOutputStream().write("{\"code\":401,\"msg\":\"Unauthorized\",\"data\":null}".getBytes(StandardCharsets.UTF_8));
+    }
+}
+
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/config/AppJwtWebConfig.java b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/config/AppJwtWebConfig.java
new file mode 100644
index 0000000..54f78d9
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/config/AppJwtWebConfig.java
@@ -0,0 +1,30 @@
+package org.dromara.member.config;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.boot.web.servlet.FilterRegistrationBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * JWT Web配置
+ *
+ * @author pengles
+ */
+@Configuration
+@RequiredArgsConstructor
+public class AppJwtWebConfig {
+    private final AppJwtFilter appJwtFilter;
+
+    @Bean
+    public FilterRegistrationBean<AppJwtFilter> appJwtFilterRegistration() {
+        FilterRegistrationBean<AppJwtFilter> bean = new FilterRegistrationBean<>();
+        bean.setFilter(appJwtFilter);
+        // 设置过滤路径
+        bean.addUrlPatterns("/system/session/*", "/system/message/*", "/app/user/*", "/app/file/*");
+        bean.setName("AppJwtFilter");
+        // 设置优先级，越小越靠前
+        bean.setOrder(10);
+        return bean;
+    }
+}
+
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/controller/AppFileController.java b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/controller/AppFileController.java
new file mode 100644
index 0000000..cf621b7
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/controller/AppFileController.java
@@ -0,0 +1,266 @@
+package org.dromara.member.controller;
+
+import cn.dev33.satoken.annotation.SaCheckLogin;
+import cn.dev33.satoken.annotation.SaIgnore;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.*;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.member.domain.bo.AppFileBo;
+import org.dromara.member.domain.vo.AppFileVo;
+import org.dromara.member.service.AppFileService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * App端文件信息Controller
+ *
+ * @author pengles
+ */
+@Tag(name = "App端文件管理", description = "App端文件信息管理接口")
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/app/file")
+public class AppFileController extends BaseController {
+
+    private final AppFileService appFileService;
+
+    /**
+     * 查询App端文件信息列表
+     */
+    @Operation(summary = "查询文件列表", description = "分页查询当前用户的文件信息列表")
+    @SaCheckLogin
+    @GetMapping("/list")
+    public TableDataInfo<AppFileVo> list(
+            @Parameter(description = "文件查询条件") @Valid AppFileBo bo,
+            @Parameter(description = "分页参数") @Valid PageQuery pageQuery) {
+        // 只能查询自己的文件
+        bo.setUserId(LoginHelper.getUserId());
+        return appFileService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 获取App端文件信息详细信息
+     */
+    @Operation(summary = "获取文件详情", description = "根据文件ID获取文件详细信息")
+    @SaCheckLogin
+    @GetMapping("/{fileId}")
+    public R<AppFileVo> getInfo(
+            @Parameter(description = "文件ID", required = true)
+            @PathVariable @NotNull(message = "文件ID不能为空") @Positive(message = "文件ID必须为正数") Long fileId) {
+        AppFileVo fileVo = appFileService.queryById(fileId);
+        if (fileVo == null) {
+            return R.fail("文件不存在");
+        }
+        // 检查权限
+        if (!fileVo.getUserId().equals(LoginHelper.getUserId()) && !"1".equals(fileVo.getIsPublic())) {
+            return R.fail("无权限访问该文件");
+        }
+        return R.ok(fileVo);
+    }
+
+    /**
+     * 新增App端文件信息
+     */
+    @Operation(summary = "新增文件信息", description = "添加新的文件信息记录")
+    @SaCheckLogin
+    @Log(title = "App端文件信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public R<Void> add(
+            @Parameter(description = "文件信息", required = true)
+            @Validated(AddGroup.class) @RequestBody AppFileBo bo) {
+        bo.setUserId(LoginHelper.getUserId());
+        return toAjax(appFileService.insertByBo(bo));
+    }
+
+    /**
+     * 修改App端文件信息
+     */
+    @Operation(summary = "修改文件信息", description = "更新文件信息记录")
+    @SaCheckLogin
+    @Log(title = "App端文件信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public R<Void> edit(
+            @Parameter(description = "文件信息", required = true)
+            @Validated(EditGroup.class) @RequestBody AppFileBo bo) {
+        // 检查权限
+        AppFileVo existFile = appFileService.queryById(bo.getFileId());
+        if (existFile == null) {
+            return R.fail("文件不存在");
+        }
+        if (!existFile.getUserId().equals(LoginHelper.getUserId())) {
+            return R.fail("无权限修改该文件");
+        }
+        return toAjax(appFileService.updateByBo(bo));
+    }
+
+    /**
+     * 删除App端文件信息
+     */
+    @Operation(summary = "删除文件", description = "批量删除文件信息")
+    @SaCheckLogin
+    @Log(title = "App端文件信息", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{fileIds}")
+    public R<Void> remove(
+            @Parameter(description = "文件ID列表", required = true)
+            @PathVariable @NotEmpty(message = "文件ID列表不能为空") Long[] fileIds) {
+        return toAjax(appFileService.batchDeleteUserFiles(Arrays.asList(fileIds), LoginHelper.getUserId()));
+    }
+
+    /**
+     * 上传文件
+     */
+    @Operation(summary = "上传文件", description = "上传单个文件")
+    @SaCheckLogin
+    @Log(title = "文件上传", businessType = BusinessType.INSERT)
+    @PostMapping("/upload")
+    public R<AppFileVo> uploadFile(
+            @Parameter(description = "上传的文件", required = true)
+            @RequestParam("file") @NotNull(message = "上传文件不能为空") MultipartFile file,
+            @Parameter(description = "文件分类")
+            @RequestParam(value = "fileCategory", required = false) @Min(value = 0, message = "文件分类不能为负数") Integer fileCategory) {
+        AppFileVo result = appFileService.uploadFile(file, LoginHelper.getUserId(), fileCategory);
+        return R.ok(result);
+    }
+
+    /**
+     * 上传头像
+     */
+    @Operation(summary = "上传头像", description = "上传用户头像文件")
+    @SaCheckLogin
+    @Log(title = "头像上传", businessType = BusinessType.INSERT)
+    @PostMapping("/upload/avatar")
+    public R<AppFileVo> uploadAvatar(
+            @Parameter(description = "头像文件", required = true)
+            @RequestParam("file") @NotNull(message = "头像文件不能为空") MultipartFile file) {
+        AppFileVo result = appFileService.uploadAvatar(file, LoginHelper.getUserId());
+        return R.ok(result);
+    }
+
+    /**
+     * 批量上传文件
+     */
+    @Operation(summary = "批量上传文件", description = "批量上传多个文件")
+    @SaCheckLogin
+    @Log(title = "批量文件上传", businessType = BusinessType.INSERT)
+    @PostMapping("/upload/batch")
+    public R<List<AppFileVo>> batchUploadFiles(
+            @Parameter(description = "上传的文件列表", required = true)
+            @RequestParam("files") @NotEmpty(message = "上传文件列表不能为空") MultipartFile[] files,
+            @Parameter(description = "文件分类")
+            @RequestParam(value = "fileCategory", required = false) @Min(value = 0, message = "文件分类不能为负数") Integer fileCategory) {
+        List<AppFileVo> result = appFileService.batchUploadFiles(files, LoginHelper.getUserId(), fileCategory);
+        return R.ok(result);
+    }
+
+    /**
+     * 根据文件分类查询文件列表
+     */
+    @Operation(summary = "根据分类获取文件", description = "获取指定分类的文件列表")
+    @SaCheckLogin
+    @GetMapping("/category/{fileCategory}")
+    public R<List<AppFileVo>> getFilesByCategory(
+            @Parameter(description = "文件分类", required = true)
+            @PathVariable @NotNull(message = "文件分类不能为空") @Min(value = 0, message = "文件分类不能为负数") Integer fileCategory) {
+        List<AppFileVo> result = appFileService.queryByUserId(LoginHelper.getUserId(), fileCategory);
+        return R.ok(result);
+    }
+
+    /**
+     * 下载文件
+     */
+    @Operation(summary = "下载文件", description = "根据文件ID下载文件")
+    @SaCheckLogin
+    @Log(title = "文件下载", businessType = BusinessType.OTHER)
+    @GetMapping("/download/{fileId}")
+    public R<AppFileVo> downloadFile(
+            @Parameter(description = "文件ID", required = true)
+            @PathVariable @NotNull(message = "文件ID不能为空") @Positive(message = "文件ID必须为正数") Long fileId) {
+        AppFileVo result = appFileService.downloadFile(fileId, LoginHelper.getUserId());
+        return R.ok(result);
+    }
+
+    /**
+     * 更新文件状态
+     */
+    @Operation(summary = "更新文件状态", description = "更新文件的状态信息")
+    @SaCheckLogin
+    @Log(title = "更新文件状态", businessType = BusinessType.UPDATE)
+    @PutMapping("/status/{fileId}")
+    public R<Void> updateFileStatus(
+            @Parameter(description = "文件ID", required = true)
+            @PathVariable @NotNull(message = "文件ID不能为空") @Positive(message = "文件ID必须为正数") Long fileId,
+            @Parameter(description = "文件状态(0-正常,1-禁用)", required = true)
+            @RequestParam @NotBlank(message = "文件状态不能为空") @Pattern(regexp = "^(0|1)$", message = "文件状态只能为0或1") String status) {
+        return toAjax(appFileService.updateFileStatus(fileId, status, LoginHelper.getUserId()));
+    }
+
+    /**
+     * 更新文件公开状态
+     */
+    @Operation(summary = "更新文件公开状态", description = "设置文件是否公开")
+    @SaCheckLogin
+    @Log(title = "更新文件公开状态", businessType = BusinessType.UPDATE)
+    @PutMapping("/public/{fileId}")
+    public R<Void> updateFilePublicStatus(
+            @Parameter(description = "文件ID", required = true)
+            @PathVariable @NotNull(message = "文件ID不能为空") @Positive(message = "文件ID必须为正数") Long fileId,
+            @Parameter(description = "是否公开(0-私有,1-公开)", required = true)
+            @RequestParam @NotBlank(message = "公开状态不能为空") @Pattern(regexp = "^(0|1)$", message = "公开状态只能为0或1") String isPublic) {
+        return toAjax(appFileService.updateFilePublicStatus(fileId, isPublic, LoginHelper.getUserId()));
+    }
+
+    /**
+     * 获取用户文件统计信息
+     */
+    @Operation(summary = "获取文件统计", description = "获取当前用户的文件统计信息")
+    @SaCheckLogin
+    @GetMapping("/statistics")
+    public R<AppFileVo> getUserFileStatistics() {
+        AppFileVo result = appFileService.getUserFileStatistics(LoginHelper.getUserId());
+        return R.ok(result);
+    }
+
+    /**
+     * 检查文件是否存在
+     */
+    @Operation(summary = "检查文件是否存在", description = "根据MD5值检查文件是否已存在")
+    @SaCheckLogin
+    @GetMapping("/check/{fileMd5}")
+    public R<AppFileVo> checkFileExists(
+            @Parameter(description = "文件MD5值", required = true)
+            @PathVariable @NotBlank(message = "文件MD5不能为空") @Size(min = 32, max = 32, message = "MD5长度必须为32位") String fileMd5) {
+        AppFileVo result = appFileService.checkFileExists(fileMd5, LoginHelper.getUserId());
+        return R.ok(result);
+    }
+
+    /**
+     * 查询公开文件列表
+     */
+    @Operation(summary = "查询公开文件列表", description = "获取指定分类的公开文件列表")
+    @SaIgnore
+    @GetMapping("/public/category/{fileCategory}")
+    public R<List<AppFileVo>> getPublicFilesByCategory(
+            @Parameter(description = "文件分类", required = true)
+            @PathVariable @NotNull(message = "文件分类不能为空") @Min(value = 0, message = "文件分类不能为负数") Integer fileCategory) {
+        List<AppFileVo> result = appFileService.queryByCategory(fileCategory);
+        return R.ok(result);
+    }
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/controller/AppJwtController.java b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/controller/AppJwtController.java
new file mode 100644
index 0000000..9c0eb56
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/controller/AppJwtController.java
@@ -0,0 +1,180 @@
+package org.dromara.member.controller;
+
+import cn.dev33.satoken.annotation.SaIgnore;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Pattern;
+import jakarta.validation.constraints.Size;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.redis.utils.RedisUtils;
+import org.dromara.member.utils.JwtUtil;
+import org.dromara.member.domain.AppUser;
+import org.dromara.member.mapper.AppUserMapper;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.time.Duration;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.UUID;
+
+/**
+ * JWT认证控制器
+ *
+ * @author pengles
+ */
+@SaIgnore
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/app/auth/jwt")
+public class AppJwtController {
+
+    private final AppUserMapper appUserMapper;
+
+    @Value("${ruoyi.app.jwt.secret:ruoyi-secret}")
+    private String jwtSecret;
+    @Value("${ruoyi.app.jwt.access-ttl-seconds:7200}")
+    private long accessTtlSeconds;
+    @Value("${ruoyi.app.jwt.refresh-ttl-seconds:604800}")
+    private long refreshTtlSeconds;
+    private static final String CAPTCHA_PREFIX = "APP:JWT:CAPTCHA:";
+    private static final String BLACKLIST_PREFIX = "APP:JWT:BLACKLIST:";
+    private static final String TOKEN_JTI_PREFIX = "APP:JWT:JTI:";
+    private static final String USER_TOKENS_PREFIX = "APP:JWT:USER_TOKENS:";
+    private static final String LOGIN_FAIL_PREFIX = "APP:JWT:LOGIN_FAIL:";
+
+    @Operation(summary = "生成图形验证码(4位字母数字)")
+    @GetMapping("/captcha")
+    public R<Map<String, String>> captcha() {
+        String code = randomCode(4);
+        String uuid = UUID.randomUUID().toString();
+        RedisUtils.setCacheObject(CAPTCHA_PREFIX + uuid, code, Duration.ofMinutes(5));
+        // 这里简化为直接返回文本验证码；实际可返回Base64图片
+        return R.ok(Map.of("uuid", uuid, "code", code));
+    }
+
+    @Operation(summary = "注册")
+    @PostMapping("/register")
+    public R<Void> register(
+            @Parameter(description = "手机号(+86或11位)") @RequestParam @Pattern(regexp = "^(\\+86\\d{11}|\\d{11})$") String phone,
+            @Parameter(description = "密码") @RequestParam @Size(min = 6, max = 64) String password,
+            @Parameter(description = "验证码uuid") @RequestParam @NotBlank String captchaUuid,
+            @Parameter(description = "验证码") @RequestParam @NotBlank String captchaCode) {
+        if (!verifyCaptcha(captchaUuid, captchaCode)) {
+            return R.fail("验证码错误");
+        }
+        AppUser exist = findByPhone(phone);
+        if (exist != null) {
+            return R.fail("手机号已注册");
+        }
+        org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder enc = new org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder(12);
+        AppUser u = new AppUser();
+        u.setPhone(phone);
+        u.setPassword(enc.encode(password));
+        boolean ok = appUserMapper.insert(u) > 0;
+        return ok ? R.ok() : R.fail("注册失败");
+    }
+
+    @Operation(summary = "登录")
+    @PostMapping("/login")
+    public R<Map<String, Object>> login(
+            @Parameter(description = "手机号(+86或11位)") @RequestParam @Pattern(regexp = "^(\\+86\\d{11}|\\d{11})$") String phone,
+            @Parameter(description = "密码") @RequestParam @Size(min = 6, max = 64) String password,
+            @Parameter(description = "验证码uuid") @RequestParam @NotBlank String captchaUuid,
+            @Parameter(description = "验证码") @RequestParam @NotBlank String captchaCode) {
+        if (!verifyCaptcha(captchaUuid, captchaCode)) {
+            return R.fail("验证码错误");
+        }
+        String failKey = LOGIN_FAIL_PREFIX + phone;
+        Integer cnt = RedisUtils.getCacheObject(failKey);
+        if (cnt != null && cnt >= 5) {
+            return R.fail("登录失败次数过多，请稍后再试");
+        }
+        AppUser user = findByPhone(phone);
+        org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder enc = new org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder(12);
+        if (user == null || !enc.matches(password, user.getPassword())) {
+            int n = (cnt == null ? 0 : cnt) + 1;
+            RedisUtils.setCacheObject(failKey, n, Duration.ofHours(1));
+            return R.fail("手机号或密码错误");
+        }
+        JwtUtil jwt = new JwtUtil(jwtSecret);
+        String jti = UUID.randomUUID().toString();
+        String access = jwt.generateToken(String.valueOf(user.getUserId()), accessTtlSeconds, jti);
+        String refresh = jwt.generateToken("refresh:" + user.getUserId(), refreshTtlSeconds, UUID.randomUUID().toString());
+        RedisUtils.setCacheObject(TOKEN_JTI_PREFIX + jti, "1", Duration.ofSeconds(accessTtlSeconds));
+        limitUserDevices(user.getUserId(), jti);
+        Map<String, Object> data = new LinkedHashMap<>();
+        data.put("accessToken", access);
+        data.put("refreshToken", refresh);
+        data.put("expiresIn", accessTtlSeconds);
+        return R.ok(data);
+    }
+
+    @Operation(summary = "刷新Token")
+    @PostMapping("/refresh")
+    public R<Map<String, Object>> refresh(@Parameter(description = "刷新令牌") @RequestParam String refreshToken) {
+        JwtUtil jwt = new JwtUtil(jwtSecret);
+        if (!jwt.verify(refreshToken)) return R.fail("刷新令牌无效");
+        Map<String, Object> payload = jwt.parsePayload(refreshToken);
+        String sub = String.valueOf(payload.get("sub"));
+        if (sub == null || !sub.startsWith("refresh:")) return R.fail("刷新令牌错误");
+        String userId = sub.substring("refresh:".length());
+        String jti = UUID.randomUUID().toString();
+        String access = jwt.generateToken(userId, accessTtlSeconds, jti);
+        RedisUtils.setCacheObject(TOKEN_JTI_PREFIX + jti, "1", Duration.ofSeconds(accessTtlSeconds));
+        limitUserDevices(Long.parseLong(userId), jti);
+        return R.ok(Map.of("accessToken", access, "expiresIn", accessTtlSeconds));
+    }
+
+    @Operation(summary = "注销")
+    @PostMapping("/logout")
+    public R<Void> logout(@Parameter(description = "访问令牌") @RequestParam String accessToken) {
+        JwtUtil jwt = new JwtUtil(jwtSecret);
+        if (!jwt.verify(accessToken)) return R.fail("令牌无效");
+        Map<String, Object> payload = jwt.parsePayload(accessToken);
+        String jti = String.valueOf(payload.get("jti"));
+        Object expObj = payload.get("exp");
+        long now = java.time.Instant.now().getEpochSecond();
+        long exp = expObj instanceof Number ? ((Number) expObj).longValue() : now;
+        long remain = Math.max(0, exp - now);
+        RedisUtils.setCacheObject(BLACKLIST_PREFIX + jti, "1", Duration.ofSeconds(remain));
+        RedisUtils.deleteObject(TOKEN_JTI_PREFIX + jti);
+        return R.ok();
+    }
+
+    private boolean verifyCaptcha(String uuid, String code) {
+        String real = RedisUtils.getCacheObject(CAPTCHA_PREFIX + uuid);
+        return real != null && real.equalsIgnoreCase(code);
+    }
+
+    private String randomCode(int n) {
+        String chars = "ABCDEFGHJKLMNPQRSTUVWXYZ23456789";
+        StringBuilder sb = new StringBuilder();
+        java.util.Random r = new java.util.Random();
+        for (int i = 0; i < n; i++) sb.append(chars.charAt(r.nextInt(chars.length())));
+        return sb.toString();
+    }
+
+    private void limitUserDevices(Long userId, String jti) {
+        String listKey = USER_TOKENS_PREFIX + userId;
+        java.util.List<String> list = RedisUtils.getCacheObject(listKey);
+        if (list == null) list = new java.util.ArrayList<>();
+        list.add(0, jti);
+        while (list.size() > 3) {
+            String old = list.remove(list.size() - 1);
+            RedisUtils.setCacheObject(BLACKLIST_PREFIX + old, "1", Duration.ofHours(2));
+            RedisUtils.deleteObject(TOKEN_JTI_PREFIX + old);
+        }
+        RedisUtils.setCacheObject(listKey, list, Duration.ofDays(8));
+    }
+
+    private AppUser findByPhone(String phone) {
+        com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper<AppUser> lqw = com.baomidou.mybatisplus.core.toolkit.Wrappers.lambdaQuery();
+        lqw.eq(AppUser::getPhone, phone);
+        return appUserMapper.selectOne(lqw);
+    }
+}
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/controller/admin/AdminConfigController.java b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/controller/admin/AdminConfigController.java
new file mode 100644
index 0000000..c0983fe
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/controller/admin/AdminConfigController.java
@@ -0,0 +1,175 @@
+package org.dromara.member.controller.admin;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 管理端系统配置
+ *
+ * @author pengles
+ */
+@Tag(name = "管理端系统配置", description = "系统配置管理接口")
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/admin/config")
+public class AdminConfigController extends BaseController {
+
+    /**
+     * 查询系统配置列表
+     */
+    @Operation(summary = "查询配置列表", description = "分页查询系统配置列表")
+    @SaCheckPermission("admin:config:list")
+    @GetMapping("/list")
+    public TableDataInfo<Map<String, Object>> list(
+            @Parameter(description = "分页参数") PageQuery pageQuery) {
+        // 模拟配置数据
+        TableDataInfo<Map<String, Object>> dataInfo = new TableDataInfo<>();
+        dataInfo.setCode(200);
+        dataInfo.setMsg("查询成功");
+        dataInfo.setTotal(0L);
+        dataInfo.setRows(List.of());
+        return dataInfo;
+    }
+
+    /**
+     * 导出系统配置列表
+     */
+    @Operation(summary = "导出配置列表", description = "导出系统配置到Excel")
+    @SaCheckPermission("admin:config:export")
+    @Log(title = "系统配置", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response) {
+        // 导出逻辑
+    }
+
+    /**
+     * 获取系统配置详细信息
+     */
+    @Operation(summary = "获取配置详情", description = "根据配置ID获取详细信息")
+    @SaCheckPermission("admin:config:query")
+    @GetMapping("/{configId}")
+    public R<Map<String, Object>> getInfo(
+            @Parameter(description = "配置ID", required = true)
+            @NotNull(message = "主键不能为空") @PathVariable Long configId) {
+        Map<String, Object> config = new HashMap<>();
+        config.put("configId", configId);
+        config.put("configName", "示例配置");
+        config.put("configKey", "example.config");
+        config.put("configValue", "示例值");
+        return R.ok(config);
+    }
+
+    /**
+     * 新增系统配置
+     */
+    @Operation(summary = "新增配置", description = "创建新的系统配置")
+    @SaCheckPermission("admin:config:add")
+    @Log(title = "系统配置", businessType = BusinessType.INSERT)
+    @PostMapping()
+    public R<Void> add(
+            @Parameter(description = "配置信息", required = true)
+            @Validated(AddGroup.class) @RequestBody Map<String, Object> config) {
+        return R.ok();
+    }
+
+    /**
+     * 修改系统配置
+     */
+    @Operation(summary = "修改配置", description = "更新系统配置信息")
+    @SaCheckPermission("admin:config:edit")
+    @Log(title = "系统配置", businessType = BusinessType.UPDATE)
+    @PutMapping()
+    public R<Void> edit(
+            @Parameter(description = "配置信息", required = true)
+            @Validated(EditGroup.class) @RequestBody Map<String, Object> config) {
+        return R.ok();
+    }
+
+    /**
+     * 删除系统配置
+     */
+    @Operation(summary = "删除配置", description = "批量删除系统配置")
+    @SaCheckPermission("admin:config:remove")
+    @Log(title = "系统配置", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{configIds}")
+    public R<Void> remove(
+            @Parameter(description = "配置ID列表", required = true)
+            @NotEmpty(message = "主键不能为空") @PathVariable Long[] configIds) {
+        return R.ok();
+    }
+
+    /**
+     * 刷新参数缓存
+     */
+    @Operation(summary = "刷新缓存", description = "刷新系统配置缓存")
+    @SaCheckPermission("admin:config:remove")
+    @Log(title = "系统配置", businessType = BusinessType.CLEAN)
+    @DeleteMapping("/refreshCache")
+    public R<Void> refreshCache() {
+        return R.ok();
+    }
+
+    /**
+     * 根据参数键名查询参数值
+     */
+    @Operation(summary = "根据键名查询配置", description = "根据配置键名获取配置值")
+    @GetMapping("/configKey/{configKey}")
+    public R<String> getConfigKey(
+            @Parameter(description = "配置键名", required = true)
+            @PathVariable String configKey) {
+        return R.ok("配置值");
+    }
+
+    /**
+     * 获取系统信息
+     */
+    @Operation(summary = "获取系统信息", description = "获取系统运行信息")
+    @SaCheckPermission("admin:config:query")
+    @GetMapping("/systemInfo")
+    public R<Map<String, Object>> getSystemInfo() {
+        Map<String, Object> systemInfo = new HashMap<>();
+        systemInfo.put("systemName", "RuoYi-Unity-AI管理系统");
+        systemInfo.put("version", "5.X");
+        systemInfo.put("author", "RuoYi");
+        systemInfo.put("javaVersion", System.getProperty("java.version"));
+        systemInfo.put("osName", System.getProperty("os.name"));
+        return R.ok(systemInfo);
+    }
+
+    /**
+     * 获取系统统计信息
+     */
+    @Operation(summary = "获取统计信息", description = "获取系统统计数据")
+    @SaCheckPermission("admin:config:query")
+    @GetMapping("/statistics")
+    public R<Map<String, Object>> getStatistics() {
+        Map<String, Object> statistics = new HashMap<>();
+        statistics.put("totalUsers", 0);
+        statistics.put("totalRoles", 0);
+        statistics.put("onlineUsers", 0);
+        statistics.put("todayVisits", 0);
+        return R.ok(statistics);
+    }
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/controller/admin/AdminRoleController.java b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/controller/admin/AdminRoleController.java
new file mode 100644
index 0000000..822dfa6
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/controller/admin/AdminRoleController.java
@@ -0,0 +1,172 @@
+package org.dromara.member.controller.admin;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.member.domain.bo.AppRoleBo;
+import org.dromara.member.domain.vo.AppRoleVo;
+import org.dromara.member.service.AppRoleService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 管理端角色信息
+ *
+ * @author pengles
+ */
+@Tag(name = "管理端角色管理", description = "管理端角色信息管理接口")
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/admin/role")
+public class AdminRoleController extends BaseController {
+
+    private final AppRoleService appRoleService;
+
+    /**
+     * 查询管理端角色信息列表
+     */
+    @Operation(summary = "查询角色列表", description = "分页查询管理端角色信息列表")
+    @SaCheckPermission("admin:role:list")
+    @GetMapping("/list")
+    public TableDataInfo<AppRoleVo> list(@Parameter(description = "角色查询条件") AppRoleBo bo,
+                                         @Parameter(description = "分页参数") PageQuery pageQuery) {
+        return appRoleService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出管理端角色信息列表
+     */
+    @Operation(summary = "导出角色列表", description = "导出管理端角色信息到Excel")
+    @SaCheckPermission("admin:role:export")
+    @Log(title = "管理端角色信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(@Parameter(description = "角色查询条件") AppRoleBo bo,
+                       @Parameter(description = "响应对象") HttpServletResponse response) {
+        List<AppRoleVo> list = appRoleService.queryList(bo);
+        ExcelUtil.exportExcel(list, "管理端角色信息", AppRoleVo.class, response);
+    }
+
+    /**
+     * 获取管理端角色信息详细信息
+     */
+    @Operation(summary = "获取角色详情", description = "根据角色ID获取详细信息")
+    @SaCheckPermission("admin:role:query")
+    @GetMapping("/{roleId}")
+    public R<AppRoleVo> getInfo(@Parameter(description = "角色ID", required = true)
+                                @NotNull(message = "主键不能为空")
+                                @PathVariable Long roleId) {
+        return R.ok(appRoleService.queryById(roleId));
+    }
+
+    /**
+     * 新增管理端角色信息
+     */
+    @Operation(summary = "新增角色", description = "新增管理端角色信息")
+    @SaCheckPermission("admin:role:add")
+    @Log(title = "管理端角色信息", businessType = BusinessType.INSERT)
+    @PostMapping()
+    public R<Void> add(@Parameter(description = "角色信息", required = true)
+                       @Validated(AddGroup.class) @RequestBody AppRoleBo bo) {
+        return toAjax(appRoleService.insertByBo(bo));
+    }
+
+    /**
+     * 修改管理端角色信息
+     */
+    @Operation(summary = "修改角色", description = "修改管理端角色信息")
+    @SaCheckPermission("admin:role:edit")
+    @Log(title = "管理端角色信息", businessType = BusinessType.UPDATE)
+    @PutMapping()
+    public R<Void> edit(@Parameter(description = "角色信息", required = true)
+                        @Validated(EditGroup.class) @RequestBody AppRoleBo bo) {
+        return toAjax(appRoleService.updateByBo(bo));
+    }
+
+    /**
+     * 删除管理端角色信息
+     */
+    @Operation(summary = "删除角色", description = "批量删除管理端角色信息")
+    @SaCheckPermission("admin:role:remove")
+    @Log(title = "管理端角色信息", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{roleIds}")
+    public R<Void> remove(@Parameter(description = "角色ID数组", required = true)
+                          @NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] roleIds) {
+        return toAjax(appRoleService.deleteWithValidByIds(List.of(roleIds), true));
+    }
+
+    /**
+     * 获取角色选择框列表
+     */
+    @Operation(summary = "获取角色选项", description = "获取角色选择框列表")
+    @SaCheckPermission("admin:role:query")
+    @GetMapping("/optionselect")
+    public R<List<AppRoleVo>> optionselect() {
+        List<AppRoleVo> roles = appRoleService.queryList(new AppRoleBo());
+        return R.ok(roles);
+    }
+
+    /**
+     * 查询已分配用户角色列表
+     */
+    @Operation(summary = "查询已分配用户", description = "查询已分配用户角色列表")
+    @SaCheckPermission("admin:role:list")
+    @GetMapping("/authUser/allocatedList")
+    public TableDataInfo<AppRoleVo> allocatedList(@Parameter(description = "角色查询条件") AppRoleBo bo,
+                                                  @Parameter(description = "分页参数") PageQuery pageQuery) {
+        return appRoleService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 查询未分配用户角色列表
+     */
+    @Operation(summary = "查询未分配用户", description = "查询未分配用户角色列表")
+    @SaCheckPermission("admin:role:list")
+    @GetMapping("/authUser/unallocatedList")
+    public TableDataInfo<AppRoleVo> unallocatedList(@Parameter(description = "角色查询条件") AppRoleBo bo,
+                                                    @Parameter(description = "分页参数") PageQuery pageQuery) {
+        return appRoleService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 取消授权用户
+     */
+    @Operation(summary = "取消授权用户", description = "批量取消用户角色授权")
+    @SaCheckPermission("admin:role:edit")
+    @Log(title = "管理端角色信息", businessType = BusinessType.GRANT)
+    @PutMapping("/authUser/cancelAll")
+    public R<Void> cancelAuthUserAll(@Parameter(description = "角色ID", required = true) Long roleId,
+                                     @Parameter(description = "用户ID数组", required = true) Long[] userIds) {
+        return toAjax(appRoleService.deleteAuthUsers(roleId, userIds));
+    }
+
+    /**
+     * 批量选择用户授权
+     */
+    @Operation(summary = "批量授权用户", description = "批量选择用户进行角色授权")
+    @SaCheckPermission("admin:role:edit")
+    @Log(title = "管理端角色信息", businessType = BusinessType.GRANT)
+    @PutMapping("/authUser/selectAll")
+    public R<Void> selectAuthUserAll(@Parameter(description = "角色ID", required = true) Long roleId,
+                                     @Parameter(description = "用户ID数组", required = true) Long[] userIds) {
+        return toAjax(appRoleService.insertAuthUsers(roleId, userIds));
+    }
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/controller/admin/AdminUserController.java b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/controller/admin/AdminUserController.java
new file mode 100644
index 0000000..a9a6d3e
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/controller/admin/AdminUserController.java
@@ -0,0 +1,191 @@
+package org.dromara.member.controller.admin;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.domain.model.LoginUser;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.member.domain.bo.AppUserBo;
+import org.dromara.member.domain.vo.AppUserVo;
+import org.dromara.member.service.AppUserService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 管理端用户信息
+ *
+ * @author pengles
+ */
+@Tag(name = "管理端用户管理", description = "管理端用户信息管理接口")
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/admin/user")
+public class AdminUserController extends BaseController {
+
+    private final AppUserService appUserService;
+
+    /**
+     * 查询管理端用户信息列表
+     */
+    @Operation(summary = "查询用户列表", description = "分页查询管理端用户信息列表")
+    @SaCheckPermission("admin:user:list")
+    @GetMapping("/list")
+    public TableDataInfo<AppUserVo> list(@Parameter(description = "用户查询条件") AppUserBo bo,
+                                         @Parameter(description = "分页参数") PageQuery pageQuery) {
+        return appUserService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出管理端用户信息列表
+     */
+    @Operation(summary = "导出用户列表", description = "导出管理端用户信息到Excel")
+    @SaCheckPermission("admin:user:export")
+    @Log(title = "管理端用户信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(@Parameter(description = "用户查询条件") AppUserBo bo,
+                       @Parameter(description = "响应对象") HttpServletResponse response) {
+        List<AppUserVo> list = appUserService.queryList(bo);
+        ExcelUtil.exportExcel(list, "管理端用户信息", AppUserVo.class, response);
+    }
+
+    /**
+     * 获取管理端用户信息详细信息
+     */
+    @Operation(summary = "获取用户详情", description = "根据用户ID获取详细信息")
+    @SaCheckPermission("admin:user:query")
+    @GetMapping("/{userId}")
+    public R<AppUserVo> getInfo(@Parameter(description = "用户ID", required = true)
+                                @NotNull(message = "主键不能为空")
+                                @PathVariable Long userId) {
+        return R.ok(appUserService.queryById(userId));
+    }
+
+    /**
+     * 新增管理端用户信息
+     */
+    @Operation(summary = "新增用户", description = "新增管理端用户信息")
+    @SaCheckPermission("admin:user:add")
+    @Log(title = "管理端用户信息", businessType = BusinessType.INSERT)
+    @PostMapping()
+    public R<Void> add(@Parameter(description = "用户信息", required = true)
+                       @Validated(AddGroup.class) @RequestBody AppUserBo bo) {
+        return toAjax(appUserService.insertByBo(bo));
+    }
+
+    /**
+     * 修改管理端用户信息
+     */
+    @Operation(summary = "修改用户", description = "修改管理端用户信息")
+    @SaCheckPermission("admin:user:edit")
+    @Log(title = "管理端用户信息", businessType = BusinessType.UPDATE)
+    @PutMapping()
+    public R<Void> edit(@Parameter(description = "用户信息", required = true)
+                        @Validated(EditGroup.class) @RequestBody AppUserBo bo) {
+        return toAjax(appUserService.updateByBo(bo));
+    }
+
+    /**
+     * 删除管理端用户信息
+     */
+    @Operation(summary = "删除用户", description = "批量删除管理端用户信息")
+    @SaCheckPermission("admin:user:remove")
+    @Log(title = "管理端用户信息", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{userIds}")
+    public R<Void> remove(@Parameter(description = "用户ID数组", required = true)
+                          @NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] userIds) {
+        return toAjax(appUserService.deleteWithValidByIds(List.of(userIds), true));
+    }
+
+    /**
+     * 获取个人信息
+     */
+    @Operation(summary = "获取个人信息", description = "获取当前登录用户的个人信息")
+    @GetMapping("/profile")
+    public R<AppUserVo> profile() {
+        LoginUser loginUser = LoginHelper.getLoginUser();
+        AppUserVo user = appUserService.queryById(loginUser.getUserId());
+        return R.ok(user);
+    }
+
+    /**
+     * 修改个人信息
+     */
+    @Operation(summary = "修改个人信息", description = "修改当前登录用户的个人信息")
+    @Log(title = "个人信息", businessType = BusinessType.UPDATE)
+    @PutMapping("/profile")
+    public R<Void> updateProfile(@Parameter(description = "用户信息", required = true)
+                                 @RequestBody AppUserBo bo) {
+        LoginUser loginUser = LoginHelper.getLoginUser();
+        bo.setUserId(loginUser.getUserId());
+        return toAjax(appUserService.updateByBo(bo));
+    }
+
+    /**
+     * 重置密码
+     */
+    @Operation(summary = "重置密码", description = "重置用户密码")
+    @SaCheckPermission("admin:user:resetPwd")
+    @Log(title = "管理端用户信息", businessType = BusinessType.UPDATE)
+    @PutMapping("/resetPwd")
+    public R<Void> resetPwd(@Parameter(description = "用户信息", required = true)
+                            @RequestBody AppUserBo bo) {
+        AppUserBo userBo = new AppUserBo();
+        userBo.setUserId(bo.getUserId());
+        userBo.setPassword(bo.getPassword());
+        return toAjax(appUserService.updateByBo(userBo));
+    }
+
+    /**
+     * 状态修改
+     */
+    @Operation(summary = "修改用户状态", description = "修改用户启用/禁用状态")
+    @SaCheckPermission("admin:user:edit")
+    @Log(title = "管理端用户信息", businessType = BusinessType.UPDATE)
+    @PutMapping("/changeStatus")
+    public R<Void> changeStatus(@Parameter(description = "用户信息", required = true)
+                                @RequestBody AppUserBo bo) {
+        return toAjax(appUserService.updateUserStatus(bo.getUserId(), bo.getStatus()));
+    }
+
+    /**
+     * 根据用户编号获取授权角色
+     */
+    @Operation(summary = "获取用户角色", description = "根据用户ID获取授权角色信息")
+    @SaCheckPermission("admin:user:query")
+    @GetMapping("/authRole/{userId}")
+    public R<AppUserVo> authRole(@Parameter(description = "用户ID", required = true)
+                                 @PathVariable Long userId) {
+        AppUserVo user = appUserService.queryById(userId);
+        return R.ok(user);
+    }
+
+    /**
+     * 获取部门树列表
+     */
+    @Operation(summary = "获取部门树", description = "获取部门树形结构列表")
+    @SaCheckPermission("admin:user:list")
+    @GetMapping("/deptTree")
+    public R<List<Object>> deptTree(@Parameter(description = "用户查询条件") AppUserBo bo) {
+        // 这里可以根据实际需求实现部门树逻辑
+        return R.ok();
+    }
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/controller/app/AppDeviceController.java b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/controller/app/AppDeviceController.java
new file mode 100644
index 0000000..4ed73a5
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/controller/app/AppDeviceController.java
@@ -0,0 +1,247 @@
+package org.dromara.member.controller.app;
+
+import cn.dev33.satoken.annotation.SaCheckLogin;
+import cn.dev33.satoken.stp.StpUtil;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.*;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.member.domain.bo.AppDeviceBo;
+import org.dromara.member.domain.vo.AppDeviceVo;
+import org.dromara.member.service.AppDeviceService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * App端设备管理
+ *
+ * @author pengles
+ */
+@Tag(name = "App端设备管理", description = "App端设备信息管理接口")
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/app/device")
+public class AppDeviceController extends BaseController {
+
+    private final AppDeviceService appDeviceService;
+
+    /**
+     * 查询App端设备信息列表
+     */
+    @Operation(summary = "查询设备列表", description = "分页查询当前用户的设备信息列表")
+    @SaCheckLogin
+    @GetMapping("/list")
+    public TableDataInfo<AppDeviceVo> list(@Parameter(description = "设备查询条件") @Valid AppDeviceBo bo,
+                                           @Parameter(description = "分页参数") @Valid PageQuery pageQuery) {
+        // 只能查询当前用户的设备
+        bo.setUserId(StpUtil.getLoginIdAsLong());
+        return appDeviceService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 获取App端设备信息详细信息
+     */
+    @Operation(summary = "获取设备详情", description = "根据设备ID获取详细信息")
+    @SaCheckLogin
+    @GetMapping("/{deviceId}")
+    public R<AppDeviceVo> getInfo(@Parameter(description = "设备ID", required = true)
+                                  @PathVariable @NotNull(message = "设备ID不能为空") @Positive(message = "设备ID必须为正数") Long deviceId) {
+        AppDeviceVo deviceVo = appDeviceService.queryById(deviceId);
+        // 验证设备是否属于当前用户
+        if (deviceVo != null && !deviceVo.getUserId().equals(StpUtil.getLoginIdAsLong())) {
+            return R.fail("无权限访问该设备信息");
+        }
+        return R.ok(deviceVo);
+    }
+
+    /**
+     * 绑定设备
+     */
+    @Operation(summary = "绑定设备", description = "绑定新设备到当前用户")
+    @SaCheckLogin
+    @Log(title = "App端设备信息", businessType = BusinessType.INSERT)
+    @PostMapping("/bind")
+    public R<Void> bind(@Parameter(description = "设备信息", required = true)
+                        @Validated(AddGroup.class) @RequestBody @NotNull(message = "设备信息不能为空") AppDeviceBo bo) {
+        // 设置当前用户ID
+        bo.setUserId(StpUtil.getLoginIdAsLong());
+
+        // 验证必要字段
+        if (StringUtils.isBlank(bo.getDeviceType())) {
+            return R.fail("设备类型不能为空");
+        }
+        if (StringUtils.isBlank(bo.getDeviceName())) {
+            return R.fail("设备名称不能为空");
+        }
+
+        return toAjax(appDeviceService.bindDevice(bo));
+    }
+
+    /**
+     * 修改设备信息
+     */
+    @Operation(summary = "修改设备信息", description = "修改设备信息")
+    @SaCheckLogin
+    @Log(title = "App端设备信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public R<Void> edit(@Parameter(description = "设备信息", required = true)
+                        @Validated(EditGroup.class) @RequestBody @NotNull(message = "设备信息不能为空") AppDeviceBo bo) {
+        // 验证设备是否属于当前用户
+        AppDeviceVo deviceVo = appDeviceService.queryById(bo.getDeviceId());
+        if (deviceVo == null) {
+            return R.fail("设备不存在");
+        }
+        if (!deviceVo.getUserId().equals(StpUtil.getLoginIdAsLong())) {
+            return R.fail("无权限修改该设备信息");
+        }
+
+        // 设置当前用户ID
+        bo.setUserId(StpUtil.getLoginIdAsLong());
+        return toAjax(appDeviceService.updateByBo(bo));
+    }
+
+    /**
+     * 解绑设备
+     */
+    @Operation(summary = "解绑设备", description = "解绑指定设备")
+    @SaCheckLogin
+    @Log(title = "App端设备信息", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{deviceId}")
+    public R<Void> unbind(@Parameter(description = "设备ID", required = true)
+                          @PathVariable @NotNull(message = "设备ID不能为空") @Positive(message = "设备ID必须为正数") Long deviceId) {
+        return toAjax(appDeviceService.unbindDevice(deviceId, StpUtil.getLoginIdAsLong()));
+    }
+
+    /**
+     * 获取我的设备列表
+     */
+    @Operation(summary = "获取我的设备", description = "获取当前用户的所有设备列表")
+    @SaCheckLogin
+    @GetMapping("/my")
+    public R<List<AppDeviceVo>> getMyDevices() {
+        List<AppDeviceVo> devices = appDeviceService.queryByUserId(StpUtil.getLoginIdAsLong());
+        return R.ok(devices);
+    }
+
+    /**
+     * 获取活跃设备列表
+     */
+    @Operation(summary = "获取活跃设备", description = "获取当前用户的活跃设备列表")
+    @SaCheckLogin
+    @GetMapping("/active")
+    public R<List<AppDeviceVo>> getActiveDevices() {
+        List<AppDeviceVo> devices = appDeviceService.getActiveDevices(StpUtil.getLoginIdAsLong());
+        return R.ok(devices);
+    }
+
+    /**
+     * 更新设备状态
+     */
+    @Operation(summary = "更新设备状态", description = "更新设备的激活状态")
+    @SaCheckLogin
+    @Log(title = "App端设备信息", businessType = BusinessType.UPDATE)
+    @PutMapping("/{deviceId}/status")
+    public R<Void> updateStatus(@Parameter(description = "设备ID", required = true)
+                                @PathVariable @NotNull(message = "设备ID不能为空") @Positive(message = "设备ID必须为正数") Long deviceId,
+                                @Parameter(description = "设备状态(0-禁用,1-启用)", required = true)
+                                @RequestParam @NotBlank(message = "设备状态不能为空") @Pattern(regexp = "^[01]$", message = "设备状态只能为0或1") String isActive) {
+        // 验证设备是否属于当前用户
+        AppDeviceVo deviceVo = appDeviceService.queryById(deviceId);
+        if (deviceVo == null) {
+            return R.fail("设备不存在");
+        }
+        if (!deviceVo.getUserId().equals(StpUtil.getLoginIdAsLong())) {
+            return R.fail("无权限修改该设备状态");
+        }
+
+        // 验证状态值
+        if (!"0".equals(isActive) && !"1".equals(isActive)) {
+            return R.fail("状态值无效");
+        }
+
+        return toAjax(appDeviceService.updateActiveStatus(deviceId, isActive));
+    }
+
+    /**
+     * 更新设备推送令牌
+     */
+    @Operation(summary = "更新推送令牌", description = "更新设备的推送令牌")
+    @SaCheckLogin
+    @Log(title = "App端设备信息", businessType = BusinessType.UPDATE)
+    @PutMapping("/{deviceId}/push-token")
+    public R<Void> updatePushToken(@Parameter(description = "设备ID", required = true)
+                                   @PathVariable @NotNull(message = "设备ID不能为空") @Positive(message = "设备ID必须为正数") Long deviceId,
+                                   @Parameter(description = "推送令牌", required = true)
+                                   @RequestParam @NotBlank(message = "推送令牌不能为空") @Size(max = 255, message = "推送令牌长度不能超过255个字符") String pushToken) {
+        // 验证设备是否属于当前用户
+        AppDeviceVo deviceVo = appDeviceService.queryById(deviceId);
+        if (deviceVo == null) {
+            return R.fail("设备不存在");
+        }
+        if (!deviceVo.getUserId().equals(StpUtil.getLoginIdAsLong())) {
+            return R.fail("无权限修改该设备推送令牌");
+        }
+
+        if (StringUtils.isBlank(pushToken)) {
+            return R.fail("推送令牌不能为空");
+        }
+
+        return toAjax(appDeviceService.updatePushToken(deviceId, pushToken));
+    }
+
+    /**
+     * 设备心跳
+     */
+    @Operation(summary = "设备心跳", description = "更新设备心跳时间")
+    @SaCheckLogin
+    @PostMapping("/{deviceId}/heartbeat")
+    public R<Void> heartbeat(@Parameter(description = "设备ID", required = true)
+                             @PathVariable @NotNull(message = "设备ID不能为空") @Positive(message = "设备ID必须为正数") Long deviceId) {
+        // 验证设备是否属于当前用户
+        AppDeviceVo deviceVo = appDeviceService.queryById(deviceId);
+        if (deviceVo == null) {
+            return R.fail("设备不存在");
+        }
+        if (!deviceVo.getUserId().equals(StpUtil.getLoginIdAsLong())) {
+            return R.fail("无权限操作该设备");
+        }
+
+        return toAjax(appDeviceService.heartbeat(deviceId));
+    }
+
+    /**
+     * 根据推送令牌获取设备信息
+     */
+    @Operation(summary = "根据推送令牌获取设备", description = "根据推送令牌获取设备信息")
+    @SaCheckLogin
+    @GetMapping("/by-push-token")
+    public R<AppDeviceVo> getDeviceByPushToken(@Parameter(description = "推送令牌", required = true)
+                                               @RequestParam @NotBlank(message = "推送令牌不能为空") @Size(max = 255, message = "推送令牌长度不能超过255个字符") String pushToken) {
+        if (StringUtils.isBlank(pushToken)) {
+            return R.fail("推送令牌不能为空");
+        }
+
+        AppDeviceVo deviceVo = appDeviceService.queryByPushToken(pushToken);
+        // 验证设备是否属于当前用户
+        if (deviceVo != null && !deviceVo.getUserId().equals(StpUtil.getLoginIdAsLong())) {
+            return R.fail("无权限访问该设备信息");
+        }
+
+        return R.ok(deviceVo);
+    }
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/controller/app/AppMessageController.java b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/controller/app/AppMessageController.java
new file mode 100644
index 0000000..38139be
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/controller/app/AppMessageController.java
@@ -0,0 +1,222 @@
+package org.dromara.member.controller.app;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Positive;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.domain.model.LoginUser;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.member.domain.bo.AppMessageBo;
+import org.dromara.member.domain.vo.AppMessageVo;
+import org.dromara.member.service.AppMessageService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * App端消息管理
+ *
+ * @author pengles
+ */
+@Tag(name = "App端消息管理", description = "App端消息管理相关接口")
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/app/message")
+public class AppMessageController extends BaseController {
+
+    private final AppMessageService appMessageService;
+
+    /**
+     * 查询App端消息列表
+     */
+    @Operation(summary = "查询消息列表", description = "查询App端消息列表")
+    @SaCheckPermission("app:message:list")
+    @GetMapping("/list")
+    public TableDataInfo<AppMessageVo> list(@Parameter(description = "查询条件") @Valid AppMessageBo bo,
+                                            @Parameter(description = "分页参数") @Valid PageQuery pageQuery) {
+        return appMessageService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 获取当前用户的消息列表
+     */
+    @Operation(summary = "获取我的消息", description = "获取当前用户的消息列表")
+    @GetMapping("/myMessages")
+    public TableDataInfo<AppMessageVo> getMyMessages(@Parameter(description = "分页参数") @Valid PageQuery pageQuery) {
+        LoginUser loginUser = LoginHelper.getLoginUser();
+        AppMessageBo bo = new AppMessageBo();
+        bo.setReceiverId(loginUser.getUserId());
+        return appMessageService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 获取当前用户未读消息数量
+     */
+    @Operation(summary = "获取未读消息数量", description = "获取当前用户未读消息数量")
+    @GetMapping("/unreadCount")
+    public R<Long> getUnreadCount() {
+        LoginUser loginUser = LoginHelper.getLoginUser();
+        Long count = appMessageService.getUnreadCount(loginUser.getUserId());
+        return R.ok(count);
+    }
+
+    /**
+     * 导出App端消息列表
+     */
+    @Operation(summary = "导出消息列表", description = "导出App端消息列表")
+    @SaCheckPermission("app:message:export")
+    @Log(title = "App端消息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(@Parameter(description = "查询条件") @Valid AppMessageBo bo, HttpServletResponse response) {
+        List<AppMessageVo> list = appMessageService.queryList(bo);
+        ExcelUtil.exportExcel(list, "App端消息", AppMessageVo.class, response);
+    }
+
+    /**
+     * 获取App端消息详细信息
+     */
+    @Operation(summary = "获取消息详情", description = "获取App端消息详细信息")
+    @SaCheckPermission("app:message:query")
+    @GetMapping("/{messageId}")
+    public R<AppMessageVo> getInfo(@Parameter(description = "消息ID", required = true)
+                                   @PathVariable @NotNull(message = "消息ID不能为空") @Positive(message = "消息ID必须为正数") Long messageId) {
+        return R.ok(appMessageService.queryById(messageId));
+    }
+
+    /**
+     * 新增App端消息
+     */
+    @Operation(summary = "新增消息", description = "新增App端消息")
+    @SaCheckPermission("app:message:add")
+    @Log(title = "App端消息", businessType = BusinessType.INSERT)
+    @PostMapping()
+    public R<Void> add(@Parameter(description = "消息信息", required = true)
+                       @Validated(AddGroup.class) @RequestBody @NotNull(message = "消息信息不能为空") AppMessageBo bo) {
+        return toAjax(appMessageService.insertByBo(bo));
+    }
+
+    /**
+     * 修改App端消息
+     */
+    @Operation(summary = "修改消息", description = "修改App端消息")
+    @SaCheckPermission("app:message:edit")
+    @Log(title = "App端消息", businessType = BusinessType.UPDATE)
+    @PutMapping()
+    public R<Void> edit(@Parameter(description = "消息信息", required = true)
+                        @Validated(EditGroup.class) @RequestBody @NotNull(message = "消息信息不能为空") AppMessageBo bo) {
+        return toAjax(appMessageService.updateByBo(bo));
+    }
+
+    /**
+     * 删除App端消息
+     */
+    @Operation(summary = "删除消息", description = "删除App端消息")
+    @SaCheckPermission("app:message:remove")
+    @Log(title = "App端消息", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{messageIds}")
+    public R<Void> remove(@Parameter(description = "消息ID数组", required = true)
+                          @PathVariable @NotEmpty(message = "消息ID不能为空") Long[] messageIds) {
+        return toAjax(appMessageService.deleteWithValidByIds(List.of(messageIds), true));
+    }
+
+    /**
+     * 标记消息为已读
+     */
+    @Operation(summary = "标记消息已读", description = "标记指定消息为已读")
+    @Log(title = "标记消息已读", businessType = BusinessType.UPDATE)
+    @PutMapping("/markRead/{messageId}")
+    public R<Void> markRead(@Parameter(description = "消息ID", required = true)
+                            @PathVariable @NotNull(message = "消息ID不能为空") @Positive(message = "消息ID必须为正数") Long messageId) {
+        LoginUser loginUser = LoginHelper.getLoginUser();
+        return toAjax(appMessageService.markAsRead(messageId, loginUser.getUserId()));
+    }
+
+    /**
+     * 批量标记消息为已读
+     */
+    @Operation(summary = "批量标记已读", description = "批量标记消息为已读")
+    @Log(title = "批量标记消息已读", businessType = BusinessType.UPDATE)
+    @PutMapping("/markReadBatch")
+    public R<Void> markReadBatch(@Parameter(description = "消息ID数组", required = true)
+                                 @RequestBody @NotEmpty(message = "消息ID列表不能为空") Long[] messageIds) {
+        LoginUser loginUser = LoginHelper.getLoginUser();
+        return toAjax(appMessageService.markAsReadBatch(List.of(messageIds), loginUser.getUserId()));
+    }
+
+    /**
+     * 标记所有消息为已读
+     */
+    @Operation(summary = "标记全部已读", description = "标记所有消息为已读")
+    @Log(title = "标记所有消息已读", businessType = BusinessType.UPDATE)
+    @PutMapping("/markAllRead")
+    public R<Void> markAllRead() {
+        LoginUser loginUser = LoginHelper.getLoginUser();
+        return toAjax(appMessageService.markAllAsRead(loginUser.getUserId()));
+    }
+
+    /**
+     * 发送系统消息
+     */
+    @Operation(summary = "发送系统消息", description = "发送系统消息")
+    @SaCheckPermission("app:message:send")
+    @Log(title = "发送系统消息", businessType = BusinessType.INSERT)
+    @PostMapping("/sendSystem")
+    public R<Void> sendSystemMessage(@Parameter(description = "消息信息", required = true)
+                                     @RequestBody @NotNull(message = "消息信息不能为空") @Valid AppMessageBo bo) {
+        return toAjax(appMessageService.sendSystemMessage(bo));
+    }
+
+    /**
+     * 发送个人消息
+     */
+    @Operation(summary = "发送个人消息", description = "发送个人消息")
+    @Log(title = "发送个人消息", businessType = BusinessType.INSERT)
+    @PostMapping("/sendPersonal")
+    public R<Void> sendPersonalMessage(@Parameter(description = "消息信息", required = true)
+                                       @RequestBody @NotNull(message = "消息信息不能为空") @Valid AppMessageBo bo) {
+        LoginUser loginUser = LoginHelper.getLoginUser();
+        bo.setSenderId(loginUser.getUserId());
+        return toAjax(appMessageService.sendPersonalMessage(bo));
+    }
+
+    /**
+     * 推送消息
+     */
+    @Operation(summary = "推送消息", description = "推送消息")
+    @SaCheckPermission("app:message:push")
+    @Log(title = "推送消息", businessType = BusinessType.OTHER)
+    @PostMapping("/push")
+    public R<Void> pushMessage(@Parameter(description = "消息信息", required = true)
+                               @Validated @RequestBody @NotNull(message = "消息信息不能为空") AppMessageBo bo) {
+        return toAjax(appMessageService.pushMessage(bo));
+    }
+
+    /**
+     * 群发消息
+     */
+    @Operation(summary = "群发消息", description = "群发消息")
+    @SaCheckPermission("app:message:broadcast")
+    @Log(title = "群发消息", businessType = BusinessType.INSERT)
+    @PostMapping("/broadcast")
+    public R<Void> broadcastMessage(@Parameter(description = "消息信息", required = true)
+                                    @Validated @RequestBody @NotNull(message = "消息信息不能为空") AppMessageBo bo) {
+        return toAjax(appMessageService.broadcastMessage(bo));
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/controller/app/AppOperLogController.java b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/controller/app/AppOperLogController.java
new file mode 100644
index 0000000..906068d
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/controller/app/AppOperLogController.java
@@ -0,0 +1,257 @@
+package org.dromara.member.controller.app;
+
+import cn.dev33.satoken.annotation.SaCheckLogin;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.stp.StpUtil;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.*;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.member.domain.bo.AppOperLogBo;
+import org.dromara.member.domain.vo.AppOperLogVo;
+import org.dromara.member.service.AppOperLogService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * App端操作日志
+ *
+ * @author pengles
+ */
+@Tag(name = "App端操作日志管理", description = "App端操作日志管理相关接口")
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/app/operLog")
+public class AppOperLogController extends BaseController {
+
+    private final AppOperLogService appOperLogService;
+
+    /**
+     * 查询App端操作日志列表
+     */
+    @Operation(summary = "查询操作日志列表", description = "查询App端操作日志列表")
+    @SaCheckPermission("app:operLog:list")
+    @GetMapping("/list")
+    public TableDataInfo<AppOperLogVo> list(@Parameter(description = "查询条件") @Valid AppOperLogBo bo,
+                                            @Parameter(description = "分页参数") @Valid PageQuery pageQuery) {
+        return appOperLogService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 获取当前用户的操作日志列表
+     */
+    @Operation(summary = "获取我的操作日志", description = "获取当前用户的操作日志列表")
+    @SaCheckLogin
+    @GetMapping("/my")
+    public TableDataInfo<AppOperLogVo> getMyOperLogs(@Parameter(description = "查询条件") @Valid AppOperLogBo bo,
+                                                     @Parameter(description = "分页参数") @Valid PageQuery pageQuery) {
+        // 只查询当前用户的操作日志
+        bo.setOperName(StpUtil.getLoginIdAsString());
+        return appOperLogService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出App端操作日志列表
+     */
+    @Operation(summary = "导出操作日志", description = "导出App端操作日志列表")
+    @SaCheckPermission("app:operLog:export")
+    @Log(title = "App端操作日志", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(@Parameter(description = "查询条件") @Valid AppOperLogBo bo, HttpServletResponse response) {
+        List<AppOperLogVo> list = appOperLogService.queryList(bo);
+        ExcelUtil.exportExcel(list, "App端操作日志", AppOperLogVo.class, response);
+    }
+
+    /**
+     * 获取App端操作日志详细信息
+     */
+    @Operation(summary = "获取操作日志详情", description = "获取App端操作日志详细信息")
+    @SaCheckPermission("app:operLog:query")
+    @GetMapping("/{operId}")
+    public R<AppOperLogVo> getInfo(@Parameter(description = "操作日志ID", required = true)
+                                   @PathVariable @NotNull(message = "操作日志ID不能为空") @Positive(message = "操作日志ID必须为正数") Long operId) {
+        return R.ok(appOperLogService.queryById(operId));
+    }
+
+    /**
+     * 新增App端操作日志
+     */
+    @Operation(summary = "新增操作日志", description = "新增App端操作日志")
+    @SaCheckPermission("app:operLog:add")
+    @Log(title = "App端操作日志", businessType = BusinessType.INSERT)
+    @PostMapping()
+    public R<Void> add(@Parameter(description = "操作日志信息", required = true)
+                       @Validated(AddGroup.class) @RequestBody @NotNull(message = "操作日志信息不能为空") AppOperLogBo bo) {
+        return toAjax(appOperLogService.insertByBo(bo));
+    }
+
+    /**
+     * 修改App端操作日志
+     */
+    @Operation(summary = "修改操作日志", description = "修改App端操作日志")
+    @SaCheckPermission("app:operLog:edit")
+    @Log(title = "App端操作日志", businessType = BusinessType.UPDATE)
+    @PutMapping()
+    public R<Void> edit(@Parameter(description = "操作日志信息", required = true)
+                        @Validated(EditGroup.class) @RequestBody @NotNull(message = "操作日志信息不能为空") AppOperLogBo bo) {
+        return toAjax(appOperLogService.updateByBo(bo));
+    }
+
+    /**
+     * 删除App端操作日志
+     */
+    @Operation(summary = "删除操作日志", description = "删除App端操作日志")
+    @SaCheckPermission("app:operLog:remove")
+    @Log(title = "App端操作日志", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{operIds}")
+    public R<Void> remove(@Parameter(description = "操作日志ID数组", required = true)
+                          @PathVariable @NotEmpty(message = "操作日志ID不能为空") Long[] operIds) {
+        return toAjax(appOperLogService.deleteWithValidByIds(List.of(operIds), true));
+    }
+
+    /**
+     * 清空App端操作日志
+     */
+    @Operation(summary = "清空操作日志", description = "清空App端操作日志")
+    @SaCheckPermission("app:operLog:remove")
+    @Log(title = "App端操作日志", businessType = BusinessType.CLEAN)
+    @DeleteMapping("/clean")
+    public R<Void> clean() {
+        appOperLogService.cleanOperLog();
+        return R.ok();
+    }
+
+    /**
+     * 根据时间范围删除操作日志
+     */
+    @Operation(summary = "按时间删除操作日志", description = "根据时间范围删除App端操作日志")
+    @SaCheckPermission("app:operLog:remove")
+    @Log(title = "App端操作日志", businessType = BusinessType.DELETE)
+    @DeleteMapping("/cleanByTime")
+    public R<Void> cleanByTime(@Parameter(description = "开始时间")
+                               @RequestParam(required = false) LocalDateTime beginTime,
+                               @Parameter(description = "结束时间")
+                               @RequestParam(required = false) LocalDateTime endTime) {
+        appOperLogService.deleteOperLogByTime(beginTime, endTime);
+        return R.ok();
+    }
+
+    /**
+     * 获取操作统计信息
+     */
+    @Operation(summary = "获取操作统计信息", description = "获取操作日志统计信息")
+    @SaCheckLogin
+    @GetMapping("/statistics")
+    public R<Long> getStatistics(@Parameter(description = "操作人员名称")
+                                 @RequestParam(required = false) @Size(max = 50, message = "操作人员名称长度不能超过50个字符") String operName,
+                                 @Parameter(description = "开始时间")
+                                 @RequestParam(required = false) LocalDateTime beginTime,
+                                 @Parameter(description = "结束时间")
+                                 @RequestParam(required = false) LocalDateTime endTime) {
+        // 如果没有指定操作人，则查询当前用户的统计
+        if (operName == null) {
+            operName = StpUtil.getLoginIdAsString();
+        }
+        Long count = appOperLogService.getOperLogCount(operName, beginTime, endTime);
+        return R.ok(count);
+    }
+
+    /**
+     * 获取用户行为分析数据
+     */
+    @Operation(summary = "获取用户行为分析", description = "获取用户行为分析数据")
+    @SaCheckLogin
+    @GetMapping("/behavior")
+    public R<List<AppOperLogVo>> getBehaviorAnalysis(@Parameter(description = "操作人员名称")
+                                                     @RequestParam(required = false) @Size(max = 50, message = "操作人员名称长度不能超过50个字符") String operName,
+                                                     @Parameter(description = "分析天数")
+                                                     @RequestParam(defaultValue = "7") @Min(value = 1, message = "天数必须大于0") @Max(value = 365, message = "天数不能超过365天") Integer days) {
+        // 如果没有指定操作人，则查询当前用户的行为分析
+        if (operName == null) {
+            operName = StpUtil.getLoginIdAsString();
+        }
+        List<AppOperLogVo> result = appOperLogService.getUserBehaviorAnalysis(operName, days);
+        return R.ok(result);
+    }
+
+    /**
+     * 获取热门操作统计
+     */
+    @Operation(summary = "获取热门操作统计", description = "获取热门操作统计")
+    @SaCheckPermission("app:operLog:list")
+    @GetMapping("/popular")
+    public R<List<AppOperLogVo>> getPopularOperations(@Parameter(description = "统计天数")
+                                                      @RequestParam(defaultValue = "7") @Min(value = 1, message = "天数必须大于0") @Max(value = 365, message = "天数不能超过365天") Integer days,
+                                                      @Parameter(description = "返回数量限制")
+                                                      @RequestParam(defaultValue = "10") @Min(value = 1, message = "限制数量必须大于0") @Max(value = 100, message = "限制数量不能超过100") Integer limit) {
+        List<AppOperLogVo> result = appOperLogService.getPopularOperations(days, limit);
+        return R.ok(result);
+    }
+
+    /**
+     * 获取错误操作统计
+     */
+    @Operation(summary = "获取错误操作统计", description = "获取错误操作统计")
+    @SaCheckPermission("app:operLog:list")
+    @GetMapping("/errors")
+    public R<List<AppOperLogVo>> getErrorOperations(@Parameter(description = "统计天数")
+                                                    @RequestParam(defaultValue = "7") @Min(value = 1, message = "天数必须大于0") @Max(value = 365, message = "天数不能超过365天") Integer days) {
+        List<AppOperLogVo> result = appOperLogService.getErrorOperations(days);
+        return R.ok(result);
+    }
+
+    /**
+     * 记录用户操作日志（供App端调用）
+     */
+    @Operation(summary = "记录操作日志", description = "记录用户操作日志（供App端调用）")
+    @SaCheckLogin
+    @Log(title = "App端操作日志", businessType = BusinessType.INSERT)
+    @PostMapping("/record")
+    public R<Void> recordOperation(@Parameter(description = "操作日志信息", required = true)
+                                   @RequestBody @NotNull(message = "操作日志信息不能为空") @Valid AppOperLogBo bo) {
+        // 设置操作人为当前登录用户
+        bo.setOperName(StpUtil.getLoginIdAsString());
+        bo.setOperTime(LocalDateTime.now());
+
+        // 异步记录操作日志
+        appOperLogService.asyncRecordOperLog(bo);
+        return R.ok();
+    }
+
+    /**
+     * 批量记录操作日志
+     */
+    @Operation(summary = "批量记录操作日志", description = "批量记录操作日志")
+    @SaCheckLogin
+    @Log(title = "App端操作日志", businessType = BusinessType.INSERT)
+    @PostMapping("/batchRecord")
+    public R<Void> batchRecordOperations(@Parameter(description = "操作日志列表", required = true)
+                                         @RequestBody @NotEmpty(message = "操作日志列表不能为空") @Valid List<AppOperLogBo> operLogs) {
+        // 设置操作人为当前登录用户
+        String currentUser = StpUtil.getLoginIdAsString();
+        operLogs.forEach(bo -> {
+            bo.setOperName(currentUser);
+            bo.setOperTime(LocalDateTime.now());
+        });
+
+        appOperLogService.batchInsertOperLog(operLogs);
+        return R.ok();
+    }
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/controller/app/AppRoleController.java b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/controller/app/AppRoleController.java
new file mode 100644
index 0000000..2e56d50
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/controller/app/AppRoleController.java
@@ -0,0 +1,189 @@
+package org.dromara.member.controller.app;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Positive;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.member.domain.bo.AppRoleBo;
+import org.dromara.member.domain.vo.AppRoleVo;
+import org.dromara.member.service.AppRoleService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * App端角色信息
+ *
+ * @author pengles
+ */
+@Tag(name = "App端角色管理", description = "App端角色信息的增删改查操作")
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/app/role")
+public class AppRoleController extends BaseController {
+
+    private final AppRoleService appRoleService;
+
+    /**
+     * 查询App端角色信息列表
+     */
+    @Operation(summary = "查询App端角色信息列表", description = "分页查询App端角色信息列表")
+    @SaCheckPermission("app:role:list")
+    @GetMapping("/list")
+    public TableDataInfo<AppRoleVo> list(
+            @Parameter(description = "角色查询条件") @Valid AppRoleBo bo,
+            @Parameter(description = "分页查询参数") @Valid PageQuery pageQuery) {
+        return appRoleService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出App端角色信息列表
+     */
+    @Operation(summary = "导出App端角色信息列表", description = "导出App端角色信息到Excel文件")
+    @SaCheckPermission("app:role:export")
+    @Log(title = "App端角色信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(
+            @Parameter(description = "角色查询条件") @Valid AppRoleBo bo,
+            HttpServletResponse response) {
+        List<AppRoleVo> list = appRoleService.queryList(bo);
+        ExcelUtil.exportExcel(list, "App端角色信息", AppRoleVo.class, response);
+    }
+
+    /**
+     * 获取App端角色信息详细信息
+     */
+    @Operation(summary = "获取App端角色信息详细信息", description = "根据角色ID获取App端角色详细信息")
+    @SaCheckPermission("app:role:query")
+    @GetMapping("/{roleId}")
+    public R<AppRoleVo> getInfo(
+            @Parameter(description = "角色ID", required = true) @PathVariable @NotNull(message = "角色ID不能为空") @Positive(message = "角色ID必须为正数") Long roleId) {
+        return R.ok(appRoleService.queryById(roleId));
+    }
+
+    /**
+     * 新增App端角色信息
+     */
+    @Operation(summary = "新增App端角色信息", description = "新增App端角色信息")
+    @SaCheckPermission("app:role:add")
+    @Log(title = "App端角色信息", businessType = BusinessType.INSERT)
+    @PostMapping()
+    public R<Void> add(
+            @Parameter(description = "角色信息", required = true) @Validated(AddGroup.class) @RequestBody @NotNull(message = "角色信息不能为空") AppRoleBo bo) {
+        return toAjax(appRoleService.insertByBo(bo));
+    }
+
+    /**
+     * 修改App端角色信息
+     */
+    @Operation(summary = "修改App端角色信息", description = "修改App端角色信息")
+    @SaCheckPermission("app:role:edit")
+    @Log(title = "App端角色信息", businessType = BusinessType.UPDATE)
+    @PutMapping()
+    public R<Void> edit(
+            @Parameter(description = "角色信息", required = true) @Validated(EditGroup.class) @RequestBody @NotNull(message = "角色信息不能为空") AppRoleBo bo) {
+        return toAjax(appRoleService.updateByBo(bo));
+    }
+
+    /**
+     * 删除App端角色信息
+     */
+    @Operation(summary = "删除App端角色信息", description = "批量删除App端角色信息")
+    @SaCheckPermission("app:role:remove")
+    @Log(title = "App端角色信息", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{roleIds}")
+    public R<Void> remove(
+            @Parameter(description = "角色ID数组", required = true) @PathVariable @NotEmpty(message = "角色ID不能为空") Long[] roleIds) {
+        return toAjax(appRoleService.deleteWithValidByIds(List.of(roleIds), true));
+    }
+
+    /**
+     * 获取角色选择框列表
+     */
+    @Operation(summary = "获取角色选择框列表", description = "获取所有角色的选择框列表")
+    @SaCheckPermission("app:role:query")
+    @GetMapping("/optionselect")
+    public R<List<AppRoleVo>> optionselect() {
+        return R.ok(appRoleService.selectRoleAll());
+    }
+
+    /**
+     * 查询已分配用户角色列表
+     */
+    @Operation(summary = "查询已分配用户角色列表", description = "分页查询已分配用户的角色列表")
+    @SaCheckPermission("app:role:list")
+    @GetMapping("/authUser/allocatedList")
+    public TableDataInfo<AppRoleVo> allocatedList(
+            @Parameter(description = "角色查询条件") @Valid AppRoleBo bo,
+            @Parameter(description = "分页查询参数") @Valid PageQuery pageQuery) {
+        return appRoleService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 查询未分配用户角色列表
+     */
+    @Operation(summary = "查询未分配用户角色列表", description = "分页查询未分配用户的角色列表")
+    @SaCheckPermission("app:role:list")
+    @GetMapping("/authUser/unallocatedList")
+    public TableDataInfo<AppRoleVo> unallocatedList(
+            @Parameter(description = "角色查询条件") @Valid AppRoleBo bo,
+            @Parameter(description = "分页查询参数") @Valid PageQuery pageQuery) {
+        return appRoleService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 取消授权用户
+     */
+    @Operation(summary = "取消授权用户", description = "取消用户的角色授权")
+    @SaCheckPermission("app:role:edit")
+    @Log(title = "App端角色信息", businessType = BusinessType.GRANT)
+    @PutMapping("/authUser/cancel")
+    public R<Void> cancelAuthUser(
+            @Parameter(description = "角色信息", required = true) @RequestBody @NotNull(message = "角色信息不能为空") @Valid AppRoleBo bo) {
+        return toAjax(appRoleService.deleteAuthUser(bo.getUserId(), bo.getRoleId()));
+    }
+
+    /**
+     * 批量取消授权用户
+     */
+    @Operation(summary = "批量取消授权用户", description = "批量取消用户的角色授权")
+    @SaCheckPermission("app:role:edit")
+    @Log(title = "App端角色信息", businessType = BusinessType.GRANT)
+    @PutMapping("/authUser/cancelAll")
+    public R<Void> cancelAuthUserAll(
+            @Parameter(description = "角色ID", required = true) @NotNull(message = "角色ID不能为空") @Positive(message = "角色ID必须为正数") Long roleId,
+            @Parameter(description = "用户ID数组", required = true) @NotEmpty(message = "用户ID不能为空") Long[] userIds) {
+        return toAjax(appRoleService.deleteAuthUsers(roleId, userIds));
+    }
+
+    /**
+     * 批量选择用户授权
+     */
+    @Operation(summary = "批量选择用户授权", description = "批量为用户分配角色授权")
+    @SaCheckPermission("app:role:edit")
+    @Log(title = "App端角色信息", businessType = BusinessType.GRANT)
+    @PutMapping("/authUser/selectAll")
+    public R<Void> selectAuthUserAll(
+            @Parameter(description = "角色ID", required = true) @NotNull(message = "角色ID不能为空") @Positive(message = "角色ID必须为正数") Long roleId,
+            @Parameter(description = "用户ID数组", required = true) @NotEmpty(message = "用户ID不能为空") Long[] userIds) {
+        return toAjax(appRoleService.insertAuthUsers(roleId, userIds));
+    }
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/controller/app/AppUserController.java b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/controller/app/AppUserController.java
new file mode 100644
index 0000000..b936189
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/controller/app/AppUserController.java
@@ -0,0 +1,220 @@
+package org.dromara.member.controller.app;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.stp.StpUtil;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.*;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.domain.model.LoginUser;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.member.domain.bo.AppUserBo;
+import org.dromara.member.domain.vo.AppUserVo;
+import org.dromara.member.service.AppUserService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * App端用户信息
+ *
+ * @author pengles
+ */
+@Tag(name = "App用户管理", description = "App端用户信息管理接口")
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/app/user")
+public class AppUserController extends BaseController {
+
+    private final AppUserService appUserService;
+
+    /**
+     * 查询App端用户信息列表
+     */
+    @Operation(summary = "查询用户列表", description = "分页查询App端用户信息列表")
+    @SaCheckPermission("app:user:list")
+    @GetMapping("/list")
+    public TableDataInfo<AppUserVo> list(
+            @Parameter(description = "查询条件") @Valid AppUserBo bo,
+            @Parameter(description = "分页参数") @Valid PageQuery pageQuery) {
+        return appUserService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出App端用户信息列表
+     */
+    @Operation(summary = "导出用户列表", description = "导出App端用户信息到Excel")
+    @SaCheckPermission("app:user:export")
+    @Log(title = "App端用户信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(
+            @Parameter(description = "查询条件") @Valid AppUserBo bo,
+            HttpServletResponse response) {
+        List<AppUserVo> list = appUserService.queryList(bo);
+        ExcelUtil.exportExcel(list, "App端用户信息", AppUserVo.class, response);
+    }
+
+    /**
+     * 获取App端用户信息详细信息
+     */
+    @Operation(summary = "获取用户详情", description = "根据用户ID获取详细信息")
+    @SaCheckPermission("app:user:query")
+    @GetMapping("/{userId}")
+    public R<AppUserVo> getInfo(
+            @Parameter(description = "用户ID", required = true)
+            @PathVariable @NotNull(message = "用户ID不能为空") @Positive(message = "用户ID必须为正数") Long userId) {
+        return R.ok(appUserService.queryById(userId));
+    }
+
+    /**
+     * 新增App端用户信息
+     */
+    @Operation(summary = "新增用户", description = "创建新的App端用户")
+    @SaCheckPermission("app:user:add")
+    @Log(title = "App端用户信息", businessType = BusinessType.INSERT)
+    @PostMapping()
+    public R<Void> add(
+            @Parameter(description = "用户信息", required = true)
+            @Validated(AddGroup.class) @RequestBody AppUserBo bo) {
+        return toAjax(appUserService.insertByBo(bo));
+    }
+
+    /**
+     * 修改App端用户信息
+     */
+    @Operation(summary = "修改用户", description = "更新App端用户信息")
+    @SaCheckPermission("app:user:edit")
+    @Log(title = "App端用户信息", businessType = BusinessType.UPDATE)
+    @PutMapping()
+    public R<Void> edit(
+            @Parameter(description = "用户信息", required = true)
+            @Validated(EditGroup.class) @RequestBody AppUserBo bo) {
+        return toAjax(appUserService.updateByBo(bo));
+    }
+
+    /**
+     * 删除App端用户信息
+     */
+    @Operation(summary = "删除用户", description = "批量删除App端用户")
+    @SaCheckPermission("app:user:remove")
+    @Log(title = "App端用户信息", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{userIds}")
+    public R<Void> remove(
+            @Parameter(description = "用户ID列表", required = true)
+            @PathVariable @NotEmpty(message = "用户ID列表不能为空") Long[] userIds) {
+        return toAjax(appUserService.deleteWithValidByIds(List.of(userIds), true));
+    }
+
+    /**
+     * 重置密码
+     */
+    @Operation(summary = "重置密码", description = "重置用户密码")
+    @SaCheckPermission("app:user:resetPwd")
+    @Log(title = "App端用户信息", businessType = BusinessType.UPDATE)
+    @PutMapping("/resetPwd")
+    public R<Void> resetPwd(
+            @Parameter(description = "用户信息", required = true)
+            @Validated(EditGroup.class) @RequestBody AppUserBo bo) {
+        return toAjax(appUserService.resetPassword(bo.getUserId(), bo.getPassword()));
+    }
+
+    /**
+     * 状态修改
+     */
+    @Operation(summary = "修改用户状态", description = "启用或禁用用户")
+    @SaCheckPermission("app:user:edit")
+    @Log(title = "App端用户信息", businessType = BusinessType.UPDATE)
+    @PutMapping("/changeStatus")
+    public R<Void> changeStatus(
+            @Parameter(description = "用户信息", required = true)
+            @Validated(EditGroup.class) @RequestBody AppUserBo bo) {
+        // 如果用户状态变为禁用，则冻结用户的所有token
+        if ("1".equals(bo.getStatus())) {
+            StpUtil.disable(bo.getUserId(), -1); // -1表示永久冻结，直到手动解冻
+        } else if ("0".equals(bo.getStatus())) {
+            // 如果用户状态变为正常，则解冻用户
+            StpUtil.untieDisable(bo.getUserId());
+        }
+        return toAjax(appUserService.updateUserStatus(bo.getUserId(), bo.getStatus()));
+    }
+
+    /**
+     * 根据用户编号获取详细信息
+     */
+    @Operation(summary = "获取用户档案", description = "根据用户ID获取用户档案信息")
+    @SaCheckPermission("app:user:query")
+    @GetMapping("/profile/{userId}")
+    public R<AppUserVo> profile(
+            @Parameter(description = "用户ID", required = true)
+            @PathVariable @NotNull(message = "用户ID不能为空") @Positive(message = "用户ID必须为正数") Long userId) {
+        AppUserVo user = appUserService.queryById(userId);
+        return R.ok(user);
+    }
+
+    /**
+     * 获取当前用户信息
+     */
+    @Operation(summary = "获取当前用户信息", description = "获取当前登录用户的详细信息")
+    @GetMapping("/getInfo")
+    public R<AppUserVo> getInfo() {
+        LoginUser loginUser = LoginHelper.getLoginUser();
+        AppUserVo user = appUserService.queryById(loginUser.getUserId());
+        return R.ok(user);
+    }
+
+    /**
+     * 获取用户个人信息
+     */
+    @Operation(summary = "获取个人信息", description = "获取当前用户的个人信息")
+    @GetMapping("/profile")
+    public R<AppUserVo> getUserProfile() {
+        LoginUser loginUser = LoginHelper.getLoginUser();
+        AppUserVo user = appUserService.queryById(loginUser.getUserId());
+        return R.ok(user);
+    }
+
+    /**
+     * 修改用户个人信息
+     */
+    @Operation(summary = "修改个人信息", description = "更新当前用户的个人信息")
+    @Log(title = "个人信息", businessType = BusinessType.UPDATE)
+    @PutMapping("/profile")
+    public R<Void> updateUserProfile(
+            @Parameter(description = "用户信息", required = true)
+            @Validated(EditGroup.class) @RequestBody AppUserBo bo) {
+        LoginUser loginUser = LoginHelper.getLoginUser();
+        bo.setUserId(loginUser.getUserId());
+        return toAjax(appUserService.updateByBo(bo));
+    }
+
+
+    /**
+     * 重置密码
+     */
+    @Operation(summary = "修改密码", description = "修改当前用户的登录密码")
+    @Log(title = "个人信息", businessType = BusinessType.UPDATE)
+    @PutMapping("/profile/updatePwd")
+    public R<Void> updateUserPwd(
+            @Parameter(description = "原密码", required = true)
+            @RequestParam @NotBlank(message = "原密码不能为空") @Size(min = 6, max = 20, message = "密码长度必须在6-20位之间") String oldPassword,
+            @Parameter(description = "新密码", required = true)
+            @RequestParam @NotBlank(message = "新密码不能为空") @Size(min = 6, max = 20, message = "密码长度必须在6-20位之间") String newPassword) {
+        LoginUser loginUser = LoginHelper.getLoginUser();
+        return toAjax(appUserService.updatePassword(loginUser.getUserId(), oldPassword, newPassword));
+    }
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/controller/app/AppVersionController.java b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/controller/app/AppVersionController.java
new file mode 100644
index 0000000..2d4967b
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/controller/app/AppVersionController.java
@@ -0,0 +1,255 @@
+package org.dromara.member.controller.app;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.*;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.member.domain.bo.AppVersionBo;
+import org.dromara.member.domain.vo.AppVersionVo;
+import org.dromara.member.service.AppVersionService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * App端版本管理
+ *
+ * @author pengles
+ */
+@Tag(name = "App端版本管理", description = "App端版本管理相关接口")
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/app/version")
+public class AppVersionController extends BaseController {
+
+    private final AppVersionService appVersionService;
+
+    /**
+     * 查询App版本信息列表
+     */
+    @Operation(summary = "查询版本列表", description = "查询App版本信息列表")
+    @GetMapping("/list")
+    public TableDataInfo<AppVersionVo> list(@Parameter(description = "查询条件") @Valid AppVersionBo bo,
+                                            @Parameter(description = "分页参数") @Valid PageQuery pageQuery) {
+        return appVersionService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 获取App版本信息详细信息
+     */
+    @Operation(summary = "获取版本详情", description = "获取App版本信息详细信息")
+    @GetMapping("/{versionId}")
+    public R<AppVersionVo> getInfo(@Parameter(description = "版本ID", required = true)
+                                   @PathVariable @NotNull(message = "版本ID不能为空") @Positive(message = "版本ID必须为正数") Long versionId) {
+        return R.ok(appVersionService.queryById(versionId));
+    }
+
+    /**
+     * 检查版本更新
+     */
+    @Operation(summary = "检查版本更新", description = "检查是否有新版本可用")
+    @GetMapping("/checkUpdate")
+    public R<Map<String, Object>> checkUpdate(@Parameter(description = "平台类型(android/ios/web)", required = true)
+                                              @RequestParam @NotBlank(message = "平台类型不能为空") @Pattern(regexp = "^(android|ios|web)$", message = "平台类型只能为android、ios或web") String platform,
+                                              @Parameter(description = "当前版本号", required = true)
+                                              @RequestParam @NotNull(message = "当前版本号不能为空") @Positive(message = "当前版本号必须为正数") Integer currentVersionCode) {
+        if (StringUtils.isBlank(platform)) {
+            return R.fail("平台类型不能为空");
+        }
+        if (currentVersionCode == null || currentVersionCode <= 0) {
+            return R.fail("当前版本号无效");
+        }
+
+        AppVersionVo updateInfo = appVersionService.getUpdateInfo(platform, currentVersionCode);
+        Map<String, Object> result = new HashMap<>();
+
+        if (updateInfo != null) {
+            result.put("hasUpdate", true);
+            result.put("versionInfo", updateInfo);
+            result.put("isForce", "1".equals(updateInfo.getIsForce()));
+            result.put("needUpdate", true);
+        } else {
+            result.put("hasUpdate", false);
+            result.put("needUpdate", false);
+            result.put("isForce", false);
+            result.put("message", "当前已是最新版本");
+        }
+
+        return R.ok(result);
+    }
+
+    /**
+     * 获取最新版本信息
+     */
+    @Operation(summary = "获取最新版本", description = "获取指定平台的最新版本信息")
+    @GetMapping("/latest")
+    public R<AppVersionVo> getLatestVersion(@Parameter(description = "平台类型(android/ios/web)", required = true)
+                                            @RequestParam @NotBlank(message = "平台类型不能为空") @Pattern(regexp = "^(android|ios|web)$", message = "平台类型只能为android、ios或web") String platform) {
+        if (StringUtils.isBlank(platform)) {
+            return R.fail("平台类型不能为空");
+        }
+
+        AppVersionVo latestVersion = appVersionService.getLatestVersion(platform);
+        if (latestVersion == null) {
+            return R.fail("未找到该平台的版本信息");
+        }
+
+        return R.ok(latestVersion);
+    }
+
+    /**
+     * 获取版本历史记录
+     */
+    @Operation(summary = "获取版本历史", description = "获取指定平台的版本历史记录")
+    @GetMapping("/history")
+    public R<List<AppVersionVo>> getVersionHistory(@Parameter(description = "平台类型(android/ios/web)", required = true)
+                                                   @RequestParam @NotBlank(message = "平台类型不能为空") @Pattern(regexp = "^(android|ios|web)$", message = "平台类型只能为android、ios或web") String platform,
+                                                   @Parameter(description = "返回数量限制")
+                                                   @RequestParam(defaultValue = "10") @Min(value = 1, message = "限制数量必须大于0") @Max(value = 100, message = "限制数量不能超过100") Integer limit) {
+        if (StringUtils.isBlank(platform)) {
+            return R.fail("平台类型不能为空");
+        }
+
+        List<AppVersionVo> versionHistory = appVersionService.getVersionHistory(platform, limit);
+        return R.ok(versionHistory);
+    }
+
+    /**
+     * 检查是否强制更新
+     */
+    @Operation(summary = "检查强制更新", description = "检查当前版本是否需要强制更新")
+    @GetMapping("/checkForceUpdate")
+    public R<Map<String, Object>> checkForceUpdate(@Parameter(description = "平台类型(android/ios/web)", required = true)
+                                                   @RequestParam @NotBlank(message = "平台类型不能为空") @Pattern(regexp = "^(android|ios|web)$", message = "平台类型只能为android、ios或web") String platform,
+                                                   @Parameter(description = "当前版本号", required = true)
+                                                   @RequestParam @NotNull(message = "当前版本号不能为空") @Positive(message = "当前版本号必须为正数") Integer currentVersionCode) {
+        if (StringUtils.isBlank(platform)) {
+            return R.fail("平台类型不能为空");
+        }
+        if (currentVersionCode == null || currentVersionCode <= 0) {
+            return R.fail("当前版本号无效");
+        }
+
+        Boolean forceUpdate = appVersionService.checkForceUpdate(platform, currentVersionCode);
+        Map<String, Object> result = new HashMap<>();
+        result.put("forceUpdate", forceUpdate);
+
+        if (forceUpdate) {
+            AppVersionVo updateInfo = appVersionService.getUpdateInfo(platform, currentVersionCode);
+            result.put("versionInfo", updateInfo);
+        }
+
+        return R.ok(result);
+    }
+
+    /**
+     * 获取更新信息
+     */
+    @Operation(summary = "获取更新信息", description = "获取详细的版本更新信息")
+    @GetMapping("/updateInfo")
+    public R<Map<String, Object>> getUpdateInfo(@Parameter(description = "平台类型(android/ios/web)", required = true)
+                                                @RequestParam @NotBlank(message = "平台类型不能为空") @Pattern(regexp = "^(android|ios|web)$", message = "平台类型只能为android、ios或web") String platform,
+                                                @Parameter(description = "当前版本号", required = true)
+                                                @RequestParam @NotNull(message = "当前版本号不能为空") @Positive(message = "当前版本号必须为正数") Integer currentVersionCode) {
+        if (StringUtils.isBlank(platform)) {
+            return R.fail("平台类型不能为空");
+        }
+        if (currentVersionCode == null || currentVersionCode <= 0) {
+            return R.fail("当前版本号无效");
+        }
+
+        AppVersionVo updateInfo = appVersionService.getUpdateInfo(platform, currentVersionCode);
+        Map<String, Object> result = new HashMap<>();
+
+        if (updateInfo != null) {
+            result.put("hasUpdate", true);
+            result.put("versionCode", updateInfo.getVersionCode());
+            result.put("versionName", updateInfo.getVersionName());
+            result.put("updateContent", updateInfo.getUpdateContent());
+            result.put("downloadUrl", updateInfo.getDownloadUrl());
+            result.put("isForce", "1".equals(updateInfo.getIsForce()));
+            result.put("platform", updateInfo.getPlatform());
+            result.put("createTime", updateInfo.getCreateTime());
+        } else {
+            result.put("hasUpdate", false);
+            result.put("message", "当前已是最新版本");
+        }
+
+        return R.ok(result);
+    }
+
+    /**
+     * 版本比较
+     */
+    @Operation(summary = "版本比较", description = "比较两个版本之间的差异")
+    @GetMapping("/compare")
+    public R<Map<String, Object>> compareVersion(@Parameter(description = "平台类型(android/ios/web)", required = true)
+                                                 @RequestParam @NotBlank(message = "平台类型不能为空") @Pattern(regexp = "^(android|ios|web)$", message = "平台类型只能为android、ios或web") String platform,
+                                                 @Parameter(description = "当前版本号", required = true)
+                                                 @RequestParam @NotNull(message = "当前版本号不能为空") @Positive(message = "当前版本号必须为正数") Integer currentVersionCode,
+                                                 @Parameter(description = "目标版本号", required = true)
+                                                 @RequestParam @NotNull(message = "目标版本号不能为空") @Positive(message = "目标版本号必须为正数") Integer targetVersionCode) {
+        if (StringUtils.isBlank(platform)) {
+            return R.fail("平台类型不能为空");
+        }
+        if (currentVersionCode == null || targetVersionCode == null) {
+            return R.fail("版本号不能为空");
+        }
+
+        Map<String, Object> result = new HashMap<>();
+        result.put("platform", platform);
+        result.put("currentVersionCode", currentVersionCode);
+        result.put("targetVersionCode", targetVersionCode);
+
+        if (targetVersionCode > currentVersionCode) {
+            result.put("needUpdate", true);
+            result.put("updateType", "upgrade");
+        } else if (targetVersionCode < currentVersionCode) {
+            result.put("needUpdate", false);
+            result.put("updateType", "downgrade");
+        } else {
+            result.put("needUpdate", false);
+            result.put("updateType", "same");
+        }
+
+        return R.ok(result);
+    }
+
+    /**
+     * 记录版本下载
+     */
+    @Operation(summary = "记录版本下载", description = "记录用户下载版本的行为")
+    @Log(title = "App版本下载", businessType = BusinessType.OTHER)
+    @PostMapping("/download/{versionId}")
+    public R<Void> recordDownload(@Parameter(description = "版本ID", required = true)
+                                  @PathVariable @NotNull(message = "版本ID不能为空") @Positive(message = "版本ID必须为正数") Long versionId) {
+        // 这里可以记录下载统计等信息
+        return R.ok();
+    }
+
+    /**
+     * 记录版本安装
+     */
+    @Operation(summary = "记录版本安装", description = "记录用户安装版本的行为")
+    @Log(title = "App版本安装", businessType = BusinessType.OTHER)
+    @PostMapping("/install/{versionId}")
+    public R<Void> recordInstall(@Parameter(description = "版本ID", required = true)
+                                 @PathVariable @NotNull(message = "版本ID不能为空") @Positive(message = "版本ID必须为正数") Long versionId) {
+        // 这里可以记录安装统计等信息
+        return R.ok();
+    }
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/domain/AppDevice.java b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/domain/AppDevice.java
new file mode 100644
index 0000000..ff88c11
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/domain/AppDevice.java
@@ -0,0 +1,109 @@
+package org.dromara.member.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * App端设备信息对象 app_device
+ *
+ * @author pengles
+ */
+@Data
+@TableName("app_device")
+public class AppDevice implements Serializable {
+
+    /**
+     * 设备ID
+     */
+    @TableId(value = "device_id")
+    private Long deviceId;
+
+    /**
+     * App用户ID
+     */
+    private Long userId;
+
+    /**
+     * 设备类型（ios android h5）
+     */
+    private String deviceType;
+
+    /**
+     * 设备名称
+     */
+    private String deviceName;
+
+    /**
+     * 设备型号
+     */
+    private String deviceModel;
+
+    /**
+     * 设备品牌
+     */
+    private String deviceBrand;
+
+    /**
+     * 操作系统版本
+     */
+    private String osVersion;
+
+    /**
+     * App版本
+     */
+    private String appVersion;
+
+    /**
+     * 推送令牌
+     */
+    private String pushToken;
+
+    /**
+     * 是否活跃（0否 1是）
+     */
+    private String isActive;
+
+    /**
+     * 最后活跃时间
+     */
+    private LocalDateTime lastActiveTime;
+
+    /**
+     * 创建者
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createBy;
+
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private LocalDateTime createTime;
+
+    /**
+     * 更新者
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateBy;
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private LocalDateTime updateTime;
+
+    /**
+     * 删除标志（0代表存在 2代表删除）
+     */
+    @TableLogic
+    private String delFlag;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/domain/AppFile.java b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/domain/AppFile.java
new file mode 100644
index 0000000..71cf679
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/domain/AppFile.java
@@ -0,0 +1,107 @@
+package org.dromara.member.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+
+/**
+ * App端文件信息对象 app_file
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("app_file")
+public class AppFile extends BaseEntity {
+
+    /**
+     * 文件ID
+     */
+    @TableId(value = "file_id")
+    private Long fileId;
+
+    /**
+     * 用户ID
+     */
+    private Long userId;
+
+    /**
+     * 文件名
+     */
+    private String fileName;
+
+    /**
+     * 原始文件名
+     */
+    private String originalName;
+
+    /**
+     * 文件路径
+     */
+    private String filePath;
+
+    /**
+     * 文件URL
+     */
+    private String fileUrl;
+
+    /**
+     * 文件大小（字节）
+     */
+    private Long fileSize;
+
+    /**
+     * 文件类型（MIME类型）
+     */
+    private String fileType;
+
+    /**
+     * 文件后缀
+     */
+    private String fileSuffix;
+
+    /**
+     * 文件分类（1头像 2文档 3图片 4视频 5音频 6其他）
+     */
+    private Integer fileCategory;
+
+    /**
+     * 存储服务商
+     */
+    private String storageService;
+
+    /**
+     * 文件状态（0正常 1删除）
+     */
+    private String status;
+
+    /**
+     * 下载次数
+     */
+    private Long downloadCount;
+
+    /**
+     * 是否公开（0私有 1公开）
+     */
+    private String isPublic;
+
+    /**
+     * 文件MD5值
+     */
+    private String fileMd5;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 删除标志（0代表存在 2代表删除）
+     */
+    @TableLogic
+    private String delFlag;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/domain/AppLoginLog.java b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/domain/AppLoginLog.java
new file mode 100644
index 0000000..a6f2d0b
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/domain/AppLoginLog.java
@@ -0,0 +1,100 @@
+package org.dromara.member.domain;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * App端登录日志对象 app_login_log
+ *
+ * @author pengles
+ */
+@Data
+@TableName("app_login_log")
+public class AppLoginLog implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 访问ID
+     */
+    @TableId(value = "info_id")
+    private Long infoId;
+
+    /**
+     * 用户账号
+     */
+    private String userName;
+
+    /**
+     * 登录状态（0成功 1失败）
+     */
+    private String status;
+
+    /**
+     * 登录IP地址
+     */
+    private String ipaddr;
+
+    /**
+     * 登录地点
+     */
+    private String loginLocation;
+
+    /**
+     * 浏览器类型
+     */
+    private String browser;
+
+    /**
+     * 操作系统
+     */
+    private String os;
+
+    /**
+     * 提示消息
+     */
+    private String msg;
+
+    /**
+     * 登录时间
+     */
+    private LocalDateTime loginTime;
+
+    /**
+     * 创建者
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createBy;
+
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private LocalDateTime createTime;
+
+    /**
+     * 更新者
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateBy;
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private LocalDateTime updateTime;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/domain/AppMessage.java b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/domain/AppMessage.java
new file mode 100644
index 0000000..2d431d4
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/domain/AppMessage.java
@@ -0,0 +1,98 @@
+package org.dromara.member.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * App端消息推送对象 app_message
+ *
+ * @author pengles
+ */
+@Data
+@TableName("app_message")
+public class AppMessage implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 消息ID
+     */
+    @TableId(value = "message_id")
+    private Long messageId;
+
+    /**
+     * 消息标题
+     */
+    private String title;
+
+    /**
+     * 消息内容
+     */
+    private String content;
+
+    /**
+     * 消息类型（system:系统消息 notice:通知 activity:活动）
+     */
+    private String messageType;
+
+    /**
+     * 推送目标（all:全部用户 user:指定用户 role:指定角色）
+     */
+    private String targetType;
+
+    /**
+     * 目标ID列表（用户ID或角色ID，逗号分隔）
+     */
+    private String targetIds;
+
+    /**
+     * 发送时间
+     */
+    private LocalDateTime sendTime;
+
+    /**
+     * 状态（0待发送 1已发送 2发送失败）
+     */
+    private String status;
+
+    /**
+     * 创建者
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createBy;
+
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private LocalDateTime createTime;
+
+    /**
+     * 更新者
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateBy;
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private LocalDateTime updateTime;
+
+    /**
+     * 删除标志（0代表存在 2代表删除）
+     */
+    @TableLogic
+    private String delFlag;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/domain/AppOperLog.java b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/domain/AppOperLog.java
new file mode 100644
index 0000000..deb7284
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/domain/AppOperLog.java
@@ -0,0 +1,130 @@
+package org.dromara.member.domain;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * App端操作日志对象 app_oper_log
+ *
+ * @author pengles
+ */
+@Data
+@TableName("app_oper_log")
+public class AppOperLog implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 日志主键
+     */
+    @TableId(value = "oper_id")
+    private Long operId;
+
+    /**
+     * 模块标题
+     */
+    private String title;
+
+    /**
+     * 业务类型（0其它 1新增 2修改 3删除）
+     */
+    private Integer businessType;
+
+    /**
+     * 方法名称
+     */
+    private String method;
+
+    /**
+     * 请求方式
+     */
+    private String requestMethod;
+
+    /**
+     * 操作人员
+     */
+    private String operName;
+
+    /**
+     * 请求URL
+     */
+    private String operUrl;
+
+    /**
+     * 主机地址
+     */
+    private String operIp;
+
+    /**
+     * 操作地点
+     */
+    private String operLocation;
+
+    /**
+     * 请求参数
+     */
+    private String operParam;
+
+    /**
+     * 返回参数
+     */
+    private String jsonResult;
+
+    /**
+     * 操作状态（0正常 1异常）
+     */
+    private Integer status;
+
+    /**
+     * 错误消息
+     */
+    private String errorMsg;
+
+    /**
+     * 操作时间
+     */
+    private LocalDateTime operTime;
+
+    /**
+     * 消耗时间
+     */
+    private Long costTime;
+
+    /**
+     * 创建者
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createBy;
+
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private LocalDateTime createTime;
+
+    /**
+     * 更新者
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateBy;
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private LocalDateTime updateTime;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/domain/AppRole.java b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/domain/AppRole.java
new file mode 100644
index 0000000..6030c93
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/domain/AppRole.java
@@ -0,0 +1,83 @@
+package org.dromara.member.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * App端角色信息对象 app_role
+ *
+ * @author pengles
+ */
+@Data
+@TableName("app_role")
+public class AppRole implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * App角色ID
+     */
+    @TableId(value = "role_id")
+    private Long roleId;
+
+    /**
+     * 角色名称
+     */
+    private String roleName;
+
+    /**
+     * 角色权限字符串
+     */
+    private String roleKey;
+
+    /**
+     * 显示顺序
+     */
+    private Integer roleSort;
+
+    /**
+     * 角色状态（0正常 1停用）
+     */
+    private String status;
+
+    /**
+     * 删除标志（0代表存在 1代表删除）
+     */
+    @TableLogic
+    private String delFlag;
+
+    /**
+     * 创建者
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createBy;
+
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private LocalDateTime createTime;
+
+    /**
+     * 更新者
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateBy;
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private LocalDateTime updateTime;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/domain/AppSocialAuth.java b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/domain/AppSocialAuth.java
new file mode 100644
index 0000000..e207f7e
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/domain/AppSocialAuth.java
@@ -0,0 +1,114 @@
+package org.dromara.member.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * App端第三方登录授权对象 app_social_auth
+ *
+ * @author pengles
+ */
+@Data
+@TableName("app_social_auth")
+public class AppSocialAuth implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * App用户ID
+     */
+    private Long userId;
+
+    /**
+     * 用户来源平台（wechat_mp:微信小程序 wechat_open:微信开放平台 qq:QQ weibo:微博）
+     */
+    private String platform;
+
+    /**
+     * 表示平台唯一用户标识
+     */
+    private String platformUid;
+
+    /**
+     * 微信openid
+     */
+    private String openId;
+
+    /**
+     * 微信unionid
+     */
+    private String unionId;
+
+    /**
+     * 用户的授权令牌
+     */
+    private String accessToken;
+
+    /**
+     * 用户的授权令牌的有效期
+     */
+    private Integer expireIn;
+
+    /**
+     * 刷新令牌
+     */
+    private String refreshToken;
+
+    /**
+     * 授予的权限
+     */
+    private String scope;
+
+    /**
+     * 创建者
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createBy;
+
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 更新者
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateBy;
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+    /**
+     * 删除标志（0代表存在 2代表删除）
+     */
+    @TableLogic
+    private String delFlag;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 创建部门
+     */
+    @TableField(exist = false)
+    private Long createDept;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/domain/AppUser.java b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/domain/AppUser.java
new file mode 100644
index 0000000..74a41e3
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/domain/AppUser.java
@@ -0,0 +1,118 @@
+package org.dromara.member.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * App端用户信息对象 app_user
+ *
+ * @author pengles
+ */
+@Data
+@TableName("app_user")
+public class AppUser implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * App用户ID
+     */
+    @TableId(value = "user_id")
+    private Long userId;
+
+    /**
+     * 用户账号
+     */
+    private String userName;
+
+    /**
+     * 用户昵称
+     */
+    private String nickName;
+
+    /**
+     * 手机号码
+     */
+    private String phone;
+
+    /**
+     * 用户邮箱
+     */
+    private String email;
+
+    /**
+     * 用户性别（0男 1女 2未知）
+     */
+    private String sex;
+
+    /**
+     * 头像地址
+     */
+    private Long avatar;
+
+    /**
+     * 密码
+     */
+    private String password;
+
+    /**
+     * 帐号状态（0正常 1停用）
+     */
+    private String status;
+
+    /**
+     * 删除标志（0代表存在 1代表删除）
+     */
+    @TableLogic
+    private String delFlag;
+
+    /**
+     * 最后登录IP
+     */
+    private String loginIp;
+
+    /**
+     * 最后登录时间
+     */
+    private LocalDateTime loginDate;
+
+    /**
+     * 注册时间
+     */
+    private LocalDateTime registerTime;
+
+    /**
+     * 创建者
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createBy;
+
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private LocalDateTime createTime;
+
+    /**
+     * 更新者
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateBy;
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private LocalDateTime updateTime;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/domain/AppUserMessage.java b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/domain/AppUserMessage.java
new file mode 100644
index 0000000..7d788af
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/domain/AppUserMessage.java
@@ -0,0 +1,83 @@
+package org.dromara.member.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * App端用户消息读取记录对象 app_user_message
+ *
+ * @author pengles
+ */
+@Data
+@TableName("app_user_message")
+public class AppUserMessage implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * App用户ID
+     */
+    private Long userId;
+
+    /**
+     * 消息ID
+     */
+    private Long messageId;
+
+    /**
+     * 是否已读（0未读 1已读）
+     */
+    private String isRead;
+
+    /**
+     * 读取时间
+     */
+    private LocalDateTime readTime;
+
+    /**
+     * 创建者
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createBy;
+
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private LocalDateTime createTime;
+
+    /**
+     * 更新者
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateBy;
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private LocalDateTime updateTime;
+
+    /**
+     * 删除标志（0代表存在 2代表删除）
+     */
+    @TableLogic
+    private String delFlag;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/domain/AppUserRole.java b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/domain/AppUserRole.java
new file mode 100644
index 0000000..d2056bf
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/domain/AppUserRole.java
@@ -0,0 +1,70 @@
+package org.dromara.member.domain;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * App端用户和角色关联对象 app_user_role
+ *
+ * @author pengles
+ */
+@Data
+@TableName("app_user_role")
+public class AppUserRole implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * App用户ID
+     */
+    private Long userId;
+
+    /**
+     * App角色ID
+     */
+    private Long roleId;
+
+    /**
+     * 创建者
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createBy;
+
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private LocalDateTime createTime;
+
+    /**
+     * 更新者
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateBy;
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private LocalDateTime updateTime;
+
+    /**
+     * 删除标志（0代表存在 2代表删除）
+     */
+    @TableLogic
+    private String delFlag;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+}
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/domain/AppVersion.java b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/domain/AppVersion.java
new file mode 100644
index 0000000..bed34b9
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/domain/AppVersion.java
@@ -0,0 +1,93 @@
+package org.dromara.member.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * App版本信息对象 app_version
+ *
+ * @author pengles
+ */
+@Data
+@TableName("app_version")
+public class AppVersion implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 版本ID
+     */
+    @TableId(value = "version_id")
+    private Long versionId;
+
+    /**
+     * 版本号（数字）
+     */
+    private Integer versionCode;
+
+    /**
+     * 版本名（如1.0.0）
+     */
+    private String versionName;
+
+    /**
+     * 更新内容
+     */
+    private String updateContent;
+
+    /**
+     * 下载地址
+     */
+    private String downloadUrl;
+
+    /**
+     * 是否强制更新（0否 1是）
+     */
+    private String isForce;
+
+    /**
+     * 平台类型（android ios）
+     */
+    private String platform;
+
+    /**
+     * 创建者
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createBy;
+
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private LocalDateTime createTime;
+
+    /**
+     * 更新者
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateBy;
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private LocalDateTime updateTime;
+
+    /**
+     * 删除标志（0代表存在 2代表删除）
+     */
+    @TableLogic
+    private String delFlag;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/domain/bo/AppDeviceBo.java b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/domain/bo/AppDeviceBo.java
new file mode 100644
index 0000000..c3815cd
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/domain/bo/AppDeviceBo.java
@@ -0,0 +1,87 @@
+package org.dromara.member.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.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+
+import java.time.LocalDateTime;
+
+/**
+ * App端设备信息业务对象 app_device
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = org.dromara.member.domain.AppDevice.class, reverseConvertGenerate = false)
+public class AppDeviceBo extends BaseEntity {
+
+    /**
+     * 设备ID
+     */
+    @NotNull(message = "设备ID不能为空", groups = {EditGroup.class})
+    private Long deviceId;
+
+    /**
+     * App用户ID
+     */
+    @NotNull(message = "用户ID不能为空", groups = {AddGroup.class, EditGroup.class})
+    private Long userId;
+
+    /**
+     * 设备类型（ios android h5）
+     */
+    @NotBlank(message = "设备类型不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String deviceType;
+
+    /**
+     * 设备名称
+     */
+    private String deviceName;
+
+    /**
+     * 设备型号
+     */
+    private String deviceModel;
+
+    /**
+     * 设备品牌
+     */
+    private String deviceBrand;
+
+    /**
+     * 操作系统版本
+     */
+    private String osVersion;
+
+    /**
+     * App版本
+     */
+    private String appVersion;
+
+    /**
+     * 推送令牌
+     */
+    private String pushToken;
+
+    /**
+     * 是否活跃（0否 1是）
+     */
+    private String isActive;
+
+    /**
+     * 最后活跃时间
+     */
+    private LocalDateTime lastActiveTime;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/domain/bo/AppFileBo.java b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/domain/bo/AppFileBo.java
new file mode 100644
index 0000000..a0cb553
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/domain/bo/AppFileBo.java
@@ -0,0 +1,108 @@
+package org.dromara.member.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.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.member.domain.AppFile;
+
+/**
+ * App端文件信息业务对象 app_file
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = AppFile.class, reverseConvertGenerate = false)
+public class AppFileBo extends BaseEntity {
+
+    /**
+     * 文件ID
+     */
+    @NotNull(message = "文件ID不能为空", groups = {EditGroup.class})
+    private Long fileId;
+
+    /**
+     * 用户ID
+     */
+    private Long userId;
+
+    /**
+     * 文件名
+     */
+    @NotBlank(message = "文件名不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String fileName;
+
+    /**
+     * 原始文件名
+     */
+    @NotBlank(message = "原始文件名不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String originalName;
+
+    /**
+     * 文件路径
+     */
+    private String filePath;
+
+    /**
+     * 文件URL
+     */
+    @NotBlank(message = "文件URL不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String fileUrl;
+
+    /**
+     * 文件大小（字节）
+     */
+    @NotNull(message = "文件大小不能为空", groups = {AddGroup.class, EditGroup.class})
+    private Long fileSize;
+
+    /**
+     * 文件类型（MIME类型）
+     */
+    private String fileType;
+
+    /**
+     * 文件后缀
+     */
+    private String fileSuffix;
+
+    /**
+     * 文件分类（1头像 2文档 3图片 4视频 5音频 6其他）
+     */
+    private Integer fileCategory;
+
+    /**
+     * 存储服务商
+     */
+    private String storageService;
+
+    /**
+     * 文件状态（0正常 1删除）
+     */
+    private String status;
+
+    /**
+     * 下载次数
+     */
+    private Long downloadCount;
+
+    /**
+     * 是否公开（0私有 1公开）
+     */
+    private String isPublic;
+
+    /**
+     * 文件MD5值
+     */
+    private String fileMd5;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/domain/bo/AppMessageBo.java b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/domain/bo/AppMessageBo.java
new file mode 100644
index 0000000..5afecfd
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/domain/bo/AppMessageBo.java
@@ -0,0 +1,82 @@
+package org.dromara.member.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.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+
+import java.time.LocalDateTime;
+
+/**
+ * App端消息业务对象 app_message
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = org.dromara.member.domain.AppMessage.class, reverseConvertGenerate = false)
+public class AppMessageBo extends BaseEntity {
+
+    /**
+     * 消息ID
+     */
+    @NotNull(message = "消息ID不能为空", groups = {EditGroup.class})
+    private Long messageId;
+
+    /**
+     * 消息标题
+     */
+    @NotBlank(message = "消息标题不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String title;
+
+    /**
+     * 消息内容
+     */
+    @NotBlank(message = "消息内容不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String content;
+
+    /**
+     * 消息类型（system:系统消息 notice:通知 activity:活动）
+     */
+    private String messageType;
+
+    /**
+     * 推送目标（all:全部用户 user:指定用户 role:指定角色）
+     */
+    private String targetType;
+
+    /**
+     * 目标ID列表（用户ID或角色ID，逗号分隔）
+     */
+    private String targetIds;
+
+    /**
+     * 发送时间
+     */
+    private LocalDateTime sendTime;
+
+    /**
+     * 状态（0待发送 1已发送 2发送失败）
+     */
+    private String status;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 接收者ID（用于查询当前用户的消息）
+     */
+    private Long receiverId;
+
+    /**
+     * 发送者ID
+     */
+    private Long senderId;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/domain/bo/AppOperLogBo.java b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/domain/bo/AppOperLogBo.java
new file mode 100644
index 0000000..07a805f
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/domain/bo/AppOperLogBo.java
@@ -0,0 +1,107 @@
+package org.dromara.member.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.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.member.domain.AppOperLog;
+
+import java.time.LocalDateTime;
+
+/**
+ * App端操作日志业务对象 app_oper_log
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = AppOperLog.class, reverseConvertGenerate = false)
+public class AppOperLogBo extends BaseEntity {
+
+    /**
+     * 日志主键
+     */
+    @NotNull(message = "日志主键不能为空", groups = {EditGroup.class})
+    private Long operId;
+
+    /**
+     * 模块标题
+     */
+    @NotBlank(message = "模块标题不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String title;
+
+    /**
+     * 业务类型（0其它 1新增 2修改 3删除）
+     */
+    private Integer businessType;
+
+    /**
+     * 方法名称
+     */
+    private String method;
+
+    /**
+     * 请求方式
+     */
+    private String requestMethod;
+
+    /**
+     * 操作人员
+     */
+    private String operName;
+
+    /**
+     * 请求URL
+     */
+    private String operUrl;
+
+    /**
+     * 主机地址
+     */
+    private String operIp;
+
+    /**
+     * 操作地点
+     */
+    private String operLocation;
+
+    /**
+     * 请求参数
+     */
+    private String operParam;
+
+    /**
+     * 返回参数
+     */
+    private String jsonResult;
+
+    /**
+     * 操作状态（0正常 1异常）
+     */
+    private Integer status;
+
+    /**
+     * 错误消息
+     */
+    private String errorMsg;
+
+    /**
+     * 操作时间
+     */
+    private LocalDateTime operTime;
+
+    /**
+     * 消耗时间
+     */
+    private Long costTime;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/domain/bo/AppRoleBo.java b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/domain/bo/AppRoleBo.java
new file mode 100644
index 0000000..464c962
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/domain/bo/AppRoleBo.java
@@ -0,0 +1,61 @@
+package org.dromara.member.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.member.domain.AppRole;
+
+/**
+ * App端角色信息业务对象 app_role
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = AppRole.class, reverseConvertGenerate = false)
+public class AppRoleBo extends BaseEntity {
+
+    /**
+     * App角色ID
+     */
+    @NotNull(message = "App角色ID不能为空", groups = {EditGroup.class})
+    private Long roleId;
+
+    /**
+     * 角色名称
+     */
+    @NotBlank(message = "角色名称不能为空", groups = {AddGroup.class, EditGroup.class})
+    @Size(max = 30, message = "角色名称长度不能超过30个字符")
+    private String roleName;
+
+    /**
+     * 角色权限字符串
+     */
+    @NotBlank(message = "角色权限字符串不能为空", groups = {AddGroup.class, EditGroup.class})
+    @Size(max = 100, message = "角色权限字符串长度不能超过100个字符")
+    private String roleKey;
+
+    /**
+     * 显示顺序
+     */
+    @NotNull(message = "显示顺序不能为空", groups = {AddGroup.class, EditGroup.class})
+    private Integer roleSort;
+
+    /**
+     * 角色状态（0正常 1停用）
+     */
+    @NotBlank(message = "角色状态不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String status;
+
+    /**
+     * 用户ID（用于用户角色授权操作）
+     */
+    private Long userId;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/domain/bo/AppUserBo.java b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/domain/bo/AppUserBo.java
new file mode 100644
index 0000000..ca3528b
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/domain/bo/AppUserBo.java
@@ -0,0 +1,96 @@
+package org.dromara.member.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.Email;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.member.domain.AppUser;
+
+import java.time.LocalDateTime;
+
+/**
+ * App端用户信息业务对象 app_user
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = AppUser.class, reverseConvertGenerate = false)
+public class AppUserBo extends BaseEntity {
+
+    /**
+     * App用户ID
+     */
+    @NotNull(message = "App用户ID不能为空", groups = {EditGroup.class})
+    private Long userId;
+
+    /**
+     * 用户账号
+     */
+    @NotBlank(message = "用户账号不能为空", groups = {AddGroup.class, EditGroup.class})
+    @Size(max = 30, message = "用户账号长度不能超过30个字符")
+    private String userName;
+
+    /**
+     * 用户昵称
+     */
+    @NotBlank(message = "用户昵称不能为空", groups = {AddGroup.class, EditGroup.class})
+    @Size(max = 30, message = "用户昵称长度不能超过30个字符")
+    private String nickName;
+
+    /**
+     * 手机号码
+     */
+    @Size(max = 11, message = "手机号码长度不能超过11个字符")
+    private String phone;
+
+    /**
+     * 用户邮箱
+     */
+    @Email(message = "邮箱格式不正确")
+    @Size(max = 50, message = "用户邮箱长度不能超过50个字符")
+    private String email;
+
+    /**
+     * 用户性别（0男 1女 2未知）
+     */
+    private String sex;
+
+    /**
+     * 头像地址
+     */
+    private Long avatar;
+
+    /**
+     * 密码
+     */
+    @Size(max = 100, message = "密码长度不能超过100个字符")
+    private String password;
+
+    /**
+     * 帐号状态（0正常 1停用）
+     */
+    private String status;
+
+    /**
+     * 最后登录IP
+     */
+    private String loginIp;
+
+    /**
+     * 最后登录时间
+     */
+    private LocalDateTime loginDate;
+
+    /**
+     * 注册时间
+     */
+    private LocalDateTime registerTime;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/domain/bo/AppVersionBo.java b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/domain/bo/AppVersionBo.java
new file mode 100644
index 0000000..a10b2b4
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/domain/bo/AppVersionBo.java
@@ -0,0 +1,67 @@
+package org.dromara.member.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.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.member.domain.AppVersion;
+
+/**
+ * App版本信息业务对象 app_version
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = AppVersion.class, reverseConvertGenerate = false)
+public class AppVersionBo extends BaseEntity {
+
+    /**
+     * 版本ID
+     */
+    @NotNull(message = "版本ID不能为空", groups = {EditGroup.class})
+    private Long versionId;
+
+    /**
+     * 版本号（数字）
+     */
+    @NotNull(message = "版本号不能为空", groups = {AddGroup.class, EditGroup.class})
+    private Integer versionCode;
+
+    /**
+     * 版本名（如1.0.0）
+     */
+    @NotBlank(message = "版本名不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String versionName;
+
+    /**
+     * 更新内容
+     */
+    private String updateContent;
+
+    /**
+     * 下载地址
+     */
+    private String downloadUrl;
+
+    /**
+     * 是否强制更新（0否 1是）
+     */
+    private String isForce;
+
+    /**
+     * 平台类型（android ios）
+     */
+    @NotBlank(message = "平台类型不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String platform;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/domain/vo/AppDeviceVo.java b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/domain/vo/AppDeviceVo.java
new file mode 100644
index 0000000..c1f0782
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/domain/vo/AppDeviceVo.java
@@ -0,0 +1,108 @@
+package org.dromara.member.domain.vo;
+
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import org.dromara.member.domain.AppDevice;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * App端设备信息视图对象 app_device
+ *
+ * @author pengles
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = AppDevice.class)
+public class AppDeviceVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 设备ID
+     */
+    @ExcelProperty(value = "设备ID")
+    private Long deviceId;
+
+    /**
+     * App用户ID
+     */
+    @ExcelProperty(value = "App用户ID")
+    private Long userId;
+
+    /**
+     * 设备类型（ios android h5）
+     */
+    @ExcelProperty(value = "设备类型", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "app_device_type")
+    private String deviceType;
+
+    /**
+     * 设备名称
+     */
+    @ExcelProperty(value = "设备名称")
+    private String deviceName;
+
+    /**
+     * 设备型号
+     */
+    @ExcelProperty(value = "设备型号")
+    private String deviceModel;
+
+    /**
+     * 设备品牌
+     */
+    @ExcelProperty(value = "设备品牌")
+    private String deviceBrand;
+
+    /**
+     * 操作系统版本
+     */
+    @ExcelProperty(value = "操作系统版本")
+    private String osVersion;
+
+    /**
+     * App版本
+     */
+    @ExcelProperty(value = "App版本")
+    private String appVersion;
+
+    /**
+     * 推送令牌
+     */
+    @ExcelProperty(value = "推送令牌")
+    private String pushToken;
+
+    /**
+     * 是否活跃（0否 1是）
+     */
+    @ExcelProperty(value = "是否活跃", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "sys_yes_no")
+    private String isActive;
+
+    /**
+     * 最后活跃时间
+     */
+    @ExcelProperty(value = "最后活跃时间")
+    private LocalDateTime lastActiveTime;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "创建时间")
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    @ExcelProperty(value = "更新时间")
+    private LocalDateTime updateTime;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/domain/vo/AppFileVo.java b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/domain/vo/AppFileVo.java
new file mode 100644
index 0000000..75f5f79
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/domain/vo/AppFileVo.java
@@ -0,0 +1,123 @@
+package org.dromara.member.domain.vo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.member.domain.AppFile;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * App端文件信息视图对象 app_file
+ *
+ * @author pengles
+ */
+@Data
+@AutoMapper(target = AppFile.class)
+public class AppFileVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 文件ID
+     */
+    private Long fileId;
+
+    /**
+     * 用户ID
+     */
+    private Long userId;
+
+    /**
+     * 文件名
+     */
+    private String fileName;
+
+    /**
+     * 原始文件名
+     */
+    private String originalName;
+
+    /**
+     * 文件路径
+     */
+    private String filePath;
+
+    /**
+     * 文件URL
+     */
+    private String fileUrl;
+
+    /**
+     * 文件大小（字节）
+     */
+    private Long fileSize;
+
+    /**
+     * 文件类型（MIME类型）
+     */
+    private String fileType;
+
+    /**
+     * 文件后缀
+     */
+    private String fileSuffix;
+
+    /**
+     * 文件分类（1头像 2文档 3图片 4视频 5音频 6其他）
+     */
+    private Integer fileCategory;
+
+    /**
+     * 存储服务商
+     */
+    private String storageService;
+
+    /**
+     * 文件状态（0正常 1删除）
+     */
+    private String status;
+
+    /**
+     * 下载次数
+     */
+    private Long downloadCount;
+
+    /**
+     * 是否公开（0私有 1公开）
+     */
+    private String isPublic;
+
+    /**
+     * 文件MD5值
+     */
+    private String fileMd5;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 创建者
+     */
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 更新者
+     */
+    private String updateBy;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/domain/vo/AppLoginLogVo.java b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/domain/vo/AppLoginLogVo.java
new file mode 100644
index 0000000..5eadb05
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/domain/vo/AppLoginLogVo.java
@@ -0,0 +1,83 @@
+package org.dromara.member.domain.vo;
+
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import org.dromara.member.domain.AppLoginLog;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * App端登录日志视图对象 app_login_log
+ *
+ * @author pengles
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = AppLoginLog.class)
+public class AppLoginLogVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 访问ID
+     */
+    @ExcelProperty(value = "访问ID")
+    private Long infoId;
+
+    /**
+     * 用户账号
+     */
+    @ExcelProperty(value = "用户账号")
+    private String userName;
+
+    /**
+     * 登录状态（0成功 1失败）
+     */
+    @ExcelProperty(value = "登录状态", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "sys_common_status")
+    private String status;
+
+    /**
+     * 登录IP地址
+     */
+    @ExcelProperty(value = "登录IP地址")
+    private String ipaddr;
+
+    /**
+     * 登录地点
+     */
+    @ExcelProperty(value = "登录地点")
+    private String loginLocation;
+
+    /**
+     * 浏览器类型
+     */
+    @ExcelProperty(value = "浏览器类型")
+    private String browser;
+
+    /**
+     * 操作系统
+     */
+    @ExcelProperty(value = "操作系统")
+    private String os;
+
+    /**
+     * 提示消息
+     */
+    @ExcelProperty(value = "提示消息")
+    private String msg;
+
+    /**
+     * 访问时间
+     */
+    @ExcelProperty(value = "访问时间")
+    private LocalDateTime loginTime;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/domain/vo/AppMessageVo.java b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/domain/vo/AppMessageVo.java
new file mode 100644
index 0000000..c64ede5
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/domain/vo/AppMessageVo.java
@@ -0,0 +1,91 @@
+package org.dromara.member.domain.vo;
+
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import org.dromara.member.domain.AppMessage;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * App端消息推送视图对象 app_message
+ *
+ * @author pengles
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = AppMessage.class)
+public class AppMessageVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 消息ID
+     */
+    @ExcelProperty(value = "消息ID")
+    private Long messageId;
+
+    /**
+     * 消息标题
+     */
+    @ExcelProperty(value = "消息标题")
+    private String title;
+
+    /**
+     * 消息内容
+     */
+    @ExcelProperty(value = "消息内容")
+    private String content;
+
+    /**
+     * 消息类型（system:系统消息 notice:通知 activity:活动）
+     */
+    @ExcelProperty(value = "消息类型", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "app_message_type")
+    private String messageType;
+
+    /**
+     * 推送目标（all:全部用户 user:指定用户 role:指定角色）
+     */
+    @ExcelProperty(value = "推送目标", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "app_target_type")
+    private String targetType;
+
+    /**
+     * 目标ID列表（用户ID或角色ID，逗号分隔）
+     */
+    @ExcelProperty(value = "目标ID列表")
+    private String targetIds;
+
+    /**
+     * 发送时间
+     */
+    @ExcelProperty(value = "发送时间")
+    private LocalDateTime sendTime;
+
+    /**
+     * 状态（0待发送 1已发送 2发送失败）
+     */
+    @ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "app_message_status")
+    private String status;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "创建时间")
+    private LocalDateTime createTime;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/domain/vo/AppOperLogVo.java b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/domain/vo/AppOperLogVo.java
new file mode 100644
index 0000000..1f0b5e6
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/domain/vo/AppOperLogVo.java
@@ -0,0 +1,120 @@
+package org.dromara.member.domain.vo;
+
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import org.dromara.member.domain.AppOperLog;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * App端操作日志视图对象 app_oper_log
+ *
+ * @author pengles
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = AppOperLog.class)
+public class AppOperLogVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 日志主键
+     */
+    @ExcelProperty(value = "日志主键")
+    private Long operId;
+
+    /**
+     * 模块标题
+     */
+    @ExcelProperty(value = "模块标题")
+    private String title;
+
+    /**
+     * 业务类型（0其它 1新增 2修改 3删除）
+     */
+    @ExcelProperty(value = "业务类型", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "sys_oper_type")
+    private Integer businessType;
+
+    /**
+     * 方法名称
+     */
+    @ExcelProperty(value = "方法名称")
+    private String method;
+
+    /**
+     * 请求方式
+     */
+    @ExcelProperty(value = "请求方式")
+    private String requestMethod;
+
+    /**
+     * 操作人员
+     */
+    @ExcelProperty(value = "操作人员")
+    private String operName;
+
+    /**
+     * 请求URL
+     */
+    @ExcelProperty(value = "请求URL")
+    private String operUrl;
+
+    /**
+     * 主机地址
+     */
+    @ExcelProperty(value = "主机地址")
+    private String operIp;
+
+    /**
+     * 操作地点
+     */
+    @ExcelProperty(value = "操作地点")
+    private String operLocation;
+
+    /**
+     * 请求参数
+     */
+    @ExcelProperty(value = "请求参数")
+    private String operParam;
+
+    /**
+     * 返回参数
+     */
+    @ExcelProperty(value = "返回参数")
+    private String jsonResult;
+
+    /**
+     * 操作状态（0正常 1异常）
+     */
+    @ExcelProperty(value = "操作状态", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "sys_common_status")
+    private Integer status;
+
+    /**
+     * 错误消息
+     */
+    @ExcelProperty(value = "错误消息")
+    private String errorMsg;
+
+    /**
+     * 操作时间
+     */
+    @ExcelProperty(value = "操作时间")
+    private LocalDateTime operTime;
+
+    /**
+     * 消耗时间
+     */
+    @ExcelProperty(value = "消耗时间")
+    private Long costTime;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/domain/vo/AppRoleVo.java b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/domain/vo/AppRoleVo.java
new file mode 100644
index 0000000..26f39b1
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/domain/vo/AppRoleVo.java
@@ -0,0 +1,71 @@
+package org.dromara.member.domain.vo;
+
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import org.dromara.member.domain.AppRole;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * App端角色信息视图对象 app_role
+ *
+ * @author pengles
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = AppRole.class)
+public class AppRoleVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * App角色ID
+     */
+    @ExcelProperty(value = "App角色ID")
+    private Long roleId;
+
+    /**
+     * 角色名称
+     */
+    @ExcelProperty(value = "角色名称")
+    private String roleName;
+
+    /**
+     * 角色权限字符串
+     */
+    @ExcelProperty(value = "角色权限字符串")
+    private String roleKey;
+
+    /**
+     * 显示顺序
+     */
+    @ExcelProperty(value = "显示顺序")
+    private Integer roleSort;
+
+    /**
+     * 角色状态（0正常 1停用）
+     */
+    @ExcelProperty(value = "角色状态", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "sys_normal_disable")
+    private String status;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "创建时间")
+    private LocalDateTime createTime;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/domain/vo/AppSocialAuthVo.java b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/domain/vo/AppSocialAuthVo.java
new file mode 100644
index 0000000..aa2670b
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/domain/vo/AppSocialAuthVo.java
@@ -0,0 +1,98 @@
+package org.dromara.member.domain.vo;
+
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.member.domain.AppSocialAuth;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * App端第三方登录授权视图对象 app_social_auth
+ *
+ * @author pengles
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = AppSocialAuth.class)
+public class AppSocialAuthVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @ExcelProperty(value = "主键")
+    private Long id;
+
+    /**
+     * App用户ID
+     */
+    @ExcelProperty(value = "App用户ID")
+    private Long userId;
+
+    /**
+     * 用户来源平台（wechat_mp:微信小程序 wechat_open:微信开放平台 qq:QQ weibo:微博）
+     */
+    @ExcelProperty(value = "用户来源平台")
+    private String platform;
+
+    /**
+     * 表示平台唯一用户标识
+     */
+    @ExcelProperty(value = "平台唯一用户标识")
+    private String platformUid;
+
+    /**
+     * 微信openid
+     */
+    @ExcelProperty(value = "微信openid")
+    private String openId;
+
+    /**
+     * 微信unionid
+     */
+    @ExcelProperty(value = "微信unionid")
+    private String unionId;
+
+    /**
+     * 用户的授权令牌
+     */
+    @ExcelProperty(value = "授权令牌")
+    private String accessToken;
+
+    /**
+     * 用户的授权令牌的有效期
+     */
+    @ExcelProperty(value = "令牌有效期")
+    private Integer expireIn;
+
+    /**
+     * 刷新令牌
+     */
+    @ExcelProperty(value = "刷新令牌")
+    private String refreshToken;
+
+    /**
+     * 授予的权限
+     */
+    @ExcelProperty(value = "授予权限")
+    private String scope;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "创建时间")
+    private LocalDateTime createTime;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/domain/vo/AppUserMessageVo.java b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/domain/vo/AppUserMessageVo.java
new file mode 100644
index 0000000..cfe143d
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/domain/vo/AppUserMessageVo.java
@@ -0,0 +1,65 @@
+package org.dromara.member.domain.vo;
+
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import org.dromara.member.domain.AppUserMessage;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * App端用户消息读取记录视图对象 app_user_message
+ *
+ * @author pengles
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = AppUserMessage.class)
+public class AppUserMessageVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @ExcelProperty(value = "主键")
+    private Long id;
+
+    /**
+     * App用户ID
+     */
+    @ExcelProperty(value = "App用户ID")
+    private Long userId;
+
+    /**
+     * 消息ID
+     */
+    @ExcelProperty(value = "消息ID")
+    private Long messageId;
+
+    /**
+     * 是否已读（0未读 1已读）
+     */
+    @ExcelProperty(value = "是否已读", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "sys_yes_no")
+    private String isRead;
+
+    /**
+     * 读取时间
+     */
+    @ExcelProperty(value = "读取时间")
+    private LocalDateTime readTime;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "创建时间")
+    private LocalDateTime createTime;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/domain/vo/AppUserRoleVo.java b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/domain/vo/AppUserRoleVo.java
new file mode 100644
index 0000000..2b524a4
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/domain/vo/AppUserRoleVo.java
@@ -0,0 +1,68 @@
+package org.dromara.member.domain.vo;
+
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.member.domain.AppUserRole;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * App端用户和角色关联视图对象 app_user_role
+ *
+ * @author pengles
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = AppUserRole.class)
+public class AppUserRoleVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * App用户ID
+     */
+    @ExcelProperty(value = "App用户ID")
+    private Long userId;
+
+    /**
+     * App角色ID
+     */
+    @ExcelProperty(value = "App角色ID")
+    private Long roleId;
+
+    /**
+     * 创建者
+     */
+    @ExcelProperty(value = "创建者")
+    private Long createBy;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "创建时间")
+    private LocalDateTime createTime;
+
+    /**
+     * 更新者
+     */
+    @ExcelProperty(value = "更新者")
+    private Long updateBy;
+
+    /**
+     * 更新时间
+     */
+    @ExcelProperty(value = "更新时间")
+    private LocalDateTime updateTime;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/domain/vo/AppUserVo.java b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/domain/vo/AppUserVo.java
new file mode 100644
index 0000000..3c92b4b
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/domain/vo/AppUserVo.java
@@ -0,0 +1,114 @@
+package org.dromara.member.domain.vo;
+
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import org.dromara.member.domain.AppUser;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * App端用户信息视图对象 app_user
+ *
+ * @author pengles
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = AppUser.class)
+public class AppUserVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * App用户ID
+     */
+    @ExcelProperty(value = "App用户ID")
+    private Long userId;
+
+    /**
+     * 用户账号
+     */
+    @ExcelProperty(value = "用户账号")
+    private String userName;
+
+    /**
+     * 密码
+     */
+    @ExcelProperty(value = "密码")
+    private String password;
+
+    /**
+     * 用户昵称
+     */
+    @ExcelProperty(value = "用户昵称")
+    private String nickName;
+
+    /**
+     * 手机号码
+     */
+    @ExcelProperty(value = "手机号码")
+    private String phone;
+
+    /**
+     * 用户邮箱
+     */
+    @ExcelProperty(value = "用户邮箱")
+    private String email;
+
+    /**
+     * 用户性别（0男 1女 2未知）
+     */
+    @ExcelProperty(value = "用户性别", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "sys_user_sex")
+    private String sex;
+
+    /**
+     * 头像地址
+     */
+    @ExcelProperty(value = "头像地址")
+    private Long avatar;
+
+    /**
+     * 帐号状态（0正常 1停用）
+     */
+    @ExcelProperty(value = "帐号状态", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "sys_normal_disable")
+    private String status;
+
+    /**
+     * 最后登录IP
+     */
+    @ExcelProperty(value = "最后登录IP")
+    private String loginIp;
+
+    /**
+     * 最后登录时间
+     */
+    @ExcelProperty(value = "最后登录时间")
+    private LocalDateTime loginDate;
+
+    /**
+     * 注册时间
+     */
+    @ExcelProperty(value = "注册时间")
+    private LocalDateTime registerTime;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "创建时间")
+    private LocalDateTime createTime;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/domain/vo/AppVersionVo.java b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/domain/vo/AppVersionVo.java
new file mode 100644
index 0000000..3da5401
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/domain/vo/AppVersionVo.java
@@ -0,0 +1,77 @@
+package org.dromara.member.domain.vo;
+
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import org.dromara.member.domain.AppVersion;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * App版本信息视图对象 app_version
+ *
+ * @author pengles
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = AppVersion.class)
+public class AppVersionVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 版本ID
+     */
+    @ExcelProperty(value = "版本ID")
+    private Long versionId;
+
+    /**
+     * 版本号（数字）
+     */
+    @ExcelProperty(value = "版本号")
+    private Integer versionCode;
+
+    /**
+     * 版本名（如1.0.0）
+     */
+    @ExcelProperty(value = "版本名")
+    private String versionName;
+
+    /**
+     * 更新内容
+     */
+    @ExcelProperty(value = "更新内容")
+    private String updateContent;
+
+    /**
+     * 下载地址
+     */
+    @ExcelProperty(value = "下载地址")
+    private String downloadUrl;
+
+    /**
+     * 是否强制更新（0否 1是）
+     */
+    @ExcelProperty(value = "是否强制更新", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "sys_yes_no")
+    private String isForce;
+
+    /**
+     * 平台（android、ios）
+     */
+    @ExcelProperty(value = "平台")
+    private String platform;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "创建时间")
+    private LocalDateTime createTime;
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/exception/AppExceptionHandler.java b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/exception/AppExceptionHandler.java
new file mode 100644
index 0000000..52e973c
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/exception/AppExceptionHandler.java
@@ -0,0 +1,159 @@
+package org.dromara.member.exception;
+
+import cn.dev33.satoken.exception.NotLoginException;
+import cn.dev33.satoken.exception.NotPermissionException;
+import jakarta.validation.ConstraintViolationException;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.exception.ServiceException;
+import org.springframework.core.annotation.Order;
+import org.springframework.http.HttpStatus;
+import org.springframework.validation.BindException;
+import org.springframework.web.bind.MethodArgumentNotValidException;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
+import org.springframework.web.multipart.MaxUploadSizeExceededException;
+
+import java.io.IOException;
+
+/**
+ * App模块专用异常处理器
+ * 处理App端特有的业务异常和错误场景
+ *
+ * @author pengles
+ */
+@Slf4j
+@Order(1) // 优先级高于全局异常处理器
+@RestControllerAdvice(basePackages = "org.dromara.app")
+public class AppExceptionHandler {
+
+    /**
+     * App端登录异常处理
+     */
+    @ExceptionHandler(NotLoginException.class)
+    @ResponseStatus(HttpStatus.UNAUTHORIZED)
+    public R<Void> handleNotLoginException(NotLoginException e) {
+        log.warn("App端用户未登录: {}", e.getMessage());
+        return R.fail(401, "请先登录后再操作");
+    }
+
+    /**
+     * App端权限异常处理
+     */
+    @ExceptionHandler(NotPermissionException.class)
+    @ResponseStatus(HttpStatus.FORBIDDEN)
+    public R<Void> handleNotPermissionException(NotPermissionException e) {
+        log.warn("App端用户权限不足: {}", e.getMessage());
+        return R.fail(403, "权限不足，无法访问该资源");
+    }
+
+    /**
+     * 文件上传大小超限异常
+     */
+    @ExceptionHandler(MaxUploadSizeExceededException.class)
+    @ResponseStatus(HttpStatus.BAD_REQUEST)
+    public R<Void> handleMaxUploadSizeExceededException(MaxUploadSizeExceededException e) {
+        log.error("App端文件上传大小超限: {}", e.getMessage());
+        return R.fail("上传文件大小超出限制，请选择较小的文件");
+    }
+
+    /**
+     * IO异常处理（主要用于文件操作）
+     */
+    @ExceptionHandler(IOException.class)
+    @ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR)
+    public R<Void> handleIOException(IOException e) {
+        log.error("App端文件操作异常: {}", e.getMessage(), e);
+        return R.fail("文件操作失败，请稍后重试");
+    }
+
+    /**
+     * App端业务异常处理
+     */
+    @ExceptionHandler(ServiceException.class)
+    @ResponseStatus(HttpStatus.BAD_REQUEST)
+    public R<Void> handleServiceException(ServiceException e) {
+        log.error("App端业务异常: {}", e.getMessage());
+        Integer code = e.getCode();
+        if (code != null) {
+            return R.fail(code, e.getMessage());
+        }
+        return R.fail(e.getMessage());
+    }
+
+    /**
+     * 参数验证异常处理
+     */
+    @ExceptionHandler(MethodArgumentNotValidException.class)
+    @ResponseStatus(HttpStatus.BAD_REQUEST)
+    public R<Void> handleMethodArgumentNotValidException(MethodArgumentNotValidException e) {
+        String message = e.getBindingResult().getFieldError().getDefaultMessage();
+        log.warn("App端参数验证失败: {}", message);
+        return R.fail("参数验证失败: " + message);
+    }
+
+    /**
+     * 参数绑定异常处理
+     */
+    @ExceptionHandler(BindException.class)
+    @ResponseStatus(HttpStatus.BAD_REQUEST)
+    public R<Void> handleBindException(BindException e) {
+        String message = e.getBindingResult().getFieldError().getDefaultMessage();
+        log.warn("App端参数绑定失败: {}", message);
+        return R.fail("参数绑定失败: " + message);
+    }
+
+    /**
+     * 约束违反异常处理
+     */
+    @ExceptionHandler(ConstraintViolationException.class)
+    @ResponseStatus(HttpStatus.BAD_REQUEST)
+    public R<Void> handleConstraintViolationException(ConstraintViolationException e) {
+        String message = e.getMessage();
+        log.warn("App端约束验证失败: {}", message);
+        return R.fail("参数验证失败: " + message);
+    }
+
+
+    /**
+     * 文件相关异常处理
+     */
+    @ExceptionHandler(FileException.class)
+    @ResponseStatus(HttpStatus.BAD_REQUEST)
+    public R<Void> handleFileException(FileException e) {
+        log.error("App端文件异常: {}", e.getMessage());
+        return R.fail(e.getCode(), e.getMessage());
+    }
+
+    /**
+     * 设备相关异常处理
+     */
+    @ExceptionHandler(DeviceException.class)
+    @ResponseStatus(HttpStatus.BAD_REQUEST)
+    public R<Void> handleDeviceException(DeviceException e) {
+        log.error("App端设备异常: {}", e.getMessage());
+        return R.fail(e.getCode(), e.getMessage());
+    }
+
+    /**
+     * 版本相关异常处理
+     */
+    @ExceptionHandler(VersionException.class)
+    @ResponseStatus(HttpStatus.BAD_REQUEST)
+    public R<Void> handleVersionException(VersionException e) {
+        log.error("App端版本异常: {}", e.getMessage());
+        return R.fail(e.getCode(), e.getMessage());
+    }
+
+    /**
+     * 通用异常处理
+     */
+    @ExceptionHandler(Exception.class)
+    @ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR)
+    public R<Void> handleException(Exception e) {
+        log.error("App端系统异常: ", e);
+        return R.fail("系统异常，请联系管理员");
+    }
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/exception/DeviceException.java b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/exception/DeviceException.java
new file mode 100644
index 0000000..c7bb0f0
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/exception/DeviceException.java
@@ -0,0 +1,96 @@
+package org.dromara.member.exception;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+
+/**
+ * 设备相关异常
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class DeviceException extends RuntimeException {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 错误码
+     */
+    private Integer code;
+
+    /**
+     * 错误信息
+     */
+    private String message;
+
+    public DeviceException(String message) {
+        super(message);
+        this.message = message;
+        this.code = 400;
+    }
+
+    public DeviceException(Integer code, String message) {
+        super(message);
+        this.code = code;
+        this.message = message;
+    }
+
+    public DeviceException(String message, Throwable cause) {
+        super(message, cause);
+        this.message = message;
+        this.code = 400;
+    }
+
+    /**
+     * 设备已绑定异常
+     */
+    public static DeviceException deviceAlreadyBound(String deviceInfo) {
+        return new DeviceException(4001, "设备已绑定: " + deviceInfo);
+    }
+
+    /**
+     * 设备不存在异常
+     */
+    public static DeviceException deviceNotFound(Long deviceId) {
+        return new DeviceException(4002, "设备不存在: " + deviceId);
+    }
+
+    /**
+     * 设备绑定失败异常
+     */
+    public static DeviceException bindFailed(String reason) {
+        return new DeviceException(4003, "设备绑定失败: " + reason);
+    }
+
+    /**
+     * 设备解绑失败异常
+     */
+    public static DeviceException unbindFailed(String reason) {
+        return new DeviceException(4004, "设备解绑失败: " + reason);
+    }
+
+    /**
+     * 设备状态异常
+     */
+    public static DeviceException invalidStatus(String status) {
+        return new DeviceException(4005, "设备状态异常: " + status);
+    }
+
+    /**
+     * 推送令牌无效异常
+     */
+    public static DeviceException invalidPushToken(String token) {
+        return new DeviceException(4006, "推送令牌无效: " + token);
+    }
+
+    /**
+     * 设备数量超限异常
+     */
+    public static DeviceException deviceLimitExceeded(int limit) {
+        return new DeviceException(4007, "设备数量超出限制，最多允许绑定 " + limit + " 台设备");
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/exception/FileException.java b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/exception/FileException.java
new file mode 100644
index 0000000..2de3701
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/exception/FileException.java
@@ -0,0 +1,127 @@
+package org.dromara.member.exception;
+
+/**
+ * 文件相关异常
+ *
+ * @author pengles
+ */
+public class FileException extends RuntimeException {
+
+    private static final long serialVersionUID = 1L;
+
+    private Integer code;
+
+    private String message;
+
+    private String detailMessage;
+
+    public FileException() {
+    }
+
+    public FileException(String message) {
+        this.message = message;
+    }
+
+    public FileException(String message, Integer code) {
+        this.message = message;
+        this.code = code;
+    }
+
+    public FileException(String message, Throwable e) {
+        super(message, e);
+        this.message = message;
+    }
+
+    public FileException(String message, Integer code, Throwable e) {
+        super(message, e);
+        this.message = message;
+        this.code = code;
+    }
+
+    public FileException(String message, Integer code, String detailMessage) {
+        this.message = message;
+        this.code = code;
+        this.detailMessage = detailMessage;
+    }
+
+    public FileException(String message, Integer code, String detailMessage, Throwable e) {
+        super(message, e);
+        this.message = message;
+        this.code = code;
+        this.detailMessage = detailMessage;
+    }
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public void setCode(Integer code) {
+        this.code = code;
+    }
+
+    @Override
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+    public String getDetailMessage() {
+        return detailMessage;
+    }
+
+    public void setDetailMessage(String detailMessage) {
+        this.detailMessage = detailMessage;
+    }
+
+    // 静态工厂方法
+    public static FileException fileEmpty() {
+        return new FileException("上传文件不能为空", 40001);
+    }
+
+    public static FileException fileSizeExceeded(long maxSize) {
+        return new FileException("文件大小超过限制", 40002, "最大允许大小: " + maxSize + "MB");
+    }
+
+    public static FileException unsupportedFileType(String fileType) {
+        return new FileException("不支持的文件类型", 40003, "文件类型: " + fileType);
+    }
+
+    public static FileException uploadFailed(String reason) {
+        return new FileException("文件上传失败", 40004, reason);
+    }
+
+    public static FileException fileNotFound(Long fileId) {
+        return new FileException("文件不存在", 40005, "文件ID: " + fileId);
+    }
+
+    public static FileException downloadFailed(String reason) {
+        return new FileException("文件下载失败", 40006, reason);
+    }
+
+    public static FileException deleteFailed(String reason) {
+        return new FileException("文件删除失败", 40007, reason);
+    }
+
+    public static FileException accessDenied(Long fileId) {
+        return new FileException("无权限访问文件", 40008, "文件ID: " + fileId);
+    }
+
+    public static FileException storageServiceError(String service) {
+        return new FileException("存储服务异常", 40009, "服务: " + service);
+    }
+
+    public static FileException md5CalculationFailed() {
+        return new FileException("文件MD5计算失败", 40010);
+    }
+
+    public static FileException invalidFileName(String fileName) {
+        return new FileException("无效的文件名", 40011, "文件名: " + fileName);
+    }
+
+    public static FileException fileAlreadyExists(String fileName) {
+        return new FileException("文件已存在", 40012, "文件名: " + fileName);
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/exception/VersionException.java b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/exception/VersionException.java
new file mode 100644
index 0000000..d397d6b
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/exception/VersionException.java
@@ -0,0 +1,110 @@
+package org.dromara.member.exception;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+
+/**
+ * 版本相关异常
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class VersionException extends RuntimeException {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 错误码
+     */
+    private Integer code;
+
+    /**
+     * 错误信息
+     */
+    private String message;
+
+    public VersionException(String message) {
+        super(message);
+        this.message = message;
+        this.code = 400;
+    }
+
+    public VersionException(Integer code, String message) {
+        super(message);
+        this.code = code;
+        this.message = message;
+    }
+
+    public VersionException(String message, Throwable cause) {
+        super(message, cause);
+        this.message = message;
+        this.code = 400;
+    }
+
+    /**
+     * 版本不存在异常
+     */
+    public static VersionException versionNotFound(String version) {
+        return new VersionException(5001, "版本不存在: " + version);
+    }
+
+    /**
+     * 版本号重复异常
+     */
+    public static VersionException versionCodeDuplicate(Integer versionCode) {
+        return new VersionException(5002, "版本号已存在: " + versionCode);
+    }
+
+    /**
+     * 版本号无效异常
+     */
+    public static VersionException invalidVersionCode(Integer versionCode) {
+        return new VersionException(5003, "版本号无效: " + versionCode);
+    }
+
+    /**
+     * 平台不支持异常
+     */
+    public static VersionException unsupportedPlatform(String platform) {
+        return new VersionException(5004, "不支持的平台: " + platform);
+    }
+
+    /**
+     * 版本发布失败异常
+     */
+    public static VersionException publishFailed(String reason) {
+        return new VersionException(5005, "版本发布失败: " + reason);
+    }
+
+    /**
+     * 版本撤回失败异常
+     */
+    public static VersionException withdrawFailed(String reason) {
+        return new VersionException(5006, "版本撤回失败: " + reason);
+    }
+
+    /**
+     * 强制更新版本冲突异常
+     */
+    public static VersionException forceUpdateConflict(String version) {
+        return new VersionException(5007, "强制更新版本冲突: " + version);
+    }
+
+    /**
+     * 版本比较异常
+     */
+    public static VersionException versionCompareError(String currentVersion, String targetVersion) {
+        return new VersionException(5008, "版本比较失败: " + currentVersion + " vs " + targetVersion);
+    }
+
+    /**
+     * 下载链接无效异常
+     */
+    public static VersionException invalidDownloadUrl(String url) {
+        return new VersionException(5009, "下载链接无效: " + url);
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/mapper/AppDeviceMapper.java b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/mapper/AppDeviceMapper.java
new file mode 100644
index 0000000..4cd6faf
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/mapper/AppDeviceMapper.java
@@ -0,0 +1,14 @@
+package org.dromara.member.mapper;
+
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.member.domain.AppDevice;
+import org.dromara.member.domain.vo.AppDeviceVo;
+
+/**
+ * App端设备信息Mapper接口
+ *
+ * @author pengles
+ */
+public interface AppDeviceMapper extends BaseMapperPlus<AppDevice, AppDeviceVo> {
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/mapper/AppFileMapper.java b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/mapper/AppFileMapper.java
new file mode 100644
index 0000000..38aa5a8
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/mapper/AppFileMapper.java
@@ -0,0 +1,14 @@
+package org.dromara.member.mapper;
+
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.member.domain.AppFile;
+import org.dromara.member.domain.vo.AppFileVo;
+
+/**
+ * App端文件信息Mapper接口
+ *
+ * @author pengles
+ */
+public interface AppFileMapper extends BaseMapperPlus<AppFile, AppFileVo> {
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/mapper/AppLoginLogMapper.java b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/mapper/AppLoginLogMapper.java
new file mode 100644
index 0000000..569202c
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/mapper/AppLoginLogMapper.java
@@ -0,0 +1,14 @@
+package org.dromara.member.mapper;
+
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.member.domain.AppLoginLog;
+import org.dromara.member.domain.vo.AppLoginLogVo;
+
+/**
+ * App端登录日志Mapper接口
+ *
+ * @author pengles
+ */
+public interface AppLoginLogMapper extends BaseMapperPlus<AppLoginLog, AppLoginLogVo> {
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/mapper/AppMessageMapper.java b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/mapper/AppMessageMapper.java
new file mode 100644
index 0000000..dc9818b
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/mapper/AppMessageMapper.java
@@ -0,0 +1,39 @@
+package org.dromara.member.mapper;
+
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.member.domain.AppMessage;
+import org.dromara.member.domain.vo.AppMessageVo;
+
+import java.util.List;
+
+/**
+ * App端消息推送Mapper接口
+ *
+ * @author pengles
+ */
+public interface AppMessageMapper extends BaseMapperPlus<AppMessage, AppMessageVo> {
+
+    /**
+     * 根据用户ID查询消息列表
+     *
+     * @param userId 用户ID
+     * @return 消息列表
+     */
+    List<AppMessageVo> selectMessagesByUserId(Long userId);
+
+    /**
+     * 根据角色ID查询消息列表
+     *
+     * @param roleId 角色ID
+     * @return 消息列表
+     */
+    List<AppMessageVo> selectMessagesByRoleId(Long roleId);
+
+    /**
+     * 查询全部用户消息列表
+     *
+     * @return 消息列表
+     */
+    List<AppMessageVo> selectMessagesForAll();
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/mapper/AppOperLogMapper.java b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/mapper/AppOperLogMapper.java
new file mode 100644
index 0000000..25d4a42
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/mapper/AppOperLogMapper.java
@@ -0,0 +1,14 @@
+package org.dromara.member.mapper;
+
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.member.domain.AppOperLog;
+import org.dromara.member.domain.vo.AppOperLogVo;
+
+/**
+ * App端操作日志Mapper接口
+ *
+ * @author pengles
+ */
+public interface AppOperLogMapper extends BaseMapperPlus<AppOperLog, AppOperLogVo> {
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/mapper/AppRoleMapper.java b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/mapper/AppRoleMapper.java
new file mode 100644
index 0000000..f32c3fe
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/mapper/AppRoleMapper.java
@@ -0,0 +1,64 @@
+package org.dromara.member.mapper;
+
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.member.domain.AppRole;
+import org.dromara.member.domain.vo.AppRoleVo;
+
+import java.util.List;
+import java.util.Set;
+
+/**
+ * App端角色信息Mapper接口
+ *
+ * @author pengles
+ */
+public interface AppRoleMapper extends BaseMapperPlus<AppRole, AppRoleVo> {
+
+    /**
+     * 根据用户ID查询角色
+     *
+     * @param userId 用户ID
+     * @return 角色列表
+     */
+    List<AppRoleVo> selectRolesByUserId(Long userId);
+
+    /**
+     * 根据用户ID获取角色权限
+     *
+     * @param userId 用户ID
+     * @return 权限列表
+     */
+    Set<String> selectRolePermissionByUserId(Long userId);
+
+    /**
+     * 查询所有角色
+     *
+     * @return 角色列表
+     */
+    List<AppRoleVo> selectRoleAll();
+
+    /**
+     * 根据用户ID获取角色选择框列表
+     *
+     * @param userId 用户ID
+     * @return 角色ID列表
+     */
+    List<Long> selectRoleListByUserId(Long userId);
+
+    /**
+     * 校验角色名称是否唯一
+     *
+     * @param roleName 角色名称
+     * @return 结果
+     */
+    int checkRoleNameUnique(String roleName);
+
+    /**
+     * 校验角色权限是否唯一
+     *
+     * @param roleKey 角色权限
+     * @return 结果
+     */
+    int checkRoleKeyUnique(String roleKey);
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/mapper/AppSocialAuthMapper.java b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/mapper/AppSocialAuthMapper.java
new file mode 100644
index 0000000..adfebb4
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/mapper/AppSocialAuthMapper.java
@@ -0,0 +1,14 @@
+package org.dromara.member.mapper;
+
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.member.domain.AppSocialAuth;
+import org.dromara.member.domain.vo.AppSocialAuthVo;
+
+/**
+ * App端第三方登录授权Mapper接口
+ *
+ * @author pengles
+ */
+public interface AppSocialAuthMapper extends BaseMapperPlus<AppSocialAuth, AppSocialAuthVo> {
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/mapper/AppUserMapper.java b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/mapper/AppUserMapper.java
new file mode 100644
index 0000000..0d84f7c
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/mapper/AppUserMapper.java
@@ -0,0 +1,62 @@
+package org.dromara.member.mapper;
+
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.member.domain.AppUser;
+import org.dromara.member.domain.vo.AppUserVo;
+
+/**
+ * App端用户信息Mapper接口
+ *
+ * @author pengles
+ */
+public interface AppUserMapper extends BaseMapperPlus<AppUser, AppUserVo> {
+
+    /**
+     * 根据用户账号查询用户
+     *
+     * @param userName 用户账号
+     * @return 用户信息
+     */
+    AppUserVo selectUserByUserName(String userName);
+
+    /**
+     * 根据手机号查询用户信息
+     *
+     * @param phone 手机号
+     * @return 用户信息
+     */
+    AppUserVo selectUserByPhone(String phone);
+
+    /**
+     * 根据邮箱查询用户信息
+     *
+     * @param email 邮箱
+     * @return 用户信息
+     */
+    AppUserVo selectUserByEmail(String email);
+
+    /**
+     * 校验用户账号是否唯一
+     *
+     * @param userName 用户账号
+     * @return 结果
+     */
+    int checkUserNameUnique(String userName);
+
+    /**
+     * 校验手机号码是否唯一
+     *
+     * @param phone 手机号码
+     * @return 结果
+     */
+    int checkPhoneUnique(String phone);
+
+    /**
+     * 校验email是否唯一
+     *
+     * @param email 用户邮箱
+     * @return 结果
+     */
+    int checkEmailUnique(String email);
+
+}
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/mapper/AppUserMessageMapper.java b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/mapper/AppUserMessageMapper.java
new file mode 100644
index 0000000..7a3ba27
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/mapper/AppUserMessageMapper.java
@@ -0,0 +1,14 @@
+package org.dromara.member.mapper;
+
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.member.domain.AppUserMessage;
+import org.dromara.member.domain.vo.AppUserMessageVo;
+
+/**
+ * App端用户消息读取记录Mapper接口
+ *
+ * @author pengles
+ */
+public interface AppUserMessageMapper extends BaseMapperPlus<AppUserMessage, AppUserMessageVo> {
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/mapper/AppUserRoleMapper.java b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/mapper/AppUserRoleMapper.java
new file mode 100644
index 0000000..dd9079c
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/mapper/AppUserRoleMapper.java
@@ -0,0 +1,51 @@
+package org.dromara.member.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.member.domain.AppUserRole;
+import org.dromara.member.domain.vo.AppUserRoleVo;
+
+import java.util.List;
+
+/**
+ * App端用户和角色关联Mapper接口
+ *
+ * @author pengles
+ */
+@Mapper
+public interface AppUserRoleMapper extends BaseMapperPlus<AppUserRole, AppUserRoleVo> {
+
+    /**
+     * 通过用户ID删除用户和角色关联
+     *
+     * @param userId 用户ID
+     * @return 结果
+     */
+    int deleteUserRoleByUserId(Long userId);
+
+    /**
+     * 批量删除用户和角色关联
+     *
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    int deleteUserRole(Long[] ids);
+
+    /**
+     * 通过角色ID查询角色使用数量
+     *
+     * @param roleId 角色ID
+     * @return 结果
+     */
+    int countUserRoleByRoleId(Long roleId);
+
+    /**
+     * 批量新增用户角色信息
+     *
+     * @param userRoleList 用户角色列表
+     * @return 结果
+     */
+    int batchUserRole(@Param("list") List<AppUserRole> userRoleList);
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/mapper/AppVersionMapper.java b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/mapper/AppVersionMapper.java
new file mode 100644
index 0000000..964e43d
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/mapper/AppVersionMapper.java
@@ -0,0 +1,16 @@
+package org.dromara.member.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.member.domain.AppVersion;
+import org.dromara.member.domain.vo.AppVersionVo;
+
+/**
+ * App版本信息Mapper接口
+ *
+ * @author pengles
+ */
+@Mapper
+public interface AppVersionMapper extends BaseMapperPlus<AppVersion, AppVersionVo> {
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/service/AppDeviceService.java b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/service/AppDeviceService.java
new file mode 100644
index 0000000..05ef9f2
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/service/AppDeviceService.java
@@ -0,0 +1,98 @@
+package org.dromara.member.service;
+
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.member.domain.bo.AppDeviceBo;
+import org.dromara.member.domain.vo.AppDeviceVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * App端设备信息Service接口
+ *
+ * @author pengles
+ */
+public interface AppDeviceService {
+
+    /**
+     * 查询App端设备信息
+     */
+    AppDeviceVo queryById(Long deviceId);
+
+    /**
+     * 查询App端设备信息列表
+     */
+    TableDataInfo<AppDeviceVo> queryPageList(AppDeviceBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询App端设备信息列表
+     */
+    List<AppDeviceVo> queryList(AppDeviceBo bo);
+
+    /**
+     * 新增App端设备信息
+     */
+    Boolean insertByBo(AppDeviceBo bo);
+
+    /**
+     * 修改App端设备信息
+     */
+    Boolean updateByBo(AppDeviceBo bo);
+
+    /**
+     * 校验并批量删除App端设备信息
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    /**
+     * 根据用户ID查询设备列表
+     */
+    List<AppDeviceVo> queryByUserId(Long userId);
+
+    /**
+     * 绑定设备
+     */
+    Boolean bindDevice(AppDeviceBo bo);
+
+    /**
+     * 解绑设备
+     */
+    Boolean unbindDevice(Long deviceId, Long userId);
+
+    /**
+     * 更新设备活跃状态
+     */
+    Boolean updateActiveStatus(Long deviceId, String isActive);
+
+    /**
+     * 更新推送令牌
+     */
+    Boolean updatePushToken(Long deviceId, String pushToken);
+
+    /**
+     * 获取用户活跃设备
+     */
+    List<AppDeviceVo> getActiveDevices(Long userId);
+
+    /**
+     * 清理非活跃设备
+     */
+    Integer cleanInactiveDevices(Integer days);
+
+    /**
+     * 根据推送令牌查询设备
+     */
+    AppDeviceVo queryByPushToken(String pushToken);
+
+    /**
+     * 设备心跳更新
+     */
+    Boolean heartbeat(Long deviceId);
+
+    /**
+     * 批量更新设备状态
+     */
+    Boolean batchUpdateStatus(List<Long> deviceIds, String isActive);
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/service/AppFileService.java b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/service/AppFileService.java
new file mode 100644
index 0000000..32a3fbb
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/service/AppFileService.java
@@ -0,0 +1,167 @@
+package org.dromara.member.service;
+
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.member.domain.bo.AppFileBo;
+import org.dromara.member.domain.vo.AppFileVo;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * App端文件信息Service接口
+ *
+ * @author pengles
+ */
+public interface AppFileService {
+
+    /**
+     * 查询App端文件信息
+     */
+    AppFileVo queryById(Long fileId);
+
+    /**
+     * 查询App端文件信息列表
+     */
+    TableDataInfo<AppFileVo> queryPageList(AppFileBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询App端文件信息列表
+     */
+    List<AppFileVo> queryList(AppFileBo bo);
+
+    /**
+     * 新增App端文件信息
+     */
+    Boolean insertByBo(AppFileBo bo);
+
+    /**
+     * 修改App端文件信息
+     */
+    Boolean updateByBo(AppFileBo bo);
+
+    /**
+     * 校验并批量删除App端文件信息
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    /**
+     * 上传文件
+     *
+     * @param file         上传的文件
+     * @param userId       用户ID
+     * @param fileCategory 文件分类
+     * @return 文件信息
+     */
+    AppFileVo uploadFile(MultipartFile file, Long userId, Integer fileCategory);
+
+    /**
+     * 上传头像
+     *
+     * @param file   头像文件
+     * @param userId 用户ID
+     * @return 文件信息
+     */
+    AppFileVo uploadAvatar(MultipartFile file, Long userId);
+
+    /**
+     * 批量上传文件
+     *
+     * @param files        文件数组
+     * @param userId       用户ID
+     * @param fileCategory 文件分类
+     * @return 文件信息列表
+     */
+    List<AppFileVo> batchUploadFiles(MultipartFile[] files, Long userId, Integer fileCategory);
+
+    /**
+     * 根据用户ID查询文件列表
+     *
+     * @param userId       用户ID
+     * @param fileCategory 文件分类（可选）
+     * @return 文件列表
+     */
+    List<AppFileVo> queryByUserId(Long userId, Integer fileCategory);
+
+    /**
+     * 根据文件分类查询文件列表
+     *
+     * @param fileCategory 文件分类
+     * @return 文件列表
+     */
+    List<AppFileVo> queryByCategory(Integer fileCategory);
+
+    /**
+     * 下载文件
+     *
+     * @param fileId 文件ID
+     * @param userId 用户ID
+     * @return 文件信息
+     */
+    AppFileVo downloadFile(Long fileId, Long userId);
+
+    /**
+     * 删除用户文件
+     *
+     * @param fileId 文件ID
+     * @param userId 用户ID
+     * @return 删除结果
+     */
+    Boolean deleteUserFile(Long fileId, Long userId);
+
+    /**
+     * 批量删除用户文件
+     *
+     * @param fileIds 文件ID列表
+     * @param userId  用户ID
+     * @return 删除结果
+     */
+    Boolean batchDeleteUserFiles(Collection<Long> fileIds, Long userId);
+
+    /**
+     * 更新文件状态
+     *
+     * @param fileId 文件ID
+     * @param status 状态
+     * @param userId 用户ID
+     * @return 更新结果
+     */
+    Boolean updateFileStatus(Long fileId, String status, Long userId);
+
+    /**
+     * 获取用户文件统计信息
+     *
+     * @param userId 用户ID
+     * @return 统计信息
+     */
+    AppFileVo getUserFileStatistics(Long userId);
+
+    /**
+     * 清理过期文件
+     *
+     * @param days 过期天数
+     * @return 清理数量
+     */
+    Integer cleanExpiredFiles(Integer days);
+
+    /**
+     * 检查文件是否存在
+     *
+     * @param fileMd5 文件MD5
+     * @param userId  用户ID
+     * @return 文件信息
+     */
+    AppFileVo checkFileExists(String fileMd5, Long userId);
+
+    /**
+     * 更新文件公开状态
+     *
+     * @param fileId   文件ID
+     * @param isPublic 是否公开
+     * @param userId   用户ID
+     * @return 更新结果
+     */
+    Boolean updateFilePublicStatus(Long fileId, String isPublic, Long userId);
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/service/AppMessageService.java b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/service/AppMessageService.java
new file mode 100644
index 0000000..0796fc7
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/service/AppMessageService.java
@@ -0,0 +1,162 @@
+package org.dromara.member.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.member.domain.AppMessage;
+import org.dromara.member.domain.bo.AppMessageBo;
+import org.dromara.member.domain.vo.AppMessageVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * App端消息Service接口
+ *
+ * @author pengles
+ */
+public interface AppMessageService extends IService<AppMessage> {
+
+    /**
+     * 查询App端消息
+     *
+     * @param messageId 消息ID
+     * @return App端消息
+     */
+    AppMessageVo queryById(Long messageId);
+
+    /**
+     * 查询App端消息列表
+     *
+     * @param bo        App端消息
+     * @param pageQuery 分页查询条件
+     * @return App端消息集合
+     */
+    TableDataInfo<AppMessageVo> queryPageList(AppMessageBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询App端消息列表
+     *
+     * @param bo App端消息
+     * @return App端消息集合
+     */
+    List<AppMessageVo> queryList(AppMessageBo bo);
+
+    /**
+     * 新增App端消息
+     *
+     * @param bo App端消息
+     * @return 结果
+     */
+    Boolean insertByBo(AppMessageBo bo);
+
+    /**
+     * 修改App端消息
+     *
+     * @param bo App端消息
+     * @return 结果
+     */
+    Boolean updateByBo(AppMessageBo bo);
+
+    /**
+     * 校验并批量删除App端消息
+     *
+     * @param ids     主键集合
+     * @param isValid 是否校验,true-删除前校验,false-不校验
+     * @return 结果
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    /**
+     * 获取用户未读消息数量
+     *
+     * @param userId 用户ID
+     * @return 未读消息数量
+     */
+    Long getUnreadCount(Long userId);
+
+    /**
+     * 标记消息为已读
+     *
+     * @param messageId 消息ID
+     * @param userId    用户ID
+     * @return 结果
+     */
+    Boolean markAsRead(Long messageId, Long userId);
+
+    /**
+     * 批量标记消息为已读
+     *
+     * @param messageIds 消息ID列表
+     * @param userId     用户ID
+     * @return 结果
+     */
+    Boolean markAsReadBatch(List<Long> messageIds, Long userId);
+
+    /**
+     * 标记所有消息为已读
+     *
+     * @param userId 用户ID
+     * @return 结果
+     */
+    Boolean markAllAsRead(Long userId);
+
+    /**
+     * 发送系统消息
+     *
+     * @param bo 消息信息
+     * @return 结果
+     */
+    Boolean sendSystemMessage(AppMessageBo bo);
+
+    /**
+     * 发送个人消息
+     *
+     * @param bo 消息信息
+     * @return 结果
+     */
+    Boolean sendPersonalMessage(AppMessageBo bo);
+
+    /**
+     * 推送消息到指定用户
+     *
+     * @param bo 消息信息
+     * @return 结果
+     */
+    Boolean pushMessage(AppMessageBo bo);
+
+    /**
+     * 群发消息
+     *
+     * @param bo 消息信息
+     * @return 结果
+     */
+    Boolean broadcastMessage(AppMessageBo bo);
+
+    /**
+     * 发送推送通知
+     *
+     * @param userId  用户ID
+     * @param title   标题
+     * @param content 内容
+     * @return 结果
+     */
+    Boolean sendPushNotification(Long userId, String title, String content);
+
+    /**
+     * 批量发送推送通知
+     *
+     * @param userIds 用户ID列表
+     * @param title   标题
+     * @param content 内容
+     * @return 结果
+     */
+    Boolean sendBatchPushNotification(List<Long> userIds, String title, String content);
+
+    /**
+     * 清理过期消息
+     *
+     * @return 清理数量
+     */
+    Integer cleanExpiredMessages();
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/service/AppOperLogService.java b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/service/AppOperLogService.java
new file mode 100644
index 0000000..98135c8
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/service/AppOperLogService.java
@@ -0,0 +1,141 @@
+package org.dromara.member.service;
+
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.member.domain.bo.AppOperLogBo;
+import org.dromara.member.domain.vo.AppOperLogVo;
+
+import java.time.LocalDateTime;
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * App端操作日志Service接口
+ *
+ * @author pengles
+ */
+public interface AppOperLogService {
+
+    /**
+     * 查询App端操作日志
+     */
+    AppOperLogVo queryById(Long operId);
+
+    /**
+     * 查询App端操作日志列表
+     */
+    TableDataInfo<AppOperLogVo> queryPageList(AppOperLogBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询App端操作日志列表
+     */
+    List<AppOperLogVo> queryList(AppOperLogBo bo);
+
+    /**
+     * 新增App端操作日志
+     */
+    Boolean insertByBo(AppOperLogBo bo);
+
+    /**
+     * 修改App端操作日志
+     */
+    Boolean updateByBo(AppOperLogBo bo);
+
+    /**
+     * 校验并批量删除App端操作日志信息
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    /**
+     * 记录操作日志
+     *
+     * @param title         模块标题
+     * @param businessType  业务类型
+     * @param method        方法名称
+     * @param requestMethod 请求方式
+     * @param operName      操作人员
+     * @param operUrl       请求URL
+     * @param operIp        主机地址
+     * @param operLocation  操作地点
+     * @param operParam     请求参数
+     * @param jsonResult    返回参数
+     * @param status        操作状态
+     * @param errorMsg      错误消息
+     * @param costTime      消耗时间
+     */
+    void recordOperLog(String title, Integer businessType, String method, String requestMethod,
+                       String operName, String operUrl, String operIp, String operLocation,
+                       String operParam, String jsonResult, Integer status, String errorMsg, Long costTime);
+
+    /**
+     * 根据操作人查询操作日志
+     *
+     * @param operName 操作人员
+     * @return 操作日志列表
+     */
+    List<AppOperLogVo> queryByOperName(String operName);
+
+    /**
+     * 清空操作日志
+     */
+    void cleanOperLog();
+
+    /**
+     * 根据时间范围删除操作日志
+     *
+     * @param beginTime 开始时间
+     * @param endTime   结束时间
+     */
+    void deleteOperLogByTime(LocalDateTime beginTime, LocalDateTime endTime);
+
+    /**
+     * 获取操作统计信息
+     *
+     * @param operName  操作人员
+     * @param beginTime 开始时间
+     * @param endTime   结束时间
+     * @return 统计信息
+     */
+    Long getOperLogCount(String operName, LocalDateTime beginTime, LocalDateTime endTime);
+
+    /**
+     * 获取用户行为分析数据
+     *
+     * @param operName 操作人员
+     * @param days     统计天数
+     * @return 行为分析数据
+     */
+    List<AppOperLogVo> getUserBehaviorAnalysis(String operName, Integer days);
+
+    /**
+     * 获取热门操作统计
+     *
+     * @param days  统计天数
+     * @param limit 返回数量限制
+     * @return 热门操作列表
+     */
+    List<AppOperLogVo> getPopularOperations(Integer days, Integer limit);
+
+    /**
+     * 获取错误操作统计
+     *
+     * @param days 统计天数
+     * @return 错误操作列表
+     */
+    List<AppOperLogVo> getErrorOperations(Integer days);
+
+    /**
+     * 批量记录操作日志
+     *
+     * @param operLogs 操作日志列表
+     */
+    void batchInsertOperLog(List<AppOperLogBo> operLogs);
+
+    /**
+     * 异步记录操作日志
+     *
+     * @param bo 操作日志业务对象
+     */
+    void asyncRecordOperLog(AppOperLogBo bo);
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/service/AppRoleService.java b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/service/AppRoleService.java
new file mode 100644
index 0000000..b83d9e2
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/service/AppRoleService.java
@@ -0,0 +1,169 @@
+package org.dromara.member.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.member.domain.AppRole;
+import org.dromara.member.domain.bo.AppRoleBo;
+import org.dromara.member.domain.vo.AppRoleVo;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * App端角色信息Service接口
+ *
+ * @author pengles
+ */
+public interface AppRoleService extends IService<AppRole> {
+
+    /**
+     * 查询App端角色信息
+     *
+     * @param roleId App角色ID
+     * @return App端角色信息
+     */
+    AppRoleVo queryById(Long roleId);
+
+    /**
+     * 查询App端角色信息列表
+     *
+     * @param bo        App端角色信息
+     * @param pageQuery 分页查询条件
+     * @return App端角色信息集合
+     */
+    TableDataInfo<AppRoleVo> queryPageList(AppRoleBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询App端角色信息列表
+     *
+     * @param bo App端角色信息
+     * @return App端角色信息集合
+     */
+    List<AppRoleVo> queryList(AppRoleBo bo);
+
+    /**
+     * 新增App端角色信息
+     *
+     * @param bo App端角色信息
+     * @return 结果
+     */
+    Boolean insertByBo(AppRoleBo bo);
+
+    /**
+     * 修改App端角色信息
+     *
+     * @param bo App端角色信息
+     * @return 结果
+     */
+    Boolean updateByBo(AppRoleBo bo);
+
+    /**
+     * 校验并批量删除App端角色信息
+     *
+     * @param ids     主键集合
+     * @param isValid 是否校验,true-删除前校验,false-不校验
+     * @return 结果
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    /**
+     * 根据用户ID查询角色
+     *
+     * @param userId 用户ID
+     * @return 角色列表
+     */
+    List<AppRoleVo> selectRolesByUserId(Long userId);
+
+    /**
+     * 根据用户ID获取角色权限
+     *
+     * @param userId 用户ID
+     * @return 权限列表
+     */
+    Set<String> selectRolePermissionByUserId(Long userId);
+
+    /**
+     * 查询所有角色
+     *
+     * @return 角色列表
+     */
+    List<AppRoleVo> selectRoleAll();
+
+    /**
+     * 根据用户ID获取角色选择框列表
+     *
+     * @param userId 用户ID
+     * @return 选中角色ID列表
+     */
+    List<Long> selectRoleListByUserId(Long userId);
+
+    /**
+     * 校验角色名称是否唯一
+     *
+     * @param roleName 角色名称
+     * @return 结果
+     */
+    boolean checkRoleNameUnique(String roleName);
+
+    /**
+     * 校验角色权限是否唯一
+     *
+     * @param roleKey 角色权限
+     * @return 结果
+     */
+    boolean checkRoleKeyUnique(String roleKey);
+
+    /**
+     * 校验角色是否允许操作
+     *
+     * @param roleId 角色ID
+     * @return 结果
+     */
+    boolean checkRoleAllowed(Long roleId);
+
+    /**
+     * 校验角色是否有数据权限
+     *
+     * @param roleId 角色ID
+     * @return 结果
+     */
+    boolean checkRoleDataScope(Long roleId);
+
+    /**
+     * 通过角色ID查询角色使用数量
+     *
+     * @param roleId 角色ID
+     * @return 结果
+     */
+    long countUserRoleByRoleId(Long roleId);
+
+    /**
+     * 取消授权用户角色
+     *
+     * @param userId 用户ID
+     * @param roleId 角色ID
+     * @return 结果
+     */
+    boolean deleteAuthUser(Long userId, Long roleId);
+
+    /**
+     * 批量取消授权用户角色
+     *
+     * @param roleId  角色ID
+     * @param userIds 需要取消授权的用户数据ID
+     * @return 结果
+     */
+    boolean deleteAuthUsers(Long roleId, Long[] userIds);
+
+    /**
+     * 批量选择授权用户角色
+     *
+     * @param roleId  角色ID
+     * @param userIds 需要授权的用户数据ID
+     * @return 结果
+     */
+    boolean insertAuthUsers(Long roleId, Long[] userIds);
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/service/AppSocialAuthService.java b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/service/AppSocialAuthService.java
new file mode 100644
index 0000000..bae3045
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/service/AppSocialAuthService.java
@@ -0,0 +1,129 @@
+package org.dromara.member.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import me.zhyd.oauth.model.AuthUser;
+import org.dromara.member.domain.AppSocialAuth;
+import org.dromara.member.domain.vo.AppSocialAuthVo;
+import org.dromara.member.domain.vo.AppUserVo;
+
+import java.util.List;
+
+/**
+ * App端第三方登录授权Service接口
+ *
+ * @author pengles
+ */
+public interface AppSocialAuthService extends IService<AppSocialAuth> {
+
+    /**
+     * 查询App端第三方登录授权
+     *
+     * @param id 主键
+     * @return App端第三方登录授权
+     */
+    AppSocialAuthVo queryById(Long id);
+
+    /**
+     * 根据用户ID查询社交认证列表
+     *
+     * @param userId 用户ID
+     * @return 社交认证列表
+     */
+    List<AppSocialAuthVo> queryByUserId(Long userId);
+
+    /**
+     * 根据平台和openId查询社交认证
+     *
+     * @param platform 平台
+     * @param openId   openId
+     * @return 社交认证信息
+     */
+    AppSocialAuth queryByPlatformAndOpenId(String platform, String openId);
+
+    /**
+     * 根据平台和unionId查询社交认证
+     *
+     * @param platform 平台
+     * @param unionId  unionId
+     * @return 社交认证信息
+     */
+    AppSocialAuth queryByPlatformAndUnionId(String platform, String unionId);
+
+    /**
+     * 新增App端第三方登录授权
+     *
+     * @param appSocialAuth App端第三方登录授权
+     * @return 结果
+     */
+    Boolean insertAppSocialAuth(AppSocialAuth appSocialAuth);
+
+    /**
+     * 修改App端第三方登录授权
+     *
+     * @param appSocialAuth App端第三方登录授权
+     * @return 结果
+     */
+    Boolean updateAppSocialAuth(AppSocialAuth appSocialAuth);
+
+    /**
+     * 删除App端第三方登录授权
+     *
+     * @param id 主键
+     * @return 结果
+     */
+    Boolean deleteAppSocialAuthById(Long id);
+
+    /**
+     * 根据用户ID删除社交认证
+     *
+     * @param userId 用户ID
+     * @return 结果
+     */
+    Boolean deleteByUserId(Long userId);
+
+    /**
+     * 更新访问令牌
+     *
+     * @param id           主键
+     * @param accessToken  访问令牌
+     * @param expireIn     过期时间
+     * @param refreshToken 刷新令牌
+     * @return 结果
+     */
+    Boolean updateAccessToken(Long id, String accessToken, Integer expireIn, String refreshToken);
+
+    /**
+     * 根据用户ID和平台删除绑定关系
+     *
+     * @param userId   用户ID
+     * @param platform 第三方平台
+     * @return 是否成功
+     */
+    Boolean deleteByUserIdAndPlatform(Long userId, String platform);
+
+    /**
+     * 根据平台和openId查询绑定的用户信息
+     *
+     * @param platform 平台
+     * @param openId   openId
+     * @return 用户信息
+     */
+    AppUserVo selectUserByPlatformAndOpenId(String platform, String openId);
+
+    /**
+     * 根据平台和unionId查询绑定的用户信息
+     *
+     * @param platform 平台
+     * @param unionId  unionId
+     * @return 用户信息
+     */
+    AppUserVo selectUserByPlatformAndUnionId(String platform, String unionId);
+
+    /**
+     * 绑定第三方用户
+     *
+     * @param authUserData 授权响应实体
+     */
+    void socialRegister(AuthUser authUserData);
+
+}
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/service/AppUserService.java b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/service/AppUserService.java
new file mode 100644
index 0000000..3df885f
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/service/AppUserService.java
@@ -0,0 +1,155 @@
+package org.dromara.member.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.member.domain.AppUser;
+import org.dromara.member.domain.bo.AppUserBo;
+import org.dromara.member.domain.vo.AppUserVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * App端用户信息Service接口
+ *
+ * @author pengles
+ */
+public interface AppUserService extends IService<AppUser> {
+
+    /**
+     * 查询App端用户信息
+     *
+     * @param userId App用户ID
+     * @return App端用户信息
+     */
+    AppUserVo queryById(Long userId);
+
+    /**
+     * 查询App端用户信息列表
+     *
+     * @param bo        App端用户信息
+     * @param pageQuery 分页查询条件
+     * @return App端用户信息集合
+     */
+    TableDataInfo<AppUserVo> queryPageList(AppUserBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询App端用户信息列表
+     *
+     * @param bo App端用户信息
+     * @return App端用户信息集合
+     */
+    List<AppUserVo> queryList(AppUserBo bo);
+
+    /**
+     * 新增App端用户信息
+     *
+     * @param bo App端用户信息
+     * @return 结果
+     */
+    Boolean insertByBo(AppUserBo bo);
+
+    /**
+     * 修改App端用户信息
+     *
+     * @param bo App端用户信息
+     * @return 结果
+     */
+    Boolean updateByBo(AppUserBo bo);
+
+    /**
+     * 校验并批量删除App端用户信息
+     *
+     * @param ids     主键集合
+     * @param isValid 是否校验,true-删除前校验,false-不校验
+     * @return 结果
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    /**
+     * 根据用户账号查询用户
+     *
+     * @param userName 用户账号
+     * @return 用户信息
+     */
+    AppUserVo selectUserByUserName(String userName);
+
+    /**
+     * 根据手机号查询用户信息
+     *
+     * @param phone 手机号
+     * @return 用户信息
+     */
+    AppUserVo selectUserByPhone(String phone);
+
+    /**
+     * 根据邮箱查询用户信息
+     *
+     * @param email 邮箱
+     * @return 用户信息
+     */
+    AppUserVo selectUserByEmail(String email);
+
+    /**
+     * 校验用户账号是否唯一
+     *
+     * @param userName 用户账号
+     * @return 结果
+     */
+    boolean checkUserNameUnique(String userName);
+
+    /**
+     * 校验手机号码是否唯一
+     *
+     * @param phone 手机号码
+     * @return 结果
+     */
+    boolean checkPhoneUnique(String phone);
+
+    /**
+     * 校验email是否唯一
+     *
+     * @param email 用户邮箱
+     * @return 结果
+     */
+    boolean checkEmailUnique(String email);
+
+    /**
+     * 用户注册
+     *
+     * @param bo 用户信息
+     * @return 结果
+     */
+    Boolean register(AppUserBo bo);
+
+    /**
+     * 修改用户密码
+     *
+     * @param userId      用户ID
+     * @param oldPassword 旧密码
+     * @param newPassword 新密码
+     * @return 结果
+     */
+    Boolean updatePassword(Long userId, String oldPassword, String newPassword);
+
+    /**
+     * 重置用户密码
+     *
+     * @param userId      用户ID
+     * @param newPassword 新密码
+     * @return 结果
+     */
+    Boolean resetPassword(Long userId, String newPassword);
+
+    /**
+     * 修改用户状态
+     *
+     * @param userId 用户ID
+     * @param status 状态
+     * @return 结果
+     */
+    Boolean updateUserStatus(Long userId, String status);
+
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/service/AppVersionService.java b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/service/AppVersionService.java
new file mode 100644
index 0000000..6549d43
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/service/AppVersionService.java
@@ -0,0 +1,88 @@
+package org.dromara.member.service;
+
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.member.domain.bo.AppVersionBo;
+import org.dromara.member.domain.vo.AppVersionVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * App版本信息Service接口
+ *
+ * @author pengles
+ */
+public interface AppVersionService {
+
+    /**
+     * 查询App版本信息
+     */
+    AppVersionVo queryById(Long versionId);
+
+    /**
+     * 查询App版本信息列表
+     */
+    TableDataInfo<AppVersionVo> queryPageList(AppVersionBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询App版本信息列表
+     */
+    List<AppVersionVo> queryList(AppVersionBo bo);
+
+    /**
+     * 新增App版本信息
+     */
+    Boolean insertByBo(AppVersionBo bo);
+
+    /**
+     * 修改App版本信息
+     */
+    Boolean updateByBo(AppVersionBo bo);
+
+    /**
+     * 校验并批量删除App版本信息
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    /**
+     * 检查版本更新
+     */
+    AppVersionVo checkUpdate(String platform, Integer currentVersionCode);
+
+    /**
+     * 获取指定平台的最新版本
+     */
+    AppVersionVo getLatestVersion(String platform);
+
+    /**
+     * 检查版本号是否唯一
+     */
+    Boolean checkVersionCodeUnique(AppVersionBo bo);
+
+    /**
+     * 获取版本历史列表
+     */
+    List<AppVersionVo> getVersionHistory(String platform, Integer limit);
+
+    /**
+     * 检查是否需要强制更新
+     */
+    Boolean checkForceUpdate(String platform, Integer currentVersionCode);
+
+    /**
+     * 获取版本更新信息
+     */
+    AppVersionVo getUpdateInfo(String platform, Integer currentVersionCode);
+
+    /**
+     * 批量发布版本
+     */
+    Boolean batchPublish(List<Long> versionIds);
+
+    /**
+     * 撤回版本
+     */
+    Boolean withdrawVersion(Long versionId);
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/service/impl/AppDeviceServiceImpl.java b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/service/impl/AppDeviceServiceImpl.java
new file mode 100644
index 0000000..ab0165a
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/service/impl/AppDeviceServiceImpl.java
@@ -0,0 +1,333 @@
+package org.dromara.member.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.member.domain.AppDevice;
+import org.dromara.member.domain.bo.AppDeviceBo;
+import org.dromara.member.domain.vo.AppDeviceVo;
+import org.dromara.member.exception.DeviceException;
+import org.dromara.member.mapper.AppDeviceMapper;
+import org.dromara.member.service.AppDeviceService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.time.LocalDateTime;
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * App端设备信息Service业务层处理
+ *
+ * @author pengles
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class AppDeviceServiceImpl extends ServiceImpl<AppDeviceMapper, AppDevice> implements AppDeviceService {
+
+    private final AppDeviceMapper baseMapper;
+
+    /**
+     * 查询App端设备信息
+     */
+    @Override
+    public AppDeviceVo queryById(Long deviceId) {
+        return baseMapper.selectVoById(deviceId);
+    }
+
+    /**
+     * 查询App端设备信息列表
+     */
+    @Override
+    public TableDataInfo<AppDeviceVo> queryPageList(AppDeviceBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<AppDevice> lqw = buildQueryWrapper(bo);
+        Page<AppDeviceVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询App端设备信息列表
+     */
+    @Override
+    public List<AppDeviceVo> queryList(AppDeviceBo bo) {
+        LambdaQueryWrapper<AppDevice> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<AppDevice> buildQueryWrapper(AppDeviceBo bo) {
+        LambdaQueryWrapper<AppDevice> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getUserId() != null, AppDevice::getUserId, bo.getUserId());
+        lqw.eq(StringUtils.isNotBlank(bo.getDeviceType()), AppDevice::getDeviceType, bo.getDeviceType());
+        lqw.like(StringUtils.isNotBlank(bo.getDeviceName()), AppDevice::getDeviceName, bo.getDeviceName());
+        lqw.like(StringUtils.isNotBlank(bo.getDeviceModel()), AppDevice::getDeviceModel, bo.getDeviceModel());
+        lqw.eq(StringUtils.isNotBlank(bo.getDeviceBrand()), AppDevice::getDeviceBrand, bo.getDeviceBrand());
+        lqw.eq(StringUtils.isNotBlank(bo.getOsVersion()), AppDevice::getOsVersion, bo.getOsVersion());
+        lqw.eq(StringUtils.isNotBlank(bo.getAppVersion()), AppDevice::getAppVersion, bo.getAppVersion());
+        lqw.eq(StringUtils.isNotBlank(bo.getIsActive()), AppDevice::getIsActive, bo.getIsActive());
+        lqw.orderByDesc(AppDevice::getLastActiveTime);
+        return lqw;
+    }
+
+    /**
+     * 新增App端设备信息
+     */
+    @Override
+    public Boolean insertByBo(AppDeviceBo bo) {
+        AppDevice add = BeanUtil.toBean(bo, AppDevice.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setDeviceId(add.getDeviceId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改App端设备信息
+     */
+    @Override
+    public Boolean updateByBo(AppDeviceBo bo) {
+        AppDevice update = BeanUtil.toBean(bo, AppDevice.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(AppDevice entity) {
+        // TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 批量删除App端设备信息
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if (isValid) {
+            // TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+
+    /**
+     * 根据用户ID查询设备列表
+     */
+    @Override
+    public List<AppDeviceVo> queryByUserId(Long userId) {
+        LambdaQueryWrapper<AppDevice> lqw = Wrappers.lambdaQuery();
+        lqw.eq(AppDevice::getUserId, userId);
+        lqw.orderByDesc(AppDevice::getLastActiveTime);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    /**
+     * 绑定设备
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean bindDevice(AppDeviceBo bo) {
+        // 检查用户设备数量限制
+        LambdaQueryWrapper<AppDevice> countLqw = Wrappers.lambdaQuery();
+        countLqw.eq(AppDevice::getUserId, bo.getUserId());
+        countLqw.eq(AppDevice::getIsActive, "1");
+        long deviceCount = baseMapper.selectCount(countLqw);
+        if (deviceCount >= 10) { // 限制每个用户最多绑定10台设备
+            throw DeviceException.deviceLimitExceeded(10);
+        }
+
+        // 检查是否已存在相同设备
+        LambdaQueryWrapper<AppDevice> lqw = Wrappers.lambdaQuery();
+        lqw.eq(AppDevice::getUserId, bo.getUserId());
+        lqw.eq(AppDevice::getDeviceType, bo.getDeviceType());
+        lqw.eq(StringUtils.isNotBlank(bo.getPushToken()), AppDevice::getPushToken, bo.getPushToken());
+
+        AppDevice existDevice = baseMapper.selectOne(lqw);
+        if (existDevice != null) {
+            // 更新现有设备信息
+            existDevice.setDeviceName(bo.getDeviceName());
+            existDevice.setDeviceModel(bo.getDeviceModel());
+            existDevice.setDeviceBrand(bo.getDeviceBrand());
+            existDevice.setOsVersion(bo.getOsVersion());
+            existDevice.setAppVersion(bo.getAppVersion());
+            existDevice.setIsActive("1");
+            existDevice.setLastActiveTime(LocalDateTime.now());
+            boolean result = baseMapper.updateById(existDevice) > 0;
+            if (!result) {
+                throw DeviceException.bindFailed("设备信息更新失败");
+            }
+            return result;
+        } else {
+            // 新增设备
+            bo.setIsActive("1");
+            bo.setLastActiveTime(LocalDateTime.now());
+            boolean result = insertByBo(bo);
+            if (!result) {
+                throw DeviceException.bindFailed("设备信息保存失败");
+            }
+            return result;
+        }
+    }
+
+    /**
+     * 解绑设备
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean unbindDevice(Long deviceId, Long userId) {
+        LambdaQueryWrapper<AppDevice> lqw = Wrappers.lambdaQuery();
+        lqw.eq(AppDevice::getDeviceId, deviceId);
+        lqw.eq(AppDevice::getUserId, userId);
+
+        AppDevice device = baseMapper.selectOne(lqw);
+        if (device == null) {
+            throw DeviceException.deviceNotFound(deviceId);
+        }
+
+        boolean result = baseMapper.deleteById(deviceId) > 0;
+        if (!result) {
+            throw DeviceException.unbindFailed("设备删除失败");
+        }
+        return result;
+    }
+
+    /**
+     * 更新设备活跃状态
+     */
+    @Override
+    public Boolean updateActiveStatus(Long deviceId, String isActive) {
+        if (!"0".equals(isActive) && !"1".equals(isActive)) {
+            throw DeviceException.invalidStatus(isActive);
+        }
+
+        AppDevice existDevice = baseMapper.selectById(deviceId);
+        if (existDevice == null) {
+            throw DeviceException.deviceNotFound(deviceId);
+        }
+
+        AppDevice device = new AppDevice();
+        device.setDeviceId(deviceId);
+        device.setIsActive(isActive);
+        if ("1".equals(isActive)) {
+            device.setLastActiveTime(LocalDateTime.now());
+        }
+        return baseMapper.updateById(device) > 0;
+    }
+
+    /**
+     * 更新推送令牌
+     */
+    @Override
+    public Boolean updatePushToken(Long deviceId, String pushToken) {
+        if (StringUtils.isBlank(pushToken)) {
+            throw DeviceException.invalidPushToken(pushToken);
+        }
+
+        AppDevice existDevice = baseMapper.selectById(deviceId);
+        if (existDevice == null) {
+            throw DeviceException.deviceNotFound(deviceId);
+        }
+
+        AppDevice device = new AppDevice();
+        device.setDeviceId(deviceId);
+        device.setPushToken(pushToken);
+        device.setLastActiveTime(LocalDateTime.now());
+        return baseMapper.updateById(device) > 0;
+    }
+
+    /**
+     * 获取用户活跃设备
+     */
+    @Override
+    public List<AppDeviceVo> getActiveDevices(Long userId) {
+        LambdaQueryWrapper<AppDevice> lqw = Wrappers.lambdaQuery();
+        lqw.eq(AppDevice::getUserId, userId);
+        lqw.eq(AppDevice::getIsActive, "1");
+        lqw.orderByDesc(AppDevice::getLastActiveTime);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    /**
+     * 清理非活跃设备
+     */
+    @Override
+    public Integer cleanInactiveDevices(Integer days) {
+        if (days == null || days <= 0) {
+            days = 30; // 默认30天
+        }
+
+        LambdaQueryWrapper<AppDevice> lqw = Wrappers.lambdaQuery();
+        lqw.lt(AppDevice::getLastActiveTime, LocalDateTime.now().minusDays(days));
+        lqw.or();
+        lqw.eq(AppDevice::getIsActive, "0");
+
+        List<AppDevice> inactiveDevices = baseMapper.selectList(lqw);
+        if (!inactiveDevices.isEmpty()) {
+            List<Long> ids = inactiveDevices.stream().map(AppDevice::getDeviceId).toList();
+            baseMapper.deleteBatchIds(ids);
+            log.info("清理非活跃设备 {} 个", ids.size());
+            return ids.size();
+        }
+
+        return 0;
+    }
+
+    /**
+     * 根据推送令牌查询设备
+     */
+    @Override
+    public AppDeviceVo queryByPushToken(String pushToken) {
+        if (StringUtils.isBlank(pushToken)) {
+            return null;
+        }
+
+        LambdaQueryWrapper<AppDevice> lqw = Wrappers.lambdaQuery();
+        lqw.eq(AppDevice::getPushToken, pushToken);
+        lqw.eq(AppDevice::getIsActive, "1");
+        return baseMapper.selectVoOne(lqw);
+    }
+
+    /**
+     * 设备心跳更新
+     */
+    @Override
+    public Boolean heartbeat(Long deviceId) {
+        AppDevice device = new AppDevice();
+        device.setDeviceId(deviceId);
+        device.setIsActive("1");
+        device.setLastActiveTime(LocalDateTime.now());
+        return baseMapper.updateById(device) > 0;
+    }
+
+    /**
+     * 批量更新设备状态
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean batchUpdateStatus(List<Long> deviceIds, String isActive) {
+        if (ObjectUtil.isEmpty(deviceIds)) {
+            return false;
+        }
+
+        AppDevice device = new AppDevice();
+        device.setIsActive(isActive);
+        if ("1".equals(isActive)) {
+            device.setLastActiveTime(LocalDateTime.now());
+        }
+
+        LambdaQueryWrapper<AppDevice> lqw = Wrappers.lambdaQuery();
+        lqw.in(AppDevice::getDeviceId, deviceIds);
+
+        return baseMapper.update(device, lqw) > 0;
+    }
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/service/impl/AppFileServiceImpl.java b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/service/impl/AppFileServiceImpl.java
new file mode 100644
index 0000000..ec87ca1
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/service/impl/AppFileServiceImpl.java
@@ -0,0 +1,420 @@
+package org.dromara.member.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.crypto.digest.DigestUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.oss.core.OssClient;
+import org.dromara.common.oss.entity.UploadResult;
+import org.dromara.common.oss.factory.OssFactory;
+import org.dromara.member.domain.AppFile;
+import org.dromara.member.domain.bo.AppFileBo;
+import org.dromara.member.domain.vo.AppFileVo;
+import org.dromara.member.exception.FileException;
+import org.dromara.member.mapper.AppFileMapper;
+import org.dromara.member.service.AppFileService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * App端文件信息Service业务层处理
+ *
+ * @author pengles
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class AppFileServiceImpl implements AppFileService {
+
+    private final AppFileMapper baseMapper;
+
+    /**
+     * 查询App端文件信息
+     */
+    @Override
+    public AppFileVo queryById(Long fileId) {
+        return baseMapper.selectVoById(fileId);
+    }
+
+    /**
+     * 查询App端文件信息列表
+     */
+    @Override
+    public TableDataInfo<AppFileVo> queryPageList(AppFileBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<AppFile> lqw = buildQueryWrapper(bo);
+        Page<AppFileVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询App端文件信息列表
+     */
+    @Override
+    public List<AppFileVo> queryList(AppFileBo bo) {
+        LambdaQueryWrapper<AppFile> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<AppFile> buildQueryWrapper(AppFileBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<AppFile> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getUserId() != null, AppFile::getUserId, bo.getUserId());
+        lqw.like(StringUtils.isNotBlank(bo.getFileName()), AppFile::getFileName, bo.getFileName());
+        lqw.like(StringUtils.isNotBlank(bo.getOriginalName()), AppFile::getOriginalName, bo.getOriginalName());
+        lqw.eq(StringUtils.isNotBlank(bo.getFileType()), AppFile::getFileType, bo.getFileType());
+        lqw.eq(StringUtils.isNotBlank(bo.getFileSuffix()), AppFile::getFileSuffix, bo.getFileSuffix());
+        lqw.eq(bo.getFileCategory() != null, AppFile::getFileCategory, bo.getFileCategory());
+        lqw.eq(StringUtils.isNotBlank(bo.getStatus()), AppFile::getStatus, bo.getStatus());
+        lqw.eq(StringUtils.isNotBlank(bo.getIsPublic()), AppFile::getIsPublic, bo.getIsPublic());
+        lqw.between(params.get("beginTime") != null && params.get("endTime") != null,
+                AppFile::getCreateTime, params.get("beginTime"), params.get("endTime"));
+        lqw.orderByDesc(AppFile::getCreateTime);
+        return lqw;
+    }
+
+    /**
+     * 新增App端文件信息
+     */
+    @Override
+    public Boolean insertByBo(AppFileBo bo) {
+        AppFile add = BeanUtil.toBean(bo, AppFile.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setFileId(add.getFileId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改App端文件信息
+     */
+    @Override
+    public Boolean updateByBo(AppFileBo bo) {
+        AppFile update = BeanUtil.toBean(bo, AppFile.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(AppFile entity) {
+        // 可以添加一些业务校验逻辑
+    }
+
+    /**
+     * 批量删除App端文件信息
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if (isValid) {
+            // 可以添加删除前的校验逻辑
+        }
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+
+    /**
+     * 上传文件
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public AppFileVo uploadFile(MultipartFile file, Long userId, Integer fileCategory) {
+        if (file.isEmpty()) {
+            throw FileException.fileEmpty();
+        }
+
+        // 检查文件大小（限制为100MB）
+        if (file.getSize() > 100 * 1024 * 1024) {
+            throw FileException.fileSizeExceeded(100);
+        }
+
+        try {
+            // 计算文件MD5
+            String fileMd5 = DigestUtil.md5Hex(file.getInputStream());
+
+            // 检查文件是否已存在
+            AppFileVo existFile = checkFileExists(fileMd5, userId);
+            if (existFile != null) {
+                return existFile;
+            }
+
+            // 上传到OSS
+            OssClient ossClient = OssFactory.instance();
+            UploadResult uploadResult = ossClient.uploadSuffix(file.getBytes(), getFileSuffix(file.getOriginalFilename()), file.getContentType());
+
+            // 保存文件信息
+            AppFile appFile = new AppFile();
+            appFile.setUserId(userId);
+            appFile.setFileName(uploadResult.getFilename());
+            appFile.setOriginalName(file.getOriginalFilename());
+            appFile.setFilePath(uploadResult.getFilename());
+            appFile.setFileUrl(uploadResult.getUrl());
+            appFile.setFileSize(file.getSize());
+            appFile.setFileType(file.getContentType());
+            appFile.setFileSuffix(getFileSuffix(file.getOriginalFilename()));
+            appFile.setFileCategory(fileCategory != null ? fileCategory : 6); // 默认为其他
+            appFile.setStorageService(ossClient.getConfigKey());
+            appFile.setStatus("0"); // 正常
+            appFile.setDownloadCount(0L);
+            appFile.setIsPublic("0"); // 默认私有
+            appFile.setFileMd5(fileMd5);
+
+            baseMapper.insert(appFile);
+            return MapstructUtils.convert(appFile, AppFileVo.class);
+
+        } catch (IOException e) {
+            log.error("文件上传失败", e);
+            throw FileException.uploadFailed(e.getMessage());
+        }
+    }
+
+    /**
+     * 上传头像
+     */
+    @Override
+    public AppFileVo uploadAvatar(MultipartFile file, Long userId) {
+        // 检查文件类型
+        String contentType = file.getContentType();
+        if (!isImageFile(contentType)) {
+            throw FileException.unsupportedFileType(contentType);
+        }
+
+        // 检查文件大小（限制为5MB）
+        if (file.getSize() > 5 * 1024 * 1024) {
+            throw FileException.fileSizeExceeded(5);
+        }
+
+        return uploadFile(file, userId, 1); // 头像分类
+    }
+
+    /**
+     * 批量上传文件
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public List<AppFileVo> batchUploadFiles(MultipartFile[] files, Long userId, Integer fileCategory) {
+        List<AppFileVo> result = new ArrayList<>();
+        for (MultipartFile file : files) {
+            try {
+                AppFileVo fileVo = uploadFile(file, userId, fileCategory);
+                result.add(fileVo);
+            } catch (Exception e) {
+                log.error("批量上传文件失败: {}", file.getOriginalFilename(), e);
+                // 继续处理其他文件
+            }
+        }
+        return result;
+    }
+
+    /**
+     * 根据用户ID查询文件列表
+     */
+    @Override
+    public List<AppFileVo> queryByUserId(Long userId, Integer fileCategory) {
+        LambdaQueryWrapper<AppFile> lqw = Wrappers.lambdaQuery();
+        lqw.eq(AppFile::getUserId, userId);
+        lqw.eq(fileCategory != null, AppFile::getFileCategory, fileCategory);
+        lqw.eq(AppFile::getStatus, "0"); // 正常状态
+        lqw.orderByDesc(AppFile::getCreateTime);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    /**
+     * 根据文件分类查询文件列表
+     */
+    @Override
+    public List<AppFileVo> queryByCategory(Integer fileCategory) {
+        LambdaQueryWrapper<AppFile> lqw = Wrappers.lambdaQuery();
+        lqw.eq(AppFile::getFileCategory, fileCategory);
+        lqw.eq(AppFile::getStatus, "0"); // 正常状态
+        lqw.eq(AppFile::getIsPublic, "1"); // 公开文件
+        lqw.orderByDesc(AppFile::getCreateTime);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    /**
+     * 下载文件
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public AppFileVo downloadFile(Long fileId, Long userId) {
+        AppFile appFile = baseMapper.selectById(fileId);
+        if (appFile == null) {
+            throw FileException.fileNotFound(fileId);
+        }
+
+        // 检查权限
+        if (!appFile.getUserId().equals(userId) && !"1".equals(appFile.getIsPublic())) {
+            throw FileException.accessDenied(fileId);
+        }
+
+        // 更新下载次数
+        appFile.setDownloadCount(appFile.getDownloadCount() + 1);
+        baseMapper.updateById(appFile);
+
+        return MapstructUtils.convert(appFile, AppFileVo.class);
+    }
+
+    /**
+     * 删除用户文件
+     */
+    @Override
+    public Boolean deleteUserFile(Long fileId, Long userId) {
+        AppFile appFile = baseMapper.selectById(fileId);
+        if (appFile == null) {
+            throw FileException.fileNotFound(fileId);
+        }
+
+        if (!appFile.getUserId().equals(userId)) {
+            throw FileException.accessDenied(fileId);
+        }
+
+        return baseMapper.deleteById(fileId) > 0;
+    }
+
+    /**
+     * 批量删除用户文件
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean batchDeleteUserFiles(Collection<Long> fileIds, Long userId) {
+        for (Long fileId : fileIds) {
+            deleteUserFile(fileId, userId);
+        }
+        return true;
+    }
+
+    /**
+     * 更新文件状态
+     */
+    @Override
+    public Boolean updateFileStatus(Long fileId, String status, Long userId) {
+        AppFile appFile = baseMapper.selectById(fileId);
+        if (appFile == null) {
+            throw new ServiceException("文件不存在");
+        }
+
+        if (!appFile.getUserId().equals(userId)) {
+            throw new ServiceException("无权限修改该文件");
+        }
+
+        appFile.setStatus(status);
+        return baseMapper.updateById(appFile) > 0;
+    }
+
+    /**
+     * 获取用户文件统计信息
+     */
+    @Override
+    public AppFileVo getUserFileStatistics(Long userId) {
+        LambdaQueryWrapper<AppFile> lqw = Wrappers.lambdaQuery();
+        lqw.eq(AppFile::getUserId, userId);
+        lqw.eq(AppFile::getStatus, "0");
+
+        List<AppFile> files = baseMapper.selectList(lqw);
+
+        AppFileVo statistics = new AppFileVo();
+        statistics.setUserId(userId);
+
+        if (!files.isEmpty()) {
+            long totalSize = files.stream().mapToLong(AppFile::getFileSize).sum();
+            long totalDownloads = files.stream().mapToLong(AppFile::getDownloadCount).sum();
+
+            statistics.setFileSize(totalSize);
+            statistics.setDownloadCount(totalDownloads);
+        }
+
+        return statistics;
+    }
+
+    /**
+     * 清理过期文件
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Integer cleanExpiredFiles(Integer days) {
+        LocalDateTime expiredTime = LocalDateTime.now().minusDays(days);
+        LambdaQueryWrapper<AppFile> lqw = Wrappers.lambdaQuery();
+        lqw.lt(AppFile::getCreateTime, expiredTime);
+        lqw.eq(AppFile::getStatus, "1"); // 已删除状态
+
+        List<AppFile> expiredFiles = baseMapper.selectList(lqw);
+        if (!expiredFiles.isEmpty()) {
+            List<Long> fileIds = expiredFiles.stream().map(AppFile::getFileId).collect(Collectors.toList());
+            baseMapper.deleteBatchIds(fileIds);
+        }
+
+        return expiredFiles.size();
+    }
+
+    /**
+     * 检查文件是否存在
+     */
+    @Override
+    public AppFileVo checkFileExists(String fileMd5, Long userId) {
+        LambdaQueryWrapper<AppFile> lqw = Wrappers.lambdaQuery();
+        lqw.eq(AppFile::getFileMd5, fileMd5);
+        lqw.eq(AppFile::getUserId, userId);
+        lqw.eq(AppFile::getStatus, "0");
+
+        AppFile existFile = baseMapper.selectOne(lqw);
+        return existFile != null ? MapstructUtils.convert(existFile, AppFileVo.class) : null;
+    }
+
+    /**
+     * 更新文件公开状态
+     */
+    @Override
+    public Boolean updateFilePublicStatus(Long fileId, String isPublic, Long userId) {
+        AppFile appFile = baseMapper.selectById(fileId);
+        if (appFile == null) {
+            throw new ServiceException("文件不存在");
+        }
+
+        if (!appFile.getUserId().equals(userId)) {
+            throw new ServiceException("无权限修改该文件");
+        }
+
+        appFile.setIsPublic(isPublic);
+        return baseMapper.updateById(appFile) > 0;
+    }
+
+    /**
+     * 获取文件后缀
+     */
+    private String getFileSuffix(String fileName) {
+        if (StringUtils.isBlank(fileName)) {
+            return "";
+        }
+        int lastDotIndex = fileName.lastIndexOf(".");
+        return lastDotIndex > 0 ? fileName.substring(lastDotIndex) : "";
+    }
+
+    /**
+     * 检查是否为图片文件
+     */
+    private boolean isImageFile(String contentType) {
+        return StringUtils.isNotBlank(contentType) &&
+                (contentType.startsWith("image/") ||
+                        contentType.equals("application/octet-stream"));
+    }
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/service/impl/AppMessageServiceImpl.java b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/service/impl/AppMessageServiceImpl.java
new file mode 100644
index 0000000..f74de06
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/service/impl/AppMessageServiceImpl.java
@@ -0,0 +1,310 @@
+package org.dromara.member.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.member.domain.AppMessage;
+import org.dromara.member.domain.bo.AppMessageBo;
+import org.dromara.member.domain.vo.AppMessageVo;
+import org.dromara.member.mapper.AppMessageMapper;
+import org.dromara.member.service.AppMessageService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.time.LocalDateTime;
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * App端消息Service业务层处理
+ *
+ * @author pengles
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class AppMessageServiceImpl extends ServiceImpl<AppMessageMapper, AppMessage> implements AppMessageService {
+
+    private final AppMessageMapper baseMapper;
+
+    /**
+     * 查询App端消息
+     */
+    @Override
+    public AppMessageVo queryById(Long messageId) {
+        return baseMapper.selectVoById(messageId);
+    }
+
+    /**
+     * 查询App端消息列表
+     */
+    @Override
+    public TableDataInfo<AppMessageVo> queryPageList(AppMessageBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<AppMessage> lqw = buildQueryWrapper(bo);
+        Page<AppMessageVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询App端消息列表
+     */
+    @Override
+    public List<AppMessageVo> queryList(AppMessageBo bo) {
+        LambdaQueryWrapper<AppMessage> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<AppMessage> buildQueryWrapper(AppMessageBo bo) {
+        LambdaQueryWrapper<AppMessage> lqw = Wrappers.lambdaQuery();
+        lqw.like(StringUtils.isNotBlank(bo.getTitle()), AppMessage::getTitle, bo.getTitle());
+        lqw.like(StringUtils.isNotBlank(bo.getContent()), AppMessage::getContent, bo.getContent());
+        lqw.eq(StringUtils.isNotBlank(bo.getMessageType()), AppMessage::getMessageType, bo.getMessageType());
+        lqw.eq(StringUtils.isNotBlank(bo.getTargetType()), AppMessage::getTargetType, bo.getTargetType());
+        lqw.like(StringUtils.isNotBlank(bo.getTargetIds()), AppMessage::getTargetIds, bo.getTargetIds());
+        lqw.eq(StringUtils.isNotBlank(bo.getStatus()), AppMessage::getStatus, bo.getStatus());
+
+        // 如果指定了接收者ID，查询该用户相关的消息
+        if (ObjectUtil.isNotNull(bo.getReceiverId())) {
+            lqw.and(wrapper -> wrapper.eq(AppMessage::getTargetType, "all")
+                    .or()
+                    .and(subWrapper -> subWrapper.eq(AppMessage::getTargetType, "user")
+                            .like(AppMessage::getTargetIds, bo.getReceiverId().toString())));
+        }
+
+        lqw.orderByDesc(AppMessage::getCreateTime);
+        return lqw;
+    }
+
+    /**
+     * 新增App端消息
+     */
+    @Override
+    public Boolean insertByBo(AppMessageBo bo) {
+        AppMessage add = BeanUtil.toBean(bo, AppMessage.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setMessageId(add.getMessageId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改App端消息
+     */
+    @Override
+    public Boolean updateByBo(AppMessageBo bo) {
+        AppMessage update = BeanUtil.toBean(bo, AppMessage.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(AppMessage entity) {
+        // TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 批量删除App端消息
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if (isValid) {
+            // TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+
+    /**
+     * 获取用户未读消息数量
+     */
+    @Override
+    public Long getUnreadCount(Long userId) {
+        LambdaQueryWrapper<AppMessage> lqw = Wrappers.lambdaQuery();
+        lqw.and(wrapper -> wrapper.eq(AppMessage::getTargetType, "user")
+                .like(AppMessage::getTargetIds, userId.toString())
+                .or()
+                .eq(AppMessage::getTargetType, "all"));
+        lqw.eq(AppMessage::getStatus, "1"); // 已发送
+        return baseMapper.selectCount(lqw);
+    }
+
+    /**
+     * 标记消息为已读
+     */
+    @Override
+    public Boolean markAsRead(Long messageId, Long userId) {
+        // 由于当前表结构不支持已读状态，这里只是示例实现
+        // 实际项目中可能需要单独的消息阅读记录表
+        log.info("用户 {} 标记消息 {} 为已读", userId, messageId);
+        return true;
+    }
+
+    /**
+     * 批量标记消息为已读
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean markAsReadBatch(List<Long> messageIds, Long userId) {
+        // 由于当前表结构不支持已读状态，这里只是示例实现
+        log.info("用户 {} 批量标记消息为已读，消息数量: {}", userId, messageIds.size());
+        return true;
+    }
+
+    /**
+     * 标记所有消息为已读
+     */
+    @Override
+    public Boolean markAllAsRead(Long userId) {
+        // 由于当前表结构不支持已读状态，这里只是示例实现
+        log.info("用户 {} 标记所有消息为已读", userId);
+        return true;
+    }
+
+    /**
+     * 发送系统消息
+     */
+    @Override
+    public Boolean sendSystemMessage(AppMessageBo bo) {
+        bo.setMessageType("system"); // 系统消息
+        bo.setTargetType("all"); // 全部用户
+        bo.setStatus("0"); // 待发送
+        bo.setSendTime(LocalDateTime.now());
+        return insertByBo(bo);
+    }
+
+    /**
+     * 发送个人消息
+     */
+    @Override
+    public Boolean sendPersonalMessage(AppMessageBo bo) {
+        bo.setMessageType("notice"); // 通知消息
+        bo.setTargetType("user"); // 指定用户
+        bo.setStatus("0"); // 待发送
+        bo.setSendTime(LocalDateTime.now());
+        return insertByBo(bo);
+    }
+
+    /**
+     * 推送消息到指定用户
+     */
+    @Override
+    public Boolean pushMessage(AppMessageBo bo) {
+        bo.setTargetType("user");
+        bo.setStatus("0"); // 待发送
+        bo.setSendTime(LocalDateTime.now());
+
+        // 先保存消息
+        Boolean result = insertByBo(bo);
+        if (result) {
+            // 发送推送通知
+            String[] userIds = bo.getTargetIds().split(",");
+            for (String userId : userIds) {
+                sendPushNotification(Long.valueOf(userId), bo.getTitle(), bo.getContent());
+            }
+
+            // 更新发送状态
+            AppMessage update = new AppMessage();
+            update.setMessageId(bo.getMessageId());
+            update.setStatus("1"); // 已发送
+            baseMapper.updateById(update);
+        }
+        return result;
+    }
+
+    /**
+     * 群发消息
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean broadcastMessage(AppMessageBo bo) {
+        bo.setMessageType("activity"); // 活动消息
+        bo.setTargetType("all"); // 全部用户
+        bo.setStatus("0"); // 待发送
+        bo.setSendTime(LocalDateTime.now());
+
+        Boolean result = insertByBo(bo);
+        if (result) {
+            // 发送批量推送通知
+            sendBatchPushNotification(null, bo.getTitle(), bo.getContent());
+
+            // 更新发送状态
+            AppMessage update = new AppMessage();
+            update.setMessageId(bo.getMessageId());
+            update.setStatus("1"); // 已发送
+            baseMapper.updateById(update);
+        }
+
+        return result;
+    }
+
+    /**
+     * 发送推送通知
+     */
+    @Override
+    public Boolean sendPushNotification(Long userId, String title, String content) {
+        try {
+            // TODO: 集成第三方推送服务（极光推送、友盟推送等）
+            // 这里只是示例代码，实际需要根据具体的推送服务进行实现
+            log.info("发送推送通知 - 用户ID: {}, 标题: {}, 内容: {}", userId, title, content);
+
+            // 模拟推送成功
+            return true;
+        } catch (Exception e) {
+            log.error("发送推送通知失败", e);
+            return false;
+        }
+    }
+
+    /**
+     * 批量发送推送通知
+     */
+    @Override
+    public Boolean sendBatchPushNotification(List<Long> userIds, String title, String content) {
+        try {
+            // TODO: 集成第三方推送服务的批量推送接口
+            if (userIds != null) {
+                log.info("批量发送推送通知 - 用户数量: {}, 标题: {}, 内容: {}", userIds.size(), title, content);
+            } else {
+                log.info("全员推送通知 - 标题: {}, 内容: {}", title, content);
+            }
+
+            // 模拟推送成功
+            return true;
+        } catch (Exception e) {
+            log.error("批量发送推送通知失败", e);
+            return false;
+        }
+    }
+
+    /**
+     * 清理过期消息
+     */
+    @Override
+    public Integer cleanExpiredMessages() {
+        // 清理30天前的已发送消息
+        LambdaQueryWrapper<AppMessage> lqw = Wrappers.lambdaQuery();
+        lqw.lt(AppMessage::getCreateTime, LocalDateTime.now().minusDays(30));
+        lqw.eq(AppMessage::getStatus, "1"); // 已发送
+
+        List<AppMessage> expiredMessages = baseMapper.selectList(lqw);
+        if (!expiredMessages.isEmpty()) {
+            List<Long> ids = expiredMessages.stream().map(AppMessage::getMessageId).toList();
+            baseMapper.deleteBatchIds(ids);
+            log.info("清理过期消息 {} 条", ids.size());
+            return ids.size();
+        }
+
+        return 0;
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/service/impl/AppOperLogServiceImpl.java b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/service/impl/AppOperLogServiceImpl.java
new file mode 100644
index 0000000..2717d26
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/service/impl/AppOperLogServiceImpl.java
@@ -0,0 +1,296 @@
+package org.dromara.member.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.member.domain.AppOperLog;
+import org.dromara.member.domain.bo.AppOperLogBo;
+import org.dromara.member.domain.vo.AppOperLogVo;
+import org.dromara.member.mapper.AppOperLogMapper;
+import org.dromara.member.service.AppOperLogService;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * App端操作日志Service业务层处理
+ *
+ * @author pengles
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class AppOperLogServiceImpl extends ServiceImpl<AppOperLogMapper, AppOperLog> implements AppOperLogService {
+
+    private final AppOperLogMapper baseMapper;
+
+    /**
+     * 查询App端操作日志
+     */
+    @Override
+    public AppOperLogVo queryById(Long operId) {
+        return baseMapper.selectVoById(operId);
+    }
+
+    /**
+     * 查询App端操作日志列表
+     */
+    @Override
+    public TableDataInfo<AppOperLogVo> queryPageList(AppOperLogBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<AppOperLog> lqw = buildQueryWrapper(bo);
+        Page<AppOperLogVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询App端操作日志列表
+     */
+    @Override
+    public List<AppOperLogVo> queryList(AppOperLogBo bo) {
+        LambdaQueryWrapper<AppOperLog> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<AppOperLog> buildQueryWrapper(AppOperLogBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<AppOperLog> lqw = Wrappers.lambdaQuery();
+        lqw.like(StringUtils.isNotBlank(bo.getTitle()), AppOperLog::getTitle, bo.getTitle());
+        lqw.eq(bo.getBusinessType() != null, AppOperLog::getBusinessType, bo.getBusinessType());
+        lqw.like(StringUtils.isNotBlank(bo.getMethod()), AppOperLog::getMethod, bo.getMethod());
+        lqw.eq(StringUtils.isNotBlank(bo.getRequestMethod()), AppOperLog::getRequestMethod, bo.getRequestMethod());
+        lqw.like(StringUtils.isNotBlank(bo.getOperName()), AppOperLog::getOperName, bo.getOperName());
+        lqw.like(StringUtils.isNotBlank(bo.getOperIp()), AppOperLog::getOperIp, bo.getOperIp());
+        lqw.eq(bo.getStatus() != null, AppOperLog::getStatus, bo.getStatus());
+        lqw.between(params.get("beginTime") != null && params.get("endTime") != null,
+                AppOperLog::getOperTime, params.get("beginTime"), params.get("endTime"));
+        lqw.orderByDesc(AppOperLog::getOperTime);
+        return lqw;
+    }
+
+    /**
+     * 新增App端操作日志
+     */
+    @Override
+    public Boolean insertByBo(AppOperLogBo bo) {
+        AppOperLog add = MapstructUtils.convert(bo, AppOperLog.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setOperId(add.getOperId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改App端操作日志
+     */
+    @Override
+    public Boolean updateByBo(AppOperLogBo bo) {
+        AppOperLog update = MapstructUtils.convert(bo, AppOperLog.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(AppOperLog entity) {
+        // TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 批量删除App端操作日志
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if (isValid) {
+            // TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+
+    /**
+     * 记录操作日志
+     */
+    @Override
+    public void recordOperLog(String title, Integer businessType, String method, String requestMethod,
+                              String operName, String operUrl, String operIp, String operLocation,
+                              String operParam, String jsonResult, Integer status, String errorMsg, Long costTime) {
+        AppOperLog operLog = new AppOperLog();
+        operLog.setTitle(title);
+        operLog.setBusinessType(businessType);
+        operLog.setMethod(method);
+        operLog.setRequestMethod(requestMethod);
+        operLog.setOperName(operName);
+        operLog.setOperUrl(operUrl);
+        operLog.setOperIp(operIp);
+        operLog.setOperLocation(operLocation);
+        operLog.setOperParam(operParam);
+        operLog.setJsonResult(jsonResult);
+        operLog.setStatus(status);
+        operLog.setErrorMsg(errorMsg);
+        operLog.setOperTime(LocalDateTime.now());
+        operLog.setCostTime(costTime);
+
+        try {
+            baseMapper.insert(operLog);
+        } catch (Exception e) {
+            log.error("记录操作日志失败: {}", e.getMessage(), e);
+        }
+    }
+
+    /**
+     * 根据操作人查询操作日志
+     */
+    @Override
+    public List<AppOperLogVo> queryByOperName(String operName) {
+        LambdaQueryWrapper<AppOperLog> lqw = Wrappers.lambdaQuery();
+        lqw.eq(StringUtils.isNotBlank(operName), AppOperLog::getOperName, operName);
+        lqw.orderByDesc(AppOperLog::getOperTime);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    /**
+     * 清空操作日志
+     */
+    @Override
+    public void cleanOperLog() {
+        baseMapper.delete(Wrappers.lambdaQuery());
+    }
+
+    /**
+     * 根据时间范围删除操作日志
+     */
+    @Override
+    public void deleteOperLogByTime(LocalDateTime beginTime, LocalDateTime endTime) {
+        LambdaQueryWrapper<AppOperLog> lqw = Wrappers.lambdaQuery();
+        if (beginTime != null) {
+            lqw.ge(AppOperLog::getOperTime, beginTime);
+        }
+        if (endTime != null) {
+            lqw.le(AppOperLog::getOperTime, endTime);
+        }
+        baseMapper.delete(lqw);
+    }
+
+    /**
+     * 获取操作统计信息
+     */
+    @Override
+    public Long getOperLogCount(String operName, LocalDateTime beginTime, LocalDateTime endTime) {
+        LambdaQueryWrapper<AppOperLog> lqw = Wrappers.lambdaQuery();
+        lqw.eq(StringUtils.isNotBlank(operName), AppOperLog::getOperName, operName);
+        if (beginTime != null) {
+            lqw.ge(AppOperLog::getOperTime, beginTime);
+        }
+        if (endTime != null) {
+            lqw.le(AppOperLog::getOperTime, endTime);
+        }
+        return baseMapper.selectCount(lqw);
+    }
+
+    /**
+     * 获取用户行为分析数据
+     */
+    @Override
+    public List<AppOperLogVo> getUserBehaviorAnalysis(String operName, Integer days) {
+        LambdaQueryWrapper<AppOperLog> lqw = Wrappers.lambdaQuery();
+        lqw.eq(StringUtils.isNotBlank(operName), AppOperLog::getOperName, operName);
+        if (days != null && days > 0) {
+            LocalDateTime startTime = LocalDateTime.now().minusDays(days);
+            lqw.ge(AppOperLog::getOperTime, startTime);
+        }
+        lqw.orderByDesc(AppOperLog::getOperTime);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    /**
+     * 获取热门操作统计
+     */
+    @Override
+    public List<AppOperLogVo> getPopularOperations(Integer days, Integer limit) {
+        LambdaQueryWrapper<AppOperLog> lqw = Wrappers.lambdaQuery();
+        if (days != null && days > 0) {
+            LocalDateTime startTime = LocalDateTime.now().minusDays(days);
+            lqw.ge(AppOperLog::getOperTime, startTime);
+        }
+        lqw.eq(AppOperLog::getStatus, 0); // 只统计成功的操作
+        lqw.orderByDesc(AppOperLog::getOperTime);
+
+        List<AppOperLogVo> allLogs = baseMapper.selectVoList(lqw);
+
+        // 按操作标题分组统计
+        Map<String, Long> operationCount = allLogs.stream()
+                .collect(Collectors.groupingBy(AppOperLogVo::getTitle, Collectors.counting()));
+
+        // 返回前N个热门操作
+        return allLogs.stream()
+                .collect(Collectors.groupingBy(AppOperLogVo::getTitle))
+                .entrySet().stream()
+                .sorted((e1, e2) -> Long.compare(e2.getValue().size(), e1.getValue().size()))
+                .limit(limit != null ? limit : 10)
+                .flatMap(entry -> entry.getValue().stream().limit(1))
+                .collect(Collectors.toList());
+    }
+
+    /**
+     * 获取错误操作统计
+     */
+    @Override
+    public List<AppOperLogVo> getErrorOperations(Integer days) {
+        LambdaQueryWrapper<AppOperLog> lqw = Wrappers.lambdaQuery();
+        if (days != null && days > 0) {
+            LocalDateTime startTime = LocalDateTime.now().minusDays(days);
+            lqw.ge(AppOperLog::getOperTime, startTime);
+        }
+        lqw.eq(AppOperLog::getStatus, 1); // 只查询异常操作
+        lqw.orderByDesc(AppOperLog::getOperTime);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    /**
+     * 批量记录操作日志
+     */
+    @Override
+    public void batchInsertOperLog(List<AppOperLogBo> operLogs) {
+        if (operLogs == null || operLogs.isEmpty()) {
+            return;
+        }
+
+        List<AppOperLog> logs = operLogs.stream()
+                .map(bo -> MapstructUtils.convert(bo, AppOperLog.class))
+                .collect(Collectors.toList());
+
+        try {
+            this.saveBatch(logs);
+        } catch (Exception e) {
+            log.error("批量记录操作日志失败: {}", e.getMessage(), e);
+        }
+    }
+
+    /**
+     * 异步记录操作日志
+     */
+    @Async
+    @Override
+    public void asyncRecordOperLog(AppOperLogBo bo) {
+        try {
+            insertByBo(bo);
+        } catch (Exception e) {
+            log.error("异步记录操作日志失败: {}", e.getMessage(), e);
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/service/impl/AppRoleServiceImpl.java b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/service/impl/AppRoleServiceImpl.java
new file mode 100644
index 0000000..1b78a7c
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/service/impl/AppRoleServiceImpl.java
@@ -0,0 +1,237 @@
+package org.dromara.member.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.member.domain.AppRole;
+import org.dromara.member.domain.AppUserRole;
+import org.dromara.member.domain.bo.AppRoleBo;
+import org.dromara.member.domain.vo.AppRoleVo;
+import org.dromara.member.mapper.AppRoleMapper;
+import org.dromara.member.mapper.AppUserRoleMapper;
+import org.dromara.member.service.AppRoleService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+/**
+ * App端角色信息Service业务层处理
+ *
+ * @author pengles
+ */
+@Service
+public class AppRoleServiceImpl extends ServiceImpl<AppRoleMapper, AppRole> implements AppRoleService {
+
+    @Autowired
+    private AppUserRoleMapper userRoleMapper;
+
+    /**
+     * 查询App端角色信息
+     */
+    @Override
+    public AppRoleVo queryById(Long roleId) {
+        return baseMapper.selectVoById(roleId);
+    }
+
+    /**
+     * 查询App端角色信息列表
+     */
+    @Override
+    public TableDataInfo<AppRoleVo> queryPageList(AppRoleBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<AppRole> lqw = buildQueryWrapper(bo);
+        Page<AppRoleVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询App端角色信息列表
+     */
+    @Override
+    public List<AppRoleVo> queryList(AppRoleBo bo) {
+        LambdaQueryWrapper<AppRole> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<AppRole> buildQueryWrapper(AppRoleBo bo) {
+        LambdaQueryWrapper<AppRole> lqw = Wrappers.lambdaQuery();
+        lqw.like(StringUtils.isNotBlank(bo.getRoleName()), AppRole::getRoleName, bo.getRoleName());
+        lqw.eq(StringUtils.isNotBlank(bo.getRoleKey()), AppRole::getRoleKey, bo.getRoleKey());
+        lqw.eq(StringUtils.isNotBlank(bo.getStatus()), AppRole::getStatus, bo.getStatus());
+        lqw.orderByAsc(AppRole::getRoleSort);
+        return lqw;
+    }
+
+    /**
+     * 新增App端角色信息
+     */
+    @Override
+    public Boolean insertByBo(AppRoleBo bo) {
+        AppRole add = BeanUtil.toBean(bo, AppRole.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setRoleId(add.getRoleId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改App端角色信息
+     */
+    @Override
+    public Boolean updateByBo(AppRoleBo bo) {
+        AppRole update = BeanUtil.toBean(bo, AppRole.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(AppRole entity) {
+        // TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 批量删除App端角色信息
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if (isValid) {
+            // 校验角色是否存在用户关联
+            for (Long id : ids) {
+                long count = countUserRoleByRoleId(id);
+                if (count > 0) {
+                    AppRoleVo role = queryById(id);
+                    throw new RuntimeException(String.format("角色%s已分配用户,不能删除", role.getRoleName()));
+                }
+            }
+        }
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+
+    /**
+     * 根据用户ID查询角色
+     */
+    @Override
+    public List<AppRoleVo> selectRolesByUserId(Long userId) {
+        return baseMapper.selectRolesByUserId(userId);
+    }
+
+    /**
+     * 根据用户ID获取角色权限
+     */
+    @Override
+    public Set<String> selectRolePermissionByUserId(Long userId) {
+        Set<String> perms = baseMapper.selectRolePermissionByUserId(userId);
+        return perms;
+    }
+
+    /**
+     * 查询所有角色
+     */
+    @Override
+    public List<AppRoleVo> selectRoleAll() {
+        return baseMapper.selectRoleAll();
+    }
+
+    /**
+     * 根据用户ID获取角色选择框列表
+     */
+    @Override
+    public List<Long> selectRoleListByUserId(Long userId) {
+        return baseMapper.selectRoleListByUserId(userId);
+    }
+
+    /**
+     * 校验角色名称是否唯一
+     */
+    @Override
+    public boolean checkRoleNameUnique(String roleName) {
+        return baseMapper.checkRoleNameUnique(roleName) == 0;
+    }
+
+    /**
+     * 校验角色权限是否唯一
+     */
+    @Override
+    public boolean checkRoleKeyUnique(String roleKey) {
+        return baseMapper.checkRoleKeyUnique(roleKey) == 0;
+    }
+
+    /**
+     * 校验角色是否允许操作
+     */
+    @Override
+    public boolean checkRoleAllowed(Long roleId) {
+        return roleId != null && roleId != 1L;
+    }
+
+    /**
+     * 校验角色是否有数据权限
+     */
+    @Override
+    public boolean checkRoleDataScope(Long roleId) {
+        return roleId != null && roleId != 1L;
+    }
+
+    /**
+     * 通过角色ID查询角色使用数量
+     */
+    @Override
+    public long countUserRoleByRoleId(Long roleId) {
+        return userRoleMapper.countUserRoleByRoleId(roleId);
+    }
+
+    /**
+     * 取消授权用户角色
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public boolean deleteAuthUser(Long userId, Long roleId) {
+        LambdaQueryWrapper<AppUserRole> wrapper = Wrappers.lambdaQuery();
+        wrapper.eq(AppUserRole::getUserId, userId)
+                .eq(AppUserRole::getRoleId, roleId);
+        return userRoleMapper.delete(wrapper) > 0;
+    }
+
+    /**
+     * 批量取消授权用户角色
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public boolean deleteAuthUsers(Long roleId, Long[] userIds) {
+        LambdaQueryWrapper<AppUserRole> wrapper = Wrappers.lambdaQuery();
+        wrapper.eq(AppUserRole::getRoleId, roleId)
+                .in(AppUserRole::getUserId, Arrays.asList(userIds));
+        return userRoleMapper.delete(wrapper) > 0;
+    }
+
+    /**
+     * 批量选择授权用户角色
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public boolean insertAuthUsers(Long roleId, Long[] userIds) {
+        // 新增用户与角色管理
+        List<AppUserRole> list = Arrays.stream(userIds).map(userId -> {
+            AppUserRole ur = new AppUserRole();
+            ur.setUserId(userId);
+            ur.setRoleId(roleId);
+            return ur;
+        }).collect(Collectors.toList());
+        return userRoleMapper.batchUserRole(list) > 0;
+    }
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/service/impl/AppSocialAuthServiceImpl.java b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/service/impl/AppSocialAuthServiceImpl.java
new file mode 100644
index 0000000..a5e19f6
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/service/impl/AppSocialAuthServiceImpl.java
@@ -0,0 +1,273 @@
+package org.dromara.member.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.member.domain.AppSocialAuth;
+import org.dromara.member.domain.vo.AppSocialAuthVo;
+import org.dromara.member.domain.vo.AppUserVo;
+import org.dromara.member.mapper.AppSocialAuthMapper;
+import org.dromara.member.service.AppSocialAuthService;
+import org.dromara.member.service.AppUserService;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * App端第三方登录授权Service业务层处理
+ *
+ * @author pengles
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class AppSocialAuthServiceImpl extends ServiceImpl<AppSocialAuthMapper, AppSocialAuth> implements AppSocialAuthService {
+
+    private final AppSocialAuthMapper baseMapper;
+    private final AppUserService appUserService;
+
+    /**
+     * 查询App端第三方登录授权
+     */
+    @Override
+    public AppSocialAuthVo queryById(Long id) {
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 根据用户ID查询社交认证列表
+     */
+    @Override
+    public List<AppSocialAuthVo> queryByUserId(Long userId) {
+        LambdaQueryWrapper<AppSocialAuth> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(AppSocialAuth::getUserId, userId)
+                .eq(AppSocialAuth::getDelFlag, "0")
+                .orderByDesc(AppSocialAuth::getCreateTime);
+        return baseMapper.selectVoList(wrapper);
+    }
+
+    /**
+     * 根据平台和openId查询社交认证
+     */
+    @Override
+    public AppSocialAuth queryByPlatformAndOpenId(String platform, String openId) {
+        if (StringUtils.isBlank(platform) || StringUtils.isBlank(openId)) {
+            return null;
+        }
+        LambdaQueryWrapper<AppSocialAuth> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(AppSocialAuth::getPlatform, platform)
+                .eq(AppSocialAuth::getOpenId, openId)
+                .eq(AppSocialAuth::getDelFlag, "0")
+                .last("LIMIT 1");
+        return baseMapper.selectOne(wrapper);
+    }
+
+    /**
+     * 根据平台和unionId查询社交认证
+     */
+    @Override
+    public AppSocialAuth queryByPlatformAndUnionId(String platform, String unionId) {
+        if (StringUtils.isBlank(platform) || StringUtils.isBlank(unionId)) {
+            return null;
+        }
+        LambdaQueryWrapper<AppSocialAuth> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(AppSocialAuth::getPlatform, platform)
+                .eq(AppSocialAuth::getUnionId, unionId)
+                .eq(AppSocialAuth::getDelFlag, "0")
+                .last("LIMIT 1");
+        return baseMapper.selectOne(wrapper);
+    }
+
+    /**
+     * 新增App端第三方登录授权
+     */
+    @Override
+    public Boolean insertAppSocialAuth(AppSocialAuth appSocialAuth) {
+        appSocialAuth.setDelFlag("0");
+        appSocialAuth.setCreateTime(new Date());
+        return baseMapper.insert(appSocialAuth) > 0;
+    }
+
+    /**
+     * 修改App端第三方登录授权
+     */
+    @Override
+    public Boolean updateAppSocialAuth(AppSocialAuth appSocialAuth) {
+        appSocialAuth.setUpdateTime(new Date());
+        return baseMapper.updateById(appSocialAuth) > 0;
+    }
+
+    /**
+     * 删除App端第三方登录授权
+     */
+    @Override
+    public Boolean deleteAppSocialAuthById(Long id) {
+        AppSocialAuth appSocialAuth = new AppSocialAuth();
+        appSocialAuth.setId(id);
+        appSocialAuth.setDelFlag("2");
+        appSocialAuth.setUpdateTime(new Date());
+        return baseMapper.updateById(appSocialAuth) > 0;
+    }
+
+    /**
+     * 根据用户ID删除社交认证
+     */
+    @Override
+    public Boolean deleteByUserId(Long userId) {
+        LambdaQueryWrapper<AppSocialAuth> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(AppSocialAuth::getUserId, userId);
+        List<AppSocialAuth> list = baseMapper.selectList(wrapper);
+        if (list.isEmpty()) {
+            return true;
+        }
+
+        AppSocialAuth updateEntity = new AppSocialAuth();
+        updateEntity.setDelFlag("2");
+        updateEntity.setUpdateTime(new Date());
+
+        return baseMapper.update(updateEntity, wrapper) > 0;
+    }
+
+    /**
+     * 更新访问令牌
+     */
+    @Override
+    public Boolean updateAccessToken(Long id, String accessToken, Integer expireIn, String refreshToken) {
+        AppSocialAuth appSocialAuth = new AppSocialAuth();
+        appSocialAuth.setId(id);
+        appSocialAuth.setAccessToken(accessToken);
+        appSocialAuth.setExpireIn(expireIn);
+        appSocialAuth.setRefreshToken(refreshToken);
+        appSocialAuth.setUpdateTime(new Date());
+        return baseMapper.updateById(appSocialAuth) > 0;
+    }
+
+    @Override
+    public Boolean deleteByUserIdAndPlatform(Long userId, String platform) {
+        LambdaQueryWrapper<AppSocialAuth> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(AppSocialAuth::getUserId, userId)
+                .eq(AppSocialAuth::getPlatform, platform)
+                .eq(AppSocialAuth::getDelFlag, "0");
+        return baseMapper.delete(wrapper) > 0;
+    }
+
+    @Override
+    public AppUserVo selectUserByPlatformAndOpenId(String platform, String openId) {
+        if (StringUtils.isBlank(platform) || StringUtils.isBlank(openId)) {
+            return null;
+        }
+
+        // 根据平台和openId查询社交认证记录
+        AppSocialAuth socialAuth = queryByPlatformAndOpenId(platform, openId);
+        if (socialAuth == null || socialAuth.getUserId() == null) {
+            return null;
+        }
+
+        // 根据userId查询用户信息
+        return appUserService.queryById(socialAuth.getUserId());
+    }
+
+    @Override
+    public AppUserVo selectUserByPlatformAndUnionId(String platform, String unionId) {
+        if (StringUtils.isBlank(platform) || StringUtils.isBlank(unionId)) {
+            return null;
+        }
+        AppSocialAuth socialAuth = queryByPlatformAndUnionId(platform, unionId);
+        if (socialAuth == null || socialAuth.getUserId() == null) {
+            return null;
+        }
+        return appUserService.queryById(socialAuth.getUserId());
+    }
+
+    @Override
+    public void socialRegister(me.zhyd.oauth.model.AuthUser authUserData) {
+        if (authUserData == null) {
+            throw new org.dromara.common.core.exception.ServiceException("第三方用户信息不能为空");
+        }
+
+        String platform = authUserData.getSource();
+        String openId = authUserData.getUuid();
+        Long userId = org.dromara.common.satoken.utils.LoginHelper.getUserId();
+
+        if (StringUtils.isBlank(platform) || StringUtils.isBlank(openId)) {
+            throw new org.dromara.common.core.exception.ServiceException("第三方平台信息不完整");
+        }
+
+        log.info("开始绑定第三方账号，用户ID: {}, 平台: {}, openId: {}", userId, platform, openId);
+
+        // 检查是否已经绑定过该第三方账号
+        AppSocialAuth existingSocialAuth = queryByPlatformAndOpenId(platform, openId);
+        if (existingSocialAuth != null) {
+            if (!userId.equals(existingSocialAuth.getUserId())) {
+                log.warn("第三方账号已被其他用户绑定，平台: {}, openId: {}, 绑定用户: {}", platform, openId, existingSocialAuth.getUserId());
+                throw new org.dromara.common.core.exception.ServiceException("此第三方账号已经被其他用户绑定!");
+            } else {
+                log.info("第三方账号已绑定当前用户，无需重复绑定，平台: {}, openId: {}", platform, openId);
+                return;
+            }
+        }
+
+        // 检查当前用户是否已经绑定过该平台的账号
+        List<AppSocialAuthVo> userSocialAuths = queryByUserId(userId);
+        boolean alreadyBound = userSocialAuths.stream()
+                .anyMatch(auth -> platform.equals(auth.getPlatform()));
+
+        if (alreadyBound) {
+            // 如果已经绑定过该平台，则更新绑定信息
+            log.info("用户已绑定该平台账号，更新绑定信息，用户ID: {}, 平台: {}", userId, platform);
+            AppSocialAuth updateAuth = userSocialAuths.stream()
+                    .filter(auth -> platform.equals(auth.getPlatform()))
+                    .map(vo -> {
+                        AppSocialAuth auth = new AppSocialAuth();
+                        auth.setId(vo.getId());
+                        auth.setUserId(userId);
+                        auth.setPlatform(platform);
+                        auth.setPlatformUid(authUserData.getUuid());
+                        auth.setOpenId(openId);
+                        auth.setUnionId(authUserData.getToken() != null ? authUserData.getToken().getUnionId() : null);
+                        auth.setAccessToken(authUserData.getToken() != null ? authUserData.getToken().getAccessToken() : null);
+                        auth.setExpireIn(authUserData.getToken() != null ? authUserData.getToken().getExpireIn() : null);
+                        auth.setRefreshToken(authUserData.getToken() != null ? authUserData.getToken().getRefreshToken() : null);
+                        auth.setScope(authUserData.getToken() != null ? authUserData.getToken().getScope() : null);
+                        return auth;
+                    })
+                    .findFirst()
+                    .orElse(null);
+
+            if (updateAuth != null) {
+                boolean success = updateAppSocialAuth(updateAuth);
+                if (success) {
+                    log.info("更新第三方账号绑定成功，用户ID: {}, 平台: {}", userId, platform);
+                } else {
+                    log.error("更新第三方账号绑定失败，用户ID: {}, 平台: {}", userId, platform);
+                    throw new org.dromara.common.core.exception.ServiceException("更新绑定信息失败");
+                }
+            }
+        } else {
+            // 新增绑定记录
+            log.info("新增第三方账号绑定，用户ID: {}, 平台: {}", userId, platform);
+            AppSocialAuth newAuth = new AppSocialAuth();
+            newAuth.setUserId(userId);
+            newAuth.setPlatform(platform);
+            newAuth.setPlatformUid(authUserData.getUuid());
+            newAuth.setOpenId(openId);
+            newAuth.setUnionId(authUserData.getToken() != null ? authUserData.getToken().getUnionId() : null);
+            newAuth.setAccessToken(authUserData.getToken() != null ? authUserData.getToken().getAccessToken() : null);
+            newAuth.setExpireIn(authUserData.getToken() != null ? authUserData.getToken().getExpireIn() : null);
+            newAuth.setRefreshToken(authUserData.getToken() != null ? authUserData.getToken().getRefreshToken() : null);
+            newAuth.setScope(authUserData.getToken() != null ? authUserData.getToken().getScope() : null);
+
+            boolean success = insertAppSocialAuth(newAuth);
+            if (success) {
+                log.info("新增第三方账号绑定成功，用户ID: {}, 平台: {}", userId, platform);
+            } else {
+                log.error("新增第三方账号绑定失败，用户ID: {}, 平台: {}", userId, platform);
+                throw new org.dromara.common.core.exception.ServiceException("绑定第三方账号失败");
+            }
+        }
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/service/impl/AppUserServiceImpl.java b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/service/impl/AppUserServiceImpl.java
new file mode 100644
index 0000000..8d85936
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/service/impl/AppUserServiceImpl.java
@@ -0,0 +1,239 @@
+package org.dromara.member.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.crypto.digest.BCrypt;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.member.domain.AppUser;
+import org.dromara.member.domain.AppUserRole;
+import org.dromara.member.domain.bo.AppUserBo;
+import org.dromara.member.domain.vo.AppUserVo;
+import org.dromara.member.mapper.AppUserMapper;
+import org.dromara.member.mapper.AppUserRoleMapper;
+import org.dromara.member.service.AppUserService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * App端用户信息Service业务层处理
+ *
+ * @author pengles
+ */
+@Service
+@RequiredArgsConstructor
+public class AppUserServiceImpl extends ServiceImpl<AppUserMapper, AppUser> implements AppUserService {
+
+    private final AppUserRoleMapper appUserRoleMapper;
+
+
+    /**
+     * 查询App端用户信息
+     */
+    @Override
+    public AppUserVo queryById(Long userId) {
+        return baseMapper.selectVoById(userId);
+    }
+
+    /**
+     * 查询App端用户信息列表
+     */
+    @Override
+    public TableDataInfo<AppUserVo> queryPageList(AppUserBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<AppUser> lqw = buildQueryWrapper(bo);
+        Page<AppUserVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询App端用户信息列表
+     */
+    @Override
+    public List<AppUserVo> queryList(AppUserBo bo) {
+        LambdaQueryWrapper<AppUser> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<AppUser> buildQueryWrapper(AppUserBo bo) {
+        LambdaQueryWrapper<AppUser> lqw = Wrappers.lambdaQuery();
+        lqw.like(StringUtils.isNotBlank(bo.getUserName()), AppUser::getUserName, bo.getUserName());
+        lqw.like(StringUtils.isNotBlank(bo.getNickName()), AppUser::getNickName, bo.getNickName());
+        lqw.eq(StringUtils.isNotBlank(bo.getPhone()), AppUser::getPhone, bo.getPhone());
+        lqw.eq(StringUtils.isNotBlank(bo.getEmail()), AppUser::getEmail, bo.getEmail());
+        lqw.eq(StringUtils.isNotBlank(bo.getSex()), AppUser::getSex, bo.getSex());
+        lqw.eq(StringUtils.isNotBlank(bo.getStatus()), AppUser::getStatus, bo.getStatus());
+        return lqw;
+    }
+
+    /**
+     * 新增App端用户信息
+     */
+    @Override
+    public Boolean insertByBo(AppUserBo bo) {
+        AppUser add = BeanUtil.toBean(bo, AppUser.class);
+        validEntityBeforeSave(add);
+        // 加密密码
+        if (StringUtils.isNotBlank(add.getPassword())) {
+            add.setPassword(BCrypt.hashpw(add.getPassword()));
+        }
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setUserId(add.getUserId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改App端用户信息
+     */
+    @Override
+    public Boolean updateByBo(AppUserBo bo) {
+        AppUser update = BeanUtil.toBean(bo, AppUser.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(AppUser entity) {
+        // TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 批量删除App端用户信息
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if (isValid) {
+            // TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+
+    /**
+     * 根据用户账号查询用户信息
+     */
+    @Override
+    public AppUserVo selectUserByUserName(String userName) {
+        return baseMapper.selectUserByUserName(userName);
+    }
+
+    /**
+     * 根据手机号查询用户信息
+     */
+    @Override
+    public AppUserVo selectUserByPhone(String phone) {
+        return baseMapper.selectUserByPhone(phone);
+    }
+
+    /**
+     * 根据邮箱查询用户信息
+     */
+    @Override
+    public AppUserVo selectUserByEmail(String email) {
+        return baseMapper.selectUserByEmail(email);
+    }
+
+    /**
+     * 校验用户账号是否唯一
+     */
+    @Override
+    public boolean checkUserNameUnique(String userName) {
+        return baseMapper.checkUserNameUnique(userName) == 0;
+    }
+
+    /**
+     * 校验手机号码是否唯一
+     */
+    @Override
+    public boolean checkPhoneUnique(String phone) {
+        return baseMapper.checkPhoneUnique(phone) == 0;
+    }
+
+    /**
+     * 校验email是否唯一
+     */
+    @Override
+    public boolean checkEmailUnique(String email) {
+        return baseMapper.checkEmailUnique(email) == 0;
+    }
+
+    /**
+     * 用户注册
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean register(AppUserBo bo) {
+        // 校验账号唯一性
+        if (!checkUserNameUnique(bo.getUserName())) {
+            throw new RuntimeException("用户账号已存在");
+        }
+        // 校验手机号唯一性
+        if (StringUtils.isNotBlank(bo.getPhone()) && !checkPhoneUnique(bo.getPhone())) {
+            throw new RuntimeException("手机号已存在");
+        }
+        // 校验邮箱唯一性
+        if (StringUtils.isNotBlank(bo.getEmail()) && !checkEmailUnique(bo.getEmail())) {
+            throw new RuntimeException("邮箱已存在");
+        }
+        boolean result = insertByBo(bo);
+        if (result) {
+            // 分配默认角色
+            AppUserRole userRole = new AppUserRole();
+            userRole.setUserId(bo.getUserId());
+            userRole.setRoleId(1L); // 默认角色ID为1 (App普通用户)
+            appUserRoleMapper.insert(userRole);
+        }
+        return result;
+    }
+
+    /**
+     * 修改用户密码
+     */
+    @Override
+    public Boolean updatePassword(Long userId, String oldPassword, String newPassword) {
+        AppUser user = baseMapper.selectById(userId);
+        if (ObjectUtil.isNull(user)) {
+            throw new RuntimeException("用户不存在");
+        }
+        if (!BCrypt.checkpw(oldPassword, user.getPassword())) {
+            throw new RuntimeException("旧密码错误");
+        }
+        user.setPassword(BCrypt.hashpw(newPassword));
+        return baseMapper.updateById(user) > 0;
+    }
+
+    /**
+     * 重置用户密码
+     */
+    @Override
+    public Boolean resetPassword(Long userId, String newPassword) {
+        AppUser user = new AppUser();
+        user.setUserId(userId);
+        user.setPassword(BCrypt.hashpw(newPassword));
+        return baseMapper.updateById(user) > 0;
+    }
+
+    /**
+     * 更新用户状态
+     */
+    @Override
+    public Boolean updateUserStatus(Long userId, String status) {
+        return baseMapper.update(null,
+                new LambdaUpdateWrapper<AppUser>()
+                        .set(AppUser::getStatus, status)
+                        .eq(AppUser::getUserId, userId)) > 0;
+    }
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/service/impl/AppVersionServiceImpl.java b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/service/impl/AppVersionServiceImpl.java
new file mode 100644
index 0000000..c490545
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/service/impl/AppVersionServiceImpl.java
@@ -0,0 +1,297 @@
+package org.dromara.member.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.member.domain.AppVersion;
+import org.dromara.member.domain.bo.AppVersionBo;
+import org.dromara.member.domain.vo.AppVersionVo;
+import org.dromara.member.exception.VersionException;
+import org.dromara.member.mapper.AppVersionMapper;
+import org.dromara.member.service.AppVersionService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * App版本信息Service业务层处理
+ *
+ * @author pengles
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class AppVersionServiceImpl extends ServiceImpl<AppVersionMapper, AppVersion> implements AppVersionService {
+
+    private final AppVersionMapper baseMapper;
+
+    /**
+     * 查询App版本信息
+     */
+    @Override
+    public AppVersionVo queryById(Long versionId) {
+        return baseMapper.selectVoById(versionId);
+    }
+
+    /**
+     * 查询App版本信息列表
+     */
+    @Override
+    public TableDataInfo<AppVersionVo> queryPageList(AppVersionBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<AppVersion> lqw = buildQueryWrapper(bo);
+        Page<AppVersionVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询App版本信息列表
+     */
+    @Override
+    public List<AppVersionVo> queryList(AppVersionBo bo) {
+        LambdaQueryWrapper<AppVersion> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<AppVersion> buildQueryWrapper(AppVersionBo bo) {
+        LambdaQueryWrapper<AppVersion> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getVersionCode() != null, AppVersion::getVersionCode, bo.getVersionCode());
+        lqw.like(StringUtils.isNotBlank(bo.getVersionName()), AppVersion::getVersionName, bo.getVersionName());
+        lqw.eq(StringUtils.isNotBlank(bo.getPlatform()), AppVersion::getPlatform, bo.getPlatform());
+        lqw.eq(StringUtils.isNotBlank(bo.getIsForce()), AppVersion::getIsForce, bo.getIsForce());
+        lqw.orderByDesc(AppVersion::getVersionCode);
+        return lqw;
+    }
+
+    /**
+     * 新增App版本信息
+     */
+    @Override
+    public Boolean insertByBo(AppVersionBo bo) {
+        AppVersion add = BeanUtil.toBean(bo, AppVersion.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setVersionId(add.getVersionId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改App版本信息
+     */
+    @Override
+    public Boolean updateByBo(AppVersionBo bo) {
+        AppVersion update = BeanUtil.toBean(bo, AppVersion.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(AppVersion entity) {
+        // 校验版本号唯一性
+        if (entity.getVersionCode() != null && StringUtils.isNotBlank(entity.getPlatform())) {
+            LambdaQueryWrapper<AppVersion> lqw = Wrappers.lambdaQuery();
+            lqw.eq(AppVersion::getVersionCode, entity.getVersionCode());
+            lqw.eq(AppVersion::getPlatform, entity.getPlatform());
+            if (entity.getVersionId() != null) {
+                lqw.ne(AppVersion::getVersionId, entity.getVersionId());
+            }
+
+            long count = baseMapper.selectCount(lqw);
+            if (count > 0) {
+                throw new RuntimeException("该平台下版本号已存在");
+            }
+        }
+    }
+
+    /**
+     * 批量删除App版本信息
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if (isValid) {
+            // TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+
+    /**
+     * 检查版本更新
+     */
+    @Override
+    public AppVersionVo checkUpdate(String platform, Integer currentVersionCode) {
+        if (StringUtils.isBlank(platform)) {
+            throw VersionException.unsupportedPlatform(platform);
+        }
+        if (currentVersionCode == null || currentVersionCode <= 0) {
+            throw VersionException.invalidVersionCode(currentVersionCode);
+        }
+
+        LambdaQueryWrapper<AppVersion> lqw = Wrappers.lambdaQuery();
+        lqw.eq(AppVersion::getPlatform, platform);
+        lqw.gt(AppVersion::getVersionCode, currentVersionCode);
+        lqw.orderByDesc(AppVersion::getVersionCode);
+        lqw.last("LIMIT 1");
+
+        return baseMapper.selectVoOne(lqw);
+    }
+
+    /**
+     * 获取指定平台的最新版本
+     */
+    @Override
+    public AppVersionVo getLatestVersion(String platform) {
+        if (StringUtils.isBlank(platform)) {
+            throw VersionException.unsupportedPlatform(platform);
+        }
+
+        LambdaQueryWrapper<AppVersion> lqw = Wrappers.lambdaQuery();
+        lqw.eq(AppVersion::getPlatform, platform);
+        lqw.orderByDesc(AppVersion::getVersionCode);
+        lqw.last("LIMIT 1");
+
+        AppVersionVo result = baseMapper.selectVoOne(lqw);
+        if (result == null) {
+            throw VersionException.versionNotFound("平台 " + platform + " 暂无可用版本");
+        }
+
+        return result;
+    }
+
+    /**
+     * 检查版本号是否唯一
+     */
+    @Override
+    public Boolean checkVersionCodeUnique(AppVersionBo bo) {
+        if (bo.getVersionCode() == null || bo.getVersionCode() <= 0) {
+            throw VersionException.invalidVersionCode(bo.getVersionCode());
+        }
+        if (StringUtils.isBlank(bo.getPlatform())) {
+            throw VersionException.unsupportedPlatform(bo.getPlatform());
+        }
+
+        LambdaQueryWrapper<AppVersion> lqw = Wrappers.lambdaQuery();
+        lqw.eq(AppVersion::getVersionCode, bo.getVersionCode());
+        lqw.eq(AppVersion::getPlatform, bo.getPlatform());
+        if (bo.getVersionId() != null) {
+            lqw.ne(AppVersion::getVersionId, bo.getVersionId());
+        }
+
+        boolean isUnique = baseMapper.selectCount(lqw) == 0;
+        if (!isUnique) {
+            throw VersionException.versionCodeDuplicate(bo.getVersionCode());
+        }
+        return true;
+    }
+
+    /**
+     * 获取版本历史列表
+     */
+    @Override
+    public List<AppVersionVo> getVersionHistory(String platform, Integer limit) {
+        if (StringUtils.isBlank(platform)) {
+            return List.of();
+        }
+
+        if (limit == null || limit <= 0) {
+            limit = 10; // 默认返回10个版本
+        }
+
+        LambdaQueryWrapper<AppVersion> lqw = Wrappers.lambdaQuery();
+        lqw.eq(AppVersion::getPlatform, platform);
+        lqw.orderByDesc(AppVersion::getVersionCode);
+        lqw.last("LIMIT " + limit);
+
+        return baseMapper.selectVoList(lqw);
+    }
+
+    /**
+     * 检查是否需要强制更新
+     */
+    @Override
+    public Boolean checkForceUpdate(String platform, Integer currentVersionCode) {
+        if (StringUtils.isBlank(platform)) {
+            throw VersionException.unsupportedPlatform(platform);
+        }
+        if (currentVersionCode == null || currentVersionCode <= 0) {
+            throw VersionException.invalidVersionCode(currentVersionCode);
+        }
+
+        LambdaQueryWrapper<AppVersion> lqw = Wrappers.lambdaQuery();
+        lqw.eq(AppVersion::getPlatform, platform);
+        lqw.gt(AppVersion::getVersionCode, currentVersionCode);
+        lqw.eq(AppVersion::getIsForce, "1");
+
+        return baseMapper.selectCount(lqw) > 0;
+    }
+
+    /**
+     * 获取版本更新信息
+     */
+    @Override
+    public AppVersionVo getUpdateInfo(String platform, Integer currentVersionCode) {
+        AppVersionVo latestVersion = checkUpdate(platform, currentVersionCode);
+        if (latestVersion == null) {
+            return null;
+        }
+
+        // 检查是否有强制更新版本
+        Boolean forceUpdate = checkForceUpdate(platform, currentVersionCode);
+        if (forceUpdate) {
+            // 如果有强制更新，返回最新的强制更新版本
+            LambdaQueryWrapper<AppVersion> lqw = Wrappers.lambdaQuery();
+            lqw.eq(AppVersion::getPlatform, platform);
+            lqw.gt(AppVersion::getVersionCode, currentVersionCode);
+            lqw.eq(AppVersion::getIsForce, "1");
+            lqw.orderByDesc(AppVersion::getVersionCode);
+            lqw.last("LIMIT 1");
+
+            AppVersionVo forceVersion = baseMapper.selectVoOne(lqw);
+            return forceVersion != null ? forceVersion : latestVersion;
+        }
+
+        return latestVersion;
+    }
+
+    /**
+     * 批量发布版本
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean batchPublish(List<Long> versionIds) {
+        if (ObjectUtil.isEmpty(versionIds)) {
+            return false;
+        }
+
+        // 这里可以添加发布逻辑，比如更新状态等
+        log.info("批量发布版本: {}", versionIds);
+        return true;
+    }
+
+    /**
+     * 撤回版本
+     */
+    @Override
+    public Boolean withdrawVersion(Long versionId) {
+        if (versionId == null) {
+            return false;
+        }
+
+        // 这里可以添加撤回逻辑，比如更新状态等
+        log.info("撤回版本: {}", versionId);
+        return true;
+    }
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/utils/JwtUtil.java b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/utils/JwtUtil.java
new file mode 100644
index 0000000..b9ef311
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/java/org/dromara/member/utils/JwtUtil.java
@@ -0,0 +1,117 @@
+package org.dromara.member.utils;
+
+import javax.crypto.Mac;
+import javax.crypto.spec.SecretKeySpec;
+import java.nio.charset.StandardCharsets;
+import java.time.Instant;
+import java.util.Base64;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.UUID;
+
+/**
+ * JWT工具类
+ *
+ * @author pengles
+ */
+public class JwtUtil {
+    private final String secret;
+
+    public JwtUtil(String secret) {
+        this.secret = secret;
+    }
+
+    public String generateToken(String subject, long ttlSeconds, String jti) {
+        long now = Instant.now().getEpochSecond();
+        long exp = now + ttlSeconds;
+        Map<String, Object> header = new LinkedHashMap<>();
+        header.put("alg", "HS256");
+        header.put("typ", "JWT");
+        Map<String, Object> payload = new LinkedHashMap<>();
+        payload.put("iss", "ruoyi-app");
+        payload.put("sub", subject);
+        payload.put("iat", now);
+        payload.put("exp", exp);
+        payload.put("jti", jti == null ? UUID.randomUUID().toString() : jti);
+        String h = base64Url(Json.write(header));
+        String p = base64Url(Json.write(payload));
+        String signing = h + "." + p;
+        String sig = base64Url(hmacSha256(signing, secret));
+        return signing + "." + sig;
+    }
+
+    public boolean verify(String token) {
+        try {
+            String[] parts = token.split("\\.");
+            if (parts.length != 3) return false;
+            String signing = parts[0] + "." + parts[1];
+            String calc = base64Url(hmacSha256(signing, secret));
+            return slowEquals(calc, parts[2]);
+        } catch (Exception e) {
+            return false;
+        }
+    }
+
+    public Map<String, Object> parsePayload(String token) {
+        String[] parts = token.split("\\.");
+        if (parts.length != 3) return Map.of();
+        String json = new String(Base64.getUrlDecoder().decode(parts[1]), StandardCharsets.UTF_8);
+        return Json.read(json);
+    }
+
+    private static boolean slowEquals(String a, String b) {
+        if (a == null || b == null) return false;
+        if (a.length() != b.length()) return false;
+        int r = 0;
+        for (int i = 0; i < a.length(); i++) r |= a.charAt(i) ^ b.charAt(i);
+        return r == 0;
+    }
+
+    private static byte[] hmacSha256(String data, String key) {
+        try {
+            Mac mac = Mac.getInstance("HmacSHA256");
+            mac.init(new SecretKeySpec(key.getBytes(StandardCharsets.UTF_8), "HmacSHA256"));
+            return mac.doFinal(data.getBytes(StandardCharsets.UTF_8));
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private static String base64Url(String s) {
+        return Base64.getUrlEncoder().withoutPadding().encodeToString(s.getBytes(StandardCharsets.UTF_8));
+    }
+
+    private static String base64Url(byte[] b) {
+        return Base64.getUrlEncoder().withoutPadding().encodeToString(b);
+    }
+
+    static class Json {
+        public static String write(Map<String, Object> map) {
+            StringBuilder sb = new StringBuilder("{");
+            boolean first = true;
+            for (Map.Entry<String, Object> e : map.entrySet()) {
+                if (!first) sb.append(",");
+                sb.append("\"").append(e.getKey()).append("\":");
+                Object v = e.getValue();
+                if (v instanceof Number || v instanceof Boolean) {
+                    sb.append(v.toString());
+                } else {
+                    sb.append("\"").append(String.valueOf(v).replace("\"", "\\\"")).append("\"");
+                }
+                first = false;
+            }
+            sb.append("}");
+            return sb.toString();
+        }
+
+        @SuppressWarnings("unchecked")
+        public static Map<String, Object> read(String json) {
+            try {
+                return org.dromara.common.json.utils.JsonUtils.parseObject(json, Map.class);
+            } catch (Exception e) {
+                return Map.of();
+            }
+        }
+    }
+}
+
diff --git a/ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/AppDeviceMapper.xml b/ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/AppDeviceMapper.xml
new file mode 100644
index 0000000..5023c18
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/AppDeviceMapper.xml
@@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.member.mapper.AppDeviceMapper">
+
+    <resultMap type="org.dromara.member.domain.AppDevice" id="AppDeviceResult">
+        <id property="deviceId" column="device_id"/>
+        <result property="userId" column="user_id"/>
+        <result property="deviceType" column="device_type"/>
+        <result property="deviceName" column="device_name"/>
+        <result property="deviceModel" column="device_model"/>
+        <result property="deviceBrand" column="device_brand"/>
+        <result property="osVersion" column="os_version"/>
+        <result property="appVersion" column="app_version"/>
+        <result property="pushToken" column="push_token"/>
+        <result property="isActive" column="is_active"/>
+        <result property="lastActiveTime" column="last_active_time"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+    </resultMap>
+
+    <resultMap type="org.dromara.member.domain.vo.AppDeviceVo" id="AppDeviceVoResult">
+        <id property="deviceId" column="device_id"/>
+        <result property="userId" column="user_id"/>
+        <result property="deviceType" column="device_type"/>
+        <result property="deviceName" column="device_name"/>
+        <result property="deviceModel" column="device_model"/>
+        <result property="deviceBrand" column="device_brand"/>
+        <result property="osVersion" column="os_version"/>
+        <result property="appVersion" column="app_version"/>
+        <result property="pushToken" column="push_token"/>
+        <result property="isActive" column="is_active"/>
+        <result property="lastActiveTime" column="last_active_time"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+    </resultMap>
+
+    <sql id="selectAppDeviceVo">
+        select device_id,
+               user_id,
+               device_type,
+               device_name,
+               device_model,
+               device_brand,
+               os_version,
+               app_version,
+               push_token,
+               is_active,
+               last_active_time,
+               create_time,
+               update_time
+        from app_device
+    </sql>
+
+    <!-- 查询设备列表 -->
+    <select id="selectAppDeviceList" parameterType="AppDevice" resultMap="AppDeviceVoResult">
+        <include refid="selectAppDeviceVo"/>
+        <where>
+            <if test="userId != null">and user_id = #{userId}</if>
+            <if test="deviceType != null and deviceType != ''">and device_type = #{deviceType}</if>
+            <if test="deviceName != null and deviceName != ''">and device_name like concat('%', #{deviceName}, '%')</if>
+            <if test="isActive != null">and is_active = #{isActive}</if>
+        </where>
+        order by create_time desc
+    </select>
+
+    <!-- 根据设备ID查询设备信息 -->
+    <select id="selectAppDeviceByDeviceId" parameterType="Long" resultMap="AppDeviceVoResult">
+        <include refid="selectAppDeviceVo"/>
+        where device_id = #{deviceId}
+    </select>
+
+    <!-- 根据用户ID查询设备列表 -->
+    <select id="selectAppDeviceByUserId" parameterType="Long" resultMap="AppDeviceVoResult">
+        <include refid="selectAppDeviceVo"/>
+        where user_id = #{userId} and is_active = '1'
+        order by last_active_time desc
+    </select>
+
+    <!-- 根据推送令牌查询设备 -->
+    <select id="selectAppDeviceByPushToken" parameterType="String" resultMap="AppDeviceResult">
+        <include refid="selectAppDeviceVo"/>
+        where push_token = #{pushToken} and is_active = '1'
+    </select>
+
+    <!-- 新增设备信息 -->
+    <insert id="insertAppDevice" parameterType="org.dromara.member.domain.AppDevice" useGeneratedKeys="true"
+            keyProperty="deviceId">
+        insert into app_device
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="userId != null">user_id,</if>
+            <if test="deviceType != null and deviceType != ''">device_type,</if>
+            <if test="deviceName != null and deviceName != ''">device_name,</if>
+            <if test="deviceModel != null and deviceModel != ''">device_model,</if>
+            <if test="deviceBrand != null and deviceBrand != ''">device_brand,</if>
+            <if test="osVersion != null and osVersion != ''">os_version,</if>
+            <if test="appVersion != null and appVersion != ''">app_version,</if>
+            <if test="pushToken != null and pushToken != ''">push_token,</if>
+            <if test="isActive != null">is_active,</if>
+            <if test="lastActiveTime != null">last_active_time,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateTime != null">update_time,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="userId != null">#{userId},</if>
+            <if test="deviceType != null and deviceType != ''">#{deviceType},</if>
+            <if test="deviceName != null and deviceName != ''">#{deviceName},</if>
+            <if test="deviceModel != null and deviceModel != ''">#{deviceModel},</if>
+            <if test="deviceBrand != null and deviceBrand != ''">#{deviceBrand},</if>
+            <if test="osVersion != null and osVersion != ''">#{osVersion},</if>
+            <if test="appVersion != null and appVersion != ''">#{appVersion},</if>
+            <if test="pushToken != null and pushToken != ''">#{pushToken},</if>
+            <if test="isActive != null">#{isActive},</if>
+            <if test="lastActiveTime != null">#{lastActiveTime},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+        </trim>
+    </insert>
+
+    <!-- 修改设备信息 -->
+    <update id="updateAppDevice" parameterType="org.dromara.member.domain.AppDevice">
+        update app_device
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="deviceType != null and deviceType != ''">device_type = #{deviceType},</if>
+            <if test="deviceName != null and deviceName != ''">device_name = #{deviceName},</if>
+            <if test="deviceModel != null and deviceModel != ''">device_model = #{deviceModel},</if>
+            <if test="deviceBrand != null and deviceBrand != ''">device_brand = #{deviceBrand},</if>
+            <if test="osVersion != null and osVersion != ''">os_version = #{osVersion},</if>
+            <if test="appVersion != null and appVersion != ''">app_version = #{appVersion},</if>
+            <if test="pushToken != null and pushToken != ''">push_token = #{pushToken},</if>
+            <if test="isActive != null">is_active = #{isActive},</if>
+            <if test="lastActiveTime != null">last_active_time = #{lastActiveTime},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+        </trim>
+        where device_id = #{deviceId}
+    </update>
+
+    <!-- 删除设备信息 -->
+    <delete id="deleteAppDeviceByDeviceId" parameterType="Long">
+        delete
+        from app_device
+        where device_id = #{deviceId}
+    </delete>
+
+    <!-- 批量删除设备信息 -->
+    <delete id="deleteAppDeviceByDeviceIds" parameterType="String">
+        delete from app_device where device_id in
+        <foreach item="deviceId" collection="array" open="(" separator="," close=")">
+            #{deviceId}
+        </foreach>
+    </delete>
+
+    <!-- 更新设备活跃状态 -->
+    <update id="updateDeviceActiveStatus">
+        update app_device
+        set is_active        = #{isActive},
+            last_active_time = #{lastActiveTime}
+        where device_id = #{deviceId}
+    </update>
+
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/AppFileMapper.xml b/ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/AppFileMapper.xml
new file mode 100644
index 0000000..18106f3
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/AppFileMapper.xml
@@ -0,0 +1,166 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.member.mapper.AppFileMapper">
+
+    <resultMap type="org.dromara.member.domain.AppFile" id="AppFileResult">
+        <result property="fileId" column="file_id"/>
+        <result property="userId" column="user_id"/>
+        <result property="fileName" column="file_name"/>
+        <result property="originalName" column="original_name"/>
+        <result property="filePath" column="file_path"/>
+        <result property="fileUrl" column="file_url"/>
+        <result property="fileSize" column="file_size"/>
+        <result property="fileType" column="file_type"/>
+        <result property="fileSuffix" column="file_suffix"/>
+        <result property="fileCategory" column="file_category"/>
+        <result property="storageService" column="storage_service"/>
+        <result property="status" column="status"/>
+        <result property="downloadCount" column="download_count"/>
+        <result property="isPublic" column="is_public"/>
+        <result property="fileMd5" column="file_md5"/>
+        <result property="remark" column="remark"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+    </resultMap>
+
+    <sql id="selectAppFileVo">
+        select file_id,
+               user_id,
+               file_name,
+               original_name,
+               file_path,
+               file_url,
+               file_size,
+               file_type,
+               file_suffix,
+               file_category,
+               storage_service,
+               status,
+               download_count,
+               is_public,
+               file_md5,
+               remark,
+               create_by,
+               create_time,
+               update_by,
+               update_time
+        from app_file
+    </sql>
+
+    <select id="selectAppFileList" parameterType="org.dromara.member.domain.AppFile" resultMap="AppFileResult">
+        <include refid="selectAppFileVo"/>
+        <where>
+            <if test="userId != null ">and user_id = #{userId}</if>
+            <if test="fileName != null  and fileName != ''">and file_name like concat('%', #{fileName}, '%')</if>
+            <if test="originalName != null  and originalName != ''">and original_name like concat('%', #{originalName},
+                '%')
+            </if>
+            <if test="filePath != null  and filePath != ''">and file_path = #{filePath}</if>
+            <if test="fileUrl != null  and fileUrl != ''">and file_url = #{fileUrl}</if>
+            <if test="fileSize != null ">and file_size = #{fileSize}</if>
+            <if test="fileType != null  and fileType != ''">and file_type = #{fileType}</if>
+            <if test="fileSuffix != null  and fileSuffix != ''">and file_suffix = #{fileSuffix}</if>
+            <if test="fileCategory != null ">and file_category = #{fileCategory}</if>
+            <if test="storageService != null  and storageService != ''">and storage_service = #{storageService}</if>
+            <if test="status != null  and status != ''">and status = #{status}</if>
+            <if test="downloadCount != null ">and download_count = #{downloadCount}</if>
+            <if test="isPublic != null  and isPublic != ''">and is_public = #{isPublic}</if>
+            <if test="fileMd5 != null  and fileMd5 != ''">and file_md5 = #{fileMd5}</if>
+        </where>
+        order by create_time desc
+    </select>
+
+    <select id="selectAppFileByFileId" parameterType="Long" resultMap="AppFileResult">
+        <include refid="selectAppFileVo"/>
+        where file_id = #{fileId}
+    </select>
+
+    <insert id="insertAppFile" parameterType="org.dromara.member.domain.AppFile" useGeneratedKeys="true"
+            keyProperty="fileId">
+        insert into app_file
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="userId != null">user_id,</if>
+            <if test="fileName != null and fileName != ''">file_name,</if>
+            <if test="originalName != null and originalName != ''">original_name,</if>
+            <if test="filePath != null and filePath != ''">file_path,</if>
+            <if test="fileUrl != null and fileUrl != ''">file_url,</if>
+            <if test="fileSize != null">file_size,</if>
+            <if test="fileType != null and fileType != ''">file_type,</if>
+            <if test="fileSuffix != null and fileSuffix != ''">file_suffix,</if>
+            <if test="fileCategory != null">file_category,</if>
+            <if test="storageService != null and storageService != ''">storage_service,</if>
+            <if test="status != null and status != ''">status,</if>
+            <if test="downloadCount != null">download_count,</if>
+            <if test="isPublic != null and isPublic != ''">is_public,</if>
+            <if test="fileMd5 != null and fileMd5 != ''">file_md5,</if>
+            <if test="remark != null">remark,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="userId != null">#{userId},</if>
+            <if test="fileName != null and fileName != ''">#{fileName},</if>
+            <if test="originalName != null and originalName != ''">#{originalName},</if>
+            <if test="filePath != null and filePath != ''">#{filePath},</if>
+            <if test="fileUrl != null and fileUrl != ''">#{fileUrl},</if>
+            <if test="fileSize != null">#{fileSize},</if>
+            <if test="fileType != null and fileType != ''">#{fileType},</if>
+            <if test="fileSuffix != null and fileSuffix != ''">#{fileSuffix},</if>
+            <if test="fileCategory != null">#{fileCategory},</if>
+            <if test="storageService != null and storageService != ''">#{storageService},</if>
+            <if test="status != null and status != ''">#{status},</if>
+            <if test="downloadCount != null">#{downloadCount},</if>
+            <if test="isPublic != null and isPublic != ''">#{isPublic},</if>
+            <if test="fileMd5 != null and fileMd5 != ''">#{fileMd5},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+        </trim>
+    </insert>
+
+    <update id="updateAppFile" parameterType="org.dromara.member.domain.AppFile">
+        update app_file
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="userId != null">user_id = #{userId},</if>
+            <if test="fileName != null and fileName != ''">file_name = #{fileName},</if>
+            <if test="originalName != null and originalName != ''">original_name = #{originalName},</if>
+            <if test="filePath != null and filePath != ''">file_path = #{filePath},</if>
+            <if test="fileUrl != null and fileUrl != ''">file_url = #{fileUrl},</if>
+            <if test="fileSize != null">file_size = #{fileSize},</if>
+            <if test="fileType != null and fileType != ''">file_type = #{fileType},</if>
+            <if test="fileSuffix != null and fileSuffix != ''">file_suffix = #{fileSuffix},</if>
+            <if test="fileCategory != null">file_category = #{fileCategory},</if>
+            <if test="storageService != null and storageService != ''">storage_service = #{storageService},</if>
+            <if test="status != null and status != ''">status = #{status},</if>
+            <if test="downloadCount != null">download_count = #{downloadCount},</if>
+            <if test="isPublic != null and isPublic != ''">is_public = #{isPublic},</if>
+            <if test="fileMd5 != null and fileMd5 != ''">file_md5 = #{fileMd5},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+        </trim>
+        where file_id = #{fileId}
+    </update>
+
+    <delete id="deleteAppFileByFileId" parameterType="Long">
+        delete
+        from app_file
+        where file_id = #{fileId}
+    </delete>
+
+    <delete id="deleteAppFileByFileIds" parameterType="String">
+        delete from app_file where file_id in
+        <foreach item="fileId" collection="array" open="(" separator="," close=")">
+            #{fileId}
+        </foreach>
+    </delete>
+
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/AppLoginLogMapper.xml b/ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/AppLoginLogMapper.xml
new file mode 100644
index 0000000..e6115cc
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/AppLoginLogMapper.xml
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.member.mapper.AppLoginLogMapper">
+
+    <resultMap type="org.dromara.member.domain.AppLoginLog" id="AppLoginLogResult">
+        <id property="infoId" column="info_id"/>
+        <result property="userName" column="user_name"/>
+        <result property="status" column="status"/>
+        <result property="ipaddr" column="ipaddr"/>
+        <result property="loginLocation" column="login_location"/>
+        <result property="browser" column="browser"/>
+        <result property="os" column="os"/>
+        <result property="msg" column="msg"/>
+        <result property="loginTime" column="login_time"/>
+    </resultMap>
+
+    <resultMap type="org.dromara.member.domain.vo.AppLoginLogVo" id="AppLoginLogVoResult">
+        <id property="infoId" column="info_id"/>
+        <result property="userName" column="user_name"/>
+        <result property="status" column="status"/>
+        <result property="ipaddr" column="ipaddr"/>
+        <result property="loginLocation" column="login_location"/>
+        <result property="browser" column="browser"/>
+        <result property="os" column="os"/>
+        <result property="msg" column="msg"/>
+        <result property="loginTime" column="login_time"/>
+    </resultMap>
+
+    <sql id="selectAppLoginLogVo">
+        select info_id,
+               user_name,
+               status,
+               ipaddr,
+               login_location,
+               browser,
+               os,
+               msg,
+               login_time
+        from app_login_log
+    </sql>
+
+    <!-- 查询登录日志列表 -->
+    <select id="selectAppLoginLogList" parameterType="AppLoginLog" resultMap="AppLoginLogVoResult">
+        <include refid="selectAppLoginLogVo"/>
+        <where>
+            <if test="userName != null and userName != ''">and user_name like concat('%', #{userName}, '%')</if>
+            <if test="status != null and status != ''">and status = #{status}</if>
+            <if test="ipaddr != null and ipaddr != ''">and ipaddr like concat('%', #{ipaddr}, '%')</if>
+            <if test="loginLocation != null and loginLocation != ''">and login_location like concat('%',
+                #{loginLocation}, '%')
+            </if>
+            <if test="params.beginTime != null and params.beginTime != ''">and login_time &gt;= #{params.beginTime}</if>
+            <if test="params.endTime != null and params.endTime != ''">and login_time &lt;= #{params.endTime}</if>
+        </where>
+        order by login_time desc
+    </select>
+
+    <!-- 根据ID查询登录日志 -->
+    <select id="selectAppLoginLogByInfoId" parameterType="Long" resultMap="AppLoginLogVoResult">
+        <include refid="selectAppLoginLogVo"/>
+        where info_id = #{infoId}
+    </select>
+
+    <!-- 根据用户名查询登录日志 -->
+    <select id="selectAppLoginLogByUserName" parameterType="String" resultMap="AppLoginLogVoResult">
+        <include refid="selectAppLoginLogVo"/>
+        where user_name = #{userName}
+        order by login_time desc
+    </select>
+
+    <!-- 新增登录日志 -->
+    <insert id="insertAppLoginLog" parameterType="org.dromara.member.domain.AppLoginLog" useGeneratedKeys="true"
+            keyProperty="infoId">
+        insert into app_login_log
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="userName != null and userName != ''">user_name,</if>
+            <if test="status != null and status != ''">status,</if>
+            <if test="ipaddr != null and ipaddr != ''">ipaddr,</if>
+            <if test="loginLocation != null and loginLocation != ''">login_location,</if>
+            <if test="browser != null and browser != ''">browser,</if>
+            <if test="os != null and os != ''">os,</if>
+            <if test="msg != null and msg != ''">msg,</if>
+            <if test="loginTime != null">login_time,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="userName != null and userName != ''">#{userName},</if>
+            <if test="status != null and status != ''">#{status},</if>
+            <if test="ipaddr != null and ipaddr != ''">#{ipaddr},</if>
+            <if test="loginLocation != null and loginLocation != ''">#{loginLocation},</if>
+            <if test="browser != null and browser != ''">#{browser},</if>
+            <if test="os != null and os != ''">#{os},</if>
+            <if test="msg != null and msg != ''">#{msg},</if>
+            <if test="loginTime != null">#{loginTime},</if>
+        </trim>
+    </insert>
+
+    <!-- 删除登录日志 -->
+    <delete id="deleteAppLoginLogByInfoId" parameterType="Long">
+        delete
+        from app_login_log
+        where info_id = #{infoId}
+    </delete>
+
+    <!-- 批量删除登录日志 -->
+    <delete id="deleteAppLoginLogByInfoIds" parameterType="String">
+        delete from app_login_log where info_id in
+        <foreach item="infoId" collection="array" open="(" separator="," close=")">
+            #{infoId}
+        </foreach>
+    </delete>
+
+    <!-- 清空登录日志 -->
+    <delete id="cleanAppLoginLog">
+        truncate table app_login_log
+    </delete>
+
+    <!-- 根据时间范围删除登录日志 -->
+    <delete id="deleteAppLoginLogByTime">
+        delete from app_login_log
+        <where>
+            <if test="beginTime != null and beginTime != ''">and login_time &gt;= #{beginTime}</if>
+            <if test="endTime != null and endTime != ''">and login_time &lt;= #{endTime}</if>
+        </where>
+    </delete>
+
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/AppMessageMapper.xml b/ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/AppMessageMapper.xml
new file mode 100644
index 0000000..ef0d208
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/AppMessageMapper.xml
@@ -0,0 +1,175 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.member.mapper.AppMessageMapper">
+
+    <resultMap type="org.dromara.member.domain.AppMessage" id="AppMessageResult">
+        <result property="messageId" column="message_id"/>
+        <result property="title" column="title"/>
+        <result property="content" column="content"/>
+        <result property="messageType" column="message_type"/>
+        <result property="pushTarget" column="push_target"/>
+        <result property="targetIds" column="target_ids"/>
+        <result property="sendTime" column="send_time"/>
+        <result property="status" column="status"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="remark" column="remark"/>
+    </resultMap>
+
+    <resultMap type="org.dromara.member.domain.vo.AppMessageVo" id="AppMessageVoResult">
+        <result property="messageId" column="message_id"/>
+        <result property="title" column="title"/>
+        <result property="content" column="content"/>
+        <result property="messageType" column="message_type"/>
+        <result property="pushTarget" column="push_target"/>
+        <result property="targetIds" column="target_ids"/>
+        <result property="sendTime" column="send_time"/>
+        <result property="status" column="status"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="remark" column="remark"/>
+    </resultMap>
+
+    <sql id="selectAppMessageVo">
+        select message_id,
+               title,
+               content,
+               message_type,
+               push_target,
+               target_ids,
+               send_time,
+               status,
+               create_by,
+               create_time,
+               update_by,
+               update_time,
+               remark
+        from app_message
+    </sql>
+
+    <select id="selectMessagesByUserId" parameterType="Long" resultMap="AppMessageResult">
+        <include refid="selectAppMessageVo"/>
+        where (push_target = 'user' and FIND_IN_SET(#{userId}, target_ids))
+        or push_target = 'all'
+        order by send_time desc
+    </select>
+
+    <select id="selectMessagesByRoleId" parameterType="Long" resultMap="AppMessageResult">
+        <include refid="selectAppMessageVo"/>
+        where push_target = 'role' and FIND_IN_SET(#{roleId}, target_ids)
+        order by send_time desc
+    </select>
+
+    <select id="selectMessagesForAll" resultMap="AppMessageResult">
+        <include refid="selectAppMessageVo"/>
+        where push_target = 'all'
+        order by send_time desc
+    </select>
+
+    <select id="selectAppMessageList" parameterType="AppMessage" resultMap="AppMessageVoResult">
+        <include refid="selectAppMessageVo"/>
+        <where>
+            <if test="title != null and title != ''">and title like concat('%', #{title}, '%')</if>
+            <if test="messageType != null and messageType != ''">and message_type = #{messageType}</if>
+            <if test="pushTarget != null and pushTarget != ''">and push_target = #{pushTarget}</if>
+            <if test="status != null and status != ''">and status = #{status}</if>
+            <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
+                and date_format(send_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
+            </if>
+            <if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
+                and date_format(send_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
+            </if>
+        </where>
+        order by send_time desc
+    </select>
+
+    <select id="selectAppMessageByMessageId" parameterType="Long" resultMap="AppMessageVoResult">
+        <include refid="selectAppMessageVo"/>
+        where message_id = #{messageId}
+    </select>
+
+    <select id="selectAppMessageByStatus" parameterType="String" resultMap="AppMessageVoResult">
+        <include refid="selectAppMessageVo"/>
+        where status = #{status}
+        order by send_time desc
+    </select>
+
+    <insert id="insertAppMessage" parameterType="AppMessage" useGeneratedKeys="true" keyProperty="messageId">
+        insert into app_message
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="title != null and title != ''">title,</if>
+            <if test="content != null">content,</if>
+            <if test="messageType != null and messageType != ''">message_type,</if>
+            <if test="pushTarget != null and pushTarget != ''">push_target,</if>
+            <if test="targetIds != null">target_ids,</if>
+            <if test="sendTime != null">send_time,</if>
+            <if test="status != null">status,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="remark != null">remark,</if>
+            create_time
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="title != null and title != ''">#{title},</if>
+            <if test="content != null">#{content},</if>
+            <if test="messageType != null and messageType != ''">#{messageType},</if>
+            <if test="pushTarget != null and pushTarget != ''">#{pushTarget},</if>
+            <if test="targetIds != null">#{targetIds},</if>
+            <if test="sendTime != null">#{sendTime},</if>
+            <if test="status != null">#{status},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="remark != null">#{remark},</if>
+            sysdate()
+        </trim>
+    </insert>
+
+    <update id="updateAppMessage" parameterType="AppMessage">
+        update app_message
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="title != null and title != ''">title = #{title},</if>
+            <if test="content != null">content = #{content},</if>
+            <if test="messageType != null and messageType != ''">message_type = #{messageType},</if>
+            <if test="pushTarget != null and pushTarget != ''">push_target = #{pushTarget},</if>
+            <if test="targetIds != null">target_ids = #{targetIds},</if>
+            <if test="sendTime != null">send_time = #{sendTime},</if>
+            <if test="status != null">status = #{status},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            update_time = sysdate()
+        </trim>
+        where message_id = #{messageId}
+    </update>
+
+    <update id="updateMessageStatus" parameterType="AppMessage">
+        update app_message
+        set status      = #{status},
+            update_by   = #{updateBy},
+            update_time = sysdate()
+        where message_id = #{messageId}
+    </update>
+
+    <delete id="deleteAppMessageByMessageId" parameterType="Long">
+        delete
+        from app_message
+        where message_id = #{messageId}
+    </delete>
+
+    <delete id="deleteAppMessageByMessageIds" parameterType="String">
+        delete from app_message where message_id in
+        <foreach item="messageId" collection="array" open="(" separator="," close=")">
+            #{messageId}
+        </foreach>
+    </delete>
+
+    <delete id="deleteAppMessageByStatus" parameterType="String">
+        delete
+        from app_message
+        where status = #{status}
+    </delete>
+
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/AppOperLogMapper.xml b/ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/AppOperLogMapper.xml
new file mode 100644
index 0000000..faabbaa
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/AppOperLogMapper.xml
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.member.mapper.AppOperLogMapper">
+
+    <resultMap type="org.dromara.member.domain.AppOperLog" id="AppOperLogResult">
+        <id property="operId" column="oper_id"/>
+        <result property="title" column="title"/>
+        <result property="businessType" column="business_type"/>
+        <result property="method" column="method"/>
+        <result property="requestMethod" column="request_method"/>
+        <result property="operName" column="oper_name"/>
+        <result property="operUrl" column="oper_url"/>
+        <result property="operIp" column="oper_ip"/>
+        <result property="operLocation" column="oper_location"/>
+        <result property="operParam" column="oper_param"/>
+        <result property="jsonResult" column="json_result"/>
+        <result property="status" column="status"/>
+        <result property="errorMsg" column="error_msg"/>
+        <result property="operTime" column="oper_time"/>
+        <result property="costTime" column="cost_time"/>
+    </resultMap>
+
+    <resultMap type="org.dromara.member.domain.vo.AppOperLogVo" id="AppOperLogVoResult">
+        <id property="operId" column="oper_id"/>
+        <result property="title" column="title"/>
+        <result property="businessType" column="business_type"/>
+        <result property="method" column="method"/>
+        <result property="requestMethod" column="request_method"/>
+        <result property="operName" column="oper_name"/>
+        <result property="operUrl" column="oper_url"/>
+        <result property="operIp" column="oper_ip"/>
+        <result property="operLocation" column="oper_location"/>
+        <result property="operParam" column="oper_param"/>
+        <result property="jsonResult" column="json_result"/>
+        <result property="status" column="status"/>
+        <result property="errorMsg" column="error_msg"/>
+        <result property="operTime" column="oper_time"/>
+        <result property="costTime" column="cost_time"/>
+    </resultMap>
+
+    <sql id="selectAppOperLogVo">
+        select oper_id,
+               title,
+               business_type,
+               method,
+               request_method,
+               oper_name,
+               oper_url,
+               oper_ip,
+               oper_location,
+               oper_param,
+               json_result,
+               status,
+               error_msg,
+               oper_time,
+               cost_time
+        from app_oper_log
+    </sql>
+
+    <!-- 查询操作日志列表 -->
+    <select id="selectAppOperLogList" parameterType="AppOperLog" resultMap="AppOperLogVoResult">
+        <include refid="selectAppOperLogVo"/>
+        <where>
+            <if test="title != null and title != ''">and title like concat('%', #{title}, '%')</if>
+            <if test="businessType != null">and business_type = #{businessType}</if>
+            <if test="method != null and method != ''">and method like concat('%', #{method}, '%')</if>
+            <if test="requestMethod != null and requestMethod != ''">and request_method = #{requestMethod}</if>
+            <if test="operName != null and operName != ''">and oper_name like concat('%', #{operName}, '%')</if>
+            <if test="operIp != null and operIp != ''">and oper_ip like concat('%', #{operIp}, '%')</if>
+            <if test="status != null">and status = #{status}</if>
+            <if test="params.beginTime != null and params.beginTime != ''">and oper_time &gt;= #{params.beginTime}</if>
+            <if test="params.endTime != null and params.endTime != ''">and oper_time &lt;= #{params.endTime}</if>
+        </where>
+        order by oper_time desc
+    </select>
+
+    <!-- 根据ID查询操作日志 -->
+    <select id="selectAppOperLogByOperId" parameterType="Long" resultMap="AppOperLogVoResult">
+        <include refid="selectAppOperLogVo"/>
+        where oper_id = #{operId}
+    </select>
+
+    <!-- 根据操作人查询操作日志 -->
+    <select id="selectAppOperLogByOperName" parameterType="String" resultMap="AppOperLogVoResult">
+        <include refid="selectAppOperLogVo"/>
+        where oper_name = #{operName}
+        order by oper_time desc
+    </select>
+
+    <!-- 新增操作日志 -->
+    <insert id="insertAppOperLog" parameterType="org.dromara.member.domain.AppOperLog" useGeneratedKeys="true"
+            keyProperty="operId">
+        insert into app_oper_log
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="title != null and title != ''">title,</if>
+            <if test="businessType != null">business_type,</if>
+            <if test="method != null and method != ''">method,</if>
+            <if test="requestMethod != null and requestMethod != ''">request_method,</if>
+            <if test="operName != null and operName != ''">oper_name,</if>
+            <if test="operUrl != null and operUrl != ''">oper_url,</if>
+            <if test="operIp != null and operIp != ''">oper_ip,</if>
+            <if test="operLocation != null and operLocation != ''">oper_location,</if>
+            <if test="operParam != null and operParam != ''">oper_param,</if>
+            <if test="jsonResult != null and jsonResult != ''">json_result,</if>
+            <if test="status != null">status,</if>
+            <if test="errorMsg != null and errorMsg != ''">error_msg,</if>
+            <if test="operTime != null">oper_time,</if>
+            <if test="costTime != null">cost_time,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="title != null and title != ''">#{title},</if>
+            <if test="businessType != null">#{businessType},</if>
+            <if test="method != null and method != ''">#{method},</if>
+            <if test="requestMethod != null and requestMethod != ''">#{requestMethod},</if>
+            <if test="operName != null and operName != ''">#{operName},</if>
+            <if test="operUrl != null and operUrl != ''">#{operUrl},</if>
+            <if test="operIp != null and operIp != ''">#{operIp},</if>
+            <if test="operLocation != null and operLocation != ''">#{operLocation},</if>
+            <if test="operParam != null and operParam != ''">#{operParam},</if>
+            <if test="jsonResult != null and jsonResult != ''">#{jsonResult},</if>
+            <if test="status != null">#{status},</if>
+            <if test="errorMsg != null and errorMsg != ''">#{errorMsg},</if>
+            <if test="operTime != null">#{operTime},</if>
+            <if test="costTime != null">#{costTime},</if>
+        </trim>
+    </insert>
+
+    <!-- 删除操作日志 -->
+    <delete id="deleteAppOperLogByOperId" parameterType="Long">
+        delete
+        from app_oper_log
+        where oper_id = #{operId}
+    </delete>
+
+    <!-- 批量删除操作日志 -->
+    <delete id="deleteAppOperLogByOperIds" parameterType="String">
+        delete from app_oper_log where oper_id in
+        <foreach item="operId" collection="array" open="(" separator="," close=")">
+            #{operId}
+        </foreach>
+    </delete>
+
+    <!-- 清空操作日志 -->
+    <delete id="cleanAppOperLog">
+        truncate table app_oper_log
+    </delete>
+
+    <!-- 根据时间范围删除操作日志 -->
+    <delete id="deleteAppOperLogByTime">
+        delete from app_oper_log
+        <where>
+            <if test="beginTime != null and beginTime != ''">and oper_time &gt;= #{beginTime}</if>
+            <if test="endTime != null and endTime != ''">and oper_time &lt;= #{endTime}</if>
+        </where>
+    </delete>
+
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/AppRoleMapper.xml b/ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/AppRoleMapper.xml
new file mode 100644
index 0000000..e6904f6
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/AppRoleMapper.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.member.mapper.AppRoleMapper">
+
+    <resultMap type="org.dromara.member.domain.AppRole" id="AppRoleResult">
+        <id property="roleId" column="role_id"/>
+        <result property="roleName" column="role_name"/>
+        <result property="roleKey" column="role_key"/>
+        <result property="roleSort" column="role_sort"/>
+        <result property="status" column="status"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="remark" column="remark"/>
+    </resultMap>
+
+    <resultMap type="org.dromara.member.domain.vo.AppRoleVo" id="AppRoleVoResult">
+        <id property="roleId" column="role_id"/>
+        <result property="roleName" column="role_name"/>
+        <result property="roleKey" column="role_key"/>
+        <result property="roleSort" column="role_sort"/>
+        <result property="status" column="status"/>
+        <result property="createTime" column="create_time"/>
+        <result property="remark" column="remark"/>
+    </resultMap>
+
+    <sql id="selectAppRoleVo">
+        select distinct r.role_id,
+                        r.role_name,
+                        r.role_key,
+                        r.role_sort,
+                        r.status,
+                        r.del_flag,
+                        r.create_time,
+                        r.remark
+        from app_role r
+                 left join app_user_role ur on ur.role_id = r.role_id
+                 left join app_user u on u.user_id = ur.user_id
+    </sql>
+
+    <select id="selectRolesByUserId" parameterType="Long" resultMap="AppRoleVoResult">
+        <include refid="selectAppRoleVo"/>
+        WHERE r.del_flag = '0' and ur.user_id = #{userId}
+    </select>
+
+    <select id="selectRolePermissionByUserId" parameterType="Long" resultType="String">
+        select distinct r.role_key
+        from app_role r
+                 left join app_user_role ur on ur.role_id = r.role_id
+        WHERE r.del_flag = '0'
+          and ur.user_id = #{userId}
+    </select>
+
+    <select id="selectRoleAll" resultMap="AppRoleVoResult">
+        <include refid="selectAppRoleVo"/>
+        where r.del_flag = '0'
+    </select>
+
+    <select id="selectRoleListByUserId" parameterType="Long" resultType="Long">
+        select r.role_id
+        from app_role r
+                 left join app_user_role ur on ur.role_id = r.role_id
+                 left join app_user u on u.user_id = ur.user_id
+        where u.user_id = #{userId}
+    </select>
+
+    <select id="checkRoleNameUnique" parameterType="String" resultType="int">
+        select count(1)
+        from app_role r
+        where r.role_name = #{roleName}
+          and r.del_flag = '0'
+    </select>
+
+    <select id="checkRoleKeyUnique" parameterType="String" resultType="int">
+        select count(1)
+        from app_role r
+        where r.role_key = #{roleKey}
+          and r.del_flag = '0'
+    </select>
+
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/AppSocialAuthMapper.xml b/ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/AppSocialAuthMapper.xml
new file mode 100644
index 0000000..5bb6d26
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/AppSocialAuthMapper.xml
@@ -0,0 +1,186 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.member.mapper.AppSocialAuthMapper">
+
+    <resultMap type="org.dromara.member.domain.AppSocialAuth" id="AppSocialAuthResult">
+        <id property="id" column="id"/>
+        <result property="userId" column="user_id"/>
+        <result property="platform" column="platform"/>
+        <result property="platformUid" column="platform_uid"/>
+        <result property="openId" column="open_id"/>
+        <result property="unionId" column="union_id"/>
+        <result property="accessToken" column="access_token"/>
+        <result property="expireIn" column="expire_in"/>
+        <result property="refreshToken" column="refresh_token"/>
+        <result property="scope" column="scope"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+    </resultMap>
+
+    <resultMap type="org.dromara.member.domain.vo.AppSocialAuthVo" id="AppSocialAuthVoResult">
+        <id property="id" column="id"/>
+        <result property="userId" column="user_id"/>
+        <result property="platform" column="platform"/>
+        <result property="platformUid" column="platform_uid"/>
+        <result property="openId" column="open_id"/>
+        <result property="unionId" column="union_id"/>
+        <result property="accessToken" column="access_token"/>
+        <result property="expireIn" column="expire_in"/>
+        <result property="refreshToken" column="refresh_token"/>
+        <result property="scope" column="scope"/>
+        <result property="createTime" column="create_time"/>
+    </resultMap>
+
+    <sql id="selectAppSocialAuthVo">
+        select id,
+               user_id,
+               platform,
+               platform_uid,
+               open_id,
+               union_id,
+               access_token,
+               expire_in,
+               refresh_token,
+               scope,
+               del_flag,
+               create_by,
+               create_time,
+               update_by,
+               update_time
+        from app_social_auth
+    </sql>
+
+    <!-- 查询社交认证列表 -->
+    <select id="selectAppSocialAuthList" parameterType="AppSocialAuth" resultMap="AppSocialAuthVoResult">
+        <include refid="selectAppSocialAuthVo"/>
+        <where>
+            <if test="userId != null">and user_id = #{userId}</if>
+            <if test="platform != null and platform != ''">and platform = #{platform}</if>
+            <if test="platformUid != null and platformUid != ''">and platform_uid = #{platformUid}</if>
+            <if test="openId != null and openId != ''">and open_id = #{openId}</if>
+            <if test="unionId != null and unionId != ''">and union_id = #{unionId}</if>
+            and del_flag = '0'
+        </where>
+        order by create_time desc
+    </select>
+
+    <!-- 根据ID查询社交认证 -->
+    <select id="selectAppSocialAuthById" parameterType="Long" resultMap="AppSocialAuthVoResult">
+        <include refid="selectAppSocialAuthVo"/>
+        where id = #{id} and del_flag = '0'
+    </select>
+
+    <!-- 根据用户ID查询社交认证列表 -->
+    <select id="selectAppSocialAuthByUserId" parameterType="Long" resultMap="AppSocialAuthVoResult">
+        <include refid="selectAppSocialAuthVo"/>
+        where user_id = #{userId} and del_flag = '0'
+        order by create_time desc
+    </select>
+
+    <!-- 根据平台和openId查询社交认证 -->
+    <select id="selectAppSocialAuthByPlatformAndOpenId" resultMap="AppSocialAuthResult">
+        <include refid="selectAppSocialAuthVo"/>
+        where platform = #{platform} and open_id = #{openId} and del_flag = '0'
+    </select>
+
+    <!-- 根据平台和unionId查询社交认证 -->
+    <select id="selectAppSocialAuthByPlatformAndUnionId" resultMap="AppSocialAuthResult">
+        <include refid="selectAppSocialAuthVo"/>
+        where platform = #{platform} and union_id = #{unionId} and del_flag = '0'
+    </select>
+
+    <!-- 新增社交认证 -->
+    <insert id="insertAppSocialAuth" parameterType="org.dromara.member.domain.AppSocialAuth" useGeneratedKeys="true"
+            keyProperty="id">
+        insert into app_social_auth
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="userId != null">user_id,</if>
+            <if test="platform != null and platform != ''">platform,</if>
+            <if test="platformUid != null and platformUid != ''">platform_uid,</if>
+            <if test="openId != null and openId != ''">open_id,</if>
+            <if test="unionId != null and unionId != ''">union_id,</if>
+            <if test="accessToken != null and accessToken != ''">access_token,</if>
+            <if test="expireIn != null">expire_in,</if>
+            <if test="refreshToken != null and refreshToken != ''">refresh_token,</if>
+            <if test="scope != null and scope != ''">scope,</if>
+            <if test="delFlag != null and delFlag != ''">del_flag,</if>
+            <if test="createBy != null and createBy != ''">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null and updateBy != ''">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="userId != null">#{userId},</if>
+            <if test="platform != null and platform != ''">#{platform},</if>
+            <if test="platformUid != null and platformUid != ''">#{platformUid},</if>
+            <if test="openId != null and openId != ''">#{openId},</if>
+            <if test="unionId != null and unionId != ''">#{unionId},</if>
+            <if test="accessToken != null and accessToken != ''">#{accessToken},</if>
+            <if test="expireIn != null">#{expireIn},</if>
+            <if test="refreshToken != null and refreshToken != ''">#{refreshToken},</if>
+            <if test="scope != null and scope != ''">#{scope},</if>
+            <if test="delFlag != null and delFlag != ''">#{delFlag},</if>
+            <if test="createBy != null and createBy != ''">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null and updateBy != ''">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+        </trim>
+    </insert>
+
+    <!-- 修改社交认证 -->
+    <update id="updateAppSocialAuth" parameterType="org.dromara.member.domain.AppSocialAuth">
+        update app_social_auth
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="userId != null">user_id = #{userId},</if>
+            <if test="platform != null and platform != ''">platform = #{platform},</if>
+            <if test="platformUid != null and platformUid != ''">platform_uid = #{platformUid},</if>
+            <if test="openId != null and openId != ''">open_id = #{openId},</if>
+            <if test="unionId != null and unionId != ''">union_id = #{unionId},</if>
+            <if test="accessToken != null and accessToken != ''">access_token = #{accessToken},</if>
+            <if test="expireIn != null">expire_in = #{expireIn},</if>
+            <if test="refreshToken != null and refreshToken != ''">refresh_token = #{refreshToken},</if>
+            <if test="scope != null and scope != ''">scope = #{scope},</if>
+            <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <!-- 删除社交认证 -->
+    <update id="deleteAppSocialAuthById" parameterType="Long">
+        update app_social_auth
+        set del_flag = '2'
+        where id = #{id}
+    </update>
+
+    <!-- 批量删除社交认证 -->
+    <update id="deleteAppSocialAuthByIds" parameterType="String">
+        update app_social_auth set del_flag = '2' where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+
+    <!-- 根据用户ID删除社交认证 -->
+    <update id="deleteAppSocialAuthByUserId" parameterType="Long">
+        update app_social_auth
+        set del_flag = '2'
+        where user_id = #{userId}
+    </update>
+
+    <!-- 更新访问令牌 -->
+    <update id="updateAccessToken">
+        update app_social_auth
+        set access_token  = #{accessToken},
+            expire_in     = #{expireIn},
+            refresh_token = #{refreshToken},
+            update_time   = #{updateTime}
+        where id = #{id}
+    </update>
+
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/AppUserMapper.xml b/ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/AppUserMapper.xml
new file mode 100644
index 0000000..4b5626b
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/AppUserMapper.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.member.mapper.AppUserMapper">
+
+    <resultMap type="org.dromara.member.domain.AppUser" id="AppUserResult">
+        <id property="userId" column="user_id"/>
+        <result property="userName" column="user_name"/>
+        <result property="nickName" column="nick_name"/>
+        <result property="phone" column="phone"/>
+        <result property="email" column="email"/>
+        <result property="sex" column="sex"/>
+        <result property="avatar" column="avatar"/>
+        <result property="password" column="password"/>
+        <result property="status" column="status"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="loginIp" column="login_ip"/>
+        <result property="loginDate" column="login_date"/>
+        <result property="registerTime" column="register_time"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="remark" column="remark"/>
+    </resultMap>
+
+
+    <resultMap type="org.dromara.member.domain.vo.AppUserVo" id="AppUserResultVo">
+        <id property="userId" column="user_id"/>
+        <result property="userName" column="user_name"/>
+        <result property="nickName" column="nick_name"/>
+        <result property="phone" column="phone"/>
+        <result property="email" column="email"/>
+        <result property="sex" column="sex"/>
+        <result property="avatar" column="avatar"/>
+        <result property="status" column="status"/>
+        <result property="loginIp" column="login_ip"/>
+        <result property="loginDate" column="login_date"/>
+        <result property="registerTime" column="register_time"/>
+        <result property="createTime" column="create_time"/>
+        <result property="remark" column="remark"/>
+    </resultMap>
+
+    <sql id="selectAppUserVo">
+        select user_id,
+               user_name,
+               nick_name,
+               phone,
+               email,
+               sex,
+               avatar,
+               password,
+               status,
+               del_flag,
+               login_ip,
+               login_date,
+               register_time,
+               create_by,
+               create_time,
+               update_by,
+               update_time,
+               remark
+        from app_user
+    </sql>
+
+    <select id="selectUserByUserName" parameterType="String" resultMap="AppUserResultVo">
+        <include refid="selectAppUserVo"/>
+        where user_name = #{userName} and del_flag = '0'
+    </select>
+
+    <select id="selectUserByPhone" parameterType="String" resultMap="AppUserResultVo">
+        <include refid="selectAppUserVo"/>
+        where phone = #{phone} and del_flag = '0'
+    </select>
+
+    <select id="selectUserByEmail" parameterType="String" resultMap="AppUserResultVo">
+        <include refid="selectAppUserVo"/>
+        where email = #{email} and del_flag = '0'
+    </select>
+
+    <select id="checkUserNameUnique" parameterType="String" resultType="int">
+        select count(*)
+        from app_user
+        where user_name = #{userName}
+          and del_flag = '0'
+    </select>
+
+    <select id="checkPhoneUnique" parameterType="String" resultType="int">
+        select count(*)
+        from app_user
+        where phone = #{phone}
+          and del_flag = '0'
+    </select>
+
+    <select id="checkEmailUnique" parameterType="String" resultType="int">
+        select count(*)
+        from app_user
+        where email = #{email}
+          and del_flag = '0'
+    </select>
+
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/AppUserMessageMapper.xml b/ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/AppUserMessageMapper.xml
new file mode 100644
index 0000000..5f91c6d
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/AppUserMessageMapper.xml
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.member.mapper.AppUserMessageMapper">
+
+    <resultMap type="org.dromara.member.domain.AppUserMessage" id="AppUserMessageResult">
+        <id property="id" column="id"/>
+        <result property="userId" column="user_id"/>
+        <result property="messageId" column="message_id"/>
+        <result property="isRead" column="is_read"/>
+        <result property="readTime" column="read_time"/>
+        <result property="createTime" column="create_time"/>
+    </resultMap>
+
+    <resultMap type="org.dromara.member.domain.vo.AppUserMessageVo" id="AppUserMessageVoResult">
+        <id property="id" column="id"/>
+        <result property="userId" column="user_id"/>
+        <result property="messageId" column="message_id"/>
+        <result property="isRead" column="is_read"/>
+        <result property="readTime" column="read_time"/>
+        <result property="createTime" column="create_time"/>
+    </resultMap>
+
+    <sql id="selectAppUserMessageVo">
+        select user_message_id, user_id, message_id, is_read, read_time, create_time
+        from app_user_message
+    </sql>
+
+    <select id="selectAppUserMessageList" parameterType="AppUserMessage" resultMap="AppUserMessageVoResult">
+        <include refid="selectAppUserMessageVo"/>
+        <where>
+            <if test="userId != null">and user_id = #{userId}</if>
+            <if test="messageId != null">and message_id = #{messageId}</if>
+            <if test="isRead != null">and is_read = #{isRead}</if>
+            <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
+                and date_format(create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
+            </if>
+            <if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
+                and date_format(create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
+            </if>
+        </where>
+        order by create_time desc
+    </select>
+
+    <select id="selectAppUserMessageByUserMessageId" parameterType="Long" resultMap="AppUserMessageVoResult">
+        <include refid="selectAppUserMessageVo"/>
+        where user_message_id = #{userMessageId}
+    </select>
+
+    <select id="selectAppUserMessageByUserId" parameterType="Long" resultMap="AppUserMessageVoResult">
+        <include refid="selectAppUserMessageVo"/>
+        where user_id = #{userId}
+        order by create_time desc
+    </select>
+
+    <select id="selectUnreadMessagesByUserId" parameterType="Long" resultMap="AppUserMessageVoResult">
+        <include refid="selectAppUserMessageVo"/>
+        where user_id = #{userId} and is_read = 0
+        order by create_time desc
+    </select>
+
+    <select id="countUnreadMessagesByUserId" parameterType="Long" resultType="int">
+        select count(1)
+        from app_user_message
+        where user_id = #{userId}
+          and is_read = 0
+    </select>
+
+    <select id="selectAppUserMessageByUserIdAndMessageId" resultMap="AppUserMessageVoResult">
+        <include refid="selectAppUserMessageVo"/>
+        where user_id = #{userId} and message_id = #{messageId}
+    </select>
+
+    <insert id="insertAppUserMessage" parameterType="AppUserMessage" useGeneratedKeys="true"
+            keyProperty="userMessageId">
+        insert into app_user_message
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="userId != null">user_id,</if>
+            <if test="messageId != null">message_id,</if>
+            <if test="isRead != null">is_read,</if>
+            <if test="readTime != null">read_time,</if>
+            create_time
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="userId != null">#{userId},</if>
+            <if test="messageId != null">#{messageId},</if>
+            <if test="isRead != null">#{isRead},</if>
+            <if test="readTime != null">#{readTime},</if>
+            sysdate()
+        </trim>
+    </insert>
+
+    <insert id="batchInsertAppUserMessage" parameterType="java.util.List">
+        insert into app_user_message(user_id, message_id, is_read, create_time)
+        values
+        <foreach collection="list" item="item" separator=",">
+            (#{item.userId}, #{item.messageId}, #{item.isRead}, sysdate())
+        </foreach>
+    </insert>
+
+    <update id="updateAppUserMessage" parameterType="AppUserMessage">
+        update app_user_message
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="userId != null">user_id = #{userId},</if>
+            <if test="messageId != null">message_id = #{messageId},</if>
+            <if test="isRead != null">is_read = #{isRead},</if>
+            <if test="readTime != null">read_time = #{readTime},</if>
+        </trim>
+        where user_message_id = #{userMessageId}
+    </update>
+
+    <update id="markAsRead" parameterType="Long">
+        update app_user_message
+        set is_read   = 1,
+            read_time = sysdate()
+        where user_message_id = #{userMessageId}
+    </update>
+
+    <update id="markAllAsReadByUserId" parameterType="Long">
+        update app_user_message
+        set is_read   = 1,
+            read_time = sysdate()
+        where user_id = #{userId}
+          and is_read = 0
+    </update>
+
+    <delete id="deleteAppUserMessageByUserMessageId" parameterType="Long">
+        delete
+        from app_user_message
+        where user_message_id = #{userMessageId}
+    </delete>
+
+    <delete id="deleteAppUserMessageByUserMessageIds" parameterType="String">
+        delete from app_user_message where user_message_id in
+        <foreach item="userMessageId" collection="array" open="(" separator="," close=")">
+            #{userMessageId}
+        </foreach>
+    </delete>
+
+    <delete id="deleteAppUserMessageByUserId" parameterType="Long">
+        delete
+        from app_user_message
+        where user_id = #{userId}
+    </delete>
+
+    <delete id="deleteAppUserMessageByMessageId" parameterType="Long">
+        delete
+        from app_user_message
+        where message_id = #{messageId}
+    </delete>
+
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/AppUserRoleMapper.xml b/ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/AppUserRoleMapper.xml
new file mode 100644
index 0000000..612ea92
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/AppUserRoleMapper.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.member.mapper.AppUserRoleMapper">
+
+    <resultMap type="org.dromara.member.domain.AppUserRole" id="AppUserRoleResult">
+        <result property="userId" column="user_id"/>
+        <result property="roleId" column="role_id"/>
+    </resultMap>
+
+    <!-- 通过用户ID删除用户和角色关联 -->
+    <delete id="deleteUserRoleByUserId" parameterType="Long">
+        delete
+        from app_user_role
+        where user_id = #{userId}
+    </delete>
+
+    <!-- 批量删除用户和角色关联 -->
+    <delete id="deleteUserRole" parameterType="Long">
+        delete from app_user_role where user_id in
+        <foreach collection="array" item="userId" open="(" separator="," close=")">
+            #{userId}
+        </foreach>
+    </delete>
+
+    <!-- 通过角色ID查询角色使用数量 -->
+    <select id="countUserRoleByRoleId" parameterType="Long" resultType="int">
+        select count(1)
+        from app_user_role
+        where role_id = #{roleId}
+    </select>
+
+    <!-- 批量新增用户角色信息 -->
+    <insert id="batchUserRole">
+        insert into app_user_role(user_id, role_id) values
+        <foreach item="item" index="index" collection="list" separator=",">
+            (#{item.userId}, #{item.roleId})
+        </foreach>
+    </insert>
+
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/AppVersionMapper.xml b/ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/AppVersionMapper.xml
new file mode 100644
index 0000000..8f05559
--- /dev/null
+++ b/ruoyi-modules/ruoyi-member/src/main/resources/mapper/member/AppVersionMapper.xml
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.member.mapper.AppVersionMapper">
+
+    <resultMap type="org.dromara.member.domain.AppVersion" id="AppVersionResult">
+        <id property="versionId" column="version_id"/>
+        <result property="versionCode" column="version_code"/>
+        <result property="versionName" column="version_name"/>
+        <result property="updateContent" column="update_content"/>
+        <result property="downloadUrl" column="download_url"/>
+        <result property="isForce" column="is_force"/>
+        <result property="platform" column="platform"/>
+        <result property="createTime" column="create_time"/>
+    </resultMap>
+
+    <resultMap type="org.dromara.member.domain.vo.AppVersionVo" id="AppVersionVoResult">
+        <id property="versionId" column="version_id"/>
+        <result property="versionCode" column="version_code"/>
+        <result property="versionName" column="version_name"/>
+        <result property="updateContent" column="update_content"/>
+        <result property="downloadUrl" column="download_url"/>
+        <result property="isForce" column="is_force"/>
+        <result property="platform" column="platform"/>
+        <result property="createTime" column="create_time"/>
+    </resultMap>
+
+    <sql id="selectAppVersionVo">
+        select version_id,
+               version_code,
+               version_name,
+               update_content,
+               download_url,
+               is_force,
+               platform,
+               create_time
+        from app_version
+    </sql>
+
+    <select id="selectAppVersionList" parameterType="AppVersion" resultMap="AppVersionVoResult">
+        <include refid="selectAppVersionVo"/>
+        <where>
+            <if test="versionName != null and versionName != ''">and version_name like concat('%', #{versionName},
+                '%')
+            </if>
+            <if test="versionCode != null and versionCode != ''">and version_code = #{versionCode}</if>
+            <if test="platform != null and platform != ''">and platform = #{platform}</if>
+            <if test="isForce != null">and is_force = #{isForce}</if>
+        </where>
+        order by create_time desc
+    </select>
+
+    <select id="selectAppVersionByVersionId" parameterType="Long" resultMap="AppVersionVoResult">
+        <include refid="selectAppVersionVo"/>
+        where version_id = #{versionId}
+    </select>
+
+    <select id="selectLatestVersionByPlatform" parameterType="String" resultMap="AppVersionVoResult">
+        <include refid="selectAppVersionVo"/>
+        where platform = #{platform}
+        order by version_code desc
+        limit 1
+    </select>
+
+    <select id="checkVersionCodeUnique" parameterType="AppVersion" resultType="int">
+        select count(1) from app_version
+        where version_code = #{versionCode} and platform = #{platform}
+        <if test="versionId != null and versionId != 0">and version_id != #{versionId}</if>
+    </select>
+
+    <insert id="insertAppVersion" parameterType="AppVersion" useGeneratedKeys="true" keyProperty="versionId">
+        insert into app_version
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="versionCode != null and versionCode != ''">version_code,</if>
+            <if test="versionName != null and versionName != ''">version_name,</if>
+            <if test="updateContent != null">update_content,</if>
+            <if test="downloadUrl != null">download_url,</if>
+            <if test="isForce != null">is_force,</if>
+            <if test="platform != null and platform != ''">platform,</if>
+            create_time
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="versionCode != null and versionCode != ''">#{versionCode},</if>
+            <if test="versionName != null and versionName != ''">#{versionName},</if>
+            <if test="updateContent != null">#{updateContent},</if>
+            <if test="downloadUrl != null">#{downloadUrl},</if>
+            <if test="isForce != null">#{isForce},</if>
+            <if test="platform != null and platform != ''">#{platform},</if>
+            sysdate()
+        </trim>
+    </insert>
+
+    <update id="updateAppVersion" parameterType="AppVersion">
+        update app_version
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="versionCode != null and versionCode != ''">version_code = #{versionCode},</if>
+            <if test="versionName != null and versionName != ''">version_name = #{versionName},</if>
+            <if test="updateContent != null">update_content = #{updateContent},</if>
+            <if test="downloadUrl != null">download_url = #{downloadUrl},</if>
+            <if test="isForce != null">is_force = #{isForce},</if>
+            <if test="platform != null and platform != ''">platform = #{platform},</if>
+        </trim>
+        where version_id = #{versionId}
+    </update>
+
+    <delete id="deleteAppVersionByVersionId" parameterType="Long">
+        delete
+        from app_version
+        where version_id = #{versionId}
+    </delete>
+
+    <delete id="deleteAppVersionByVersionIds" parameterType="String">
+        delete from app_version where version_id in
+        <foreach item="versionId" collection="array" open="(" separator="," close=")">
+            #{versionId}
+        </foreach>
+    </delete>
+
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-mp/pom.xml b/ruoyi-modules/ruoyi-mp/pom.xml
new file mode 100644
index 0000000..b0bde9f
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mp/pom.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         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.dromara</groupId>
+        <artifactId>ruoyi-modules</artifactId>
+        <version>${revision}</version>
+    </parent>
+
+    <artifactId>ruoyi-mp</artifactId>
+    <description>微信公众号模块</description>
+
+    <dependencies>
+        <!-- 核心模块 -->
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-core</artifactId>
+        </dependency>
+
+        <!-- Web模块 -->
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-web</artifactId>
+        </dependency>
+
+        <!-- 安全模块 -->
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-satoken</artifactId>
+        </dependency>
+
+        <!-- 微信公众号 SDK -->
+        <dependency>
+            <groupId>com.github.binarywang</groupId>
+            <artifactId>weixin-java-mp</artifactId>
+        </dependency>
+
+        <!-- Spring Boot Starter Web -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+
+        <!-- Spring Boot Configuration Processor -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-configuration-processor</artifactId>
+            <optional>true</optional>
+        </dependency>
+
+        <!-- Jackson -->
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+        </dependency>
+
+        <!-- Lombok -->
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <optional>true</optional>
+        </dependency>
+
+        <!-- Hutool -->
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>${hutool.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>redis.clients</groupId>
+            <artifactId>jedis</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/annotation/SwitchoverCheck.java b/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/annotation/SwitchoverCheck.java
new file mode 100644
index 0000000..654b8ed
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/annotation/SwitchoverCheck.java
@@ -0,0 +1,16 @@
+package org.dromara.mp.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * 微信公众号切换配置注解
+ *
+ * @author Peng Les
+ */
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface SwitchoverCheck {
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/aspect/SwitchoverCheckAspect.java b/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/aspect/SwitchoverCheckAspect.java
new file mode 100644
index 0000000..112d090
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/aspect/SwitchoverCheckAspect.java
@@ -0,0 +1,46 @@
+package org.dromara.mp.aspect;
+
+import me.chanjar.weixin.mp.api.WxMpService;
+import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Before;
+import org.aspectj.lang.annotation.Pointcut;
+import org.dromara.common.core.utils.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 微信公众号切面 用于切换公众号配置
+ *
+ * @author Peng Les
+ */
+@Aspect
+@Component
+public class SwitchoverCheckAspect {
+
+    @Autowired
+    private WxMpService wxMpService;
+
+    @Pointcut("@annotation(org.dromara.mp.annotation.SwitchoverCheck)")
+    public void switchoverCheckPointcut() {
+    }
+
+    @Before("switchoverCheckPointcut()")
+    public void beforeSwitchover(JoinPoint joinPoint) {
+        // 获取方法参数
+        Object[] args = joinPoint.getArgs();
+        if (args.length > 0 && args[0] instanceof String) {
+            String appid = (String) args[0];
+            System.out.println("前置切面：准备切换公众号配置，appid: " + appid);
+
+            // 检查 appid 是否为空
+            if (StringUtils.isEmpty(appid)) {
+                throw new IllegalArgumentException("appid 不能为空！");
+            }
+
+            if (!wxMpService.switchover(appid)) {
+                throw new IllegalArgumentException(String.format("未找到对应appid=[%s]的配置，请核实！", appid));
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/builder/WxMpAbstractBuilder.java b/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/builder/WxMpAbstractBuilder.java
new file mode 100644
index 0000000..73fbf31
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/builder/WxMpAbstractBuilder.java
@@ -0,0 +1,17 @@
+package org.dromara.mp.builder;
+
+import me.chanjar.weixin.mp.api.WxMpService;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlOutMessage;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * @author Peng Les
+ */
+public abstract class WxMpAbstractBuilder {
+    protected final Logger logger = LoggerFactory.getLogger(getClass());
+
+    public abstract WxMpXmlOutMessage build(String content,
+                                            WxMpXmlMessage wxMessage, WxMpService service);
+}
diff --git a/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/builder/WxMpImageBuilderWxMp.java b/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/builder/WxMpImageBuilderWxMp.java
new file mode 100644
index 0000000..4ff8f6e
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/builder/WxMpImageBuilderWxMp.java
@@ -0,0 +1,23 @@
+package org.dromara.mp.builder;
+
+import me.chanjar.weixin.mp.api.WxMpService;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlOutImageMessage;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlOutMessage;
+
+/**
+ * @author Peng Les
+ */
+public class WxMpImageBuilderWxMp extends WxMpAbstractBuilder {
+
+    @Override
+    public WxMpXmlOutMessage build(String content, WxMpXmlMessage wxMessage,
+                                   WxMpService service) {
+        logger.info("build 图片消息，内容：{}", content);
+        WxMpXmlOutImageMessage m = WxMpXmlOutMessage.IMAGE().mediaId(content)
+                .fromUser(wxMessage.getToUser()).toUser(wxMessage.getFromUser())
+                .build();
+        return m;
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/builder/WxMpTextBuilderWxMp.java b/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/builder/WxMpTextBuilderWxMp.java
new file mode 100644
index 0000000..d48c3fe
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/builder/WxMpTextBuilderWxMp.java
@@ -0,0 +1,23 @@
+package org.dromara.mp.builder;
+
+import me.chanjar.weixin.mp.api.WxMpService;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlOutMessage;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlOutTextMessage;
+
+/**
+ * @author Peng Les
+ */
+public class WxMpTextBuilderWxMp extends WxMpAbstractBuilder {
+
+    @Override
+    public WxMpXmlOutMessage build(String content, WxMpXmlMessage wxMessage,
+                                   WxMpService service) {
+        logger.info("build 文本消息，内容：{}", content);
+        WxMpXmlOutTextMessage m = WxMpXmlOutMessage.TEXT().content(content)
+                .fromUser(wxMessage.getToUser()).toUser(wxMessage.getFromUser())
+                .build();
+        return m;
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/config/WxMpConfiguration.java b/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/config/WxMpConfiguration.java
new file mode 100644
index 0000000..7b29202
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/config/WxMpConfiguration.java
@@ -0,0 +1,81 @@
+package org.dromara.mp.config;
+
+import lombok.RequiredArgsConstructor;
+import me.chanjar.weixin.common.redis.JedisWxRedisOps;
+import me.chanjar.weixin.mp.api.WxMpMessageRouter;
+import me.chanjar.weixin.mp.api.WxMpService;
+import me.chanjar.weixin.mp.api.impl.WxMpServiceImpl;
+import me.chanjar.weixin.mp.config.impl.WxMpDefaultConfigImpl;
+import me.chanjar.weixin.mp.config.impl.WxMpRedisConfigImpl;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import redis.clients.jedis.JedisPool;
+import redis.clients.jedis.JedisPoolConfig;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 微信公众号配置
+ *
+ * @author pengles
+ *
+ * 微信公众号服务端装配：
+ * - 读取 wx.mp.* 配置，支持多公众号与可选 Redis 存储
+ * - 注入 WxMpService 与消息路由器，用于处理消息、二维码、模板消息等能力
+ */
+@Configuration
+@EnableConfigurationProperties(WxMpProperties.class)
+@ConditionalOnClass(WxMpService.class)
+@RequiredArgsConstructor
+public class WxMpConfiguration {
+
+    private final WxMpProperties properties;
+
+    /**
+     * 构建 WxMpService，支持多公众号配置与 Redis 存储
+     */
+    @Bean
+    @ConditionalOnMissingBean
+    public WxMpService wxMpService() {
+        final List<WxMpProperties.MpConfig> configs = this.properties.getConfigs();
+        if (configs == null || configs.isEmpty()) {
+            throw new RuntimeException("请先配置微信公众号相关信息！");
+        }
+
+        WxMpService service = new WxMpServiceImpl();
+        service.setMultiConfigStorages(configs
+                .stream().map(a -> {
+                    WxMpDefaultConfigImpl configStorage;
+                    if (this.properties.isUseRedis()) {
+                        final WxMpProperties.RedisConfig redisConfig = this.properties.getRedisConfig();
+                        JedisPoolConfig poolConfig = new JedisPoolConfig();
+                        JedisPool jedisPool = new JedisPool(poolConfig, redisConfig.getHost(), redisConfig.getPort(),
+                                redisConfig.getTimeout(), redisConfig.getPassword());
+                        configStorage = new WxMpRedisConfigImpl(new JedisWxRedisOps(jedisPool), a.getAppId());
+                    } else {
+                        configStorage = new WxMpDefaultConfigImpl();
+                    }
+
+                    configStorage.setAppId(a.getAppId());
+                    configStorage.setSecret(a.getSecret());
+                    configStorage.setToken(a.getToken());
+                    configStorage.setAesKey(a.getAesKey());
+                    configStorage.setOauth2RedirectUrl(a.getOauth2RedirectUrl());
+                    configStorage.setQrConnectRedirectUrl(a.getQrConnectRedirectUrl());
+                    return configStorage;
+                }).collect(Collectors.toMap(WxMpDefaultConfigImpl::getAppId, a -> a, (o, n) -> o)));
+        return service;
+    }
+
+    /**
+     * 构建消息路由器，按规则分发处理入口消息
+     */
+    @Bean
+    public WxMpMessageRouter messageRouter(WxMpService wxMpService) {
+        return new WxMpMessageRouter(wxMpService);
+    }
+}
diff --git a/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/config/WxMpProperties.java b/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/config/WxMpProperties.java
new file mode 100644
index 0000000..c258809
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/config/WxMpProperties.java
@@ -0,0 +1,87 @@
+package org.dromara.mp.config;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+import java.util.List;
+
+/**
+ * 微信公众号属性绑定（wx.mp.*）
+ * - useRedis：是否使用 Redis 存储 access token
+ * - redisConfig：Redis 连接参数
+ * - configs：多公众号配置（appid、secret、token、aesKey 以及各类回调地址）
+ */
+@Data
+@ConfigurationProperties(prefix = "wx.mp")
+public class WxMpProperties {
+    /**
+     * 是否使用redis存储access token
+     */
+    private boolean useRedis;
+
+    /**
+     * redis 配置
+     */
+    private RedisConfig redisConfig;
+    /**
+     * 多个公众号配置信息
+     */
+    private List<MpConfig> configs;
+
+    @Data
+    public static class RedisConfig {
+        /**
+         * redis服务器 主机地址
+         */
+        private String host;
+        /**
+         * redis服务器 端口号
+         */
+        private Integer port;
+        /**
+         * redis服务器 数据库索引
+         */
+        private Integer database;
+        /**
+         * redis服务器 密码
+         */
+        private String password;
+        /**
+         * redis服务器 连接超时时间
+         */
+        private Integer timeout;
+    }
+
+    @Data
+    public static class MpConfig {
+        /**
+         * 设置微信公众号的appid
+         */
+        private String appId;
+
+        /**
+         * 设置微信公众号的app secret
+         */
+        private String secret;
+
+        /**
+         * 设置微信公众号的token
+         */
+        private String token;
+
+        /**
+         * 设置微信公众号的EncodingAESKey
+         */
+        private String aesKey;
+
+        /**
+         * 设置微信公众号网页授权获取用户信息回调地址
+         */
+        private String oauth2RedirectUrl;
+
+        /**
+         * 设置微信公众号网页应用授权登陆回调地址回调地址
+         */
+        private String qrConnectRedirectUrl;
+    }
+}
diff --git a/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/controller/WxMpJsapiController.java b/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/controller/WxMpJsapiController.java
new file mode 100644
index 0000000..0d7663d
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/controller/WxMpJsapiController.java
@@ -0,0 +1,107 @@
+package org.dromara.mp.controller;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import me.chanjar.weixin.common.bean.WxJsapiSignature;
+import me.chanjar.weixin.mp.api.WxMpService;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.mp.annotation.SwitchoverCheck;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 微信公众号JSAPI控制器
+ *
+ * @author pengles
+ */
+@Slf4j
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/wx/mp/jsapi/{appid}")
+public class WxMpJsapiController extends BaseController {
+
+    private final WxMpService wxMpService;
+
+    /**
+     * 获取JSAPI票据
+     *
+     * @param appid        公众号appid
+     * @param forceRefresh 是否强制刷新
+     * @return JSAPI票据
+     */
+    @GetMapping("/ticket")
+    @SwitchoverCheck
+    public R<String> getJsapiTicket(@PathVariable String appid,
+                                    @RequestParam(defaultValue = "false") boolean forceRefresh) {
+        try {
+            String ticket = wxMpService.getJsapiTicket(forceRefresh);
+            return R.ok(ticket);
+        } catch (Exception e) {
+            log.error("获取JSAPI票据失败: {}", e.getMessage(), e);
+            return R.fail("获取JSAPI票据失败: " + e.getMessage());
+        }
+    }
+
+    /**
+     * 创建JSAPI签名
+     *
+     * @param appid 公众号appid
+     * @param url   当前网页的URL，不包含#及其后面部分
+     * @return JSAPI签名信息
+     */
+    @GetMapping("/signature")
+    @SwitchoverCheck
+    public R<WxJsapiSignature> createJsapiSignature(@PathVariable String appid,
+                                                    @RequestParam String url) {
+        try {
+            WxJsapiSignature signature = wxMpService.createJsapiSignature(url);
+            return R.ok(signature);
+        } catch (Exception e) {
+            log.error("创建JSAPI签名失败: {}", e.getMessage(), e);
+            return R.fail("创建JSAPI签名失败: " + e.getMessage());
+        }
+    }
+
+    /**
+     * 获取微信卡券签名
+     *
+     * @param appid 公众号appid
+     * @param url   当前网页的URL
+     * @return 卡券签名信息
+     */
+    @GetMapping("/card/signature")
+    @SwitchoverCheck
+    public R<Object> createCardSignature(@PathVariable String appid,
+                                         @RequestParam String url) {
+        try {
+            // 这里可以添加卡券签名的逻辑
+            log.info("创建卡券签名: appid={}, url={}", appid, url);
+            return R.ok("卡券签名功能待实现");
+        } catch (Exception e) {
+            log.error("创建卡券签名失败: {}", e.getMessage(), e);
+            return R.fail("创建卡券签名失败: " + e.getMessage());
+        }
+    }
+
+    /**
+     * 获取微信JS接口的临时票据
+     *
+     * @param appid 公众号appid
+     * @param type  票据类型
+     * @return 临时票据
+     */
+    @GetMapping("/ticket/{type}")
+    @SwitchoverCheck
+    public R<String> getTicket(@PathVariable String appid,
+                               @PathVariable String type) {
+        try {
+            String ticket = wxMpService.getTicket(me.chanjar.weixin.common.enums.TicketType.valueOf(type.toUpperCase()));
+            return R.ok(ticket);
+        } catch (Exception e) {
+            log.error("获取票据失败: {}", e.getMessage(), e);
+            return R.fail("获取票据失败: " + e.getMessage());
+        }
+    }
+}
diff --git a/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/controller/WxMpMediaController.java b/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/controller/WxMpMediaController.java
new file mode 100644
index 0000000..247f3ca
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/controller/WxMpMediaController.java
@@ -0,0 +1,205 @@
+package org.dromara.mp.controller;
+
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import me.chanjar.weixin.common.bean.result.WxMediaUploadResult;
+import me.chanjar.weixin.mp.api.WxMpService;
+import me.chanjar.weixin.mp.bean.material.WxMpMaterialFileBatchGetResult;
+import me.chanjar.weixin.mp.bean.material.WxMpMaterialUploadResult;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.mp.annotation.SwitchoverCheck;
+import org.dromara.mp.service.WxMpMaterialService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.io.File;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+/**
+ * 微信公众号素材管理控制器
+ *
+ * @author pengles
+ */
+@Slf4j
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/wx/mp/media/{appid}")
+public class WxMpMediaController extends BaseController {
+
+    private final WxMpService wxMpService;
+    private final WxMpMaterialService wxMpMaterialService;
+
+    /**
+     * 上传临时素材
+     *
+     * @param appid 公众号appid
+     * @param type  素材类型（image、voice、video、thumb）
+     * @param file  文件
+     * @return 上传结果
+     */
+    @PostMapping("/upload/temp")
+    @SwitchoverCheck
+    public R<WxMediaUploadResult> uploadTempMedia(@PathVariable String appid,
+                                                  @RequestParam String type,
+                                                  @RequestParam("file") File file) {
+        try {
+            WxMediaUploadResult result = wxMpMaterialService.uploadTempMedia(type, file);
+            return R.ok(result);
+        } catch (Exception e) {
+            log.error("上传临时素材失败: {}", e.getMessage(), e);
+            return R.fail("上传临时素材失败: " + e.getMessage());
+        }
+    }
+
+    /**
+     * 下载临时素材
+     *
+     * @param appid    公众号appid
+     * @param mediaId  素材ID
+     * @param response HTTP响应
+     */
+    @GetMapping("/download/temp/{mediaId}")
+    @SwitchoverCheck
+    public void downloadTempMedia(@PathVariable String appid,
+                                  @PathVariable String mediaId,
+                                  HttpServletResponse response) {
+        try {
+            InputStream inputStream = wxMpMaterialService.downloadTempMedia(mediaId);
+            response.setContentType("application/octet-stream");
+            response.setHeader("Content-Disposition", "attachment; filename=" + mediaId);
+
+            try (OutputStream outputStream = response.getOutputStream()) {
+                byte[] buffer = new byte[1024];
+                int bytesRead;
+                while ((bytesRead = inputStream.read(buffer)) != -1) {
+                    outputStream.write(buffer, 0, bytesRead);
+                }
+                outputStream.flush();
+            }
+        } catch (Exception e) {
+            log.error("下载临时素材失败: {}", e.getMessage(), e);
+            response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+        }
+    }
+
+    /**
+     * 上传永久素材
+     *
+     * @param appid 公众号appid
+     * @param type  素材类型（image、voice、video、thumb）
+     * @param file  文件
+     * @return 上传结果
+     */
+    @PostMapping("/upload/forever")
+    @SwitchoverCheck
+    public R<WxMpMaterialUploadResult> uploadForeverMedia(@PathVariable String appid,
+                                                          @RequestParam String type,
+                                                          @RequestParam("file") File file) {
+        try {
+            WxMpMaterialUploadResult result = wxMpMaterialService.uploadMaterial(type, file);
+            return R.ok(result);
+        } catch (Exception e) {
+            log.error("上传永久素材失败: {}", e.getMessage(), e);
+            return R.fail("上传永久素材失败: " + e.getMessage());
+        }
+    }
+
+    /**
+     * 删除永久素材
+     *
+     * @param appid   公众号appid
+     * @param mediaId 素材ID
+     * @return 删除结果
+     */
+    @DeleteMapping("/delete/forever/{mediaId}")
+    @SwitchoverCheck
+    public R<Void> deleteForeverMedia(@PathVariable String appid, @PathVariable String mediaId) {
+        try {
+            boolean result = wxMpMaterialService.deleteMaterial(mediaId);
+            return result ? R.ok() : R.fail("删除永久素材失败");
+        } catch (Exception e) {
+            log.error("删除永久素材失败: {}", e.getMessage(), e);
+            return R.fail("删除永久素材失败: " + e.getMessage());
+        }
+    }
+
+    /**
+     * 获取永久素材
+     *
+     * @param appid   公众号appid
+     * @param mediaId 素材ID
+     */
+    @GetMapping("/get/forever/{mediaId}")
+    @SwitchoverCheck
+    public R<WxMpMaterialFileBatchGetResult.WxMaterialFileBatchGetNewsItem> getForeverMedia(@PathVariable String appid,
+                                                                                            @PathVariable String mediaId) {
+        WxMpMaterialFileBatchGetResult.WxMaterialFileBatchGetNewsItem wxMpMaterialServiceMaterial = wxMpMaterialService.getMaterial(mediaId);
+        return R.ok(wxMpMaterialServiceMaterial);
+    }
+
+    /**
+     * 获取素材总数
+     *
+     * @param appid 公众号appid
+     * @return 素材总数
+     */
+    @GetMapping("/count")
+    @SwitchoverCheck
+    public R<Object> getMaterialCount(@PathVariable String appid) {
+        try {
+            Object count = wxMpMaterialService.getMaterialCount();
+            return R.ok(count);
+        } catch (Exception e) {
+            log.error("获取素材总数失败: {}", e.getMessage(), e);
+            return R.fail("获取素材总数失败: " + e.getMessage());
+        }
+    }
+
+    /**
+     * 获取素材列表
+     *
+     * @param appid  公众号appid
+     * @param type   素材类型
+     * @param offset 偏移量
+     * @param count  数量
+     * @return 素材列表
+     */
+    @GetMapping("/list")
+    @SwitchoverCheck
+    public R<Object> getMaterialList(@PathVariable String appid,
+                                     @RequestParam String type,
+                                     @RequestParam(defaultValue = "0") int offset,
+                                     @RequestParam(defaultValue = "20") int count) {
+        try {
+            Object materialList = wxMpMaterialService.getMaterialList(type, offset, count);
+            return R.ok(materialList);
+        } catch (Exception e) {
+            log.error("获取素材列表失败: {}", e.getMessage(), e);
+            return R.fail("获取素材列表失败: " + e.getMessage());
+        }
+    }
+
+    /**
+     * 上传图文消息内的图片
+     *
+     * @param appid 公众号appid
+     * @param file  图片文件
+     * @return 上传结果
+     */
+    @PostMapping("/upload/img")
+    @SwitchoverCheck
+    public R<String> uploadImg(@PathVariable String appid,
+                               @RequestParam("file") File file) {
+        try {
+            String url = wxMpMaterialService.uploadImg(file);
+            return R.ok(url);
+        } catch (Exception e) {
+            log.error("上传图文消息图片失败: {}", e.getMessage(), e);
+            return R.fail("上传图文消息图片失败: " + e.getMessage());
+        }
+    }
+}
diff --git a/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/controller/WxMpMenuController.java b/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/controller/WxMpMenuController.java
new file mode 100644
index 0000000..e4f52eb
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/controller/WxMpMenuController.java
@@ -0,0 +1,124 @@
+package org.dromara.mp.controller;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import me.chanjar.weixin.common.bean.menu.WxMenu;
+import me.chanjar.weixin.mp.api.WxMpService;
+import me.chanjar.weixin.mp.bean.menu.WxMpMenu;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.mp.annotation.SwitchoverCheck;
+import org.dromara.mp.service.WxMpMenuService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 微信公众号菜单管理控制器
+ *
+ * @author pengles
+ */
+@Slf4j
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/wx/mp/menu/{appid}")
+public class WxMpMenuController extends BaseController {
+
+    private final WxMpService wxMpService;
+    private final WxMpMenuService wxMpMenuService;
+
+    /**
+     * 创建菜单
+     *
+     * @param appid  公众号appid
+     * @param wxMenu 菜单信息
+     * @return 创建结果
+     */
+    @PostMapping("/create")
+    @SwitchoverCheck
+    public R<Void> createMenu(@PathVariable String appid, @RequestBody WxMenu wxMenu) {
+        try {
+            boolean result = wxMpMenuService.createMenu(wxMenu);
+            return result ? R.ok() : R.fail("创建菜单失败");
+        } catch (Exception e) {
+            log.error("创建菜单失败: {}", e.getMessage(), e);
+            return R.fail("创建菜单失败: " + e.getMessage());
+        }
+    }
+
+    /**
+     * 删除菜单
+     *
+     * @param appid 公众号appid
+     * @return 删除结果
+     */
+    @DeleteMapping("/delete")
+    @SwitchoverCheck
+    public R<Void> deleteMenu(@PathVariable String appid) {
+        try {
+            boolean result = wxMpMenuService.deleteMenu();
+            return result ? R.ok() : R.fail("删除菜单失败");
+        } catch (Exception e) {
+            log.error("删除菜单失败: {}", e.getMessage(), e);
+            return R.fail("删除菜单失败: " + e.getMessage());
+        }
+    }
+
+    /**
+     * 查询菜单
+     *
+     * @param appid 公众号appid
+     * @return 菜单信息
+     */
+    @GetMapping("/get")
+    @SwitchoverCheck
+    public R<WxMpMenu> getMenu(@PathVariable String appid) {
+        try {
+            WxMpMenu menu = wxMpMenuService.getMenu();
+            return R.ok(menu);
+        } catch (Exception e) {
+            log.error("查询菜单失败: {}", e.getMessage(), e);
+            return R.fail("查询菜单失败: " + e.getMessage());
+        }
+    }
+
+    /**
+     * 创建默认菜单
+     *
+     * @param appid 公众号appid
+     * @return 创建结果
+     */
+    @PostMapping("/create-default")
+    @SwitchoverCheck
+    public R<Void> createDefaultMenu(@PathVariable String appid) {
+        try {
+            boolean result = wxMpMenuService.createDefaultMenu();
+            return result ? R.ok() : R.fail("创建默认菜单失败");
+        } catch (Exception e) {
+            log.error("创建默认菜单失败: {}", e.getMessage(), e);
+            return R.fail("创建默认菜单失败: " + e.getMessage());
+        }
+    }
+
+    /**
+     * 处理菜单点击事件
+     *
+     * @param appid    公众号appid
+     * @param eventKey 事件key
+     * @param openid   用户openid
+     * @return 处理结果
+     */
+    @PostMapping("/handle-click")
+    @SwitchoverCheck
+    public R<String> handleMenuClick(@PathVariable String appid,
+                                     @RequestParam String eventKey,
+                                     @RequestParam String openid) {
+        try {
+            String response = wxMpMenuService.handleMenuClick(eventKey);
+            return R.ok(response);
+        } catch (Exception e) {
+            log.error("处理菜单点击事件失败: {}", e.getMessage(), e);
+            return R.fail("处理菜单点击事件失败: " + e.getMessage());
+        }
+    }
+}
diff --git a/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/controller/WxMpOAuth2Controller.java b/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/controller/WxMpOAuth2Controller.java
new file mode 100644
index 0000000..72d6b7b
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/controller/WxMpOAuth2Controller.java
@@ -0,0 +1,235 @@
+package org.dromara.mp.controller;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import me.chanjar.weixin.common.bean.oauth2.WxOAuth2AccessToken;
+import me.chanjar.weixin.common.enums.TicketType;
+import me.chanjar.weixin.mp.api.WxMpService;
+import org.apache.commons.codec.digest.DigestUtils;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.mp.annotation.SwitchoverCheck;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.UUID;
+
+/**
+ * 微信公众号OAuth2控制器
+ *
+ * @author pengles
+ */
+@Slf4j
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/wx/mp/oauth2/{appid}")
+public class WxMpOAuth2Controller extends BaseController {
+
+    private final WxMpService wxMpService;
+
+    /**
+     * 构建授权URL
+     *
+     * @param appid       公众号appid
+     * @param redirectUrl 重定向URL
+     * @param scope       授权作用域（snsapi_base静默授权，snsapi_userinfo用户信息授权）
+     * @param state       防CSRF攻击的随机字符串
+     * @return 授权URL
+     */
+    @GetMapping("/buildAuthorizationUrl")
+    @SwitchoverCheck
+    public R<String> buildAuthorizationUrl(@PathVariable String appid,
+                                           @RequestParam String redirectUrl,
+                                           @RequestParam(defaultValue = "snsapi_userinfo") String scope,
+                                           @RequestParam String state) {
+        try {
+            String url = wxMpService.getOAuth2Service().buildAuthorizationUrl(redirectUrl, scope, state);
+            return R.ok(url);
+        } catch (Exception e) {
+            log.error("构建授权URL失败: {}", e.getMessage(), e);
+            return R.fail("构建授权URL失败: " + e.getMessage());
+        }
+    }
+
+    /**
+     * 获取访问令牌
+     *
+     * @param appid 公众号appid
+     * @param code  授权码
+     * @return 访问令牌信息
+     */
+    @GetMapping("/getAccessToken")
+    @SwitchoverCheck
+    public R<WxOAuth2AccessToken> getAccessToken(@PathVariable String appid,
+                                                 @RequestParam String code) {
+        try {
+            WxOAuth2AccessToken accessToken = wxMpService.getOAuth2Service().getAccessToken(code);
+            return R.ok(accessToken);
+        } catch (Exception e) {
+            log.error("获取访问令牌失败: {}", e.getMessage(), e);
+            return R.fail("获取访问令牌失败: " + e.getMessage());
+        }
+    }
+
+    /**
+     * 刷新访问令牌
+     *
+     * @param appid        公众号appid
+     * @param refreshToken 刷新令牌
+     * @return 新的访问令牌信息
+     */
+    @GetMapping("/refreshAccessToken")
+    @SwitchoverCheck
+    public R<WxOAuth2AccessToken> refreshAccessToken(@PathVariable String appid,
+                                                     @RequestParam String refreshToken) {
+        try {
+            WxOAuth2AccessToken accessToken = wxMpService.getOAuth2Service().refreshAccessToken(refreshToken);
+            return R.ok(accessToken);
+        } catch (Exception e) {
+            log.error("刷新访问令牌失败: {}", e.getMessage(), e);
+            return R.fail("刷新访问令牌失败: " + e.getMessage());
+        }
+    }
+
+    /**
+     * 验证访问令牌
+     *
+     * @param appid       公众号appid
+     * @param accessToken 访问令牌
+     * @param openId      用户openid
+     * @return 验证结果
+     */
+    @PostMapping("/validateAccessToken")
+    @SwitchoverCheck
+    public R<Boolean> validateAccessToken(@PathVariable String appid,
+                                          @RequestParam String accessToken,
+                                          @RequestParam String openId) {
+        try {
+            WxOAuth2AccessToken wxOAuth2AccessToken = new WxOAuth2AccessToken();
+            wxOAuth2AccessToken.setAccessToken(accessToken);
+            wxOAuth2AccessToken.setOpenId(openId);
+            boolean isValid = wxMpService.getOAuth2Service().validateAccessToken(wxOAuth2AccessToken);
+            return R.ok(isValid);
+        } catch (Exception e) {
+            log.error("验证访问令牌失败: {}", e.getMessage(), e);
+            return R.fail("验证访问令牌失败: " + e.getMessage());
+        }
+    }
+
+    /**
+     * 获取JSAPI签名
+     *
+     * @param appid 公众号appid
+     * @param url   当前网页URL
+     * @return JSAPI签名信息
+     */
+    @GetMapping("/getSignature")
+    @SwitchoverCheck
+    public R<Object> getSignature(@PathVariable String appid,
+                                  @RequestParam String url) {
+        try {
+            String jsapiTicket = wxMpService.getTicket(TicketType.JSAPI);
+            String nonceStr = UUID.randomUUID().toString();
+            String timestamp = String.valueOf(System.currentTimeMillis() / 1000);
+            String signature = DigestUtils.sha1Hex(
+                    "jsapi_ticket=" + jsapiTicket +
+                            "&noncestr=" + nonceStr +
+                            "&timestamp=" + timestamp +
+                            "&url=" + url
+            );
+
+            WxSignatureVo signatureVo = new WxSignatureVo();
+            signatureVo.setAppId(appid);
+            signatureVo.setNonceStr(nonceStr);
+            signatureVo.setTimestamp(timestamp);
+            signatureVo.setSignature(signature);
+            signatureVo.setUrl(url);
+
+            return R.ok(signatureVo);
+        } catch (Exception e) {
+            log.error("获取JSAPI签名失败: {}", e.getMessage(), e);
+            return R.fail("获取JSAPI签名失败: " + e.getMessage());
+        }
+    }
+
+    /**
+     * 获取用户信息
+     *
+     * @param appid       公众号appid
+     * @param accessToken 访问令牌
+     * @param openId      用户openid
+     * @param lang        语言
+     * @return 用户信息
+     */
+    @GetMapping("/getUserInfo")
+    @SwitchoverCheck
+    public R<Object> getUserInfo(@PathVariable String appid,
+                                 @RequestParam String accessToken,
+                                 @RequestParam String openId,
+                                 @RequestParam(defaultValue = "zh_CN") String lang) {
+        try {
+            WxOAuth2AccessToken token = new WxOAuth2AccessToken();
+            token.setAccessToken(accessToken);
+            token.setOpenId(openId);
+
+            Object userInfo = wxMpService.getOAuth2Service().getUserInfo(token, lang);
+            return R.ok(userInfo);
+        } catch (Exception e) {
+            log.error("获取用户信息失败: {}", e.getMessage(), e);
+            return R.fail("获取用户信息失败: " + e.getMessage());
+        }
+    }
+
+    /**
+     * 签名VO类
+     */
+    public static class WxSignatureVo {
+        private String appId;
+        private String nonceStr;
+        private String timestamp;
+        private String signature;
+        private String url;
+
+        // Getters and Setters
+        public String getAppId() {
+            return appId;
+        }
+
+        public void setAppId(String appId) {
+            this.appId = appId;
+        }
+
+        public String getNonceStr() {
+            return nonceStr;
+        }
+
+        public void setNonceStr(String nonceStr) {
+            this.nonceStr = nonceStr;
+        }
+
+        public String getTimestamp() {
+            return timestamp;
+        }
+
+        public void setTimestamp(String timestamp) {
+            this.timestamp = timestamp;
+        }
+
+        public String getSignature() {
+            return signature;
+        }
+
+        public void setSignature(String signature) {
+            this.signature = signature;
+        }
+
+        public String getUrl() {
+            return url;
+        }
+
+        public void setUrl(String url) {
+            this.url = url;
+        }
+    }
+}
diff --git a/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/controller/WxMpOauth2RedirectController.java b/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/controller/WxMpOauth2RedirectController.java
new file mode 100644
index 0000000..40a7a0b
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/controller/WxMpOauth2RedirectController.java
@@ -0,0 +1,177 @@
+package org.dromara.mp.controller;
+
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import me.chanjar.weixin.common.bean.WxOAuth2UserInfo;
+import me.chanjar.weixin.common.bean.oauth2.WxOAuth2AccessToken;
+import me.chanjar.weixin.mp.api.WxMpService;
+import me.chanjar.weixin.mp.config.WxMpConfigStorage;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.mp.annotation.SwitchoverCheck;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.io.IOException;
+
+/**
+ * 微信公众号OAuth2授权回调控制器
+ *
+ * @author pengles
+ */
+@Slf4j
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/wx/mp/oauth2/redirect/{appid}")
+public class WxMpOauth2RedirectController extends BaseController {
+
+    private final WxMpService wxMpService;
+
+    /**
+     * 微信授权回调处理
+     *
+     * @param appid    公众号appid
+     * @param code     授权码
+     * @param state    状态参数
+     * @param response HTTP响应
+     */
+    @RequestMapping("/greet")
+    @SwitchoverCheck
+    public void greetUser(@PathVariable String appid,
+                          @RequestParam String code,
+                          @RequestParam String state,
+                          HttpServletResponse response) {
+        try {
+            // 获取访问令牌
+            WxOAuth2AccessToken wxOAuth2AccessToken = wxMpService.getOAuth2Service().getAccessToken(code);
+
+            // 获取用户信息
+            WxOAuth2UserInfo user = wxMpService.getOAuth2Service().getUserInfo(wxOAuth2AccessToken, null);
+            log.info("OAuth2授权用户信息: {}", user);
+
+            // 获取配置信息
+            WxMpConfigStorage mpConfigStorage = wxMpService.getWxMpConfigStorage();
+            String redirectUrl = mpConfigStorage.getOauth2RedirectUrl();
+
+            // 构建重定向URL，携带用户信息
+            String redirectWithToken = redirectUrl + "?unionId=" + user.getUnionId() +
+                    "&openId=" + user.getOpenid() +
+                    "&mpAccessToken=" + wxOAuth2AccessToken.getAccessToken() +
+                    "&mpRefreshToken=" + wxOAuth2AccessToken.getRefreshToken() +
+                    "&nickname=" + user.getNickname() +
+                    "&headImgUrl=" + user.getHeadImgUrl();
+
+            // 执行重定向
+            response.setStatus(HttpServletResponse.SC_FOUND);
+            response.setHeader("Location", redirectWithToken);
+
+        } catch (Exception e) {
+            log.error("OAuth2授权回调处理失败: {}", e.getMessage(), e);
+            try {
+                response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, "授权处理失败");
+            } catch (IOException ioException) {
+                log.error("发送错误响应失败: {}", ioException.getMessage(), ioException);
+            }
+        }
+    }
+
+    /**
+     * 获取授权用户信息（API接口）
+     *
+     * @param appid 公众号appid
+     * @param code  授权码
+     * @param state 状态参数
+     * @return 用户信息
+     */
+    @GetMapping("/userinfo")
+    @SwitchoverCheck
+    public R<WxOAuth2UserInfo> getUserInfo(@PathVariable String appid,
+                                           @RequestParam String code,
+                                           @RequestParam(required = false) String state) {
+        try {
+            // 获取访问令牌
+            WxOAuth2AccessToken wxOAuth2AccessToken = wxMpService.getOAuth2Service().getAccessToken(code);
+
+            // 获取用户信息
+            WxOAuth2UserInfo user = wxMpService.getOAuth2Service().getUserInfo(wxOAuth2AccessToken, null);
+            log.info("获取OAuth2用户信息: {}", user);
+
+            return R.ok(user);
+        } catch (Exception e) {
+            log.error("获取OAuth2用户信息失败: {}", e.getMessage(), e);
+            return R.fail("获取用户信息失败: " + e.getMessage());
+        }
+    }
+
+    /**
+     * 静默授权回调处理
+     *
+     * @param appid 公众号appid
+     * @param code  授权码
+     * @param state 状态参数
+     * @return 访问令牌信息
+     */
+    @GetMapping("/silent")
+    @SwitchoverCheck
+    public R<WxOAuth2AccessToken> silentAuth(@PathVariable String appid,
+                                             @RequestParam String code,
+                                             @RequestParam(required = false) String state) {
+        try {
+            // 静默授权只获取访问令牌，不获取用户详细信息
+            WxOAuth2AccessToken wxOAuth2AccessToken = wxMpService.getOAuth2Service().getAccessToken(code);
+            log.info("静默授权成功，openId: {}", wxOAuth2AccessToken.getOpenId());
+
+            return R.ok(wxOAuth2AccessToken);
+        } catch (Exception e) {
+            log.error("静默授权失败: {}", e.getMessage(), e);
+            return R.fail("静默授权失败: " + e.getMessage());
+        }
+    }
+
+    /**
+     * 自定义授权回调处理
+     *
+     * @param appid       公众号appid
+     * @param code        授权码
+     * @param state       状态参数
+     * @param redirectUrl 自定义重定向URL
+     * @param response    HTTP响应
+     */
+    @RequestMapping("/custom")
+    @SwitchoverCheck
+    public void customRedirect(@PathVariable String appid,
+                               @RequestParam String code,
+                               @RequestParam(required = false) String state,
+                               @RequestParam String redirectUrl,
+                               HttpServletResponse response) {
+        try {
+            // 获取访问令牌
+            WxOAuth2AccessToken wxOAuth2AccessToken = wxMpService.getOAuth2Service().getAccessToken(code);
+
+            // 获取用户信息
+            WxOAuth2UserInfo user = wxMpService.getOAuth2Service().getUserInfo(wxOAuth2AccessToken, null);
+            log.info("自定义授权回调用户信息: {}", user);
+
+            // 构建自定义重定向URL
+            String customRedirectUrl = redirectUrl +
+                    (redirectUrl.contains("?") ? "&" : "?") +
+                    "openId=" + user.getOpenid() +
+                    "&unionId=" + user.getUnionId() +
+                    "&accessToken=" + wxOAuth2AccessToken.getAccessToken();
+
+            // 执行重定向
+            response.setStatus(HttpServletResponse.SC_FOUND);
+            response.setHeader("Location", customRedirectUrl);
+
+        } catch (Exception e) {
+            log.error("自定义授权回调处理失败: {}", e.getMessage(), e);
+            try {
+                response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, "授权处理失败");
+            } catch (IOException ioException) {
+                log.error("发送错误响应失败: {}", ioException.getMessage(), ioException);
+            }
+        }
+    }
+}
diff --git a/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/controller/WxMpPortalController.java b/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/controller/WxMpPortalController.java
new file mode 100644
index 0000000..212f653
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/controller/WxMpPortalController.java
@@ -0,0 +1,181 @@
+package org.dromara.mp.controller;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import me.chanjar.weixin.mp.api.WxMpMessageRouter;
+import me.chanjar.weixin.mp.api.WxMpService;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlOutMessage;
+import org.apache.commons.lang3.StringUtils;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.mp.annotation.SwitchoverCheck;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 微信公众号消息处理控制器
+ *
+ * @author pengles
+ */
+@Slf4j
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/wx/mp/portal/{appid}")
+public class WxMpPortalController extends BaseController {
+
+    private final WxMpService wxMpService;
+    private final WxMpMessageRouter messageRouter;
+
+    /**
+     * 微信公众号服务器配置验证
+     *
+     * @param appid     公众号appid
+     * @param signature 微信加密签名
+     * @param timestamp 时间戳
+     * @param nonce     随机数
+     * @param echostr   随机字符串
+     * @return 验证结果
+     */
+    @GetMapping(produces = "text/plain;charset=utf-8")
+    @SwitchoverCheck
+    public String authGet(@PathVariable String appid,
+                          @RequestParam(name = "signature", required = false) String signature,
+                          @RequestParam(name = "timestamp", required = false) String timestamp,
+                          @RequestParam(name = "nonce", required = false) String nonce,
+                          @RequestParam(name = "echostr", required = false) String echostr) {
+        log.info("接收到来自微信服务器的认证消息：[{}, {}, {}, {}]", signature, timestamp, nonce, echostr);
+
+        if (StringUtils.isAnyBlank(signature, timestamp, nonce, echostr)) {
+            log.error("请求参数非法，请核实!");
+            return "非法请求";
+        }
+
+        try {
+            if (wxMpService.checkSignature(timestamp, nonce, signature)) {
+                log.info("微信公众号验证成功");
+                return echostr;
+            } else {
+                log.error("微信公众号验证失败");
+                return "非法请求";
+            }
+        } catch (Exception e) {
+            log.error("微信公众号验证异常: {}", e.getMessage(), e);
+            return "验证异常";
+        }
+    }
+
+    /**
+     * 微信公众号消息处理
+     *
+     * @param appid        公众号appid
+     * @param requestBody  请求体
+     * @param signature    微信加密签名
+     * @param timestamp    时间戳
+     * @param nonce        随机数
+     * @param openid       用户openid
+     * @param encType      加密类型
+     * @param msgSignature 消息签名
+     * @param request      HTTP请求
+     * @return 处理结果
+     */
+    @PostMapping(produces = "application/xml; charset=UTF-8")
+    @SwitchoverCheck
+    public String post(@PathVariable String appid,
+                       @RequestBody String requestBody,
+                       @RequestParam("signature") String signature,
+                       @RequestParam("timestamp") String timestamp,
+                       @RequestParam("nonce") String nonce,
+                       @RequestParam("openid") String openid,
+                       @RequestParam(name = "encrypt_type", required = false) String encType,
+                       @RequestParam(name = "msg_signature", required = false) String msgSignature) {
+        log.info("接收微信请求：[openid=[{}], [signature=[{}], encType=[{}], msgSignature=[{}], timestamp=[{}], nonce=[{}], requestBody=[\n{}\n] ]",
+                openid, signature, encType, msgSignature, timestamp, nonce, requestBody);
+
+        try {
+            if (!wxMpService.checkSignature(timestamp, nonce, signature)) {
+                log.error("非法请求，可能属于伪造的请求！");
+                return "非法请求";
+            }
+
+            String out = null;
+            if (encType == null) {
+                // 明文传输的消息
+                WxMpXmlMessage inMessage = WxMpXmlMessage.fromXml(requestBody);
+                WxMpXmlOutMessage outMessage = this.route(inMessage);
+                if (outMessage == null) {
+                    return "";
+                }
+                out = outMessage.toXml();
+            } else if ("aes".equalsIgnoreCase(encType)) {
+                // aes加密的消息
+                WxMpXmlMessage inMessage = WxMpXmlMessage.fromEncryptedXml(requestBody, wxMpService.getWxMpConfigStorage(), timestamp, nonce, msgSignature);
+                log.debug("消息解密后内容为：\n{} ", inMessage.toString());
+                WxMpXmlOutMessage outMessage = this.route(inMessage);
+                if (outMessage == null) {
+                    return "";
+                }
+                out = outMessage.toEncryptedXml(wxMpService.getWxMpConfigStorage());
+            }
+
+            log.debug("组装回复信息：{}", out);
+            return out;
+        } catch (Exception e) {
+            log.error("微信消息处理异常: {}", e.getMessage(), e);
+            return "";
+        }
+    }
+
+    /**
+     * 消息路由处理
+     *
+     * @param message 微信消息
+     * @return 回复消息
+     */
+    private WxMpXmlOutMessage route(WxMpXmlMessage message) {
+        try {
+            return this.messageRouter.route(message);
+        } catch (Exception e) {
+            log.error("路由消息时出现异常！", e);
+            return null;
+        }
+    }
+
+    /**
+     * 获取微信公众号配置信息
+     *
+     * @param appid 公众号appid
+     * @return 配置信息
+     */
+    @GetMapping("/config")
+    @SwitchoverCheck
+    public R<Object> getConfig(@PathVariable String appid) {
+        try {
+            Object config = wxMpService.getWxMpConfigStorage();
+            return R.ok(config);
+        } catch (Exception e) {
+            log.error("获取微信公众号配置失败: {}", e.getMessage(), e);
+            return R.fail("获取配置失败: " + e.getMessage());
+        }
+    }
+
+    /**
+     * 清理微信公众号配置缓存
+     *
+     * @param appid 公众号appid
+     * @return 清理结果
+     */
+    @DeleteMapping("/config/cache")
+    @SwitchoverCheck
+    public R<Void> clearConfigCache(@PathVariable String appid) {
+        try {
+            // 这里可以添加清理缓存的逻辑
+            log.info("清理微信公众号配置缓存: {}", appid);
+            return R.ok();
+        } catch (Exception e) {
+            log.error("清理配置缓存失败: {}", e.getMessage(), e);
+            return R.fail("清理缓存失败: " + e.getMessage());
+        }
+    }
+}
diff --git a/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/controller/WxMpQrCodeController.java b/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/controller/WxMpQrCodeController.java
new file mode 100644
index 0000000..569adbf
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/controller/WxMpQrCodeController.java
@@ -0,0 +1,129 @@
+package org.dromara.mp.controller;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import me.chanjar.weixin.mp.api.WxMpService;
+import me.chanjar.weixin.mp.bean.result.WxMpQrCodeTicket;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.mp.annotation.SwitchoverCheck;
+import org.dromara.mp.service.WxMpQrCodeService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 微信公众号二维码管理控制器
+ *
+ * @author pengles
+ */
+@Slf4j
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/wx/mp/qrcode/{appid}")
+public class WxMpQrCodeController extends BaseController {
+
+    private final WxMpService wxMpService;
+    private final WxMpQrCodeService wxMpQrCodeService;
+
+    /**
+     * 生成临时二维码
+     *
+     * @param appid         公众号appid
+     * @param expireSeconds 过期时间（秒）
+     * @param sceneStr      场景字符串
+     * @return 二维码ticket
+     */
+    @PostMapping("/temp")
+    @SwitchoverCheck
+    public R<WxMpQrCodeTicket> createTempQrCode(@PathVariable String appid,
+                                                @RequestParam(defaultValue = "2592000") int expireSeconds,
+                                                @RequestParam int sceneStr) {
+        try {
+            WxMpQrCodeTicket ticket = wxMpQrCodeService.createTempQrCode(expireSeconds, sceneStr);
+            return R.ok(ticket);
+        } catch (Exception e) {
+            log.error("生成临时二维码失败: {}", e.getMessage(), e);
+            return R.fail("生成临时二维码失败: " + e.getMessage());
+        }
+    }
+
+    /**
+     * 生成永久二维码
+     *
+     * @param appid    公众号appid
+     * @param sceneStr 场景字符串
+     * @return 二维码ticket
+     */
+    @PostMapping("/forever")
+    @SwitchoverCheck
+    public R<WxMpQrCodeTicket> createForeverQrCode(@PathVariable String appid,
+                                                   @RequestParam String sceneStr) {
+        try {
+            WxMpQrCodeTicket ticket = wxMpQrCodeService.createForeverQrCode(sceneStr);
+            return R.ok(ticket);
+        } catch (Exception e) {
+            log.error("生成永久二维码失败: {}", e.getMessage(), e);
+            return R.fail("生成永久二维码失败: " + e.getMessage());
+        }
+    }
+
+    /**
+     * 获取二维码URL
+     *
+     * @param appid  公众号appid
+     * @param ticket 二维码ticket
+     * @return 二维码URL
+     */
+    @GetMapping("/url")
+    @SwitchoverCheck
+    public R<String> getQrCodeUrl(@PathVariable String appid, @RequestParam String ticket) {
+        try {
+            String url = wxMpQrCodeService.getQrCodeUrl(ticket);
+            return R.ok(url);
+        } catch (Exception e) {
+            log.error("获取二维码URL失败: {}", e.getMessage(), e);
+            return R.fail("获取二维码URL失败: " + e.getMessage());
+        }
+    }
+
+    /**
+     * 生成活动二维码
+     *
+     * @param appid      公众号appid
+     * @param activityId 活动ID
+     * @return 二维码ticket
+     */
+    @PostMapping("/activity")
+    @SwitchoverCheck
+    public R<WxMpQrCodeTicket> createActivityQrCode(@PathVariable String appid,
+                                                    @RequestParam String activityId) {
+        try {
+            WxMpQrCodeTicket ticket = wxMpQrCodeService.createActivityQrCode(activityId);
+            return R.ok(ticket);
+        } catch (Exception e) {
+            log.error("生成活动二维码失败: {}", e.getMessage(), e);
+            return R.fail("生成活动二维码失败: " + e.getMessage());
+        }
+    }
+
+    /**
+     * 生成渠道二维码
+     *
+     * @param appid     公众号appid
+     * @param channelId 渠道ID
+     * @return 二维码ticket
+     */
+    @PostMapping("/channel")
+    @SwitchoverCheck
+    public R<WxMpQrCodeTicket> createChannelQrCode(@PathVariable String appid,
+                                                   @RequestParam String channelId) {
+        try {
+            WxMpQrCodeTicket ticket = wxMpQrCodeService.createChannelQrCode(channelId);
+            return R.ok(ticket);
+        } catch (Exception e) {
+            log.error("生成渠道二维码失败: {}", e.getMessage(), e);
+            return R.fail("生成渠道二维码失败: " + e.getMessage());
+        }
+    }
+}
diff --git a/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/controller/WxMpTemplateController.java b/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/controller/WxMpTemplateController.java
new file mode 100644
index 0000000..3549fb5
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/controller/WxMpTemplateController.java
@@ -0,0 +1,226 @@
+package org.dromara.mp.controller;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import me.chanjar.weixin.mp.api.WxMpService;
+import me.chanjar.weixin.mp.bean.template.WxMpTemplate;
+import me.chanjar.weixin.mp.bean.template.WxMpTemplateIndustry;
+import me.chanjar.weixin.mp.bean.template.WxMpTemplateIndustryEnum;
+import me.chanjar.weixin.mp.bean.template.WxMpTemplateMessage;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.mp.annotation.SwitchoverCheck;
+import org.dromara.mp.service.WxMpTemplateService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 微信公众号模板消息控制器
+ *
+ * @author pengles
+ */
+@Slf4j
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/wx/mp/template/{appid}")
+public class WxMpTemplateController extends BaseController {
+
+    private final WxMpService wxMpService;
+    private final WxMpTemplateService wxMpTemplateService;
+
+    /**
+     * 发送模板消息
+     *
+     * @param appid           公众号appid
+     * @param templateMessage 模板消息
+     * @return 发送结果
+     */
+    @PostMapping("/send")
+    @SwitchoverCheck
+    public R<String> sendTemplateMessage(@PathVariable String appid,
+                                         @RequestBody WxMpTemplateMessage templateMessage) {
+        try {
+            String msgId = wxMpTemplateService.sendTemplateMessage(templateMessage);
+            return R.ok(msgId);
+        } catch (Exception e) {
+            log.error("发送模板消息失败: {}", e.getMessage(), e);
+            return R.fail("发送模板消息失败: " + e.getMessage());
+        }
+    }
+
+    /**
+     * 获取所有模板列表
+     *
+     * @param appid 公众号appid
+     * @return 模板列表
+     */
+    @GetMapping("/list")
+    @SwitchoverCheck
+    public R<List<WxMpTemplate>> getAllTemplates(@PathVariable String appid) {
+        try {
+            List<WxMpTemplate> templates = wxMpTemplateService.getAllTemplates();
+            return R.ok(templates);
+        } catch (Exception e) {
+            log.error("获取模板列表失败: {}", e.getMessage(), e);
+            return R.fail("获取模板列表失败: " + e.getMessage());
+        }
+    }
+
+    /**
+     * 删除模板
+     *
+     * @param appid      公众号appid
+     * @param templateId 模板ID
+     * @return 删除结果
+     */
+    @DeleteMapping("/delete/{templateId}")
+    @SwitchoverCheck
+    public R<Void> deleteTemplate(@PathVariable String appid, @PathVariable String templateId) {
+        try {
+            boolean result = wxMpTemplateService.deleteTemplate(templateId);
+            return result ? R.ok() : R.fail("删除模板失败");
+        } catch (Exception e) {
+            log.error("删除模板失败: {}", e.getMessage(), e);
+            return R.fail("删除模板失败: " + e.getMessage());
+        }
+    }
+
+    /**
+     * 获取行业信息
+     *
+     * @param appid 公众号appid
+     * @return 行业信息
+     */
+    @GetMapping("/industry")
+    @SwitchoverCheck
+    public R<WxMpTemplateIndustry> getIndustry(@PathVariable String appid) {
+        try {
+            WxMpTemplateIndustry industry = wxMpService.getTemplateMsgService().getIndustry();
+            return R.ok(industry);
+        } catch (Exception e) {
+            log.error("获取行业信息失败: {}", e.getMessage(), e);
+            return R.fail("获取行业信息失败: " + e.getMessage());
+        }
+    }
+
+    /**
+     * 设置行业信息
+     *
+     * @param appid       公众号appid
+     * @param industryId1 行业代码1
+     * @param industryId2 行业代码2
+     * @return 设置结果
+     */
+    @PostMapping("/industry")
+    @SwitchoverCheck
+    public R<Void> setIndustry(@PathVariable String appid,
+                               @RequestParam String industryId1,
+                               @RequestParam String industryId2) {
+        try {
+            WxMpTemplateIndustry wxMpTemplateIndustry = new WxMpTemplateIndustry();
+            wxMpTemplateIndustry.setPrimaryIndustry(WxMpTemplateIndustryEnum.valueOf(industryId1));
+            wxMpTemplateIndustry.setSecondIndustry(WxMpTemplateIndustryEnum.valueOf(industryId2));
+            wxMpService.getTemplateMsgService().setIndustry(wxMpTemplateIndustry);
+            return R.ok();
+        } catch (Exception e) {
+            log.error("设置行业信息失败: {}", e.getMessage(), e);
+            return R.fail("设置行业信息失败: " + e.getMessage());
+        }
+    }
+
+    /**
+     * 发送通知消息
+     *
+     * @param appid      公众号appid
+     * @param openid     用户openid
+     * @param templateId 模板ID
+     * @param url        跳转URL
+     * @param data       消息数据
+     * @return 发送结果
+     */
+    @PostMapping("/send-notification")
+    @SwitchoverCheck
+    public R<String> sendNotification(@PathVariable String appid,
+                                      @RequestParam String openid,
+                                      @RequestParam String templateId,
+                                      @RequestParam String url,
+                                      @RequestBody Map<String, String> data) {
+        try {
+            String msgId = wxMpTemplateService.sendNotificationMessage(openid, templateId, url, data);
+            return R.ok(msgId);
+        } catch (Exception e) {
+            log.error("发送通知消息失败: {}", e.getMessage(), e);
+            return R.fail("发送通知消息失败: " + e.getMessage());
+        }
+    }
+
+    /**
+     * 发送订单消息
+     *
+     * @param appid  公众号appid
+     * @param openid 用户openid
+     * @param data   订单数据
+     * @return 发送结果
+     */
+    @PostMapping("/send-order")
+    @SwitchoverCheck
+    public R<String> sendOrderMessage(@PathVariable String appid,
+                                      @RequestParam String openid,
+                                      @RequestBody Map<String, Object> data) {
+        try {
+            String msgId = wxMpTemplateService.sendOrderMessage(openid, null, null, null);
+            return R.ok(msgId);
+        } catch (Exception e) {
+            log.error("发送订单消息失败: {}", e.getMessage(), e);
+            return R.fail("发送订单消息失败: " + e.getMessage());
+        }
+    }
+
+    /**
+     * 发送审核结果消息
+     *
+     * @param appid  公众号appid
+     * @param openid 用户openid
+     * @param data   审核数据
+     * @return 发送结果
+     */
+    @PostMapping("/send-audit-result")
+    @SwitchoverCheck
+    public R<String> sendAuditResult(@PathVariable String appid,
+                                     @RequestParam String openid,
+                                     @RequestBody Map<String, Object> data) {
+        try {
+            String msgId = wxMpTemplateService.sendAuditResultMessage(openid, null, null);
+            return R.ok(msgId);
+        } catch (Exception e) {
+            log.error("发送审核结果消息失败: {}", e.getMessage(), e);
+            return R.fail("发送审核结果消息失败: " + e.getMessage());
+        }
+    }
+
+    /**
+     * 发送活动通知
+     *
+     * @param appid  公众号appid
+     * @param openid 用户openid
+     * @param data   活动数据
+     * @return 发送结果
+     */
+    @PostMapping("/send-activity")
+    @SwitchoverCheck
+    public R<String> sendActivityNotification(@PathVariable String appid,
+                                              @RequestParam String openid,
+                                              @RequestBody Map<String, Object> data) {
+        try {
+            String msgId = wxMpTemplateService.sendActivityNotificationMessage(openid, null, null, null);
+            return R.ok(msgId);
+        } catch (Exception e) {
+            log.error("发送活动通知失败: {}", e.getMessage(), e);
+            return R.fail("发送活动通知失败: " + e.getMessage());
+        }
+    }
+}
diff --git a/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/controller/WxMpUserController.java b/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/controller/WxMpUserController.java
new file mode 100644
index 0000000..4fa398f
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/controller/WxMpUserController.java
@@ -0,0 +1,251 @@
+package org.dromara.mp.controller;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import me.chanjar.weixin.mp.api.WxMpService;
+import me.chanjar.weixin.mp.bean.result.WxMpUser;
+import me.chanjar.weixin.mp.bean.result.WxMpUserList;
+import me.chanjar.weixin.mp.bean.tag.WxUserTag;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.mp.annotation.SwitchoverCheck;
+import org.dromara.mp.service.WxMpUserService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 微信公众号用户管理控制器
+ *
+ * @author pengles
+ */
+@Slf4j
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/wx/mp/user/{appid}")
+public class WxMpUserController extends BaseController {
+
+    private final WxMpService wxMpService;
+    private final WxMpUserService wxMpUserService;
+
+    /**
+     * 获取用户信息
+     *
+     * @param appid  公众号appid
+     * @param openid 用户openid
+     * @return 用户信息
+     */
+    @GetMapping("/info/{openid}")
+    @SwitchoverCheck
+    public R<WxMpUser> getUserInfo(@PathVariable String appid, @PathVariable String openid) {
+        try {
+            WxMpUser user = wxMpUserService.getUserInfo(openid);
+            return R.ok(user);
+        } catch (Exception e) {
+            log.error("获取用户信息失败: {}", e.getMessage(), e);
+            return R.fail("获取用户信息失败: " + e.getMessage());
+        }
+    }
+
+    /**
+     * 获取用户列表
+     *
+     * @param appid      公众号appid
+     * @param nextOpenid 下一个openid
+     * @return 用户列表
+     */
+    @GetMapping("/list")
+    @SwitchoverCheck
+    public R<WxMpUserList> getUserList(@PathVariable String appid,
+                                       @RequestParam(required = false) String nextOpenid) {
+        try {
+            return R.ok(wxMpUserService.getUserList(nextOpenid));
+        } catch (Exception e) {
+            log.error("获取用户列表失败: {}", e.getMessage(), e);
+            return R.fail("获取用户列表失败: " + e.getMessage());
+        }
+    }
+
+    /**
+     * 获取所有用户
+     *
+     * @param appid 公众号appid
+     * @return 所有用户openid列表
+     */
+    @GetMapping("/all")
+    @SwitchoverCheck
+    public R<List<String>> getAllUsers(@PathVariable String appid) {
+        try {
+            List<String> allUsers = wxMpUserService.getAllUsers();
+            return R.ok(allUsers);
+        } catch (Exception e) {
+            log.error("获取所有用户失败: {}", e.getMessage(), e);
+            return R.fail("获取所有用户失败: " + e.getMessage());
+        }
+    }
+
+    /**
+     * 创建标签
+     *
+     * @param appid   公众号appid
+     * @param tagName 标签名称
+     * @return 创建结果
+     */
+    @PostMapping("/tag/create")
+    @SwitchoverCheck
+    public R<WxUserTag> createTag(@PathVariable String appid, @RequestParam String tagName) {
+        try {
+            WxUserTag tag = wxMpUserService.createTag(tagName);
+            return R.ok(tag);
+        } catch (Exception e) {
+            log.error("创建标签失败: {}", e.getMessage(), e);
+            return R.fail("创建标签失败: " + e.getMessage());
+        }
+    }
+
+    /**
+     * 获取所有标签
+     *
+     * @param appid 公众号appid
+     * @return 标签列表
+     */
+    @GetMapping("/tag/list")
+    @SwitchoverCheck
+    public R<List<WxUserTag>> getTags(@PathVariable String appid) {
+        try {
+            List<WxUserTag> tags = wxMpUserService.getTags();
+            return R.ok(tags);
+        } catch (Exception e) {
+            log.error("获取标签列表失败: {}", e.getMessage(), e);
+            return R.fail("获取标签列表失败: " + e.getMessage());
+        }
+    }
+
+    /**
+     * 更新标签
+     *
+     * @param appid   公众号appid
+     * @param tagId   标签ID
+     * @param tagName 新标签名称
+     * @return 更新结果
+     */
+    @PutMapping("/tag/{tagId}")
+    @SwitchoverCheck
+    public R<Void> updateTag(@PathVariable String appid,
+                             @PathVariable Long tagId,
+                             @RequestParam String tagName) {
+        try {
+            boolean result = wxMpUserService.updateTag(tagId, tagName);
+            return result ? R.ok() : R.fail("更新标签失败");
+        } catch (Exception e) {
+            log.error("更新标签失败: {}", e.getMessage(), e);
+            return R.fail("更新标签失败: " + e.getMessage());
+        }
+    }
+
+    /**
+     * 删除标签
+     *
+     * @param appid 公众号appid
+     * @param tagId 标签ID
+     * @return 删除结果
+     */
+    @DeleteMapping("/tag/{tagId}")
+    @SwitchoverCheck
+    public R<Void> deleteTag(@PathVariable String appid, @PathVariable Long tagId) {
+        try {
+            boolean result = wxMpUserService.deleteTag(tagId);
+            return result ? R.ok() : R.fail("删除标签失败");
+        } catch (Exception e) {
+            log.error("删除标签失败: {}", e.getMessage(), e);
+            return R.fail("删除标签失败: " + e.getMessage());
+        }
+    }
+
+    /**
+     * 批量为用户打标签
+     *
+     * @param appid      公众号appid
+     * @param tagId      标签ID
+     * @param openidList 用户openid列表
+     * @return 操作结果
+     */
+    @PostMapping("/tag/{tagId}/users")
+    @SwitchoverCheck
+    public R<Void> batchTagging(@PathVariable String appid,
+                                @PathVariable Long tagId,
+                                @RequestBody List<String> openidList) {
+        try {
+            boolean result = wxMpUserService.batchTagging(tagId, openidList);
+            return result ? R.ok() : R.fail("批量打标签失败");
+        } catch (Exception e) {
+            log.error("批量打标签失败: {}", e.getMessage(), e);
+            return R.fail("批量打标签失败: " + e.getMessage());
+        }
+    }
+
+    /**
+     * 批量为用户取消标签
+     *
+     * @param appid      公众号appid
+     * @param tagId      标签ID
+     * @param openidList 用户openid列表
+     * @return 操作结果
+     */
+    @DeleteMapping("/tag/{tagId}/users")
+    @SwitchoverCheck
+    public R<Void> batchUntagging(@PathVariable String appid,
+                                  @PathVariable Long tagId,
+                                  @RequestBody List<String> openidList) {
+        try {
+            boolean result = wxMpUserService.batchUntagging(tagId, openidList);
+            return result ? R.ok() : R.fail("批量取消标签失败");
+        } catch (Exception e) {
+            log.error("批量取消标签失败: {}", e.getMessage(), e);
+            return R.fail("批量取消标签失败: " + e.getMessage());
+        }
+    }
+
+    /**
+     * 获取用户身上的标签列表
+     *
+     * @param appid  公众号appid
+     * @param openid 用户openid
+     * @return 用户标签列表
+     */
+    @GetMapping("/tag/user/{openid}")
+    @SwitchoverCheck
+    public R<List<Long>> getUserTags(@PathVariable String appid, @PathVariable String openid) {
+        try {
+            List<Long> userTags = wxMpUserService.getUserTags(openid);
+            return R.ok(userTags);
+        } catch (Exception e) {
+            log.error("获取用户标签失败: {}", e.getMessage(), e);
+            return R.fail("获取用户标签失败: " + e.getMessage());
+        }
+    }
+
+    /**
+     * 获取标签下的用户列表
+     *
+     * @param appid      公众号appid
+     * @param tagId      标签ID
+     * @param nextOpenid 下一个openid
+     * @return 用户列表
+     */
+    @GetMapping("/tag/{tagId}/users")
+    @SwitchoverCheck
+    public R<List<String>> getTagUsers(@PathVariable String appid,
+                                       @PathVariable Long tagId,
+                                       @RequestParam(required = false) String nextOpenid) {
+        try {
+            List<String> tagUsers = wxMpUserService.getTagUsers(tagId, nextOpenid);
+            return R.ok(tagUsers);
+        } catch (Exception e) {
+            log.error("获取标签用户列表失败: {}", e.getMessage(), e);
+            return R.fail("获取标签用户列表失败: " + e.getMessage());
+        }
+    }
+}
diff --git a/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/handler/AbstractHandler.java b/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/handler/AbstractHandler.java
new file mode 100644
index 0000000..e938431
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/handler/AbstractHandler.java
@@ -0,0 +1,67 @@
+package org.dromara.mp.handler;
+
+import lombok.extern.slf4j.Slf4j;
+import me.chanjar.weixin.common.session.WxSessionManager;
+import me.chanjar.weixin.mp.api.WxMpMessageHandler;
+import me.chanjar.weixin.mp.api.WxMpService;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlOutMessage;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlOutTextMessage;
+
+import java.util.Map;
+
+/**
+ * 微信公众号消息处理器抽象类
+ *
+ * @author pengles
+ */
+@Slf4j
+public abstract class AbstractHandler implements WxMpMessageHandler {
+
+    /**
+     * 构建文本消息
+     *
+     * @param content   消息内容
+     * @param wxMessage 微信消息
+     * @param service   微信服务
+     * @return 文本消息
+     */
+    protected WxMpXmlOutTextMessage buildTextMessage(String content, WxMpXmlMessage wxMessage, WxMpService service) {
+        return WxMpXmlOutTextMessage.TEXT().content(content)
+                .fromUser(wxMessage.getToUser())
+                .toUser(wxMessage.getFromUser())
+                .build();
+    }
+
+    /**
+     * 记录日志
+     *
+     * @param wxMessage 微信消息
+     */
+    protected void logMessage(WxMpXmlMessage wxMessage) {
+        log.info("接收到微信消息：{}", wxMessage.toString());
+    }
+
+    @Override
+    public WxMpXmlOutMessage handle(WxMpXmlMessage wxMessage,
+                                    Map<String, Object> context,
+                                    WxMpService wxMpService,
+                                    WxSessionManager sessionManager) {
+        logMessage(wxMessage);
+        return doHandle(wxMessage, context, wxMpService, sessionManager);
+    }
+
+    /**
+     * 具体的消息处理逻辑
+     *
+     * @param wxMessage      微信消息
+     * @param context        上下文
+     * @param wxMpService    微信服务
+     * @param sessionManager 会话管理器
+     * @return 回复消息
+     */
+    protected abstract WxMpXmlOutMessage doHandle(WxMpXmlMessage wxMessage,
+                                                  Map<String, Object> context,
+                                                  WxMpService wxMpService,
+                                                  WxSessionManager sessionManager);
+}
diff --git a/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/handler/KfSessionHandler.java b/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/handler/KfSessionHandler.java
new file mode 100644
index 0000000..cab5658
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/handler/KfSessionHandler.java
@@ -0,0 +1,30 @@
+package org.dromara.mp.handler;
+
+import me.chanjar.weixin.common.session.WxSessionManager;
+import me.chanjar.weixin.mp.api.WxMpService;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlOutMessage;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+/**
+ * @author Peng Les
+ */
+@Component
+public class KfSessionHandler extends AbstractHandler {
+
+    @Override
+    public WxMpXmlOutMessage handle(WxMpXmlMessage wxMessage,
+                                    Map<String, Object> context, WxMpService wxMpService,
+                                    WxSessionManager sessionManager) {
+        //TODO 对会话做处理
+        return null;
+    }
+
+    @Override
+    protected WxMpXmlOutMessage doHandle(WxMpXmlMessage wxMessage, Map<String, Object> context, WxMpService wxMpService, WxSessionManager sessionManager) {
+        return null;
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/handler/LocationHandler.java b/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/handler/LocationHandler.java
new file mode 100644
index 0000000..0069eda
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/handler/LocationHandler.java
@@ -0,0 +1,52 @@
+package org.dromara.mp.handler;
+
+import lombok.extern.slf4j.Slf4j;
+import me.chanjar.weixin.common.session.WxSessionManager;
+import me.chanjar.weixin.mp.api.WxMpService;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlOutMessage;
+import org.dromara.mp.builder.WxMpTextBuilderWxMp;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+import static me.chanjar.weixin.common.api.WxConsts.XmlMsgType;
+
+/**
+ * 地理位消息处理
+ *
+ * @author Peng Les
+ */
+@Slf4j
+@Component
+public class LocationHandler extends AbstractHandler {
+
+    @Override
+    public WxMpXmlOutMessage handle(WxMpXmlMessage wxMessage,
+                                    Map<String, Object> context, WxMpService wxMpService,
+                                    WxSessionManager sessionManager) {
+        if (wxMessage.getMsgType().equals(XmlMsgType.LOCATION)) {
+            // TODO 接收处理用户发送的地理位置消息
+            try {
+                String content = "感谢反馈，您的的地理位置已收到！";
+                return new WxMpTextBuilderWxMp().build(content, wxMessage, null);
+            } catch (Exception e) {
+                return null;
+            }
+        }
+
+        //上报地理位置事件
+        log.info("上报地理位置，纬度 : {}，经度 : {}，精度 : {}",
+                wxMessage.getLatitude(), wxMessage.getLongitude(), wxMessage.getPrecision());
+
+        // TODO  可以将用户地理位置信息保存到本地数据库，以便以后使用
+
+        return null;
+    }
+
+    @Override
+    protected WxMpXmlOutMessage doHandle(WxMpXmlMessage wxMessage, Map<String, Object> context, WxMpService wxMpService, WxSessionManager sessionManager) {
+        return null;
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/handler/LogHandler.java b/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/handler/LogHandler.java
new file mode 100644
index 0000000..9733258
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/handler/LogHandler.java
@@ -0,0 +1,28 @@
+package org.dromara.mp.handler;
+
+import me.chanjar.weixin.common.session.WxSessionManager;
+import me.chanjar.weixin.mp.api.WxMpService;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlOutMessage;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+/**
+ * @author Peng Les
+ */
+@Component
+public class LogHandler extends AbstractHandler {
+    @Override
+    public WxMpXmlOutMessage handle(WxMpXmlMessage wxMessage,
+                                    Map<String, Object> context, WxMpService wxMpService,
+                                    WxSessionManager sessionManager) {
+        return null;
+    }
+
+    @Override
+    protected WxMpXmlOutMessage doHandle(WxMpXmlMessage wxMessage, Map<String, Object> context, WxMpService wxMpService, WxSessionManager sessionManager) {
+        return null;
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/handler/MenuHandler.java b/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/handler/MenuHandler.java
new file mode 100644
index 0000000..e6f9776
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/handler/MenuHandler.java
@@ -0,0 +1,42 @@
+package org.dromara.mp.handler;
+
+import me.chanjar.weixin.common.session.WxSessionManager;
+import me.chanjar.weixin.mp.api.WxMpService;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlOutMessage;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+import static me.chanjar.weixin.common.api.WxConsts.EventType;
+
+/**
+ * 自定义菜单事件
+ *
+ * @author Peng Les
+ */
+@Component
+public class MenuHandler extends AbstractHandler {
+
+    @Override
+    public WxMpXmlOutMessage handle(WxMpXmlMessage wxMessage,
+                                    Map<String, Object> context, WxMpService weixinService,
+                                    WxSessionManager sessionManager) {
+        String msg = String.format("type:%s, event:%s, key:%s",
+                wxMessage.getMsgType(), wxMessage.getEvent(),
+                wxMessage.getEventKey());
+        if (EventType.VIEW.equals(wxMessage.getEvent())) {
+            return null;
+        }
+
+        return WxMpXmlOutMessage.TEXT().content(msg)
+                .fromUser(wxMessage.getToUser()).toUser(wxMessage.getFromUser())
+                .build();
+    }
+
+    @Override
+    protected WxMpXmlOutMessage doHandle(WxMpXmlMessage wxMessage, Map<String, Object> context, WxMpService wxMpService, WxSessionManager sessionManager) {
+        return null;
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/handler/MsgHandler.java b/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/handler/MsgHandler.java
new file mode 100644
index 0000000..75e96fb
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/handler/MsgHandler.java
@@ -0,0 +1,44 @@
+package org.dromara.mp.handler;
+
+import me.chanjar.weixin.common.session.WxSessionManager;
+import me.chanjar.weixin.mp.api.WxMpService;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlOutMessage;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+/**
+ * 文本消息处理器
+ *
+ * @author pengles
+ */
+@Component
+public class MsgHandler extends AbstractHandler {
+
+    @Override
+    protected WxMpXmlOutMessage doHandle(WxMpXmlMessage wxMessage,
+                                         Map<String, Object> context,
+                                         WxMpService wxMpService,
+                                         WxSessionManager sessionManager) {
+
+        String content = wxMessage.getContent();
+
+        // 简单的自动回复逻辑
+        String replyContent;
+        if ("你好".equals(content) || "hello".equalsIgnoreCase(content)) {
+            replyContent = "您好！欢迎关注我们的公众号！";
+        } else if ("帮助".equals(content) || "help".equalsIgnoreCase(content)) {
+            replyContent = "您可以发送以下关键词获取帮助：\n" +
+                    "1. 你好 - 获取欢迎信息\n" +
+                    "2. 帮助 - 获取帮助信息\n" +
+                    "3. 联系我们 - 获取联系方式";
+        } else if ("联系我们".equals(content)) {
+            replyContent = "如需帮助，请联系客服：400-123-4567";
+        } else {
+            replyContent = "感谢您的消息，我们已收到。如需帮助，请回复'帮助'。";
+        }
+
+        return buildTextMessage(replyContent, wxMessage, wxMpService);
+    }
+}
diff --git a/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/handler/NullHandler.java b/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/handler/NullHandler.java
new file mode 100644
index 0000000..da0b616
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/handler/NullHandler.java
@@ -0,0 +1,32 @@
+package org.dromara.mp.handler;
+
+import lombok.extern.slf4j.Slf4j;
+import me.chanjar.weixin.common.session.WxSessionManager;
+import me.chanjar.weixin.mp.api.WxMpService;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlOutMessage;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+/**
+ * @author Peng Les
+ */
+@Slf4j
+@Component
+public class NullHandler extends AbstractHandler {
+
+    @Override
+    public WxMpXmlOutMessage handle(WxMpXmlMessage wxMessage,
+                                    Map<String, Object> context, WxMpService wxMpService,
+                                    WxSessionManager sessionManager) {
+        log.info("\n接收到请求消息，内容：{}", wxMessage.toString());
+        return null;
+    }
+
+    @Override
+    protected WxMpXmlOutMessage doHandle(WxMpXmlMessage wxMessage, Map<String, Object> context, WxMpService wxMpService, WxSessionManager sessionManager) {
+        return null;
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/handler/ScanHandler.java b/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/handler/ScanHandler.java
new file mode 100644
index 0000000..2d9fb62
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/handler/ScanHandler.java
@@ -0,0 +1,62 @@
+package org.dromara.mp.handler;
+
+import me.chanjar.weixin.common.session.WxSessionManager;
+import me.chanjar.weixin.mp.api.WxMpService;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlOutMessage;
+import me.chanjar.weixin.mp.bean.result.WxMpUser;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+/**
+ * 扫描事件处理
+ *
+ * @author Peng Les
+ */
+@Component
+public class ScanHandler extends AbstractHandler {
+
+    @Override
+    public WxMpXmlOutMessage handle(WxMpXmlMessage wxMessage, Map<String, Object> map,
+                                    WxMpService wxMpService, WxSessionManager wxSessionManager) {
+        return doHandle(wxMessage, map, wxMpService, wxSessionManager);
+    }
+
+    @Override
+    protected WxMpXmlOutMessage doHandle(WxMpXmlMessage wxMessage, Map<String, Object> context, WxMpService wxMpService, WxSessionManager sessionManager) {
+        String eventKey = wxMessage.getEventKey();
+        String openId = wxMessage.getFromUser();
+        if (StringUtils.isBlank(eventKey) || StringUtils.isBlank(openId)) {
+            return buildTextMessage("参数缺失，绑定失败。", wxMessage, wxMpService);
+        }
+        // 处理二维码场景值
+        String scene = eventKey;
+        if (scene.startsWith("qrscene_")) {
+            scene = scene.substring("qrscene_".length());
+        }
+        if (!scene.startsWith("sys_user:")) {
+            return buildTextMessage("二维码场景不匹配，未执行绑定。", wxMessage, wxMpService);
+        }
+        String userIdStr = scene.substring("sys_user:".length());
+        Long userId = null;
+        try {
+            userId = Long.valueOf(userIdStr);
+        } catch (Exception e) {
+            return buildTextMessage("用户标识解析失败，绑定终止。", wxMessage, wxMpService);
+        }
+
+        String unionId = null;
+        try {
+            WxMpUser user = wxMpService.getUserService().userInfo(openId);
+            unionId = user.getUnionId();
+        } catch (Exception ignore) {
+        }
+
+        String msg = "绑定请求已识别。\nopenid：" + openId +
+                (StringUtils.isNotBlank(unionId) ? ("\nunionId：" + unionId) : "") +
+                "\n请在后台完成管理员微信绑定。";
+        return buildTextMessage(msg, wxMessage, wxMpService);
+    }
+}
diff --git a/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/handler/StoreCheckNotifyHandler.java b/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/handler/StoreCheckNotifyHandler.java
new file mode 100644
index 0000000..eee13c0
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/handler/StoreCheckNotifyHandler.java
@@ -0,0 +1,32 @@
+package org.dromara.mp.handler;
+
+import me.chanjar.weixin.common.session.WxSessionManager;
+import me.chanjar.weixin.mp.api.WxMpService;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlOutMessage;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+/**
+ * 门店审核事件处理
+ *
+ * @author Peng Les
+ */
+@Component
+public class StoreCheckNotifyHandler extends AbstractHandler {
+
+    @Override
+    public WxMpXmlOutMessage handle(WxMpXmlMessage wxMessage,
+                                    Map<String, Object> context, WxMpService wxMpService,
+                                    WxSessionManager sessionManager) {
+        // TODO 处理门店审核事件
+        return null;
+    }
+
+    @Override
+    protected WxMpXmlOutMessage doHandle(WxMpXmlMessage wxMessage, Map<String, Object> context, WxMpService wxMpService, WxSessionManager sessionManager) {
+        return null;
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/handler/SubscribeHandler.java b/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/handler/SubscribeHandler.java
new file mode 100644
index 0000000..80dbb96
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/handler/SubscribeHandler.java
@@ -0,0 +1,34 @@
+package org.dromara.mp.handler;
+
+import me.chanjar.weixin.common.session.WxSessionManager;
+import me.chanjar.weixin.mp.api.WxMpService;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlOutMessage;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+/**
+ * 关注事件处理器
+ *
+ * @author pengles
+ */
+@Component
+public class SubscribeHandler extends AbstractHandler {
+
+    @Override
+    protected WxMpXmlOutMessage doHandle(WxMpXmlMessage wxMessage,
+                                         Map<String, Object> context,
+                                         WxMpService wxMpService,
+                                         WxSessionManager sessionManager) {
+
+        String welcomeMsg = "感谢您关注我们的公众号！\n\n" +
+                "您可以发送以下关键词获取帮助：\n" +
+                "• 你好 - 获取欢迎信息\n" +
+                "• 帮助 - 获取帮助信息\n" +
+                "• 联系我们 - 获取联系方式\n\n" +
+                "我们将为您提供优质的服务！";
+
+        return buildTextMessage(welcomeMsg, wxMessage, wxMpService);
+    }
+}
diff --git a/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/handler/UnsubscribeHandler.java b/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/handler/UnsubscribeHandler.java
new file mode 100644
index 0000000..d6a68cd
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/handler/UnsubscribeHandler.java
@@ -0,0 +1,35 @@
+package org.dromara.mp.handler;
+
+import lombok.extern.slf4j.Slf4j;
+import me.chanjar.weixin.common.session.WxSessionManager;
+import me.chanjar.weixin.mp.api.WxMpService;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlOutMessage;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+/**
+ * 取消关注事件处理
+ *
+ * @author pengles
+ */
+@Slf4j
+@Component
+public class UnsubscribeHandler extends AbstractHandler {
+
+    @Override
+    public WxMpXmlOutMessage handle(WxMpXmlMessage wxMessage,
+                                    Map<String, Object> context, WxMpService wxMpService,
+                                    WxSessionManager sessionManager) {
+        log.info("取消关注用户 openId: {}, unionId: {}", wxMessage.getFromUser(), wxMessage.getUnionId());
+
+        return null;
+    }
+
+    @Override
+    protected WxMpXmlOutMessage doHandle(WxMpXmlMessage wxMessage, Map<String, Object> context, WxMpService wxMpService, WxSessionManager sessionManager) {
+        return null;
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/handler/UserAuthorizationRevokeHandler.java b/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/handler/UserAuthorizationRevokeHandler.java
new file mode 100644
index 0000000..2dd9d42
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/handler/UserAuthorizationRevokeHandler.java
@@ -0,0 +1,34 @@
+package org.dromara.mp.handler;
+
+import lombok.extern.slf4j.Slf4j;
+import me.chanjar.weixin.common.session.WxSessionManager;
+import me.chanjar.weixin.mp.api.WxMpService;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlOutMessage;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+/**
+ * 用户撤回授权处理
+ *
+ * @author: Peng Les
+ */
+@Slf4j
+@Component
+public class UserAuthorizationRevokeHandler extends AbstractHandler {
+
+    @Override
+    public WxMpXmlOutMessage handle(WxMpXmlMessage wxMessage,
+                                    Map<String, Object> context, WxMpService wxMpService,
+                                    WxSessionManager sessionManager) {
+        log.info("用户撤回授权 openId: {}, unionId: {}", wxMessage.getFromUser(), wxMessage.getUnionId());
+
+        return null;
+    }
+
+    @Override
+    protected WxMpXmlOutMessage doHandle(WxMpXmlMessage wxMessage, Map<String, Object> context, WxMpService wxMpService, WxSessionManager sessionManager) {
+        return null;
+    }
+}
diff --git a/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/service/WxMpMaterialService.java b/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/service/WxMpMaterialService.java
new file mode 100644
index 0000000..232400f
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/service/WxMpMaterialService.java
@@ -0,0 +1,84 @@
+package org.dromara.mp.service;
+
+import me.chanjar.weixin.common.bean.result.WxMediaUploadResult;
+import me.chanjar.weixin.mp.bean.material.WxMpMaterialCountResult;
+import me.chanjar.weixin.mp.bean.material.WxMpMaterialFileBatchGetResult;
+import me.chanjar.weixin.mp.bean.material.WxMpMaterialUploadResult;
+
+import java.io.File;
+import java.io.InputStream;
+
+/**
+ * 微信公众号素材管理服务接口
+ *
+ * @author pengles
+ */
+public interface WxMpMaterialService {
+
+    /**
+     * 上传临时素材
+     *
+     * @param mediaType 媒体类型
+     * @param file      文件
+     * @return 上传结果
+     */
+    WxMediaUploadResult uploadTempMedia(String mediaType, File file);
+
+    /**
+     * 下载临时素材
+     *
+     * @param mediaId 媒体ID
+     * @return 文件输入流
+     */
+    InputStream downloadTempMedia(String mediaId);
+
+    /**
+     * 上传永久素材
+     *
+     * @param mediaType 媒体类型
+     * @param file      文件
+     * @return 上传结果
+     */
+    WxMpMaterialUploadResult uploadMaterial(String mediaType, File file);
+
+    /**
+     * 删除永久素材
+     *
+     * @param mediaId 媒体ID
+     * @return 是否删除成功
+     */
+    boolean deleteMaterial(String mediaId);
+
+    /**
+     * 获取永久素材
+     *
+     * @param mediaId 媒体ID
+     * @return 素材信息
+     */
+    WxMpMaterialFileBatchGetResult.WxMaterialFileBatchGetNewsItem getMaterial(String mediaId);
+
+    /**
+     * 获取素材列表
+     *
+     * @param type   素材类型
+     * @param offset 偏移量
+     * @param count  数量
+     * @return 素材列表
+     */
+    WxMpMaterialFileBatchGetResult getMaterialList(String type, int offset, int count);
+
+    /**
+     * 获取素材总数
+     *
+     * @return 素材总数
+     */
+    WxMpMaterialCountResult getMaterialCount();
+
+    /**
+     * 上传图文消息内的图片
+     *
+     * @param file 图片文件
+     * @return 图片URL
+     */
+    String uploadImg(File file);
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/service/WxMpMenuService.java b/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/service/WxMpMenuService.java
new file mode 100644
index 0000000..94c1c0a
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/service/WxMpMenuService.java
@@ -0,0 +1,50 @@
+package org.dromara.mp.service;
+
+
+import me.chanjar.weixin.common.bean.menu.WxMenu;
+import me.chanjar.weixin.mp.bean.menu.WxMpMenu;
+
+/**
+ * 微信公众号菜单管理服务接口
+ *
+ * @author pengles
+ */
+public interface WxMpMenuService {
+
+    /**
+     * 创建菜单
+     *
+     * @param menu 菜单对象
+     * @return 是否成功
+     */
+    boolean createMenu(WxMenu menu);
+
+    /**
+     * 删除菜单
+     *
+     * @return 是否成功
+     */
+    boolean deleteMenu();
+
+    /**
+     * 查询菜单
+     *
+     * @return 菜单对象
+     */
+    WxMpMenu getMenu();
+
+    /**
+     * 创建默认菜单
+     *
+     * @return 是否成功
+     */
+    boolean createDefaultMenu();
+
+    /**
+     * 处理菜单点击事件
+     *
+     * @param eventKey 事件key
+     * @return 响应消息
+     */
+    String handleMenuClick(String eventKey);
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/service/WxMpMessageService.java b/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/service/WxMpMessageService.java
new file mode 100644
index 0000000..54e5042
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/service/WxMpMessageService.java
@@ -0,0 +1,123 @@
+package org.dromara.mp.service;
+
+import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlOutMessage;
+
+/**
+ * 微信公众号消息处理服务接口
+ *
+ * @author pengles
+ */
+public interface WxMpMessageService {
+
+    /**
+     * 处理文本消息
+     *
+     * @param inMessage 接收到的消息
+     * @return 回复消息
+     */
+    WxMpXmlOutMessage handleTextMessage(WxMpXmlMessage inMessage);
+
+    /**
+     * 处理图片消息
+     *
+     * @param inMessage 接收到的消息
+     * @return 回复消息
+     */
+    WxMpXmlOutMessage handleImageMessage(WxMpXmlMessage inMessage);
+
+    /**
+     * 处理语音消息
+     *
+     * @param inMessage 接收到的消息
+     * @return 回复消息
+     */
+    WxMpXmlOutMessage handleVoiceMessage(WxMpXmlMessage inMessage);
+
+    /**
+     * 处理视频消息
+     *
+     * @param inMessage 接收到的消息
+     * @return 回复消息
+     */
+    WxMpXmlOutMessage handleVideoMessage(WxMpXmlMessage inMessage);
+
+    /**
+     * 处理位置消息
+     *
+     * @param inMessage 接收到的消息
+     * @return 回复消息
+     */
+    WxMpXmlOutMessage handleLocationMessage(WxMpXmlMessage inMessage);
+
+    /**
+     * 处理链接消息
+     *
+     * @param inMessage 接收到的消息
+     * @return 回复消息
+     */
+    WxMpXmlOutMessage handleLinkMessage(WxMpXmlMessage inMessage);
+
+    /**
+     * 处理事件消息
+     *
+     * @param inMessage 接收到的消息
+     * @return 回复消息
+     */
+    WxMpXmlOutMessage handleEventMessage(WxMpXmlMessage inMessage);
+
+    /**
+     * 自动回复消息
+     *
+     * @param keyword 关键词
+     * @param openId  用户openId
+     * @return 回复内容
+     */
+    String getAutoReplyContent(String keyword, String openId);
+
+    /**
+     * 保存用户消息记录
+     *
+     * @param inMessage 接收到的消息
+     */
+    void saveUserMessage(WxMpXmlMessage inMessage);
+
+    /**
+     * 保存回复消息记录
+     *
+     * @param outMessage 回复的消息
+     * @param openId     用户openId
+     */
+    void saveReplyMessage(WxMpXmlOutMessage outMessage, String openId);
+
+    /**
+     * 获取默认回复内容
+     *
+     * @return 默认回复内容
+     */
+    String getDefaultReplyContent();
+
+    /**
+     * 处理关注事件
+     *
+     * @param openId 用户openId
+     * @return 欢迎消息
+     */
+    String handleSubscribeEvent(String openId);
+
+    /**
+     * 处理取消关注事件
+     *
+     * @param openId 用户openId
+     */
+    void handleUnsubscribeEvent(String openId);
+
+    /**
+     * 处理扫码事件
+     *
+     * @param openId   用户openId
+     * @param sceneStr 场景值
+     * @return 回复内容
+     */
+    String handleScanEvent(String openId, String sceneStr);
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/service/WxMpQrCodeService.java b/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/service/WxMpQrCodeService.java
new file mode 100644
index 0000000..8b12801
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/service/WxMpQrCodeService.java
@@ -0,0 +1,76 @@
+package org.dromara.mp.service;
+
+import me.chanjar.weixin.mp.bean.result.WxMpQrCodeTicket;
+
+/**
+ * 微信公众号二维码生成服务接口
+ *
+ * @author pengles
+ */
+public interface WxMpQrCodeService {
+
+    /**
+     * 创建临时二维码
+     *
+     * @param sceneId       场景值ID
+     * @param expireSeconds 过期时间（秒）
+     * @return 二维码ticket
+     */
+    WxMpQrCodeTicket createTempQrCode(int sceneId, int expireSeconds);
+
+    /**
+     * 创建永久二维码
+     *
+     * @param sceneStr 场景值字符串
+     * @return 二维码ticket
+     */
+    WxMpQrCodeTicket createPermanentQrCode(String sceneStr);
+
+    /**
+     * 创建永久二维码（别名方法）
+     *
+     * @param sceneStr 场景值字符串
+     * @return 二维码ticket
+     */
+    WxMpQrCodeTicket createForeverQrCode(String sceneStr);
+
+    /**
+     * 创建永久二维码
+     *
+     * @param sceneId 场景值ID
+     * @return 二维码ticket
+     */
+    WxMpQrCodeTicket createPermanentQrCode(int sceneId);
+
+    /**
+     * 通过ticket换取二维码图片URL
+     *
+     * @param ticket 二维码ticket
+     * @return 二维码图片URL
+     */
+    String getQrCodeUrl(String ticket);
+
+    /**
+     * 创建用户邀请二维码
+     *
+     * @param userId 用户ID
+     * @return 二维码ticket
+     */
+    WxMpQrCodeTicket createUserInviteQrCode(String userId);
+
+    /**
+     * 创建活动推广二维码
+     *
+     * @param activityId 活动ID
+     * @return 二维码ticket
+     */
+    WxMpQrCodeTicket createActivityQrCode(String activityId);
+
+    /**
+     * 创建渠道推广二维码
+     *
+     * @param channelId 渠道ID
+     * @return 二维码ticket
+     */
+    WxMpQrCodeTicket createChannelQrCode(String channelId);
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/service/WxMpStatisticsService.java b/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/service/WxMpStatisticsService.java
new file mode 100644
index 0000000..81fea1f
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/service/WxMpStatisticsService.java
@@ -0,0 +1,158 @@
+package org.dromara.mp.service;
+
+import java.time.LocalDate;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 微信公众号数据统计服务接口
+ *
+ * @author pengles
+ */
+public interface WxMpStatisticsService {
+
+    /**
+     * 获取用户增减数据
+     *
+     * @param beginDate 开始日期
+     * @param endDate   结束日期
+     * @return 用户增减数据
+     */
+    List<Map<String, Object>> getUserSummary(LocalDate beginDate, LocalDate endDate);
+
+    /**
+     * 获取用户累计数据
+     *
+     * @param beginDate 开始日期
+     * @param endDate   结束日期
+     * @return 用户累计数据
+     */
+    List<Map<String, Object>> getUserCumulate(LocalDate beginDate, LocalDate endDate);
+
+    /**
+     * 获取图文群发每日数据
+     *
+     * @param beginDate 开始日期
+     * @param endDate   结束日期
+     * @return 图文群发数据
+     */
+    List<Map<String, Object>> getArticleSummary(LocalDate beginDate, LocalDate endDate);
+
+    /**
+     * 获取图文群发总数据
+     *
+     * @param beginDate 开始日期
+     * @param endDate   结束日期
+     * @return 图文群发总数据
+     */
+    List<Map<String, Object>> getArticleTotal(LocalDate beginDate, LocalDate endDate);
+
+    /**
+     * 获取图文统计数据
+     *
+     * @param beginDate 开始日期
+     * @param endDate   结束日期
+     * @return 图文统计数据
+     */
+    List<Map<String, Object>> getUserRead(LocalDate beginDate, LocalDate endDate);
+
+    /**
+     * 获取图文统计分时数据
+     *
+     * @param beginDate 开始日期
+     * @param endDate   结束日期
+     * @return 图文统计分时数据
+     */
+    List<Map<String, Object>> getUserReadHour(LocalDate beginDate, LocalDate endDate);
+
+    /**
+     * 获取图文分享转发数据
+     *
+     * @param beginDate 开始日期
+     * @param endDate   结束日期
+     * @return 图文分享转发数据
+     */
+    List<Map<String, Object>> getUserShare(LocalDate beginDate, LocalDate endDate);
+
+    /**
+     * 获取图文分享转发分时数据
+     *
+     * @param beginDate 开始日期
+     * @param endDate   结束日期
+     * @return 图文分享转发分时数据
+     */
+    List<Map<String, Object>> getUserShareHour(LocalDate beginDate, LocalDate endDate);
+
+    /**
+     * 获取消息发送概况数据
+     *
+     * @param beginDate 开始日期
+     * @param endDate   结束日期
+     * @return 消息发送概况数据
+     */
+    List<Map<String, Object>> getUpstreamMsg(LocalDate beginDate, LocalDate endDate);
+
+    /**
+     * 获取消息分送分时数据
+     *
+     * @param beginDate 开始日期
+     * @param endDate   结束日期
+     * @return 消息分送分时数据
+     */
+    List<Map<String, Object>> getUpstreamMsgHour(LocalDate beginDate, LocalDate endDate);
+
+    /**
+     * 获取消息关键词发送概况
+     *
+     * @param beginDate 开始日期
+     * @param endDate   结束日期
+     * @return 消息关键词发送概况
+     */
+    List<Map<String, Object>> getUpstreamMsgWeek(LocalDate beginDate, LocalDate endDate);
+
+
+    /**
+     * 获取菜单分析数据
+     *
+     * @param beginDate 开始日期
+     * @param endDate   结束日期
+     * @return 菜单分析数据
+     */
+    List<Map<String, Object>> getMenuSummary(LocalDate beginDate, LocalDate endDate);
+
+    /**
+     * 获取统计概览数据
+     *
+     * @return 统计概览
+     */
+    Map<String, Object> getStatisticsOverview();
+
+    /**
+     * 获取用户画像数据
+     *
+     * @param beginDate 开始日期
+     * @param endDate   结束日期
+     * @return 用户画像数据
+     */
+    Map<String, Object> getUserPortrait(LocalDate beginDate, LocalDate endDate);
+
+    /**
+     * 获取热门内容排行
+     *
+     * @param beginDate 开始日期
+     * @param endDate   结束日期
+     * @param limit     限制数量
+     * @return 热门内容排行
+     */
+    List<Map<String, Object>> getPopularContent(LocalDate beginDate, LocalDate endDate, int limit);
+
+    /**
+     * 获取关键词统计
+     *
+     * @param beginDate 开始日期
+     * @param endDate   结束日期
+     * @param limit     限制数量
+     * @return 关键词统计
+     */
+    List<Map<String, Object>> getKeywordStatistics(LocalDate beginDate, LocalDate endDate, int limit);
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/service/WxMpTemplateService.java b/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/service/WxMpTemplateService.java
new file mode 100644
index 0000000..f2b14ae
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/service/WxMpTemplateService.java
@@ -0,0 +1,81 @@
+package org.dromara.mp.service;
+
+import me.chanjar.weixin.mp.bean.template.WxMpTemplate;
+import me.chanjar.weixin.mp.bean.template.WxMpTemplateMessage;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 微信公众号模板消息服务接口
+ *
+ * @author pengles
+ */
+public interface WxMpTemplateService {
+
+    /**
+     * 发送模板消息
+     *
+     * @param templateMessage 模板消息对象
+     * @return 消息ID
+     */
+    String sendTemplateMessage(WxMpTemplateMessage templateMessage);
+
+    /**
+     * 获取所有模板列表
+     *
+     * @return 模板列表
+     */
+    List<WxMpTemplate> getAllTemplates();
+
+    /**
+     * 删除模板
+     *
+     * @param templateId 模板ID
+     * @return 是否成功
+     */
+    boolean deleteTemplate(String templateId);
+
+    /**
+     * 发送通知模板消息
+     *
+     * @param openId     用户openId
+     * @param templateId 模板ID
+     * @param url        跳转链接
+     * @param data       模板数据
+     * @return 消息ID
+     */
+    String sendNotificationMessage(String openId, String templateId, String url, Map<String, String> data);
+
+    /**
+     * 发送订单模板消息
+     *
+     * @param openId  用户openId
+     * @param orderNo 订单号
+     * @param amount  金额
+     * @param status  状态
+     * @return 消息ID
+     */
+    String sendOrderMessage(String openId, String orderNo, String amount, String status);
+
+    /**
+     * 发送审核结果模板消息
+     *
+     * @param openId 用户openId
+     * @param result 审核结果
+     * @param reason 审核原因
+     * @return 消息ID
+     */
+    String sendAuditResultMessage(String openId, String result, String reason);
+
+    /**
+     * 发送活动通知模板消息
+     *
+     * @param openId       用户openId
+     * @param activityName 活动名称
+     * @param startTime    开始时间
+     * @param endTime      结束时间
+     * @return 消息ID
+     */
+    String sendActivityNotificationMessage(String openId, String activityName, String startTime, String endTime);
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/service/WxMpUserService.java b/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/service/WxMpUserService.java
new file mode 100644
index 0000000..3bbef0c
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/service/WxMpUserService.java
@@ -0,0 +1,133 @@
+package org.dromara.mp.service;
+
+import me.chanjar.weixin.mp.bean.result.WxMpUser;
+import me.chanjar.weixin.mp.bean.result.WxMpUserList;
+import me.chanjar.weixin.mp.bean.tag.WxTagListUser;
+import me.chanjar.weixin.mp.bean.tag.WxUserTag;
+
+import java.util.List;
+
+/**
+ * 微信公众号用户管理服务接口
+ *
+ * @author pengles
+ */
+public interface WxMpUserService {
+
+    /**
+     * 获取用户基本信息
+     *
+     * @param openId 用户openId
+     * @return 用户信息
+     */
+    WxMpUser getUserInfo(String openId);
+
+    /**
+     * 获取用户列表
+     *
+     * @param nextOpenId 下一个openId，用于分页
+     * @return 用户列表
+     */
+    WxMpUserList getUserList(String nextOpenId);
+
+    /**
+     * 获取所有用户列表
+     *
+     * @return 所有用户的openId列表
+     */
+    List<String> getAllUsers();
+
+    /**
+     * 创建标签
+     *
+     * @param tagName 标签名称
+     * @return 标签对象
+     */
+    WxUserTag createTag(String tagName);
+
+    /**
+     * 获取所有标签
+     *
+     * @return 标签列表
+     */
+    List<WxUserTag> getTags();
+
+    /**
+     * 更新标签
+     *
+     * @param tagId   标签ID
+     * @param tagName 新标签名称
+     * @return 是否成功
+     */
+    boolean updateTag(Long tagId, String tagName);
+
+    /**
+     * 删除标签
+     *
+     * @param tagId 标签ID
+     * @return 是否成功
+     */
+    boolean deleteTag(Long tagId);
+
+    /**
+     * 给用户打标签
+     *
+     * @param tagId   标签ID
+     * @param openIds 用户openId列表
+     * @return 是否成功
+     */
+    boolean tagUsers(Long tagId, String[] openIds);
+
+    /**
+     * 取消用户标签
+     *
+     * @param tagId   标签ID
+     * @param openIds 用户openId列表
+     * @return 是否成功
+     */
+    boolean untagUsers(Long tagId, String[] openIds);
+
+    /**
+     * 获取用户的标签列表
+     *
+     * @param openId 用户openId
+     * @return 标签ID列表
+     */
+    List<Long> getUserTags(String openId);
+
+    /**
+     * 获取标签下的用户列表
+     *
+     * @param tagId      标签ID
+     * @param nextOpenId 下一个openId，用于分页
+     * @return 用户列表
+     */
+    WxTagListUser getUsersByTag(Long tagId, String nextOpenId);
+
+    /**
+     * 获取标签下的用户openId列表
+     *
+     * @param tagId      标签ID
+     * @param nextOpenid 下一个openid，用于分页
+     * @return 用户openId列表
+     */
+    List<String> getTagUsers(Long tagId, String nextOpenid);
+
+    /**
+     * 批量为用户打标签
+     *
+     * @param tagId      标签ID
+     * @param openidList 用户openid列表
+     * @return 操作结果
+     */
+    boolean batchTagging(Long tagId, List<String> openidList);
+
+    /**
+     * 批量为用户取消标签
+     *
+     * @param tagId      标签ID
+     * @param openidList 用户openid列表
+     * @return 操作结果
+     */
+    boolean batchUntagging(Long tagId, List<String> openidList);
+}
diff --git a/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/service/impl/WxMpMaterialServiceImpl.java b/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/service/impl/WxMpMaterialServiceImpl.java
new file mode 100644
index 0000000..9447885
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/service/impl/WxMpMaterialServiceImpl.java
@@ -0,0 +1,139 @@
+package org.dromara.mp.service.impl;
+
+import me.chanjar.weixin.common.bean.result.WxMediaUploadResult;
+import me.chanjar.weixin.common.error.WxErrorException;
+import me.chanjar.weixin.mp.api.WxMpService;
+import me.chanjar.weixin.mp.bean.material.*;
+import org.dromara.mp.service.WxMpMaterialService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.io.File;
+import java.io.InputStream;
+
+/**
+ * 微信公众号素材管理服务实现类
+ *
+ * @author pengles
+ */
+@Service
+public class WxMpMaterialServiceImpl implements WxMpMaterialService {
+
+    private static final Logger logger = LoggerFactory.getLogger(WxMpMaterialServiceImpl.class);
+
+    @Autowired
+    private WxMpService wxMpService;
+
+    @Override
+    public WxMediaUploadResult uploadTempMedia(String mediaType, File file) {
+        try {
+            WxMediaUploadResult result = wxMpService.getMaterialService().mediaUpload(mediaType, file);
+            logger.info("上传临时素材成功: {}", result.getMediaId());
+            return result;
+        } catch (WxErrorException e) {
+            logger.error("上传临时素材失败: {}", e.getMessage(), e);
+            return null;
+        }
+    }
+
+    @Override
+    public InputStream downloadTempMedia(String mediaId) {
+        try {
+            File file = wxMpService.getMaterialService().mediaDownload(mediaId);
+            logger.info("下载临时素材成功: {}", mediaId);
+            return file.toURI().toURL().openStream();
+        } catch (Exception e) {
+            logger.error("下载临时素材失败: {}", e.getMessage(), e);
+            return null;
+        }
+    }
+
+    @Override
+    public WxMpMaterialUploadResult uploadMaterial(String mediaType, File file) {
+        try {
+            WxMpMaterial material = new WxMpMaterial();
+            material.setFile(file);
+            material.setName(file.getName());
+
+            WxMpMaterialUploadResult result = wxMpService.getMaterialService().materialFileUpload(mediaType, material);
+            logger.info("上传永久素材成功: {}", result.getMediaId());
+            return result;
+        } catch (WxErrorException e) {
+            logger.error("上传永久素材失败: {}", e.getMessage(), e);
+            return null;
+        }
+    }
+
+    @Override
+    public boolean deleteMaterial(String mediaId) {
+        try {
+            boolean result = wxMpService.getMaterialService().materialDelete(mediaId);
+            logger.info("删除永久素材成功: {}", mediaId);
+            return result;
+        } catch (WxErrorException e) {
+            logger.error("删除永久素材失败: {}", e.getMessage(), e);
+            return false;
+        }
+    }
+
+    @Override
+    public WxMpMaterialFileBatchGetResult.WxMaterialFileBatchGetNewsItem getMaterial(String mediaId) {
+        try {
+            WxMpMaterialFileBatchGetResult.WxMaterialFileBatchGetNewsItem item =
+                    wxMpService.getMaterialService().materialFileBatchGet("news", 0, 1)
+                            .getItems().stream()
+                            .filter(i -> mediaId.equals(i.getMediaId()))
+                            .findFirst()
+                            .orElse(null);
+
+            if (item != null) {
+                logger.info("获取永久素材成功: {}", mediaId);
+            } else {
+                logger.warn("未找到永久素材: {}", mediaId);
+            }
+            return item;
+        } catch (WxErrorException e) {
+            logger.error("获取永久素材失败: {}", e.getMessage(), e);
+            return null;
+        }
+    }
+
+    @Override
+    public WxMpMaterialFileBatchGetResult getMaterialList(String type, int offset, int count) {
+        try {
+            WxMpMaterialFileBatchGetResult result = wxMpService.getMaterialService().materialFileBatchGet(type, offset, count);
+            logger.info("获取素材列表成功: 类型={}, 数量={}", type, result.getItemCount());
+            return result;
+        } catch (WxErrorException e) {
+            logger.error("获取素材列表失败: {}", e.getMessage(), e);
+            return null;
+        }
+    }
+
+    @Override
+    public WxMpMaterialCountResult getMaterialCount() {
+        try {
+            WxMpMaterialCountResult result = wxMpService.getMaterialService().materialCount();
+            logger.info("获取素材总数成功: 图片={}, 语音={}, 视频={}, 图文={}",
+                    result.getImageCount(), result.getVoiceCount(), result.getVideoCount(), result.getNewsCount());
+            return result;
+        } catch (WxErrorException e) {
+            logger.error("获取素材总数失败: {}", e.getMessage(), e);
+            return null;
+        }
+    }
+
+    @Override
+    public String uploadImg(File file) {
+        try {
+            WxMediaImgUploadResult result = wxMpService.getMaterialService().mediaImgUpload(file);
+            logger.info("上传图文消息图片成功: {}", result.getUrl());
+            return result.getUrl();
+        } catch (WxErrorException e) {
+            logger.error("上传图文消息图片失败: {}", e.getMessage(), e);
+            return null;
+        }
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/service/impl/WxMpMenuServiceImpl.java b/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/service/impl/WxMpMenuServiceImpl.java
new file mode 100644
index 0000000..ca953da
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/service/impl/WxMpMenuServiceImpl.java
@@ -0,0 +1,120 @@
+package org.dromara.mp.service.impl;
+
+import me.chanjar.weixin.common.bean.menu.WxMenu;
+import me.chanjar.weixin.common.bean.menu.WxMenuButton;
+import me.chanjar.weixin.common.error.WxErrorException;
+import me.chanjar.weixin.mp.api.WxMpService;
+import me.chanjar.weixin.mp.bean.menu.WxMpMenu;
+import org.dromara.mp.service.WxMpMenuService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * 微信公众号菜单管理服务实现类
+ *
+ * @author pengles
+ */
+@Service
+public class WxMpMenuServiceImpl implements WxMpMenuService {
+
+    private static final Logger logger = LoggerFactory.getLogger(WxMpMenuServiceImpl.class);
+
+    @Autowired
+    private WxMpService wxMpService;
+
+    @Override
+    public boolean createMenu(WxMenu menu) {
+        try {
+            String result = wxMpService.getMenuService().menuCreate(menu);
+            logger.info("创建菜单成功: {}", result);
+            return true;
+        } catch (WxErrorException e) {
+            logger.error("创建菜单失败: {}", e.getMessage(), e);
+            return false;
+        }
+    }
+
+    @Override
+    public boolean deleteMenu() {
+        try {
+            wxMpService.getMenuService().menuDelete();
+            logger.info("删除菜单成功");
+            return true;
+        } catch (WxErrorException e) {
+            logger.error("删除菜单失败: {}", e.getMessage(), e);
+            return false;
+        }
+    }
+
+    @Override
+    public WxMpMenu getMenu() {
+        try {
+            WxMpMenu menu = wxMpService.getMenuService().menuGet();
+            logger.info("查询菜单成功");
+            return menu;
+        } catch (WxErrorException e) {
+            logger.error("查询菜单失败: {}", e.getMessage(), e);
+            return null;
+        }
+    }
+
+    @Override
+    public boolean createDefaultMenu() {
+        WxMenu menu = new WxMenu();
+
+        // 一级菜单1
+        WxMenuButton button1 = new WxMenuButton();
+        button1.setName("关于我们");
+        button1.setType("click");
+        button1.setKey("ABOUT_US");
+
+        // 一级菜单2
+        WxMenuButton button2 = new WxMenuButton();
+        button2.setName("服务中心");
+
+        // 二级菜单2-1
+        WxMenuButton subButton21 = new WxMenuButton();
+        subButton21.setName("在线客服");
+        subButton21.setType("click");
+        subButton21.setKey("ONLINE_SERVICE");
+
+        // 二级菜单2-2
+        WxMenuButton subButton22 = new WxMenuButton();
+        subButton22.setName("常见问题");
+        subButton22.setType("click");
+        subButton22.setKey("FAQ");
+
+        button2.getSubButtons().add(subButton21);
+        button2.getSubButtons().add(subButton22);
+
+        // 一级菜单3
+        WxMenuButton button3 = new WxMenuButton();
+        button3.setName("联系我们");
+        button3.setType("click");
+        button3.setKey("CONTACT_US");
+
+        menu.getButtons().add(button1);
+        menu.getButtons().add(button2);
+        menu.getButtons().add(button3);
+
+        return createMenu(menu);
+    }
+
+    @Override
+    public String handleMenuClick(String eventKey) {
+        switch (eventKey) {
+            case "ABOUT_US":
+                return "欢迎了解我们！\n\n我们致力于为用户提供优质的服务和产品。";
+            case "ONLINE_SERVICE":
+                return "客服服务时间：\n周一至周五 9:00-18:00\n\n如需帮助，请直接回复您的问题。";
+            case "FAQ":
+                return "常见问题：\n\n1. 如何使用我们的服务？\n2. 如何联系客服？\n3. 服务时间是什么？\n\n更多问题请咨询在线客服。";
+            case "CONTACT_US":
+                return "联系方式：\n\n客服电话：400-123-4567\n客服邮箱：service@example.com\n工作时间：周一至周五 9:00-18:00";
+            default:
+                return "感谢您的关注！";
+        }
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/service/impl/WxMpMessageServiceImpl.java b/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/service/impl/WxMpMessageServiceImpl.java
new file mode 100644
index 0000000..5610160
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/service/impl/WxMpMessageServiceImpl.java
@@ -0,0 +1,293 @@
+package org.dromara.mp.service.impl;
+
+import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlOutMessage;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlOutTextMessage;
+import org.dromara.mp.service.WxMpMessageService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 微信公众号消息处理服务实现类
+ *
+ * @author pengles
+ */
+@Service
+public class WxMpMessageServiceImpl implements WxMpMessageService {
+
+    private static final Logger logger = LoggerFactory.getLogger(WxMpMessageServiceImpl.class);
+
+    // 自动回复关键词映射
+    private static final Map<String, String> AUTO_REPLY_MAP = new HashMap<>();
+
+    static {
+        AUTO_REPLY_MAP.put("帮助", "您好！我是智能客服助手，可以为您提供以下服务：\n\n1. 输入\"联系客服\"获取人工客服\n2. 输入\"常见问题\"查看FAQ\n3. 输入\"产品介绍\"了解我们的产品\n4. 输入\"使用教程\"获取使用指南");
+        AUTO_REPLY_MAP.put("联系客服", "客服工作时间：周一至周五 9:00-18:00\n\n如需人工客服，请拨打：400-123-4567\n或发送邮件至：service@example.com");
+        AUTO_REPLY_MAP.put("常见问题", "常见问题：\n\n1. 如何注册账号？\n2. 忘记密码怎么办？\n3. 如何修改个人信息？\n4. 如何联系客服？\n\n更多问题请输入具体问题关键词。");
+        AUTO_REPLY_MAP.put("产品介绍", "我们的产品特色：\n\n✅ 功能强大，操作简单\n✅ 安全可靠，数据保护\n✅ 7x24小时技术支持\n✅ 持续更新，免费升级\n\n了解更多请访问官网或联系客服。");
+        AUTO_REPLY_MAP.put("使用教程", "使用教程：\n\n📖 新手入门指南\n📖 功能操作说明\n📖 常见问题解答\n📖 视频教程\n\n详细教程请访问帮助中心或联系客服获取。");
+    }
+
+    @Override
+    public WxMpXmlOutMessage handleTextMessage(WxMpXmlMessage inMessage) {
+        String content = inMessage.getContent();
+        String openId = inMessage.getFromUser();
+
+        logger.info("收到文本消息: openId={}, content={}", openId, content);
+
+        // 保存用户消息
+        saveUserMessage(inMessage);
+
+        // 获取自动回复内容
+        String replyContent = getAutoReplyContent(content, openId);
+
+        // 构建回复消息
+        WxMpXmlOutTextMessage outMessage = WxMpXmlOutMessage.TEXT()
+                .content(replyContent)
+                .fromUser(inMessage.getToUser())
+                .toUser(openId)
+                .build();
+
+        // 保存回复消息
+        saveReplyMessage(outMessage, openId);
+
+        return outMessage;
+    }
+
+    @Override
+    public WxMpXmlOutMessage handleImageMessage(WxMpXmlMessage inMessage) {
+        String openId = inMessage.getFromUser();
+        logger.info("收到图片消息: openId={}, mediaId={}", openId, inMessage.getMediaId());
+
+        saveUserMessage(inMessage);
+
+        String replyContent = "感谢您发送的图片！如需帮助，请输入\"帮助\"查看可用功能。";
+
+        WxMpXmlOutTextMessage outMessage = WxMpXmlOutMessage.TEXT()
+                .content(replyContent)
+                .fromUser(inMessage.getToUser())
+                .toUser(openId)
+                .build();
+
+        saveReplyMessage(outMessage, openId);
+        return outMessage;
+    }
+
+    @Override
+    public WxMpXmlOutMessage handleVoiceMessage(WxMpXmlMessage inMessage) {
+        String openId = inMessage.getFromUser();
+        logger.info("收到语音消息: openId={}, mediaId={}", openId, inMessage.getMediaId());
+
+        saveUserMessage(inMessage);
+
+        String replyContent = "收到您的语音消息！目前暂不支持语音识别，请发送文字消息或输入\"帮助\"查看可用功能。";
+
+        WxMpXmlOutTextMessage outMessage = WxMpXmlOutMessage.TEXT()
+                .content(replyContent)
+                .fromUser(inMessage.getToUser())
+                .toUser(openId)
+                .build();
+
+        saveReplyMessage(outMessage, openId);
+        return outMessage;
+    }
+
+    @Override
+    public WxMpXmlOutMessage handleVideoMessage(WxMpXmlMessage inMessage) {
+        String openId = inMessage.getFromUser();
+        logger.info("收到视频消息: openId={}, mediaId={}", openId, inMessage.getMediaId());
+
+        saveUserMessage(inMessage);
+
+        String replyContent = "感谢您发送的视频！如需帮助，请输入\"帮助\"查看可用功能。";
+
+        WxMpXmlOutTextMessage outMessage = WxMpXmlOutMessage.TEXT()
+                .content(replyContent)
+                .fromUser(inMessage.getToUser())
+                .toUser(openId)
+                .build();
+
+        saveReplyMessage(outMessage, openId);
+        return outMessage;
+    }
+
+    @Override
+    public WxMpXmlOutMessage handleLocationMessage(WxMpXmlMessage inMessage) {
+        String openId = inMessage.getFromUser();
+        logger.info("收到位置消息: openId={}, location=({}, {})",
+                openId, inMessage.getLocationX(), inMessage.getLocationY());
+
+        saveUserMessage(inMessage);
+
+        String replyContent = String.format("收到您的位置信息：\n纬度：%s\n经度：%s\n\n如需基于位置的服务，请联系客服。",
+                inMessage.getLocationX(), inMessage.getLocationY());
+
+        WxMpXmlOutTextMessage outMessage = WxMpXmlOutMessage.TEXT()
+                .content(replyContent)
+                .fromUser(inMessage.getToUser())
+                .toUser(openId)
+                .build();
+
+        saveReplyMessage(outMessage, openId);
+        return outMessage;
+    }
+
+    @Override
+    public WxMpXmlOutMessage handleLinkMessage(WxMpXmlMessage inMessage) {
+        String openId = inMessage.getFromUser();
+        logger.info("收到链接消息: openId={}, url={}", openId, inMessage.getUrl());
+
+        saveUserMessage(inMessage);
+
+        String replyContent = "感谢您分享的链接！如需帮助，请输入\"帮助\"查看可用功能。";
+
+        WxMpXmlOutTextMessage outMessage = WxMpXmlOutMessage.TEXT()
+                .content(replyContent)
+                .fromUser(inMessage.getToUser())
+                .toUser(openId)
+                .build();
+
+        saveReplyMessage(outMessage, openId);
+        return outMessage;
+    }
+
+    @Override
+    public WxMpXmlOutMessage handleEventMessage(WxMpXmlMessage inMessage) {
+        String openId = inMessage.getFromUser();
+        String event = inMessage.getEvent();
+
+        logger.info("收到事件消息: openId={}, event={}", openId, event);
+
+        String replyContent;
+
+        switch (event) {
+            case "subscribe":
+                replyContent = handleSubscribeEvent(openId);
+                break;
+            case "unsubscribe":
+                handleUnsubscribeEvent(openId);
+                return null; // 取消关注不回复消息
+            case "SCAN":
+                replyContent = handleScanEvent(openId, inMessage.getEventKey());
+                break;
+            case "CLICK":
+                replyContent = handleMenuClickEvent(inMessage.getEventKey());
+                break;
+            default:
+                replyContent = getDefaultReplyContent();
+                break;
+        }
+
+        if (replyContent != null) {
+            WxMpXmlOutTextMessage outMessage = WxMpXmlOutMessage.TEXT()
+                    .content(replyContent)
+                    .fromUser(inMessage.getToUser())
+                    .toUser(openId)
+                    .build();
+
+            saveReplyMessage(outMessage, openId);
+            return outMessage;
+        }
+
+        return null;
+    }
+
+    @Override
+    public String getAutoReplyContent(String keyword, String openId) {
+        // 精确匹配
+        if (AUTO_REPLY_MAP.containsKey(keyword)) {
+            return AUTO_REPLY_MAP.get(keyword);
+        }
+
+        // 模糊匹配
+        for (Map.Entry<String, String> entry : AUTO_REPLY_MAP.entrySet()) {
+            if (keyword.contains(entry.getKey()) || entry.getKey().contains(keyword)) {
+                return entry.getValue();
+            }
+        }
+
+        // 默认回复
+        return getDefaultReplyContent();
+    }
+
+    @Override
+    public void saveUserMessage(WxMpXmlMessage inMessage) {
+        // TODO: 保存用户消息到数据库
+        logger.info("保存用户消息: openId={}, msgType={}, content={}",
+                inMessage.getFromUser(), inMessage.getMsgType(), inMessage.getContent());
+    }
+
+    @Override
+    public void saveReplyMessage(WxMpXmlOutMessage outMessage, String openId) {
+        // TODO: 保存回复消息到数据库
+        logger.info("保存回复消息: openId={}, content={}", openId, outMessage.getMsgSignature());
+    }
+
+    @Override
+    public String getDefaultReplyContent() {
+        return "您好！欢迎关注我们！\n\n输入\"帮助\"查看可用功能，或直接描述您的问题，我们会尽快为您解答。";
+    }
+
+    @Override
+    public String handleSubscribeEvent(String openId) {
+        logger.info("用户关注: openId={}", openId);
+
+        String welcomeMessage = "🎉 欢迎关注我们！\n\n" +
+                "感谢您的关注，我们将为您提供优质的服务。\n\n" +
+                "💡 输入\"帮助\"查看可用功能\n" +
+                "📞 输入\"联系客服\"获取人工服务\n" +
+                "❓ 输入\"常见问题\"查看FAQ\n\n" +
+                "有任何问题随时联系我们！";
+
+        return welcomeMessage;
+    }
+
+    @Override
+    public void handleUnsubscribeEvent(String openId) {
+        logger.info("用户取消关注: openId={}", openId);
+        // TODO: 更新用户关注状态
+    }
+
+    @Override
+    public String handleScanEvent(String openId, String sceneStr) {
+        logger.info("用户扫码: openId={}, sceneStr={}", openId, sceneStr);
+
+        if (sceneStr.startsWith("invite_")) {
+            String inviteUserId = sceneStr.substring(7);
+            return String.format("感谢通过邀请码关注我们！\n邀请人ID：%s\n\n您已获得新用户专属福利，详情请联系客服。", inviteUserId);
+        } else if (sceneStr.startsWith("activity_")) {
+            String activityId = sceneStr.substring(9);
+            return String.format("欢迎参与活动！\n活动ID：%s\n\n活动详情和参与方式请联系客服了解。", activityId);
+        } else if (sceneStr.startsWith("channel_")) {
+            String channelId = sceneStr.substring(8);
+            return String.format("欢迎通过渠道关注我们！\n渠道ID：%s\n\n感谢您的关注，有任何问题请随时联系。", channelId);
+        }
+
+        return "感谢扫码关注我们！如需帮助，请输入\"帮助\"查看可用功能。";
+    }
+
+    /**
+     * 处理菜单点击事件
+     *
+     * @param eventKey 事件key
+     * @return 回复内容
+     */
+    private String handleMenuClickEvent(String eventKey) {
+        switch (eventKey) {
+            case "ABOUT_US":
+                return "关于我们\n\n我们是一家专注于为用户提供优质服务的公司，致力于通过技术创新改善用户体验。";
+            case "ONLINE_SERVICE":
+                return "在线客服\n\n客服工作时间：周一至周五 9:00-18:00\n\n请直接描述您的问题，我们会尽快回复。";
+            case "FAQ":
+                return AUTO_REPLY_MAP.get("常见问题");
+            case "CONTACT_US":
+                return AUTO_REPLY_MAP.get("联系客服");
+            default:
+                return getDefaultReplyContent();
+        }
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/service/impl/WxMpQrCodeServiceImpl.java b/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/service/impl/WxMpQrCodeServiceImpl.java
new file mode 100644
index 0000000..31c6974
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/service/impl/WxMpQrCodeServiceImpl.java
@@ -0,0 +1,96 @@
+package org.dromara.mp.service.impl;
+
+import me.chanjar.weixin.common.error.WxErrorException;
+import me.chanjar.weixin.mp.api.WxMpService;
+import me.chanjar.weixin.mp.bean.result.WxMpQrCodeTicket;
+import org.dromara.mp.service.WxMpQrCodeService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * 微信公众号二维码生成服务实现类
+ *
+ * @author pengles
+ */
+@Service
+public class WxMpQrCodeServiceImpl implements WxMpQrCodeService {
+
+    private static final Logger logger = LoggerFactory.getLogger(WxMpQrCodeServiceImpl.class);
+
+    @Autowired
+    private WxMpService wxMpService;
+
+    @Override
+    public WxMpQrCodeTicket createTempQrCode(int sceneId, int expireSeconds) {
+        try {
+            WxMpQrCodeTicket ticket = wxMpService.getQrcodeService().qrCodeCreateTmpTicket(sceneId, expireSeconds);
+            logger.info("创建临时二维码成功: sceneId={}, ticket={}", sceneId, ticket.getTicket());
+            return ticket;
+        } catch (WxErrorException e) {
+            logger.error("创建临时二维码失败: {}", e.getMessage(), e);
+            return null;
+        }
+    }
+
+    @Override
+    public WxMpQrCodeTicket createPermanentQrCode(String sceneStr) {
+        try {
+            WxMpQrCodeTicket ticket = wxMpService.getQrcodeService().qrCodeCreateLastTicket(sceneStr);
+            logger.info("创建永久二维码成功: sceneStr={}, ticket={}", sceneStr, ticket.getTicket());
+            return ticket;
+        } catch (WxErrorException e) {
+            logger.error("创建永久二维码失败: {}", e.getMessage(), e);
+            return null;
+        }
+    }
+
+    @Override
+    public WxMpQrCodeTicket createPermanentQrCode(int sceneId) {
+        try {
+            WxMpQrCodeTicket ticket = wxMpService.getQrcodeService().qrCodeCreateLastTicket(sceneId);
+            logger.info("创建永久二维码成功: sceneId={}, ticket={}", sceneId, ticket.getTicket());
+            return ticket;
+        } catch (WxErrorException e) {
+            logger.error("创建永久二维码失败: {}", e.getMessage(), e);
+            return null;
+        }
+    }
+
+    @Override
+    public WxMpQrCodeTicket createForeverQrCode(String sceneStr) {
+        // 别名方法，直接调用createPermanentQrCode
+        return createPermanentQrCode(sceneStr);
+    }
+
+    @Override
+    public String getQrCodeUrl(String ticket) {
+        String url = null;
+        try {
+            url = wxMpService.getQrcodeService().qrCodePictureUrl(ticket);
+        } catch (WxErrorException e) {
+            throw new RuntimeException(e);
+        }
+        logger.info("获取二维码URL成功: ticket={}, url={}", ticket, url);
+        return url;
+    }
+
+    @Override
+    public WxMpQrCodeTicket createUserInviteQrCode(String userId) {
+        String sceneStr = "invite_" + userId;
+        return createPermanentQrCode(sceneStr);
+    }
+
+    @Override
+    public WxMpQrCodeTicket createActivityQrCode(String activityId) {
+        String sceneStr = "activity_" + activityId;
+        return createPermanentQrCode(sceneStr);
+    }
+
+    @Override
+    public WxMpQrCodeTicket createChannelQrCode(String channelId) {
+        String sceneStr = "channel_" + channelId;
+        return createPermanentQrCode(sceneStr);
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/service/impl/WxMpStatisticsServiceImpl.java b/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/service/impl/WxMpStatisticsServiceImpl.java
new file mode 100644
index 0000000..7de6f57
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/service/impl/WxMpStatisticsServiceImpl.java
@@ -0,0 +1,493 @@
+package org.dromara.mp.service.impl;
+
+import me.chanjar.weixin.common.error.WxErrorException;
+import me.chanjar.weixin.mp.api.WxMpService;
+import me.chanjar.weixin.mp.bean.datacube.*;
+import org.dromara.mp.service.WxMpStatisticsService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDate;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
+
+/**
+ * 微信公众号数据统计服务实现类
+ *
+ * @author pengles
+ */
+@Service
+public class WxMpStatisticsServiceImpl implements WxMpStatisticsService {
+
+    private static final Logger logger = LoggerFactory.getLogger(WxMpStatisticsServiceImpl.class);
+    private static final DateTimeFormatter DATE_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+
+    @Autowired
+    private WxMpService wxMpService;
+
+    @Override
+    public List<Map<String, Object>> getUserSummary(LocalDate beginDate, LocalDate endDate) {
+        try {
+            List<WxDataCubeUserSummary> summaries = wxMpService.getDataCubeService()
+                    .getUserSummary(Date.from(beginDate.atStartOfDay(ZoneId.systemDefault()).toInstant()), Date.from(endDate.atStartOfDay(ZoneId.systemDefault()).toInstant()));
+
+            List<Map<String, Object>> result = new ArrayList<>();
+            for (WxDataCubeUserSummary summary : summaries) {
+                Map<String, Object> data = new HashMap<>();
+                data.put("refDate", summary.getRefDate());
+                data.put("userSource", summary.getUserSource());
+                data.put("newUser", summary.getNewUser());
+                data.put("cancelUser", summary.getCancelUser());
+                result.add(data);
+            }
+
+            logger.info("获取用户增减数据成功: {} - {}", beginDate, endDate);
+            return result;
+        } catch (WxErrorException e) {
+            logger.error("获取用户增减数据失败: {}", e.getMessage(), e);
+            return new ArrayList<>();
+        }
+    }
+
+    @Override
+    public List<Map<String, Object>> getUserCumulate(LocalDate beginDate, LocalDate endDate) {
+        try {
+            List<WxDataCubeUserCumulate> cumulates = wxMpService.getDataCubeService()
+                    .getUserCumulate(Date.from(beginDate.atStartOfDay(ZoneId.systemDefault()).toInstant()), Date.from(endDate.atStartOfDay(ZoneId.systemDefault()).toInstant()));
+
+            List<Map<String, Object>> result = new ArrayList<>();
+            for (WxDataCubeUserCumulate cumulate : cumulates) {
+                Map<String, Object> data = new HashMap<>();
+                data.put("refDate", cumulate.getRefDate());
+                data.put("cumulateUser", cumulate.getCumulateUser());
+                result.add(data);
+            }
+
+            logger.info("获取用户累计数据成功: {} - {}", beginDate, endDate);
+            return result;
+        } catch (WxErrorException e) {
+            logger.error("获取用户累计数据失败: {}", e.getMessage(), e);
+            return new ArrayList<>();
+        }
+    }
+
+    @Override
+    public List<Map<String, Object>> getArticleSummary(LocalDate beginDate, LocalDate endDate) {
+        try {
+            List<WxDataCubeArticleResult> summaries = wxMpService.getDataCubeService()
+                    .getArticleSummary(Date.from(beginDate.atStartOfDay(ZoneId.systemDefault()).toInstant()), Date.from(endDate.atStartOfDay(ZoneId.systemDefault()).toInstant()));
+
+            List<Map<String, Object>> result = new ArrayList<>();
+            for (WxDataCubeArticleResult summary : summaries) {
+                Map<String, Object> data = new HashMap<>();
+                data.put("refDate", summary.getRefDate());
+                data.put("msgid", summary.getMsgId());
+                data.put("title", summary.getTitle());
+                data.put("intPageReadUser", summary.getIntPageReadUser());
+                data.put("intPageReadCount", summary.getIntPageReadCount());
+                data.put("oriPageReadUser", summary.getOriPageReadUser());
+                data.put("oriPageReadCount", summary.getOriPageReadCount());
+                data.put("shareUser", summary.getShareUser());
+                data.put("shareCount", summary.getShareCount());
+                data.put("addToFavUser", summary.getAddToFavUser());
+                data.put("addToFavCount", summary.getAddToFavCount());
+                result.add(data);
+            }
+
+            logger.info("获取图文群发每日数据成功: {} - {}", beginDate, endDate);
+            return result;
+        } catch (WxErrorException e) {
+            logger.error("获取图文群发每日数据失败: {}", e.getMessage(), e);
+            return new ArrayList<>();
+        }
+    }
+
+    @Override
+    public List<Map<String, Object>> getArticleTotal(LocalDate beginDate, LocalDate endDate) {
+        try {
+            List<WxDataCubeArticleTotal> totals = wxMpService.getDataCubeService()
+                    .getArticleTotal(Date.from(beginDate.atStartOfDay(ZoneId.systemDefault()).toInstant()), Date.from(endDate.atStartOfDay(ZoneId.systemDefault()).toInstant()));
+
+            List<Map<String, Object>> result = new ArrayList<>();
+            for (WxDataCubeArticleTotal total : totals) {
+                Map<String, Object> data = new HashMap<>();
+                data.put("refDate", total.getRefDate());
+                data.put("msgid", total.getMsgId());
+                data.put("title", total.getTitle());
+                data.put("details", total.getDetails());
+                result.add(data);
+            }
+
+            logger.info("获取图文群发总数据成功: {} - {}", beginDate, endDate);
+            return result;
+        } catch (WxErrorException e) {
+            logger.error("获取图文群发总数据失败: {}", e.getMessage(), e);
+            return new ArrayList<>();
+        }
+    }
+
+    @Override
+    public List<Map<String, Object>> getUserRead(LocalDate beginDate, LocalDate endDate) {
+        try {
+            List<WxDataCubeArticleResult> reads = wxMpService.getDataCubeService()
+                    .getUserRead(Date.from(beginDate.atStartOfDay(ZoneId.systemDefault()).toInstant()), Date.from(endDate.atStartOfDay(ZoneId.systemDefault()).toInstant()));
+
+
+            List<Map<String, Object>> result = new ArrayList<>();
+            for (WxDataCubeArticleResult read : reads) {
+                Map<String, Object> data = new HashMap<>();
+                data.put("refDate", read.getRefDate());
+                data.put("userSource", read.getUserSource());
+                data.put("intPageReadUser", read.getIntPageReadUser());
+                data.put("intPageReadCount", read.getIntPageReadCount());
+                data.put("oriPageReadUser", read.getOriPageReadUser());
+                data.put("oriPageReadCount", read.getOriPageReadCount());
+                data.put("shareUser", read.getShareUser());
+                data.put("shareCount", read.getShareCount());
+                data.put("addToFavUser", read.getAddToFavUser());
+                data.put("addToFavCount", read.getAddToFavCount());
+                result.add(data);
+            }
+
+            logger.info("获取图文统计数据成功: {} - {}", beginDate, endDate);
+            return result;
+        } catch (WxErrorException e) {
+            logger.error("获取图文统计数据失败: {}", e.getMessage(), e);
+            return new ArrayList<>();
+        }
+    }
+
+    @Override
+    public List<Map<String, Object>> getUserReadHour(LocalDate beginDate, LocalDate endDate) {
+        try {
+            List<WxDataCubeArticleResult> reads = wxMpService.getDataCubeService()
+                    .getUserReadHour(Date.from(beginDate.atStartOfDay(ZoneId.systemDefault()).toInstant()), Date.from(endDate.atStartOfDay(ZoneId.systemDefault()).toInstant()));
+
+
+            List<Map<String, Object>> result = new ArrayList<>();
+            for (WxDataCubeArticleResult read : reads) {
+                Map<String, Object> data = new HashMap<>();
+                data.put("refDate", read.getRefDate());
+                data.put("refHour", read.getRefHour());
+                data.put("userSource", read.getUserSource());
+                data.put("intPageReadUser", read.getIntPageReadUser());
+                data.put("intPageReadCount", read.getIntPageReadCount());
+                data.put("oriPageReadUser", read.getOriPageReadUser());
+                data.put("oriPageReadCount", read.getOriPageReadCount());
+                data.put("shareUser", read.getShareUser());
+                data.put("shareCount", read.getShareCount());
+                data.put("addToFavUser", read.getAddToFavUser());
+                data.put("addToFavCount", read.getAddToFavCount());
+                result.add(data);
+            }
+
+            logger.info("获取图文统计分时数据成功: {} - {}", beginDate, endDate);
+            return result;
+        } catch (WxErrorException e) {
+            logger.error("获取图文统计分时数据失败: {}", e.getMessage(), e);
+            return new ArrayList<>();
+        }
+    }
+
+    @Override
+    public List<Map<String, Object>> getUserShare(LocalDate beginDate, LocalDate endDate) {
+        try {
+            List<WxDataCubeArticleResult> shares = wxMpService.getDataCubeService()
+                    .getUserShare(Date.from(beginDate.atStartOfDay(ZoneId.systemDefault()).toInstant()), Date.from(endDate.atStartOfDay(ZoneId.systemDefault()).toInstant()));
+
+            List<Map<String, Object>> result = new ArrayList<>();
+            for (WxDataCubeArticleResult share : shares) {
+                Map<String, Object> data = new HashMap<>();
+                data.put("refDate", share.getRefDate());
+                data.put("shareScene", share.getShareScene());
+                data.put("shareUser", share.getShareUser());
+                data.put("shareCount", share.getShareCount());
+                result.add(data);
+            }
+
+            logger.info("获取图文分享转发数据成功: {} - {}", beginDate, endDate);
+            return result;
+        } catch (WxErrorException e) {
+            logger.error("获取图文分享转发数据失败: {}", e.getMessage(), e);
+            return new ArrayList<>();
+        }
+    }
+
+    @Override
+    public List<Map<String, Object>> getUserShareHour(LocalDate beginDate, LocalDate endDate) {
+        try {
+            List<WxDataCubeArticleResult> shares = wxMpService.getDataCubeService()
+                    .getUserShareHour(Date.from(beginDate.atStartOfDay(ZoneId.systemDefault()).toInstant()), Date.from(endDate.atStartOfDay(ZoneId.systemDefault()).toInstant()));
+
+            List<Map<String, Object>> result = new ArrayList<>();
+            for (WxDataCubeArticleResult share : shares) {
+                Map<String, Object> data = new HashMap<>();
+                data.put("refDate", share.getRefDate());
+                data.put("refHour", share.getRefHour());
+                data.put("shareScene", share.getShareScene());
+                data.put("shareUser", share.getShareUser());
+                data.put("shareCount", share.getShareCount());
+                result.add(data);
+            }
+
+            logger.info("获取图文分享转发分时数据成功: {} - {}", beginDate, endDate);
+            return result;
+        } catch (WxErrorException e) {
+            logger.error("获取图文分享转发分时数据失败: {}", e.getMessage(), e);
+            return new ArrayList<>();
+        }
+    }
+
+    @Override
+    public List<Map<String, Object>> getUpstreamMsg(LocalDate beginDate, LocalDate endDate) {
+        try {
+            List<WxDataCubeMsgResult> msgs = wxMpService.getDataCubeService()
+                    .getUpstreamMsg(Date.from(beginDate.atStartOfDay(ZoneId.systemDefault()).toInstant()), Date.from(endDate.atStartOfDay(ZoneId.systemDefault()).toInstant()));
+
+            List<Map<String, Object>> result = new ArrayList<>();
+            for (WxDataCubeMsgResult msg : msgs) {
+                Map<String, Object> data = new HashMap<>();
+                data.put("refDate", msg.getRefDate());
+                data.put("msgType", msg.getMsgType());
+                data.put("msgUser", msg.getMsgUser());
+                data.put("msgCount", msg.getMsgCount());
+                result.add(data);
+            }
+
+            logger.info("获取消息发送概况数据成功: {} - {}", beginDate, endDate);
+            return result;
+        } catch (WxErrorException e) {
+            logger.error("获取消息发送概况数据失败: {}", e.getMessage(), e);
+            return new ArrayList<>();
+        }
+    }
+
+    @Override
+    public List<Map<String, Object>> getUpstreamMsgHour(LocalDate beginDate, LocalDate endDate) {
+        try {
+            List<WxDataCubeMsgResult> msgs = wxMpService.getDataCubeService()
+                    .getUpstreamMsgHour(Date.from(beginDate.atStartOfDay(ZoneId.systemDefault()).toInstant()), Date.from(endDate.atStartOfDay(ZoneId.systemDefault()).toInstant()));
+
+            List<Map<String, Object>> result = new ArrayList<>();
+            for (WxDataCubeMsgResult msg : msgs) {
+                Map<String, Object> data = new HashMap<>();
+                data.put("refDate", msg.getRefDate());
+                data.put("refHour", msg.getRefHour());
+                data.put("msgType", msg.getMsgType());
+                data.put("msgUser", msg.getMsgUser());
+                data.put("msgCount", msg.getMsgCount());
+                result.add(data);
+            }
+
+            logger.info("获取消息分送分时数据成功: {} - {}", beginDate, endDate);
+            return result;
+        } catch (WxErrorException e) {
+            logger.error("获取消息分送分时数据失败: {}", e.getMessage(), e);
+            return new ArrayList<>();
+        }
+    }
+
+    @Override
+    public List<Map<String, Object>> getUpstreamMsgWeek(LocalDate beginDate, LocalDate endDate) {
+        try {
+            List<WxDataCubeMsgResult> msgs = wxMpService.getDataCubeService()
+                    .getUpstreamMsgWeek(Date.from(beginDate.atStartOfDay(ZoneId.systemDefault()).toInstant()), Date.from(endDate.atStartOfDay(ZoneId.systemDefault()).toInstant()));
+
+            List<Map<String, Object>> result = new ArrayList<>();
+            for (WxDataCubeMsgResult msg : msgs) {
+                Map<String, Object> data = new HashMap<>();
+                data.put("refDate", msg.getRefDate());
+                data.put("msgType", msg.getMsgType());
+                data.put("msgUser", msg.getMsgUser());
+                data.put("msgCount", msg.getMsgCount());
+                result.add(data);
+            }
+
+            logger.info("获取消息关键词发送概况(周)成功: {} - {}", beginDate, endDate);
+            return result;
+        } catch (WxErrorException e) {
+            logger.error("获取消息关键词发送概况(周)失败: {}", e.getMessage(), e);
+            return new ArrayList<>();
+        }
+    }
+
+    @Override
+    public List<Map<String, Object>> getMenuSummary(LocalDate beginDate, LocalDate endDate) {
+        // 微信API暂不支持菜单分析数据接口，这里提供模拟数据结构
+        List<Map<String, Object>> result = new ArrayList<>();
+
+        // 模拟菜单点击数据
+        Map<String, Object> menuData = new HashMap<>();
+        menuData.put("refDate", beginDate.format(DATE_FORMATTER));
+        menuData.put("menuId", "ABOUT_US");
+        menuData.put("menuName", "关于我们");
+        menuData.put("clickCount", 0);
+        menuData.put("clickUser", 0);
+        result.add(menuData);
+
+        logger.info("获取菜单分析数据(模拟): {} - {}", beginDate, endDate);
+        return result;
+    }
+
+    @Override
+    public Map<String, Object> getStatisticsOverview() {
+        Map<String, Object> overview = new HashMap<>();
+
+        try {
+            LocalDate today = LocalDate.now();
+            LocalDate yesterday = today.minusDays(1);
+            LocalDate weekAgo = today.minusDays(7);
+
+            // 获取用户数据
+            List<Map<String, Object>> userSummary = getUserSummary(yesterday, yesterday);
+            List<Map<String, Object>> userCumulate = getUserCumulate(yesterday, yesterday);
+
+            int newUsers = userSummary.stream()
+                    .mapToInt(data -> (Integer) data.getOrDefault("newUser", 0))
+                    .sum();
+            int cancelUsers = userSummary.stream()
+                    .mapToInt(data -> (Integer) data.getOrDefault("cancelUser", 0))
+                    .sum();
+            int totalUsers = userCumulate.stream()
+                    .mapToInt(data -> (Integer) data.getOrDefault("cumulateUser", 0))
+                    .max().orElse(0);
+
+            overview.put("newUsers", newUsers);
+            overview.put("cancelUsers", cancelUsers);
+            overview.put("totalUsers", totalUsers);
+            overview.put("netGrowth", newUsers - cancelUsers);
+
+            // 获取消息数据
+            List<Map<String, Object>> msgData = getUpstreamMsg(yesterday, yesterday);
+            int totalMessages = msgData.stream()
+                    .mapToInt(data -> (Integer) data.getOrDefault("msgCount", 0))
+                    .sum();
+            int activeUsers = msgData.stream()
+                    .mapToInt(data -> (Integer) data.getOrDefault("msgUser", 0))
+                    .sum();
+
+            overview.put("totalMessages", totalMessages);
+            overview.put("activeUsers", activeUsers);
+
+            // 计算活跃度
+            double activityRate = totalUsers > 0 ? (double) activeUsers / totalUsers * 100 : 0;
+            overview.put("activityRate", Math.round(activityRate * 100.0) / 100.0);
+
+            overview.put("updateTime", LocalDate.now().format(DATE_FORMATTER));
+
+            logger.info("获取统计概览数据成功");
+
+        } catch (Exception e) {
+            logger.error("获取统计概览数据失败: {}", e.getMessage(), e);
+            // 返回默认数据
+            overview.put("newUsers", 0);
+            overview.put("cancelUsers", 0);
+            overview.put("totalUsers", 0);
+            overview.put("netGrowth", 0);
+            overview.put("totalMessages", 0);
+            overview.put("activeUsers", 0);
+            overview.put("activityRate", 0.0);
+            overview.put("updateTime", LocalDate.now().format(DATE_FORMATTER));
+        }
+
+        return overview;
+    }
+
+    @Override
+    public Map<String, Object> getUserPortrait(LocalDate beginDate, LocalDate endDate) {
+        Map<String, Object> portrait = new HashMap<>();
+
+        try {
+            // 获取用户来源分析
+            List<Map<String, Object>> userSummary = getUserSummary(beginDate, endDate);
+
+            Map<String, Integer> sourceAnalysis = new HashMap<>();
+            for (Map<String, Object> data : userSummary) {
+                String source = (String) data.get("userSource");
+                int newUser = (Integer) data.getOrDefault("newUser", 0);
+                sourceAnalysis.put(source, sourceAnalysis.getOrDefault(source, 0) + newUser);
+            }
+
+            portrait.put("sourceAnalysis", sourceAnalysis);
+
+            // 获取消息类型分析
+            List<Map<String, Object>> msgData = getUpstreamMsg(beginDate, endDate);
+
+            Map<String, Integer> msgTypeAnalysis = new HashMap<>();
+            for (Map<String, Object> data : msgData) {
+                String msgType = (String) data.get("msgType");
+                int msgCount = (Integer) data.getOrDefault("msgCount", 0);
+                msgTypeAnalysis.put(msgType, msgTypeAnalysis.getOrDefault(msgType, 0) + msgCount);
+            }
+
+            portrait.put("msgTypeAnalysis", msgTypeAnalysis);
+
+            logger.info("获取用户画像数据成功: {} - {}", beginDate, endDate);
+
+        } catch (Exception e) {
+            logger.error("获取用户画像数据失败: {}", e.getMessage(), e);
+            portrait.put("sourceAnalysis", new HashMap<>());
+            portrait.put("msgTypeAnalysis", new HashMap<>());
+        }
+
+        return portrait;
+    }
+
+    @Override
+    public List<Map<String, Object>> getPopularContent(LocalDate beginDate, LocalDate endDate, int limit) {
+        try {
+            List<Map<String, Object>> articleData = getArticleSummary(beginDate, endDate);
+
+            // 按阅读量排序
+            articleData.sort((a, b) -> {
+                int readCountA = (Integer) a.getOrDefault("intPageReadCount", 0);
+                int readCountB = (Integer) b.getOrDefault("intPageReadCount", 0);
+                return Integer.compare(readCountB, readCountA);
+            });
+
+            // 限制返回数量
+            List<Map<String, Object>> result = articleData.stream()
+                    .limit(limit)
+                    .collect(ArrayList::new, (list, item) -> list.add(item), ArrayList::addAll);
+
+            logger.info("获取热门内容排行成功: {} - {}, limit={}", beginDate, endDate, limit);
+            return result;
+
+        } catch (Exception e) {
+            logger.error("获取热门内容排行失败: {}", e.getMessage(), e);
+            return new ArrayList<>();
+        }
+    }
+
+    @Override
+    public List<Map<String, Object>> getKeywordStatistics(LocalDate beginDate, LocalDate endDate, int limit) {
+        // 这里需要结合实际的消息记录数据库来统计关键词
+        // 目前提供模拟数据结构
+        List<Map<String, Object>> result = new ArrayList<>();
+
+        // 模拟关键词统计数据
+        String[] keywords = {"帮助", "客服", "产品", "价格", "使用", "问题", "联系", "服务"};
+        Random random = new Random();
+
+        for (int i = 0; i < Math.min(keywords.length, limit); i++) {
+            Map<String, Object> data = new HashMap<>();
+            data.put("keyword", keywords[i]);
+            data.put("count", random.nextInt(100) + 1);
+            data.put("userCount", random.nextInt(50) + 1);
+            result.add(data);
+        }
+
+        // 按使用次数排序
+        result.sort((a, b) -> {
+            int countA = (Integer) a.get("count");
+            int countB = (Integer) b.get("count");
+            return Integer.compare(countB, countA);
+        });
+
+        logger.info("获取关键词统计(模拟)成功: {} - {}, limit={}", beginDate, endDate, limit);
+        return result;
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/service/impl/WxMpTemplateServiceImpl.java b/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/service/impl/WxMpTemplateServiceImpl.java
new file mode 100644
index 0000000..c2282ed
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/service/impl/WxMpTemplateServiceImpl.java
@@ -0,0 +1,134 @@
+package org.dromara.mp.service.impl;
+
+import me.chanjar.weixin.common.error.WxErrorException;
+import me.chanjar.weixin.mp.api.WxMpService;
+import me.chanjar.weixin.mp.bean.template.WxMpTemplate;
+import me.chanjar.weixin.mp.bean.template.WxMpTemplateData;
+import me.chanjar.weixin.mp.bean.template.WxMpTemplateMessage;
+import org.dromara.mp.service.WxMpTemplateService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 微信公众号模板消息服务实现类
+ *
+ * @author pengles
+ */
+@Service
+public class WxMpTemplateServiceImpl implements WxMpTemplateService {
+
+    private static final Logger logger = LoggerFactory.getLogger(WxMpTemplateServiceImpl.class);
+
+    @Autowired
+    private WxMpService wxMpService;
+
+    @Override
+    public String sendTemplateMessage(WxMpTemplateMessage templateMessage) {
+        try {
+            String msgId = wxMpService.getTemplateMsgService().sendTemplateMsg(templateMessage);
+            logger.info("发送模板消息成功: {}", msgId);
+            return msgId;
+        } catch (WxErrorException e) {
+            logger.error("发送模板消息失败: {}", e.getMessage(), e);
+            return null;
+        }
+    }
+
+    @Override
+    public List<WxMpTemplate> getAllTemplates() {
+        try {
+            List<WxMpTemplate> templates = wxMpService.getTemplateMsgService().getAllPrivateTemplate();
+            logger.info("获取模板列表成功，模板数量: {}", templates.size());
+            return templates;
+        } catch (WxErrorException e) {
+            logger.error("获取模板列表失败: {}", e.getMessage(), e);
+            return new ArrayList<>();
+        }
+    }
+
+    @Override
+    public boolean deleteTemplate(String templateId) {
+        try {
+            boolean result = wxMpService.getTemplateMsgService().delPrivateTemplate(templateId);
+            logger.info("删除模板成功: {}", templateId);
+            return result;
+        } catch (WxErrorException e) {
+            logger.error("删除模板失败: {}", e.getMessage(), e);
+            return false;
+        }
+    }
+
+    @Override
+    public String sendNotificationMessage(String openId, String templateId, String url, Map<String, String> data) {
+        WxMpTemplateMessage templateMessage = WxMpTemplateMessage.builder()
+                .toUser(openId)
+                .templateId(templateId)
+                .url(url)
+                .build();
+
+        // 添加模板数据
+        for (Map.Entry<String, String> entry : data.entrySet()) {
+            templateMessage.addData(new WxMpTemplateData(entry.getKey(), entry.getValue(), "#173177"));
+        }
+
+        return sendTemplateMessage(templateMessage);
+    }
+
+    @Override
+    public String sendOrderMessage(String openId, String orderNo, String amount, String status) {
+        WxMpTemplateMessage templateMessage = WxMpTemplateMessage.builder()
+                .toUser(openId)
+                .templateId("ORDER_TEMPLATE_ID") // 需要配置实际的模板ID
+                .build();
+
+        // 添加模板数据
+        templateMessage.addData(new WxMpTemplateData("first", "订单状态通知", "#173177"));
+        templateMessage.addData(new WxMpTemplateData("keyword1", orderNo, "#173177"));
+        templateMessage.addData(new WxMpTemplateData("keyword2", amount, "#173177"));
+        templateMessage.addData(new WxMpTemplateData("keyword3", status, "#173177"));
+        templateMessage.addData(new WxMpTemplateData("remark", "感谢您的支持！", "#173177"));
+
+        return sendTemplateMessage(templateMessage);
+    }
+
+    @Override
+    public String sendAuditResultMessage(String openId, String result, String reason) {
+        WxMpTemplateMessage templateMessage = WxMpTemplateMessage.builder()
+                .toUser(openId)
+                .templateId("AUDIT_TEMPLATE_ID") // 需要配置实际的模板ID
+                .build();
+
+        // 添加模板数据
+        templateMessage.addData(new WxMpTemplateData("first", "审核结果通知", "#173177"));
+        templateMessage.addData(new WxMpTemplateData("keyword1", result, "#173177"));
+        templateMessage.addData(new WxMpTemplateData("keyword2", reason, "#173177"));
+        templateMessage.addData(new WxMpTemplateData("remark", "如有疑问，请联系客服。", "#173177"));
+
+        return sendTemplateMessage(templateMessage);
+    }
+
+    @Override
+    public String sendActivityNotificationMessage(String openId, String activityName, String startTime, String endTime) {
+        WxMpTemplateMessage templateMessage = WxMpTemplateMessage.builder()
+                .toUser(openId)
+                .templateId("ACTIVITY_TEMPLATE_ID") // 需要配置实际的模板ID
+                .build();
+
+        // 添加模板数据
+        templateMessage.addData(new WxMpTemplateData("first", "活动通知", "#173177"));
+        templateMessage.addData(new WxMpTemplateData("keyword1", activityName, "#173177"));
+        templateMessage.addData(new WxMpTemplateData("keyword2", startTime, "#173177"));
+        templateMessage.addData(new WxMpTemplateData("keyword3", endTime, "#173177"));
+        templateMessage.addData(new WxMpTemplateData("remark", "点击查看活动详情", "#173177"));
+
+        return sendTemplateMessage(templateMessage);
+    }
+
+
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/service/impl/WxMpUserServiceImpl.java b/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/service/impl/WxMpUserServiceImpl.java
new file mode 100644
index 0000000..e8ebb2d
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/service/impl/WxMpUserServiceImpl.java
@@ -0,0 +1,199 @@
+package org.dromara.mp.service.impl;
+
+import me.chanjar.weixin.common.error.WxErrorException;
+import me.chanjar.weixin.mp.api.WxMpService;
+import me.chanjar.weixin.mp.bean.result.WxMpUser;
+import me.chanjar.weixin.mp.bean.result.WxMpUserList;
+import me.chanjar.weixin.mp.bean.tag.WxTagListUser;
+import me.chanjar.weixin.mp.bean.tag.WxUserTag;
+import org.dromara.mp.service.WxMpUserService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 微信公众号用户管理服务实现类
+ *
+ * @author pengles
+ */
+@Service
+public class WxMpUserServiceImpl implements WxMpUserService {
+
+    private static final Logger logger = LoggerFactory.getLogger(WxMpUserServiceImpl.class);
+
+    @Autowired
+    private WxMpService wxMpService;
+
+    @Override
+    public WxMpUser getUserInfo(String openId) {
+        try {
+            WxMpUser user = wxMpService.getUserService().userInfo(openId);
+            logger.info("获取用户信息成功: {}", openId);
+            return user;
+        } catch (WxErrorException e) {
+            logger.error("获取用户信息失败: {}", e.getMessage(), e);
+            return null;
+        }
+    }
+
+    @Override
+    public WxMpUserList getUserList(String nextOpenId) {
+        try {
+            WxMpUserList userList = wxMpService.getUserService().userList(nextOpenId);
+            logger.info("获取用户列表成功，数量: {}", userList.getCount());
+            return userList;
+        } catch (WxErrorException e) {
+            logger.error("获取用户列表失败: {}", e.getMessage(), e);
+            return null;
+        }
+    }
+
+    @Override
+    public List<String> getAllUsers() {
+        try {
+            List<String> allUsers = wxMpService.getUserService().userList().getOpenids();
+            logger.info("获取所有用户成功，数量: {}", allUsers.size());
+            return allUsers;
+        } catch (WxErrorException e) {
+            logger.error("获取所有用户失败: {}", e.getMessage(), e);
+            return null;
+        }
+    }
+
+    @Override
+    public WxUserTag createTag(String tagName) {
+        try {
+            WxUserTag tag = wxMpService.getUserTagService().tagCreate(tagName);
+            logger.info("创建标签成功: {}", tagName);
+            return tag;
+        } catch (WxErrorException e) {
+            logger.error("创建标签失败: {}", e.getMessage(), e);
+            return null;
+        }
+    }
+
+    @Override
+    public List<WxUserTag> getTags() {
+        try {
+            List<WxUserTag> tags = wxMpService.getUserTagService().tagGet();
+            logger.info("获取标签列表成功，数量: {}", tags.size());
+            return tags;
+        } catch (WxErrorException e) {
+            logger.error("获取标签列表失败: {}", e.getMessage(), e);
+            return null;
+        }
+    }
+
+    @Override
+    public boolean updateTag(Long tagId, String tagName) {
+        try {
+            boolean result = wxMpService.getUserTagService().tagUpdate(tagId, tagName);
+            logger.info("更新标签成功: {} -> {}", tagId, tagName);
+            return result;
+        } catch (WxErrorException e) {
+            logger.error("更新标签失败: {}", e.getMessage(), e);
+            return false;
+        }
+    }
+
+    @Override
+    public boolean deleteTag(Long tagId) {
+        try {
+            boolean result = wxMpService.getUserTagService().tagDelete(tagId);
+            logger.info("删除标签成功: {}", tagId);
+            return result;
+        } catch (WxErrorException e) {
+            logger.error("删除标签失败: {}", e.getMessage(), e);
+            return false;
+        }
+    }
+
+    @Override
+    public boolean tagUsers(Long tagId, String[] openIds) {
+        try {
+            boolean result = wxMpService.getUserTagService().batchTagging(tagId, openIds);
+            logger.info("批量打标签成功: {} 用户数: {}", tagId, openIds.length);
+            return result;
+        } catch (WxErrorException e) {
+            logger.error("批量打标签失败: {}", e.getMessage(), e);
+            return false;
+        }
+    }
+
+    @Override
+    public boolean untagUsers(Long tagId, String[] openIds) {
+        try {
+            boolean result = wxMpService.getUserTagService().batchUntagging(tagId, openIds);
+            logger.info("批量取消标签成功: {} 用户数: {}", tagId, openIds.length);
+            return result;
+        } catch (WxErrorException e) {
+            logger.error("批量取消标签失败: {}", e.getMessage(), e);
+            return false;
+        }
+    }
+
+    @Override
+    public List<Long> getUserTags(String openId) {
+        try {
+            List<Long> tags = wxMpService.getUserTagService().userTagList(openId);
+            logger.info("获取用户标签成功: {} 标签数: {}", openId, tags.size());
+            return tags;
+        } catch (WxErrorException e) {
+            logger.error("获取用户标签失败: {}", e.getMessage(), e);
+            return null;
+        }
+    }
+
+    @Override
+    public WxTagListUser getUsersByTag(Long tagId, String nextOpenId) {
+        try {
+            WxTagListUser userList = wxMpService.getUserTagService().tagListUser(tagId, nextOpenId);
+            logger.info("获取标签下用户列表成功: {} 用户数: {}", tagId, userList.getCount());
+            return userList;
+        } catch (WxErrorException e) {
+            logger.error("获取标签下用户列表失败: {}", e.getMessage(), e);
+            return null;
+        }
+    }
+
+    @Override
+    public List<String> getTagUsers(Long tagId, String nextOpenId) {
+        try {
+            WxTagListUser userList = wxMpService.getUserTagService().tagListUser(tagId, nextOpenId);
+            logger.info("获取标签下用户openId列表成功: {} 用户数: {}", tagId, userList.getCount());
+            return userList.getData().getOpenidList();
+        } catch (WxErrorException e) {
+            logger.error("获取标签下用户openId列表失败: {}", e.getMessage(), e);
+            return null;
+        }
+    }
+
+    @Override
+    public boolean batchTagging(Long tagId, List<String> openidList) {
+        try {
+            String[] openIds = openidList.toArray(new String[0]);
+            boolean result = wxMpService.getUserTagService().batchTagging(tagId, openIds);
+            logger.info("批量打标签成功: {} 用户数: {}", tagId, openIds.length);
+            return result;
+        } catch (WxErrorException e) {
+            logger.error("批量打标签失败: {}", e.getMessage(), e);
+            return false;
+        }
+    }
+
+    @Override
+    public boolean batchUntagging(Long tagId, List<String> openidList) {
+        try {
+            String[] openIds = openidList.toArray(new String[0]);
+            boolean result = wxMpService.getUserTagService().batchUntagging(tagId, openIds);
+            logger.info("批量取消标签成功: {} 用户数: {}", tagId, openIds.length);
+            return result;
+        } catch (WxErrorException e) {
+            logger.error("批量取消标签失败: {}", e.getMessage(), e);
+            return false;
+        }
+    }
+}
diff --git a/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/utils/WxMpUtils.java b/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/utils/WxMpUtils.java
new file mode 100644
index 0000000..b93ba8f
--- /dev/null
+++ b/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/utils/WxMpUtils.java
@@ -0,0 +1,365 @@
+package org.dromara.mp.utils;
+
+import me.chanjar.weixin.common.api.WxConsts;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlOutMessage;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.Arrays;
+import java.util.regex.Pattern;
+
+/**
+ * 微信公众号工具类
+ *
+ * @author pengles
+ */
+public class WxMpUtils {
+
+    private static final Logger logger = LoggerFactory.getLogger(WxMpUtils.class);
+
+    /**
+     * 手机号正则表达式
+     */
+    private static final Pattern MOBILE_PATTERN = Pattern.compile("^1[3-9]\\d{9}$");
+
+    /**
+     * 邮箱正则表达式
+     */
+    private static final Pattern EMAIL_PATTERN = Pattern.compile("^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}$");
+
+    /**
+     * 身份证号正则表达式
+     */
+    private static final Pattern ID_CARD_PATTERN = Pattern.compile("^[1-9]\\d{5}(18|19|20)\\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\\d{3}[0-9Xx]$");
+
+    /**
+     * 验证微信签名
+     *
+     * @param token     微信公众号token
+     * @param signature 微信签名
+     * @param timestamp 时间戳
+     * @param nonce     随机数
+     * @return 验证结果
+     */
+    public static boolean checkSignature(String token, String signature, String timestamp, String nonce) {
+        String[] arr = new String[]{token, timestamp, nonce};
+        Arrays.sort(arr);
+        StringBuilder content = new StringBuilder();
+        for (String s : arr) {
+            content.append(s);
+        }
+
+        try {
+            MessageDigest md = MessageDigest.getInstance("SHA-1");
+            byte[] digest = md.digest(content.toString().getBytes());
+            StringBuilder hexStr = new StringBuilder();
+            for (byte b : digest) {
+                String shaHex = Integer.toHexString(b & 0xFF);
+                if (shaHex.length() < 2) {
+                    hexStr.append(0);
+                }
+                hexStr.append(shaHex);
+            }
+            return hexStr.toString().equals(signature);
+        } catch (NoSuchAlgorithmException e) {
+            logger.error("SHA-1算法不存在", e);
+            return false;
+        }
+    }
+
+    /**
+     * 构建文本回复消息
+     *
+     * @param content   回复内容
+     * @param wxMessage 接收到的消息
+     * @return 回复消息
+     */
+    public static WxMpXmlOutMessage buildTextMessage(String content, WxMpXmlMessage wxMessage) {
+        return WxMpXmlOutMessage.TEXT()
+                .content(content)
+                .fromUser(wxMessage.getToUser())
+                .toUser(wxMessage.getFromUser())
+                .build();
+    }
+
+    /**
+     * 构建图片回复消息
+     *
+     * @param mediaId   图片媒体ID
+     * @param wxMessage 接收到的消息
+     * @return 回复消息
+     */
+    public static WxMpXmlOutMessage buildImageMessage(String mediaId, WxMpXmlMessage wxMessage) {
+        return WxMpXmlOutMessage.IMAGE()
+                .mediaId(mediaId)
+                .fromUser(wxMessage.getToUser())
+                .toUser(wxMessage.getFromUser())
+                .build();
+    }
+
+    /**
+     * 构建语音回复消息
+     *
+     * @param mediaId   语音媒体ID
+     * @param wxMessage 接收到的消息
+     * @return 回复消息
+     */
+    public static WxMpXmlOutMessage buildVoiceMessage(String mediaId, WxMpXmlMessage wxMessage) {
+        return WxMpXmlOutMessage.VOICE()
+                .mediaId(mediaId)
+                .fromUser(wxMessage.getToUser())
+                .toUser(wxMessage.getFromUser())
+                .build();
+    }
+
+    /**
+     * 构建视频回复消息
+     *
+     * @param mediaId     视频媒体ID
+     * @param title       视频标题
+     * @param description 视频描述
+     * @param wxMessage   接收到的消息
+     * @return 回复消息
+     */
+    public static WxMpXmlOutMessage buildVideoMessage(String mediaId, String title, String description, WxMpXmlMessage wxMessage) {
+        return WxMpXmlOutMessage.VIDEO()
+                .mediaId(mediaId)
+                .title(title)
+                .description(description)
+                .fromUser(wxMessage.getToUser())
+                .toUser(wxMessage.getFromUser())
+                .build();
+    }
+
+    /**
+     * 构建音乐回复消息
+     *
+     * @param title        音乐标题
+     * @param description  音乐描述
+     * @param musicUrl     音乐链接
+     * @param hqMusicUrl   高质量音乐链接
+     * @param thumbMediaId 缩略图媒体ID
+     * @param wxMessage    接收到的消息
+     * @return 回复消息
+     */
+    public static WxMpXmlOutMessage buildMusicMessage(String title, String description, String musicUrl,
+                                                      String hqMusicUrl, String thumbMediaId, WxMpXmlMessage wxMessage) {
+        return WxMpXmlOutMessage.MUSIC()
+                .title(title)
+                .description(description)
+                .musicUrl(musicUrl)
+                .hqMusicUrl(hqMusicUrl)
+                .thumbMediaId(thumbMediaId)
+                .fromUser(wxMessage.getToUser())
+                .toUser(wxMessage.getFromUser())
+                .build();
+    }
+
+    /**
+     * 判断是否为文本消息
+     *
+     * @param wxMessage 微信消息
+     * @return 是否为文本消息
+     */
+    public static boolean isTextMessage(WxMpXmlMessage wxMessage) {
+        return WxConsts.XmlMsgType.TEXT.equals(wxMessage.getMsgType());
+    }
+
+    /**
+     * 判断是否为图片消息
+     *
+     * @param wxMessage 微信消息
+     * @return 是否为图片消息
+     */
+    public static boolean isImageMessage(WxMpXmlMessage wxMessage) {
+        return WxConsts.XmlMsgType.IMAGE.equals(wxMessage.getMsgType());
+    }
+
+    /**
+     * 判断是否为语音消息
+     *
+     * @param wxMessage 微信消息
+     * @return 是否为语音消息
+     */
+    public static boolean isVoiceMessage(WxMpXmlMessage wxMessage) {
+        return WxConsts.XmlMsgType.VOICE.equals(wxMessage.getMsgType());
+    }
+
+    /**
+     * 判断是否为视频消息
+     *
+     * @param wxMessage 微信消息
+     * @return 是否为视频消息
+     */
+    public static boolean isVideoMessage(WxMpXmlMessage wxMessage) {
+        return WxConsts.XmlMsgType.VIDEO.equals(wxMessage.getMsgType()) ||
+                WxConsts.XmlMsgType.SHORTVIDEO.equals(wxMessage.getMsgType());
+    }
+
+    /**
+     * 判断是否为地理位置消息
+     *
+     * @param wxMessage 微信消息
+     * @return 是否为地理位置消息
+     */
+    public static boolean isLocationMessage(WxMpXmlMessage wxMessage) {
+        return WxConsts.XmlMsgType.LOCATION.equals(wxMessage.getMsgType());
+    }
+
+    /**
+     * 判断是否为链接消息
+     *
+     * @param wxMessage 微信消息
+     * @return 是否为链接消息
+     */
+    public static boolean isLinkMessage(WxMpXmlMessage wxMessage) {
+        return WxConsts.XmlMsgType.LINK.equals(wxMessage.getMsgType());
+    }
+
+    /**
+     * 判断是否为事件消息
+     *
+     * @param wxMessage 微信消息
+     * @return 是否为事件消息
+     */
+    public static boolean isEventMessage(WxMpXmlMessage wxMessage) {
+        return WxConsts.XmlMsgType.EVENT.equals(wxMessage.getMsgType());
+    }
+
+    /**
+     * 判断是否为关注事件
+     *
+     * @param wxMessage 微信消息
+     * @return 是否为关注事件
+     */
+    public static boolean isSubscribeEvent(WxMpXmlMessage wxMessage) {
+        return isEventMessage(wxMessage) && WxConsts.EventType.SUBSCRIBE.equals(wxMessage.getEvent());
+    }
+
+    /**
+     * 判断是否为取消关注事件
+     *
+     * @param wxMessage 微信消息
+     * @return 是否为取消关注事件
+     */
+    public static boolean isUnsubscribeEvent(WxMpXmlMessage wxMessage) {
+        return isEventMessage(wxMessage) && WxConsts.EventType.UNSUBSCRIBE.equals(wxMessage.getEvent());
+    }
+
+    /**
+     * 判断是否为菜单点击事件
+     *
+     * @param wxMessage 微信消息
+     * @return 是否为菜单点击事件
+     */
+    public static boolean isMenuClickEvent(WxMpXmlMessage wxMessage) {
+        return isEventMessage(wxMessage) && WxConsts.EventType.CLICK.equals(wxMessage.getEvent());
+    }
+
+    /**
+     * 判断是否为扫码事件
+     *
+     * @param wxMessage 微信消息
+     * @return 是否为扫码事件
+     */
+    public static boolean isScanEvent(WxMpXmlMessage wxMessage) {
+        return isEventMessage(wxMessage) &&
+                (WxConsts.EventType.SCAN.equals(wxMessage.getEvent()) ||
+                        (WxConsts.EventType.SUBSCRIBE.equals(wxMessage.getEvent()) && wxMessage.getEventKey() != null && wxMessage.getEventKey().startsWith("qrscene_")));
+    }
+
+    /**
+     * 验证手机号格式
+     *
+     * @param mobile 手机号
+     * @return 是否有效
+     */
+    public static boolean isValidMobile(String mobile) {
+        return mobile != null && MOBILE_PATTERN.matcher(mobile).matches();
+    }
+
+    /**
+     * 验证邮箱格式
+     *
+     * @param email 邮箱
+     * @return 是否有效
+     */
+    public static boolean isValidEmail(String email) {
+        return email != null && EMAIL_PATTERN.matcher(email).matches();
+    }
+
+    /**
+     * 验证身份证号格式
+     *
+     * @param idCard 身份证号
+     * @return 是否有效
+     */
+    public static boolean isValidIdCard(String idCard) {
+        return idCard != null && ID_CARD_PATTERN.matcher(idCard).matches();
+    }
+
+    /**
+     * 获取扫码事件的场景值
+     *
+     * @param wxMessage 微信消息
+     * @return 场景值
+     */
+    public static String getScanSceneValue(WxMpXmlMessage wxMessage) {
+        if (!isScanEvent(wxMessage)) {
+            return null;
+        }
+
+        String eventKey = wxMessage.getEventKey();
+        if (eventKey == null) {
+            return null;
+        }
+
+        // 如果是关注时扫码，eventKey格式为qrscene_场景值
+        if (eventKey.startsWith("qrscene_")) {
+            return eventKey.substring(8);
+        }
+
+        // 如果是已关注用户扫码，eventKey就是场景值
+        return eventKey;
+    }
+
+    /**
+     * 过滤敏感词
+     *
+     * @param content 原始内容
+     * @return 过滤后的内容
+     */
+    public static String filterSensitiveWords(String content) {
+        if (content == null || content.trim().isEmpty()) {
+            return content;
+        }
+
+        // 这里可以接入敏感词过滤服务
+        // 简单示例：替换一些常见敏感词
+        String filtered = content;
+        String[] sensitiveWords = {"fuck", "shit", "damn"};
+
+        for (String word : sensitiveWords) {
+            filtered = filtered.replaceAll("(?i)" + word, "***");
+        }
+
+        return filtered;
+    }
+
+    /**
+     * 截取字符串，超出长度用省略号表示
+     *
+     * @param str       原始字符串
+     * @param maxLength 最大长度
+     * @return 截取后的字符串
+     */
+    public static String truncateString(String str, int maxLength) {
+        if (str == null || str.length() <= maxLength) {
+            return str;
+        }
+        return str.substring(0, maxLength - 3) + "...";
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-pay/README.md b/ruoyi-modules/ruoyi-pay/README.md
new file mode 100644
index 0000000..401390c
--- /dev/null
+++ b/ruoyi-modules/ruoyi-pay/README.md
@@ -0,0 +1,912 @@
+# 支付中心 (RuoYi-Pay)
+
+## 模块简介
+
+`ruoyi-pay` 是 PoJie 项目的**聚合支付中台模块**，提供多支付渠道的统一接入、订单管理、退款管理、回调通知等功能。
+
+### 定位
+
+`ruoyi-pay` 是一个独立于业务系统的**聚合支付中台**。它向下屏蔽微信、支付宝、银联等渠道的协议差异，向上为电商、会员、充值等业务提供统一的支付、退款、查单接口。
+
+### 核心能力
+
+- ✅ **多商户/多应用**: 支持多个业务线（如商城App、门店小程序）配置独立的支付参数
+- ✅ **多渠道支持**: 微信支付 (Native/JSAPI/App/H5/小程序)、支付宝 (PC/Wap/App/QR)
+- ✅ **统一下单**: 一套接口适配所有渠道，支持收银台模式
+- ✅ **可靠回调**: 包含验签、防重、重试机制，确保业务方能收到通知
+- ✅ **防掉单机制**: 自动轮询"支付中"订单，主动同步三方状态
+- ✅ **退款管理**: 支持退款申请、退款查询、退款回调处理
+- ⏳ **钱包系统**: 支持用户余额充值、提现、消费（待实现）
+
+## 功能特性
+
+### 1. 支付应用管理 ✅
+
+- ✅ 支付应用CRUD操作
+- ✅ 应用状态管理（开启/关闭）
+- ✅ 回调地址配置（支付回调和退款回调）
+
+### 2. 支付渠道管理 ✅
+
+- ✅ 支付渠道CRUD操作
+- ✅ 渠道配置管理（JSON格式，支持动态配置）
+- ✅ 渠道状态管理
+- ✅ 渠道费率配置
+- ✅ 支持支付宝、微信支付等多种渠道
+
+### 3. 支付订单管理 ✅
+
+- ✅ 支付订单创建
+- ✅ 订单状态查询
+- ✅ 订单同步（防掉单）
+- ✅ 订单过期处理
+- ✅ 订单关闭
+- ✅ 商户订单号唯一性校验
+
+### 4. 退款管理 ✅
+
+- ✅ 退款申请
+- ✅ 退款状态查询
+- ✅ 退款回调处理
+- ✅ 部分退款支持
+- ✅ 退款金额校验
+
+### 5. 回调通知 ✅
+
+- ✅ 支付回调处理
+- ✅ 退款回调处理
+- ✅ 异步通知重试机制
+- ✅ 指数退避重试策略（15s → 30s → 1m → 2m → 5m）
+- ✅ 回调验签和幂等性处理
+
+### 6. 定时任务 ✅
+
+- ✅ 支付订单过期处理（每分钟）
+- ✅ 支付订单状态同步（每2分钟，防掉单）
+- ✅ 支付回调通知重试（每30秒）
+
+## 支持的支付渠道
+
+### 支付宝
+
+| 渠道编码 | 名称 | 说明 | 状态 |
+|---------|------|------|------|
+| `alipay_pc` | 支付宝 PC 支付 | 电脑网站支付 | ✅ |
+| `alipay_wap` | 支付宝 Wap 支付 | 手机网站支付 | ✅ |
+| `alipay_app` | 支付宝 App 支付 | 手机 App 支付 | ✅ |
+| `alipay_qr` | 支付宝扫码支付 | 当面付 | ✅ |
+
+### 微信支付
+
+| 渠道编码 | 名称 | 说明 | 状态 |
+|---------|------|------|------|
+| `wx_pub` | 微信 JSAPI 支付 | 公众号、小程序支付 | ✅ |
+| `wx_lite` | 微信小程序支付 | 独立小程序支付 | ✅ |
+| `wx_app` | 微信 App 支付 | 手机 App 支付 | ✅ |
+| `wx_native` | 微信 Native 支付 | 扫码支付 | ✅ |
+| `wx_h5` | 微信 H5 支付 | 手机浏览器支付 | ✅ |
+
+### 其他渠道
+
+| 渠道编码 | 名称 | 说明 | 状态 |
+|---------|------|------|------|
+| `mock` | 模拟支付 | 开发测试用 | ⏳ 待实现 |
+| `wallet` | 钱包支付 | 余额支付 | ⏳ 待实现 |
+
+## 核心架构设计
+
+### 实体关系图 (ERD)
+
+```
+┌──────────┐
+│  PayApp  │ (支付应用)
+└────┬─────┘
+     │ 1
+     │
+     │ N
+┌────▼──────────┐
+│ PayChannel    │ (支付渠道)
+└────┬──────────┘
+     │
+     │ N
+┌────▼──────────┐
+│  PayOrder     │ (支付订单)
+└────┬──────────┘
+     │ 1
+     │
+     │ N
+┌────▼──────────┐        ┌──────────────┐
+│  PayRefund    │        │ PayNotifyTask│ (回调任务)
+└───────────────┘        └──────────────┘
+```
+
+### 核心流程
+
+1. **商户入驻**: 在管理后台创建 `应用(App)`，并在该应用下配置 `渠道(Channel)` 参数（如微信AppID、支付宝公钥）
+2. **业务下单**: 业务方调用 `pay/order/submit`，传入 `appId` 和 `channelCode`
+3. **支付路由**: 支付中心根据 `appId + channelCode` 读取动态配置，实例化对应的支付客户端策略
+
+### 设计模式
+
+#### 策略模式 (Strategy Pattern)
+
+使用策略模式实现不同支付渠道的统一接口：
+
+- `PayStrategy` - 支付策略接口，定义统一的操作方法
+- `AlipayStrategy` - 支付宝策略实现
+- `WechatPayStrategy` - 微信支付策略实现
+- `PayStrategyFactory` - 策略工厂，负责策略的注册和获取
+
+#### 事件驱动 (Event-Driven)
+
+- `PaySuccessEvent` - 支付成功事件
+- `PayOrderListener` - 监听支付成功事件，创建回调任务
+
+## 数据库设计
+
+### 1. 支付应用表 (`pay_app`)
+
+用于隔离不同业务线的支付配置。
+
+| 字段名 | 类型 | 说明 |
+|--------|------|------|
+| id | BIGINT | 应用ID（主键） |
+| name | VARCHAR(64) | 应用名 |
+| status | TINYINT | 状态(0开启 1关闭) |
+| remark | VARCHAR(255) | 备注 |
+| pay_notify_url | VARCHAR(1024) | 支付结果回调地址 |
+| refund_notify_url | VARCHAR(1024) | 退款结果回调地址 |
+| create_by | VARCHAR(64) | 创建者 |
+| create_time | DATETIME | 创建时间 |
+| update_by | VARCHAR(64) | 更新者 |
+| update_time | DATETIME | 更新时间 |
+
+**索引**: `PRIMARY KEY (id)`
+
+### 2. 支付渠道表 (`pay_channel`)
+
+存储具体的支付参数（JSON格式），实现无需重启即可修改密钥。
+
+| 字段名 | 类型 | 说明 |
+|--------|------|------|
+| id | BIGINT | 渠道ID（主键） |
+| code | VARCHAR(32) | 渠道编码(alipay_pc, wx_pub) |
+| status | TINYINT | 状态(0开启 1关闭) |
+| remark | VARCHAR(255) | 备注 |
+| fee_rate | DOUBLE | 渠道费率(%) |
+| app_id | BIGINT | 应用ID |
+| config | TEXT | 支付渠道配置(JSON) |
+| create_by | VARCHAR(64) | 创建者 |
+| create_time | DATETIME | 创建时间 |
+| update_by | VARCHAR(64) | 更新者 |
+| update_time | DATETIME | 更新时间 |
+
+**索引**: `PRIMARY KEY (id)`
+
+### 3. 支付订单表 (`pay_order`)
+
+| 字段名 | 类型 | 说明 |
+|--------|------|------|
+| id | BIGINT | 订单ID（主键） |
+| app_id | BIGINT | 应用ID |
+| channel_id | BIGINT | 渠道ID |
+| channel_code | VARCHAR(32) | 渠道编码 |
+| merchant_order_id | VARCHAR(64) | 商户订单编号 |
+| subject | VARCHAR(32) | 商品标题 |
+| body | VARCHAR(128) | 商品描述 |
+| notify_url | VARCHAR(1024) | 异步通知地址 |
+| price | INT | 支付金额(分) |
+| channel_fee_rate | DOUBLE | 渠道费率 |
+| channel_fee_price | INT | 渠道手续费(分) |
+| status | TINYINT | 状态(0未支付 10已支付 20已退款 30已关闭) |
+| user_ip | VARCHAR(50) | 用户IP |
+| expire_time | DATETIME | 订单失效时间 |
+| success_time | DATETIME | 支付成功时间 |
+| extension_id | BIGINT | 拓展业务ID |
+| no | VARCHAR(32) | 支付单号(内部生成) |
+| channel_order_no | VARCHAR(64) | 渠道订单号(微信/支付宝) |
+| channel_user_id | VARCHAR(64) | 渠道用户OpenId |
+| channel_extras | VARCHAR(1024) | 渠道额外参数(JSON) |
+| create_by | VARCHAR(64) | 创建者 |
+| create_time | DATETIME | 创建时间 |
+| update_by | VARCHAR(64) | 更新者 |
+| update_time | DATETIME | 更新时间 |
+
+**索引**:
+- `PRIMARY KEY (id)`
+- `KEY idx_merchant_order_id (merchant_order_id)`
+
+### 4. 退款订单表 (`pay_refund`)
+
+| 字段名 | 类型 | 说明 |
+|--------|------|------|
+| id | BIGINT | 退款ID（主键） |
+| no | VARCHAR(32) | 退款单号 |
+| app_id | BIGINT | 应用ID |
+| channel_id | BIGINT | 渠道ID |
+| channel_code | VARCHAR(32) | 渠道编码 |
+| order_id | BIGINT | 支付订单ID |
+| order_no | VARCHAR(32) | 支付订单no |
+| merchant_order_id | VARCHAR(64) | 商户订单编号 |
+| merchant_refund_id | VARCHAR(64) | 商户退款编号 |
+| notify_url | VARCHAR(1024) | 回调地址 |
+| status | TINYINT | 状态(0等待 10成功 20失败) |
+| pay_price | INT | 支付金额(分) |
+| refund_price | INT | 退款金额(分) |
+| reason | VARCHAR(256) | 退款原因 |
+| user_ip | VARCHAR(50) | 用户IP |
+| channel_order_no | VARCHAR(64) | 渠道订单号 |
+| channel_refund_no | VARCHAR(64) | 渠道退款单号 |
+| success_time | DATETIME | 退款成功时间 |
+| error_code | VARCHAR(32) | 渠道错误码 |
+| error_msg | VARCHAR(128) | 渠道错误描述 |
+| create_by | VARCHAR(64) | 创建者 |
+| create_time | DATETIME | 创建时间 |
+| update_by | VARCHAR(64) | 更新者 |
+| update_time | DATETIME | 更新时间 |
+
+**索引**: `PRIMARY KEY (id)`
+
+### 5. 支付通知任务表 (`pay_notify_task`)
+
+用于记录支付/退款回调通知任务，支持重试机制。
+
+| 字段名 | 类型 | 说明 |
+|--------|------|------|
+| id | BIGINT | 任务ID（主键） |
+| order_id | BIGINT | 订单ID |
+| order_no | VARCHAR(32) | 订单号 |
+| notify_url | VARCHAR(1024) | 通知地址 |
+| notify_body | TEXT | 通知内容(JSON) |
+| retry_count | INT | 重试次数（默认0） |
+| max_retry | INT | 最大重试次数（默认5） |
+| status | TINYINT | 状态(0进行中 1成功 2失败) |
+| next_notify_time | DATETIME | 下次通知时间 |
+| create_by | VARCHAR(64) | 创建者 |
+| create_time | DATETIME | 创建时间 |
+| update_by | VARCHAR(64) | 更新者 |
+| update_time | DATETIME | 更新时间 |
+
+**索引**:
+- `PRIMARY KEY (id)`
+- `KEY idx_next_notify_time (next_notify_time)`
+
+### 6. 支付通知日志表 (`pay_notify_log`)
+
+用于记录回调通知的请求和响应日志（可选）。
+
+| 字段名 | 类型 | 说明 |
+|--------|------|------|
+| id | BIGINT | 日志ID（主键） |
+| app_id | BIGINT | 应用ID |
+| channel_id | BIGINT | 渠道ID |
+| order_id | BIGINT | 支付订单ID |
+| notify_type | VARCHAR(32) | 通知类型(pay, refund) |
+| status | TINYINT | 处理状态(0处理中 10成功 20失败) |
+| request_params | TEXT | 请求参数 |
+| response_body | TEXT | 响应结果 |
+| create_time | DATETIME | 创建时间 |
+
+**索引**:
+- `PRIMARY KEY (id)`
+- `KEY idx_order_id (order_id)`
+
+**数据库脚本位置**: `script/sql/ry_pay.sql`
+
+## 关键枚举定义
+
+### 渠道编码 (PayChannelEnum)
+
+见 [支持的支付渠道](#支持的支付渠道) 章节。
+
+### 订单状态 (PayOrderStatusEnum)
+
+| 状态码 | 描述 |
+|:---|:---|
+| `0` | **WAITING** (未支付) |
+| `10` | **SUCCESS** (支付成功) |
+| `20` | **REFUND** (已退款) |
+| `30` | **CLOSED** (已关闭) |
+
+### 退款状态 (RefundStatusEnum)
+
+| 状态码 | 描述 |
+|:---|:---|
+| `0` | **WAITING** (等待处理) |
+| `10` | **SUCCESS** (退款成功) |
+| `20` | **FAIL** (退款失败) |
+
+## 模块结构
+
+```
+org.dromara.pay/
+├── config/              # 配置类
+│   └── PayProperties.java
+├── controller/          # 控制器
+│   ├── admin/          # 管理端
+│   │   ├── PayAppController.java
+│   │   ├── PayChannelController.java
+│   │   ├── PayOrderController.java
+│   │   └── PayRefundController.java
+│   ├── app/            # 移动端
+│   │   ├── AppPayOrderController.java
+│   │   └── AppPayRefundController.java
+│   └── PayNotifyController.java  # 回调接口
+├── core/               # 核心策略
+│   ├── PayStrategy.java
+│   ├── PayStrategyFactory.java
+│   └── impl/
+│       ├── AlipayStrategy.java
+│       ├── WechatPayStrategy.java
+│       └── WechatPayUtil.java
+├── domain/             # 领域模型
+│   ├── PayApp.java
+│   ├── PayChannel.java
+│   ├── PayOrder.java
+│   ├── PayRefund.java
+│   ├── PayNotifyTask.java
+│   ├── bo/            # 业务对象
+│   └── vo/            # 视图对象
+├── enums/              # 枚举
+│   ├── PayChannelEnum.java
+│   ├── PayOrderStatusEnum.java
+│   └── RefundStatusEnum.java
+├── event/              # 事件
+│   └── PaySuccessEvent.java
+├── job/                # 定时任务
+│   ├── PayNotifyJob.java
+│   ├── PayOrderExpireJob.java
+│   └── PayOrderSyncJob.java
+├── listener/           # 监听器
+│   └── PayOrderListener.java
+├── mapper/             # 数据访问
+│   ├── PayAppMapper.java
+│   ├── PayChannelMapper.java
+│   ├── PayOrderMapper.java
+│   ├── PayRefundMapper.java
+│   └── PayNotifyTaskMapper.java
+├── service/            # 服务层
+│   ├── PayAppService.java
+│   ├── PayChannelService.java
+│   ├── PayOrderService.java
+│   ├── PayRefundService.java
+│   ├── PayNotifyService.java
+│   └── impl/
+└── util/               # 工具类
+    └── WechatPayUtil.java
+```
+
+## 核心业务流程
+
+### 1. 统一下单流程
+
+```
+业务方 → 支付中心 → 策略工厂 → 三方渠道
+   ↓         ↓          ↓         ↓
+提交订单   创建订单   获取策略   调用下单
+   ↑         ↑          ↑         ↑
+返回参数   返回参数   返回参数   返回参数
+```
+
+**详细流程**:
+
+1. 业务方调用 `/app/pay/order/submit` 提交支付订单
+2. 支付中心校验 App 状态和参数
+3. 创建 `pay_order` 记录（状态为 WAITING）
+4. 通过策略工厂获取对应的支付策略（Alipay/Wechat）
+5. 读取 `pay_channel` 配置，实例化支付客户端
+6. 调用三方渠道的下单接口
+7. 封装标准响应 `PayOrderSubmitRespVO` 返回给业务方
+8. 业务方使用返回的支付参数调起支付
+
+### 2. 支付回调流程
+
+```
+三方渠道 → 支付中心 → 业务方
+    ↓         ↓         ↓
+异步回调   验签更新   接收通知
+    ↑         ↑         ↑
+返回成功   创建任务   返回success
+```
+
+**详细流程**:
+
+1. 支付成功后，三方渠道异步回调 `/pay/notify/{channelCode}/{channelId}`
+2. 支付中心解析参数并进行验签
+3. 加分布式锁（`lock:order:{id}`）确保幂等性
+4. 幂等校验（若已支付则忽略）
+5. 更新 `pay_order` 状态为 SUCCESS
+6. 发布支付成功事件（`PaySuccessEvent`）
+7. 监听器创建 `pay_notify_task` 回调任务
+8. 立即执行一次 HTTP 回调通知业务方
+9. 业务方返回 `"success"` 或 `{"code": 200}`
+10. 如果失败，定时任务按指数退避策略重试
+
+### 3. 退款流程
+
+```
+业务方 → 支付中心 → 三方渠道
+   ↓         ↓         ↓
+申请退款   创建退款   调用退款
+   ↑         ↑         ↑
+回调通知   更新状态   返回结果
+```
+
+**详细流程**:
+
+1. 业务方调用 `/app/pay/refund/apply` 申请退款
+2. 支付中心校验订单（是否已支付、金额是否足够）
+3. 创建 `pay_refund` 记录（状态为 WAITING）
+4. 调用三方渠道的退款接口
+5. **如果三方同步返回退款成功**:
+   - 更新 `pay_refund` 状态为 SUCCESS
+   - 更新 `pay_order` 状态（REFUND/部分退款）
+   - 发送退款回调通知
+6. **如果三方异步处理中**:
+   - 保持 WAITING 状态等待回调
+   - 接收三方异步退款回调
+   - 更新 `pay_refund` 和 `pay_order` 状态
+   - 发送退款回调通知
+
+### 4. 防掉单轮询流程
+
+```
+定时任务 → 支付中心 → 三方渠道 → 业务方
+    ↓         ↓         ↓         ↓
+扫描订单   查询状态   返回状态   补发通知
+    ↓         ↓
+更新状态   触发逻辑
+```
+
+**详细流程**:
+
+1. 定时任务（每2分钟）扫描状态为 `WAITING`、创建时间超过2分钟、未过期的订单
+2. 调用三方渠道的查单接口
+3. **如果已支付（掉单补救）**:
+   - 更新 `pay_order` 状态为 SUCCESS
+   - 触发支付成功逻辑
+   - 补发支付成功通知给业务方
+4. **如果支付关闭/超时**:
+   - 更新 `pay_order` 状态为 CLOSED
+   - （可选）调用三方关单接口
+5. **如果等待支付**:
+   - 不做处理，继续等待
+
+## API 接口文档
+
+### 管理端接口
+
+#### 支付应用管理 (`/pay/app`)
+
+| 方法 | 路径 | 说明 | 权限 |
+|:---|:---|:---|:---|
+| GET | `/pay/app/list` | 查询支付应用列表 | `pay:app:list` |
+| GET | `/pay/app/{id}` | 查询支付应用详情 | `pay:app:query` |
+| POST | `/pay/app` | 新增支付应用 | `pay:app:add` |
+| PUT | `/pay/app` | 修改支付应用 | `pay:app:edit` |
+| DELETE | `/pay/app/{ids}` | 删除支付应用 | `pay:app:remove` |
+| POST | `/pay/app/export` | 导出支付应用列表 | `pay:app:export` |
+
+#### 支付渠道管理 (`/pay/channel`)
+
+| 方法 | 路径 | 说明 | 权限 |
+|:---|:---|:---|:---|
+| GET | `/pay/channel/list` | 查询支付渠道列表 | `pay:channel:list` |
+| GET | `/pay/channel/{id}` | 查询支付渠道详情 | `pay:channel:query` |
+| POST | `/pay/channel` | 新增支付渠道 | `pay:channel:add` |
+| PUT | `/pay/channel` | 修改支付渠道 | `pay:channel:edit` |
+| DELETE | `/pay/channel/{ids}` | 删除支付渠道 | `pay:channel:remove` |
+| POST | `/pay/channel/export` | 导出支付渠道列表 | `pay:channel:export` |
+
+#### 支付订单管理 (`/pay/order`)
+
+| 方法 | 路径 | 说明 | 权限 |
+|:---|:---|:---|:---|
+| GET | `/pay/order/list` | 查询支付订单列表 | `pay:order:list` |
+| GET | `/pay/order/{id}` | 查询支付订单详情 | `pay:order:query` |
+| POST | `/pay/order` | 新增支付订单 | `pay:order:add` |
+| POST | `/pay/order/submit` | 提交支付订单 | `pay:order:submit` |
+| PUT | `/pay/order` | 修改支付订单 | `pay:order:edit` |
+| DELETE | `/pay/order/{ids}` | 删除支付订单 | `pay:order:remove` |
+| POST | `/pay/order/export` | 导出支付订单列表 | `pay:order:export` |
+
+#### 退款订单管理 (`/pay/refund`)
+
+| 方法 | 路径 | 说明 | 权限 |
+|:---|:---|:---|:---|
+| GET | `/pay/refund/list` | 查询退款订单列表 | `pay:refund:list` |
+| GET | `/pay/refund/{id}` | 查询退款订单详情 | `pay:refund:query` |
+| POST | `/pay/refund` | 新增退款订单 | `pay:refund:add` |
+| POST | `/pay/refund/apply` | 申请退款 | `pay:refund:apply` |
+| PUT | `/pay/refund` | 修改退款订单 | `pay:refund:edit` |
+| DELETE | `/pay/refund/{ids}` | 删除退款订单 | `pay:refund:remove` |
+| POST | `/pay/refund/export` | 导出退款订单列表 | `pay:refund:export` |
+
+### 移动端接口
+
+#### 支付订单 (`/app/pay/order`)
+
+| 方法 | 路径 | 说明 |
+|:---|:---|:---|
+| POST | `/app/pay/order/submit` | 提交支付订单 |
+| GET | `/app/pay/order/list` | 查询支付订单列表 |
+| GET | `/app/pay/order/{id}` | 查询支付订单详情 |
+| GET | `/app/pay/order/query` | 根据商户订单号查询 |
+
+**提交支付订单请求示例**:
+```json
+{
+  "appId": 1,
+  "channelCode": "wx_pub",
+  "channelId": 1,
+  "merchantOrderId": "ORDER20240101001",
+  "subject": "商品订单",
+  "body": "商品订单-ORDER20240101001",
+  "price": 10000,
+  "notifyUrl": "https://your-domain.com/app/mall/pay/notify",
+  "userIp": "127.0.0.1",
+  "channelUserId": "openid_xxx"
+}
+```
+
+**响应示例**:
+```json
+{
+  "code": 200,
+  "msg": "操作成功",
+  "data": {
+    "payOrderNo": "PAY20240101001",
+    "payData": "{\"appId\":\"wx123\",\"timeStamp\":\"1234567890\",\"nonceStr\":\"abc\",\"package\":\"prepay_id=xxx\",\"signType\":\"RSA\",\"paySign\":\"xxx\"}",
+    "status": 0
+  }
+}
+```
+
+#### 退款 (`/app/pay/refund`)
+
+| 方法 | 路径 | 说明 |
+|:---|:---|:---|
+| POST | `/app/pay/refund/apply` | 申请退款 |
+| GET | `/app/pay/refund/list` | 查询退款订单列表 |
+| GET | `/app/pay/refund/{id}` | 查询退款订单详情 |
+| GET | `/app/pay/refund/query` | 根据商户退款编号查询 |
+
+**申请退款请求示例**:
+```json
+{
+  "orderNo": "PAY20240101001",
+  "merchantRefundId": "REFUND20240101001",
+  "refundPrice": 10000,
+  "reason": "用户申请退款",
+  "notifyUrl": "https://your-domain.com/app/mall/refund/notify",
+  "userIp": "127.0.0.1"
+}
+```
+
+### 回调接口
+
+#### 支付回调 (`/pay/notify`)
+
+| 方法 | 路径 | 说明 |
+|:---|:---|:---|
+| POST | `/pay/notify/{channelCode}/{channelId}` | 接收支付回调 |
+
+**回调通知内容**:
+```json
+{
+  "orderNo": "PAY20240101001",
+  "merchantOrderId": "ORDER20240101001",
+  "status": 10,
+  "price": 10000,
+  "channelUserId": "openid_xxx",
+  "successTime": "2024-01-01 12:00:00",
+  "channelOrderNo": "wx20240101001"
+}
+```
+
+**业务方响应**: 返回 `"success"` 或 `{"code": 200}` 表示成功
+
+#### 退款回调 (`/pay/notify/refund`)
+
+| 方法 | 路径 | 说明 |
+|:---|:---|:---|
+| POST | `/pay/notify/refund/{channelCode}/{channelId}` | 接收退款回调 |
+
+## 配置说明
+
+### 支付应用配置
+
+```json
+{
+  "name": "电商应用",
+  "status": 0,
+  "remark": "电商业务支付应用",
+  "payNotifyUrl": "https://your-domain.com/pay/notify",
+  "refundNotifyUrl": "https://your-domain.com/pay/notify/refund"
+}
+```
+
+### 支付宝渠道配置
+
+```json
+{
+  "serverUrl": "https://openapi.alipay.com/gateway.do",
+  "appId": "your_app_id",
+  "privateKey": "your_private_key",
+  "publicKey": "your_public_key",
+  "signType": "RSA2"
+}
+```
+
+**说明**:
+- `serverUrl`: 支付宝网关地址（生产环境/沙箱环境）
+- `appId`: 支付宝应用ID
+- `privateKey`: 应用私钥（RSA2格式）
+- `publicKey`: 支付宝公钥
+- `signType`: 签名类型，固定为 `RSA2`
+
+### 微信支付渠道配置
+
+```json
+{
+  "appId": "your_app_id",
+  "mchId": "your_mch_id",
+  "privateKey": "your_private_key",
+  "mchSerialNo": "your_serial_no",
+  "apiV3Key": "your_api_v3_key"
+}
+```
+
+**说明**:
+- `appId`: 微信应用ID（公众号/小程序/App）
+- `mchId`: 商户号
+- `privateKey`: 商户私钥（PEM格式）
+- `mchSerialNo`: 商户证书序列号
+- `apiV3Key`: APIv3密钥
+
+## 定时任务
+
+### 支付订单过期处理 (PayOrderExpireJob)
+
+- **执行频率**: 每分钟 (`0 0/1 * * * ?`)
+- **功能**: 
+  - 扫描状态为 `WAITING` 且已过期的订单
+  - 调用支付渠道的关单接口
+  - 更新订单状态为 `CLOSED`
+- **限制**: 每次处理最多100条，防止积压
+
+### 支付订单状态同步 (PayOrderSyncJob)
+
+- **执行频率**: 每2分钟 (`0 0/2 * * * ?`)
+- **功能**: 
+  - 扫描状态为 `WAITING`、创建时间超过2分钟、未过期的订单
+  - 调用支付渠道的查单接口
+  - 如果已支付，更新订单状态并触发支付成功逻辑
+  - 如果已关闭，更新订单状态
+- **目的**: 防止掉单，主动同步三方状态
+
+### 支付回调通知重试 (PayNotifyJob)
+
+- **执行频率**: 每30秒 (`0/30 * * * * ?`)
+- **功能**: 
+  - 扫描状态为 `进行中` 且到达通知时间的任务
+  - 执行HTTP回调通知
+  - 根据响应判断成功或失败
+  - 失败时按指数退避策略计算下次通知时间
+- **重试策略**: 15s → 30s → 1m → 2m → 5m
+- **最大重试次数**: 5次
+
+## 数据校验规则
+
+### 支付订单校验
+
+- ✅ 商户订单号唯一性校验
+- ✅ 支付单号唯一性校验
+- ✅ 删除时校验：已支付的订单不能删除
+
+### 退款订单校验
+
+- ✅ 退款单号唯一性校验
+- ✅ 商户退款编号唯一性校验
+- ✅ 退款金额不能超过支付金额
+- ✅ 删除时校验：处理中的退款不能删除
+
+### 支付应用校验
+
+- ✅ 应用名称不能为空
+- ✅ 回调地址格式校验（必须以 http:// 或 https:// 开头）
+
+### 支付渠道校验
+
+- ✅ 渠道编码不能为空
+- ✅ 同一应用下渠道编码唯一性校验
+- ✅ 渠道配置JSON格式校验
+
+## 接入指南
+
+### Maven 依赖
+
+```xml
+<dependency>
+    <groupId>org.dromara</groupId>
+    <artifactId>ruoyi-pay</artifactId>
+    <version>${revision}</version>
+</dependency>
+```
+
+### 快速开始
+
+#### 步骤1: 创建支付应用
+
+在管理后台创建支付应用，配置回调地址。
+
+#### 步骤2: 配置支付渠道
+
+在应用下配置支付渠道，填写渠道参数（JSON格式）。
+
+#### 步骤3: 调用统一下单接口
+
+```java
+PayOrderBo bo = new PayOrderBo();
+bo.setAppId(1L);
+bo.setChannelCode("wx_pub");
+bo.setMerchantOrderId("ORDER001");
+bo.setSubject("商品订单");
+bo.setPrice(10000);
+bo.setNotifyUrl("https://your-domain.com/notify");
+PayOrderSubmitRespVO resp = payOrderService.submitOrder(bo);
+```
+
+#### 步骤4: 处理支付回调
+
+实现回调接口，接收支付成功通知：
+```java
+@PostMapping("/notify")
+public String notify(@RequestBody Map<String, Object> data) {
+    String orderNo = (String) data.get("merchantOrderId");
+    // 处理业务逻辑
+    return "success";
+}
+```
+
+## 扩展开发
+
+### 添加新的支付渠道
+
+1. 实现 `PayStrategy` 接口
+2. 在 `@PostConstruct` 方法中注册到 `PayStrategyFactory`
+3. 在 `PayChannelEnum` 中添加新的渠道枚举
+4. 配置渠道参数
+
+示例：
+```java
+@Component
+@RequiredArgsConstructor
+public class NewPayStrategy implements PayStrategy {
+    private final PayStrategyFactory payStrategyFactory;
+    
+    @PostConstruct
+    public void init() {
+        payStrategyFactory.register("new_pay", this);
+    }
+    
+    @Override
+    public PayOrderSubmitRespVO submitOrder(PayOrderBo bo, PayChannel channel) {
+        // 实现下单逻辑
+    }
+    
+    // 实现其他接口方法...
+}
+```
+
+## 错误码定义
+
+| 错误信息 | 说明 |
+|:---|:---|
+| `应用不存在或已禁用` | 支付应用不存在或状态为关闭 |
+| `支付渠道不存在或已禁用` | 支付渠道不存在或状态为关闭 |
+| `商户订单号已存在` | 商户订单号重复 |
+| `支付单号已存在` | 支付单号重复 |
+| `退款单号已存在` | 退款单号重复 |
+| `商户退款编号已存在` | 商户退款编号重复 |
+| `退款金额不能超过支付金额` | 退款金额校验失败 |
+| `订单不存在` | 支付订单不存在 |
+| `订单未支付或已退款` | 订单状态不允许退款 |
+| `不支持的支付渠道` | 渠道编码不在支持列表中 |
+| `未找到支付策略` | 策略未注册 |
+
+## 扩展功能规划
+
+### 收银台模式 ⏳
+
+- 提供统一的 H5 收银台页面
+- 业务方只需传入订单号，跳转至收银台
+- 用户在收银台选择微信/支付宝/余额支付
+- **状态**: ⏳ 待实现
+
+### 钱包系统 (Wallet) ⏳
+
+- **充值**: 创建充值订单 -> 调起支付 -> 回调增加余额
+- **消费**: 余额扣减 -> 生成消费记录
+- **提现**: 申请提现 -> 管理员审核 -> 企业付款到零钱/银行卡
+- **状态**: ⏳ 待实现
+
+### 模拟支付 (Mock) ⏳
+
+- 开发环境专用
+- 下单直接返回成功，不调用真实三方接口
+- 用于前端联调和流程测试
+- **状态**: ⏳ 待实现
+
+### 对账功能 ⏳
+
+- 每日对账任务，对比支付中心订单与三方渠道订单
+- 生成对账报表，标记差异订单
+- **状态**: ⏳ 待实现
+
+### 支付统计报表 ⏳
+
+- 按日/月统计支付金额、订单数、成功率等
+- 按渠道统计支付数据
+- **状态**: ⏳ 待实现
+
+## 注意事项
+
+### 幂等性
+
+- 支付回调需要保证幂等处理，避免重复处理
+- 通过订单状态判断，已支付的订单直接返回成功
+- 使用分布式锁确保并发安全
+
+### 安全性
+
+- 回调接口需要验签，确保请求来自支付渠道
+- 使用 HTTPS 传输敏感信息
+- 渠道配置中的密钥需要妥善保管
+- 不要在日志中输出敏感信息（密钥、密码等）
+
+### 超时处理
+
+- 支付订单默认30分钟过期，可通过配置调整
+- 过期订单会自动关闭，调用渠道关单接口
+- 业务方需要及时处理订单，避免过期
+
+### 重试机制
+
+- 回调通知采用指数退避策略，最多重试5次
+- 重试间隔：15s → 30s → 1m → 2m → 5m
+- 业务方需要快速响应回调，返回 `"success"` 或 `{"code": 200}`
+- 回调响应时间建议控制在3秒内
+
+### 防掉单
+
+- 定时任务主动查询订单状态，防止掉单
+- 查询创建时间超过2分钟且未过期的待支付订单
+- 如果发现已支付但未收到回调，主动触发支付成功逻辑
+
+### 金额单位
+
+- 所有金额以"分"为单位存储和传递
+- 前端展示时需要转换为"元"
+- 计算时注意单位转换，避免精度问题
+
+### 回调地址
+
+- 回调地址必须是公网可访问的 HTTPS 地址
+- 回调地址需要支持 POST 请求
+- 回调响应需要快速返回，避免超时
+- 建议使用内网地址 + 反向代理的方式处理回调
+
+
+## 依赖模块
+
+- `ruoyi-common-core` - 核心工具类
+- `ruoyi-common-mybatis` - 数据库操作
+- `ruoyi-common-web` - Web框架支持
+- `ruoyi-common-security` - 安全认证（Sa-Token）
+- `ruoyi-common-log` - 日志记录
+- `ruoyi-common-idempotent` - 幂等性控制
+- `ruoyi-common-redis` - Redis缓存
+- `alipay-sdk-java` - 支付宝SDK
+- `wechatpay-java` - 微信支付SDK
+- `weixin-java-mp` - 微信公众号SDK（用于JSAPI支付）
diff --git a/ruoyi-modules/ruoyi-pay/pom.xml b/ruoyi-modules/ruoyi-pay/pom.xml
new file mode 100644
index 0000000..d5351fd
--- /dev/null
+++ b/ruoyi-modules/ruoyi-pay/pom.xml
@@ -0,0 +1,78 @@
+<?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>
+        <groupId>org.dromara</groupId>
+        <artifactId>ruoyi-modules</artifactId>
+        <version>${revision}</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>ruoyi-pay</artifactId>
+
+    <description>
+        ruoyi-pay支付模块
+    </description>
+
+    <dependencies>
+        <!-- 通用工具-->
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-core</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-doc</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-mybatis</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-security</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-web</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-log</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-idempotent</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-redis</artifactId>
+        </dependency>
+
+        <!-- 支付宝SDK -->
+        <dependency>
+            <groupId>com.alipay.sdk</groupId>
+            <artifactId>alipay-sdk-java</artifactId>
+        </dependency>
+        <!-- 微信支付 SDK -->
+        <dependency>
+            <groupId>com.github.wechatpay-apiv3</groupId>
+            <artifactId>wechatpay-java</artifactId>
+        </dependency>
+        <!-- 微信公众号 SDK (for JSAPI) -->
+        <dependency>
+            <groupId>com.github.binarywang</groupId>
+            <artifactId>weixin-java-mp</artifactId>
+        </dependency>
+
+    </dependencies>
+
+</project>
diff --git a/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/config/PayProperties.java b/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/config/PayProperties.java
new file mode 100644
index 0000000..5b00228
--- /dev/null
+++ b/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/config/PayProperties.java
@@ -0,0 +1,131 @@
+package org.dromara.pay.config;
+
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+import org.springframework.validation.annotation.Validated;
+
+/**
+ * 支付配置属性
+ *
+ * @author pengles
+ */
+@Data
+@Component
+@Validated
+@ConfigurationProperties(prefix = "pay")
+public class PayProperties {
+
+    /**
+     * 支付宝配置
+     */
+    @Valid
+    private AlipayProperties alipay = new AlipayProperties();
+
+    /**
+     * 微信支付配置
+     */
+    @Valid
+    private WechatProperties wechat = new WechatProperties();
+
+    @Data
+    public static class AlipayProperties {
+        /**
+         * 应用ID
+         */
+        @NotBlank(message = "支付宝AppId不能为空")
+        private String appId;
+
+        /**
+         * 商户号
+         */
+        @NotBlank(message = "支付宝商户号不能为空")
+        private String mchId;
+
+        /**
+         * 支付宝网关地址
+         */
+        @NotBlank(message = "支付宝网关地址不能为空")
+        private String serverUrl;
+
+        /**
+         * 支付宝公钥
+         */
+        @NotBlank(message = "支付宝公钥不能为空")
+        private String alipayPublicKey;
+
+        /**
+         * 应用私钥
+         */
+        @NotBlank(message = "应用私钥不能为空")
+        private String privateKey;
+
+        /**
+         * 异步通知地址
+         */
+        @NotBlank(message = "支付宝异步通知地址不能为空")
+        private String notifyUrl;
+
+        /**
+         * 同步跳转地址
+         */
+        @NotBlank(message = "支付宝同步跳转地址不能为空")
+        private String returnUrl;
+
+        /**
+         * 签名类型
+         */
+        private String signType = "RSA2";
+
+        /**
+         * 字符编码
+         */
+        private String charset = "UTF-8";
+    }
+
+    @Data
+    public static class WechatProperties {
+        /**
+         * 公众号AppId 1
+         */
+        @NotBlank(message = "微信公众号AppId不能为空")
+        private String appMp1Id;
+
+        /**
+         * 公众号AppId 2
+         */
+        private String appMp2Id;
+
+        /**
+         * 商户号
+         */
+        @NotBlank(message = "微信商户号不能为空")
+        private String mchId;
+
+        /**
+         * 商户证书序列号
+         */
+        @NotBlank(message = "微信商户证书序列号不能为空")
+        private String mchSerialNo;
+
+        /**
+         * 商户API私钥
+         */
+        @NotBlank(message = "微信商户API私钥不能为空")
+        private String privateKey;
+
+        /**
+         * API V3 密钥
+         */
+        @NotBlank(message = "微信API V3密钥不能为空")
+        private String apiV3Key;
+        
+        /**
+         * 异步通知地址
+         */
+        @NotBlank(message = "微信异步通知地址不能为空")
+        private String notifyUrl;
+    }
+}
diff --git a/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/controller/PayNotifyController.java b/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/controller/PayNotifyController.java
new file mode 100644
index 0000000..1359048
--- /dev/null
+++ b/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/controller/PayNotifyController.java
@@ -0,0 +1,136 @@
+package org.dromara.pay.controller;
+
+import cn.dev33.satoken.annotation.SaIgnore;
+import jakarta.servlet.http.HttpServletRequest;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.pay.core.PayStrategy;
+import org.dromara.pay.core.PayStrategyFactory;
+import org.dromara.pay.domain.PayChannel;
+import org.dromara.pay.domain.vo.PayNotifyResult;
+import org.dromara.pay.domain.vo.PayChannelVo;
+import org.dromara.pay.service.PayChannelService;
+import org.dromara.pay.service.PayOrderService;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 支付回调通知
+ *
+ * @author pengles
+ */
+@Slf4j
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/pay/notify")
+public class PayNotifyController {
+
+    private final PayOrderService payOrderService;
+    private final PayChannelService payChannelService;
+    private final PayStrategyFactory payStrategyFactory;
+    private final org.dromara.pay.service.PayRefundService payRefundService;
+
+    /**
+     * 接收支付回调
+     *
+     * @param channelCode 渠道编码
+     * @param channelId   渠道ID
+     * @param request     请求对象
+     */
+    @SaIgnore
+    @PostMapping("/{channelCode}/{channelId}")
+    public String notify(@PathVariable String channelCode, @PathVariable Long channelId, HttpServletRequest request) {
+        log.info("收到支付回调: channelCode={}, channelId={}", channelCode, channelId);
+        
+        // 1. 获取渠道配置
+        PayChannelVo channelVo = payChannelService.queryById(channelId);
+        if (channelVo == null) {
+            log.error("支付回调失败，渠道不存在: {}", channelId);
+            return "failure";
+        }
+        if (!channelVo.getCode().equals(channelCode)) {
+             log.error("支付回调失败，渠道编码不匹配: {} != {}", channelVo.getCode(), channelCode);
+             return "failure";
+        }
+        PayChannel channel = MapstructUtils.convert(channelVo, PayChannel.class);
+
+        // 2. 获取策略处理回调
+        try {
+            PayStrategy strategy = payStrategyFactory.getStrategy(channelCode);
+            PayNotifyResult result = strategy.processNotify(request, channel);
+            
+            if (result.isSuccess()) {
+                // 3. 更新订单状态
+                // 这里需要根据 orderNo 查询订单，确保存在且未支付
+                // 暂时假设 PayOrderService 有方法处理状态更新，或者我们直接在这里处理
+                // 由于 PayOrderService 主要是 CRUD，这里我们可能需要扩展它或直接操作
+                
+                // 简单实现：查询订单 -> 更新状态
+                // 注意：需要幂等处理 (result.isSuccess() 只是验签通过，业务状态可能已经更新)
+                handleOrderSuccess(result.getOrderNo(), result.getTradeNo(), channelCode);
+                
+                return result.getResponseBody();
+            } else {
+                log.error("支付回调验签失败: {}", channelCode);
+                return result.getResponseBody(); // 通常是 failure
+            }
+        } catch (Exception e) {
+            log.error("支付回调处理异常", e);
+            return "failure";
+        }
+    }
+    
+    private void handleOrderSuccess(String orderNo, String channelOrderNo, String channelCode) {
+        payOrderService.notifyOrderSuccess(orderNo, channelOrderNo);
+    }
+
+    /**
+     * 接收退款回调
+     *
+     * @param channelCode 渠道编码
+     * @param channelId   渠道ID
+     * @param request     请求对象
+     */
+    @SaIgnore
+    @PostMapping("/refund/{channelCode}/{channelId}")
+    public String refundNotify(@PathVariable String channelCode, @PathVariable Long channelId, HttpServletRequest request) {
+        log.info("收到退款回调: channelCode={}, channelId={}", channelCode, channelId);
+        
+        // 1. 获取渠道配置
+        PayChannelVo channelVo = payChannelService.queryById(channelId);
+        if (channelVo == null) {
+            log.error("退款回调失败，渠道不存在: {}", channelId);
+            return "failure";
+        }
+        if (!channelVo.getCode().equals(channelCode)) {
+            log.error("退款回调失败，渠道编码不匹配: {} != {}", channelVo.getCode(), channelCode);
+            return "failure";
+        }
+        PayChannel channel = MapstructUtils.convert(channelVo, PayChannel.class);
+
+        // 2. 获取策略处理回调（退款回调通常与支付回调类似，但需要解析退款单号）
+        try {
+            PayStrategy strategy = payStrategyFactory.getStrategy(channelCode);
+            PayNotifyResult result = strategy.processNotify(request, channel);
+            
+            if (result.isSuccess()) {
+                // 3. 更新退款状态
+                // 注意：退款回调中，orderNo可能是退款单号，需要根据实际情况调整
+                // 这里假设result.getOrderNo()是退款单号
+                handleRefundSuccess(result.getOrderNo(), result.getTradeNo(), channelCode);
+                
+                return result.getResponseBody();
+            } else {
+                log.error("退款回调验签失败: {}", channelCode);
+                return result.getResponseBody();
+            }
+        } catch (Exception e) {
+            log.error("退款回调处理异常", e);
+            return "failure";
+        }
+    }
+    
+    private void handleRefundSuccess(String refundNo, String channelRefundNo, String channelCode) {
+        payRefundService.notifyRefundSuccess(refundNo, channelRefundNo);
+    }
+}
diff --git a/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/controller/admin/PayAppController.java b/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/controller/admin/PayAppController.java
new file mode 100644
index 0000000..e870028
--- /dev/null
+++ b/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/controller/admin/PayAppController.java
@@ -0,0 +1,84 @@
+package org.dromara.pay.controller.admin;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.pay.domain.bo.PayAppBo;
+import org.dromara.pay.domain.vo.PayAppVo;
+import org.dromara.pay.service.PayAppService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Arrays;
+
+/**
+ * 支付应用
+ *
+ * @author pengles
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/pay/app")
+public class PayAppController extends BaseController {
+
+    private final PayAppService payAppService;
+
+    /**
+     * 查询支付应用列表
+     */
+    @SaCheckPermission("pay:app:list")
+    @GetMapping("/list")
+    public TableDataInfo<PayAppVo> list(PayAppBo bo, PageQuery pageQuery) {
+        return payAppService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 获取支付应用详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("pay:app:query")
+    @GetMapping("/{id}")
+    public R<PayAppVo> getInfo(@PathVariable Long id) {
+        return R.ok(payAppService.queryById(id));
+    }
+
+    /**
+     * 新增支付应用
+     */
+    @SaCheckPermission("pay:app:add")
+    @Log(title = "支付应用", businessType = BusinessType.INSERT)
+    @PostMapping
+    public R<Void> add(@Validated @RequestBody PayAppBo bo) {
+        return toAjax(payAppService.insertByBo(bo));
+    }
+
+    /**
+     * 修改支付应用
+     */
+    @SaCheckPermission("pay:app:edit")
+    @Log(title = "支付应用", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public R<Void> edit(@Validated @RequestBody PayAppBo bo) {
+        return toAjax(payAppService.updateByBo(bo));
+    }
+
+    /**
+     * 删除支付应用
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("pay:app:remove")
+    @Log(title = "支付应用", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@PathVariable Long[] ids) {
+        return toAjax(payAppService.deleteWithValidByIds(Arrays.asList(ids), true));
+    }
+}
diff --git a/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/controller/admin/PayChannelController.java b/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/controller/admin/PayChannelController.java
new file mode 100644
index 0000000..186a258
--- /dev/null
+++ b/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/controller/admin/PayChannelController.java
@@ -0,0 +1,84 @@
+package org.dromara.pay.controller.admin;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.pay.domain.bo.PayChannelBo;
+import org.dromara.pay.domain.vo.PayChannelVo;
+import org.dromara.pay.service.PayChannelService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 支付渠道
+ *
+ * @author pengles
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/pay/channel")
+public class PayChannelController extends BaseController {
+
+    private final PayChannelService payChannelService;
+
+    /**
+     * 查询支付渠道列表
+     */
+    @SaCheckPermission("pay:channel:list")
+    @GetMapping("/list")
+    public TableDataInfo<PayChannelVo> list(PayChannelBo bo, PageQuery pageQuery) {
+        return payChannelService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 获取支付渠道详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("pay:channel:query")
+    @GetMapping("/{id}")
+    public R<PayChannelVo> getInfo(@PathVariable Long id) {
+        return R.ok(payChannelService.queryById(id));
+    }
+
+    /**
+     * 新增支付渠道
+     */
+    @SaCheckPermission("pay:channel:add")
+    @Log(title = "支付渠道", businessType = BusinessType.INSERT)
+    @PostMapping
+    public R<Void> add(@Validated @RequestBody PayChannelBo bo) {
+        return toAjax(payChannelService.insertByBo(bo));
+    }
+
+    /**
+     * 修改支付渠道
+     */
+    @SaCheckPermission("pay:channel:edit")
+    @Log(title = "支付渠道", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public R<Void> edit(@Validated @RequestBody PayChannelBo bo) {
+        return toAjax(payChannelService.updateByBo(bo));
+    }
+
+    /**
+     * 删除支付渠道
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("pay:channel:remove")
+    @Log(title = "支付渠道", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@PathVariable Long[] ids) {
+        return toAjax(payChannelService.deleteWithValidByIds(Arrays.asList(ids), true));
+    }
+}
diff --git a/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/controller/admin/PayOrderController.java b/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/controller/admin/PayOrderController.java
new file mode 100644
index 0000000..68812fb
--- /dev/null
+++ b/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/controller/admin/PayOrderController.java
@@ -0,0 +1,95 @@
+package org.dromara.pay.controller.admin;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.pay.domain.bo.PayOrderBo;
+import org.dromara.pay.domain.vo.PayOrderSubmitRespVO;
+import org.dromara.pay.domain.vo.PayOrderVo;
+import org.dromara.pay.service.PayOrderService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 支付订单
+ *
+ * @author pengles
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/pay/order")
+public class PayOrderController extends BaseController {
+
+    private final PayOrderService payOrderService;
+
+    /**
+     * 查询支付订单列表
+     */
+    @SaCheckPermission("pay:order:list")
+    @GetMapping("/list")
+    public TableDataInfo<PayOrderVo> list(PayOrderBo bo, PageQuery pageQuery) {
+        return payOrderService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 获取支付订单详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("pay:order:query")
+    @GetMapping("/{id}")
+    public R<PayOrderVo> getInfo(@PathVariable Long id) {
+        return R.ok(payOrderService.queryById(id));
+    }
+
+    /**
+     * 新增支付订单
+     */
+    @SaCheckPermission("pay:order:add")
+    @Log(title = "支付订单", businessType = BusinessType.INSERT)
+    @PostMapping
+    public R<Void> add(@Validated @RequestBody PayOrderBo bo) {
+        return toAjax(payOrderService.insertByBo(bo));
+    }
+
+    /**
+     * 提交支付订单
+     */
+    @SaCheckPermission("pay:order:submit")
+    @Log(title = "支付订单", businessType = BusinessType.OTHER)
+    @PostMapping("/submit")
+    public R<PayOrderSubmitRespVO> submit(@Validated @RequestBody PayOrderBo bo) {
+        return R.ok(payOrderService.submitOrder(bo));
+    }
+
+    /**
+     * 修改支付订单
+     */
+    @SaCheckPermission("pay:order:edit")
+    @Log(title = "支付订单", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public R<Void> edit(@Validated @RequestBody PayOrderBo bo) {
+        return toAjax(payOrderService.updateByBo(bo));
+    }
+
+    /**
+     * 删除支付订单
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("pay:order:remove")
+    @Log(title = "支付订单", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@PathVariable Long[] ids) {
+        return toAjax(payOrderService.deleteWithValidByIds(Arrays.asList(ids), true));
+    }
+}
diff --git a/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/controller/admin/PayRefundController.java b/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/controller/admin/PayRefundController.java
new file mode 100644
index 0000000..b033929
--- /dev/null
+++ b/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/controller/admin/PayRefundController.java
@@ -0,0 +1,84 @@
+package org.dromara.pay.controller.admin;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.pay.domain.bo.PayRefundBo;
+import org.dromara.pay.domain.vo.PayRefundVo;
+import org.dromara.pay.service.PayRefundService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 退款订单
+ *
+ * @author pengles
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/pay/refund")
+public class PayRefundController extends BaseController {
+
+    private final PayRefundService payRefundService;
+
+    /**
+     * 查询退款订单列表
+     */
+    @SaCheckPermission("pay:refund:list")
+    @GetMapping("/list")
+    public TableDataInfo<PayRefundVo> list(PayRefundBo bo, PageQuery pageQuery) {
+        return payRefundService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 获取退款订单详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("pay:refund:query")
+    @GetMapping("/{id}")
+    public R<PayRefundVo> getInfo(@PathVariable Long id) {
+        return R.ok(payRefundService.queryById(id));
+    }
+
+    /**
+     * 新增退款订单
+     */
+    @SaCheckPermission("pay:refund:add")
+    @Log(title = "退款订单", businessType = BusinessType.INSERT)
+    @PostMapping
+    public R<Void> add(@Validated @RequestBody PayRefundBo bo) {
+        return toAjax(payRefundService.insertByBo(bo));
+    }
+
+    /**
+     * 修改退款订单
+     */
+    @SaCheckPermission("pay:refund:edit")
+    @Log(title = "退款订单", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public R<Void> edit(@Validated @RequestBody PayRefundBo bo) {
+        return toAjax(payRefundService.updateByBo(bo));
+    }
+
+    /**
+     * 删除退款订单
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("pay:refund:remove")
+    @Log(title = "退款订单", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@PathVariable Long[] ids) {
+        return toAjax(payRefundService.deleteWithValidByIds(Arrays.asList(ids), true));
+    }
+}
diff --git a/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/controller/app/AppPayOrderController.java b/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/controller/app/AppPayOrderController.java
new file mode 100644
index 0000000..c3315ce
--- /dev/null
+++ b/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/controller/app/AppPayOrderController.java
@@ -0,0 +1,69 @@
+package org.dromara.pay.controller.app;
+
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.pay.domain.bo.PayOrderBo;
+import org.dromara.pay.domain.vo.PayOrderSubmitRespVO;
+import org.dromara.pay.domain.vo.PayOrderVo;
+import org.dromara.pay.service.PayOrderService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 移动端支付订单Controller
+ *
+ * @author pengles
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/app/pay/order")
+public class AppPayOrderController extends BaseController {
+
+    private final PayOrderService payOrderService;
+
+    /**
+     * 提交支付订单
+     */
+    @PostMapping("/submit")
+    public R<PayOrderSubmitRespVO> submitOrder(@Validated @RequestBody PayOrderBo bo) {
+        PayOrderSubmitRespVO resp = payOrderService.submitOrder(bo);
+        return R.ok(resp);
+    }
+
+    /**
+     * 查询支付订单列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo<PayOrderVo> list(PayOrderBo bo, PageQuery pageQuery) {
+        // 可以根据业务需要过滤当前用户的订单
+        return payOrderService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 查询支付订单详情
+     */
+    @GetMapping("/{id}")
+    public R<PayOrderVo> getInfo(@PathVariable Long id) {
+        return R.ok(payOrderService.queryById(id));
+    }
+
+    /**
+     * 根据商户订单号查询支付订单
+     */
+    @GetMapping("/query")
+    public R<PayOrderVo> queryByMerchantOrderId(@RequestParam String merchantOrderId) {
+        PayOrderBo bo = new PayOrderBo();
+        bo.setMerchantOrderId(merchantOrderId);
+        var list = payOrderService.queryList(bo);
+        if (list.isEmpty()) {
+            return R.fail("支付订单不存在");
+        }
+        return R.ok(list.get(0));
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/controller/app/AppPayRefundController.java b/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/controller/app/AppPayRefundController.java
new file mode 100644
index 0000000..c8b2ae1
--- /dev/null
+++ b/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/controller/app/AppPayRefundController.java
@@ -0,0 +1,70 @@
+package org.dromara.pay.controller.app;
+
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.pay.domain.bo.PayRefundBo;
+import org.dromara.pay.domain.vo.PayRefundVo;
+import org.dromara.pay.service.PayRefundService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 移动端退款Controller
+ *
+ * @author pengles
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/app/pay/refund")
+public class AppPayRefundController extends BaseController {
+
+    private final PayRefundService refundService;
+
+    /**
+     * 申请退款
+     */
+    @PostMapping("/apply")
+    @Log(title = "申请退款", businessType = BusinessType.INSERT)
+    public R<Void> applyRefund(@Validated @RequestBody PayRefundBo bo) {
+        return toAjax(refundService.createRefund(bo));
+    }
+
+    /**
+     * 查询退款订单列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo<PayRefundVo> list(PayRefundBo bo, PageQuery pageQuery) {
+        return refundService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 查询退款订单详情
+     */
+    @GetMapping("/{id}")
+    public R<PayRefundVo> getInfo(@PathVariable Long id) {
+        return R.ok(refundService.queryById(id));
+    }
+
+    /**
+     * 根据商户退款编号查询
+     */
+    @GetMapping("/query")
+    public R<PayRefundVo> queryByMerchantRefundId(@RequestParam String merchantRefundId) {
+        PayRefundBo bo = new PayRefundBo();
+        bo.setMerchantRefundId(merchantRefundId);
+        List<PayRefundVo> list = refundService.queryList(bo);
+        if (list.isEmpty()) {
+            return R.fail("退款订单不存在");
+        }
+        return R.ok(list.get(0));
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/core/PayStrategy.java b/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/core/PayStrategy.java
new file mode 100644
index 0000000..88c3d94
--- /dev/null
+++ b/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/core/PayStrategy.java
@@ -0,0 +1,70 @@
+package org.dromara.pay.core;
+
+import jakarta.servlet.http.HttpServletRequest;
+import org.dromara.pay.domain.PayChannel;
+import org.dromara.pay.domain.PayOrder;
+import org.dromara.pay.domain.PayRefund;
+import org.dromara.pay.domain.vo.PayNotifyResult;
+import org.dromara.pay.domain.vo.PayOrderSubmitRespVO;
+
+/**
+ * 支付策略接口
+ *
+ * @author pengles
+ */
+public interface PayStrategy {
+
+    /**
+     * 统一下单
+     *
+     * @param order   支付订单
+     * @param channel 支付渠道
+     * @return 提交响应
+     */
+    PayOrderSubmitRespVO unifiedOrder(PayOrder order, PayChannel channel);
+
+    /**
+     * 退款
+     *
+     * @param refund  退款订单
+     * @param channel 支付渠道
+     * @return 是否提交成功
+     */
+    Boolean refund(PayRefund refund, PayChannel channel);
+
+    /**
+     * 查询订单状态
+     *
+     * @param order   支付订单
+     * @param channel 支付渠道
+     * @return 渠道订单状态 (映射到 PayOrderStatusEnum)
+     */
+    Integer queryOrder(PayOrder order, PayChannel channel);
+
+    /**
+     * 关闭订单
+     *
+     * @param order   支付订单
+     * @param channel 支付渠道
+     * @return 是否关闭成功
+     */
+    Boolean closeOrder(PayOrder order, PayChannel channel);
+
+    /**
+     * 查询退款状态
+     *
+     * @param refund  退款订单
+     * @param channel 支付渠道
+     * @return 退款状态
+     */
+    Integer queryRefund(PayRefund refund, PayChannel channel);
+
+    /**
+     * 处理回调通知
+     *
+     * @param request HTTP请求
+     * @param channel 支付渠道
+     * @return 处理结果
+     */
+    PayNotifyResult processNotify(HttpServletRequest request, PayChannel channel);
+}
diff --git a/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/core/PayStrategyFactory.java b/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/core/PayStrategyFactory.java
new file mode 100644
index 0000000..2858399
--- /dev/null
+++ b/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/core/PayStrategyFactory.java
@@ -0,0 +1,60 @@
+package org.dromara.pay.core;
+
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.extra.spring.SpringUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.pay.enums.PayChannelEnum;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * 支付策略工厂
+ *
+ * @author pengles
+ */
+@Slf4j
+@Component
+public class PayStrategyFactory {
+
+    private final Map<String, PayStrategy> strategyMap = new ConcurrentHashMap<>();
+
+    /**
+     * 注册策略
+     */
+    public void register(String channelCode, PayStrategy strategy) {
+        strategyMap.put(channelCode, strategy);
+    }
+
+    /**
+     * 获取策略
+     */
+    public PayStrategy getStrategy(String channelCode) {
+        PayChannelEnum channelEnum = PayChannelEnum.getByCode(channelCode);
+        if (channelEnum == null) {
+            throw new ServiceException("不支持的支付渠道: " + channelCode);
+        }
+        // 简单映射：假设 code 前缀决定策略，例如 wx_pub -> WechatPayStrategy
+        // 或者直接根据 code 获取 bean
+        // 这里为了简单，假设实现类自己注册，或者通过 BeanName 获取
+        // 比如 WechatPayStrategy 处理所有 wx_ 开头的
+        
+        // 更好的方式是策略实现类在 init 时注册自己
+        PayStrategy strategy = strategyMap.get(channelCode);
+        if (strategy == null) {
+            // 尝试根据前缀查找 (例如 wx_pub, wx_lite 都用 WechatPayStrategy)
+             if (channelCode.startsWith("wx_")) {
+                 strategy = strategyMap.get("wx");
+             } else if (channelCode.startsWith("alipay_")) {
+                 strategy = strategyMap.get("alipay");
+             }
+        }
+        
+        if (strategy == null) {
+             throw new ServiceException("未找到支付策略: " + channelCode);
+        }
+        return strategy;
+    }
+}
diff --git a/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/core/impl/AlipayStrategy.java b/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/core/impl/AlipayStrategy.java
new file mode 100644
index 0000000..0bb01a1
--- /dev/null
+++ b/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/core/impl/AlipayStrategy.java
@@ -0,0 +1,254 @@
+package org.dromara.pay.core.impl;
+
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONUtil;
+import com.alipay.api.AlipayApiException;
+import com.alipay.api.AlipayClient;
+import com.alipay.api.DefaultAlipayClient;
+import com.alipay.api.domain.*;
+import com.alipay.api.internal.util.AlipaySignature;
+import com.alipay.api.request.*;
+import com.alipay.api.response.*;
+import jakarta.annotation.PostConstruct;
+import jakarta.servlet.http.HttpServletRequest;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.json.utils.JsonUtils;
+import org.dromara.pay.core.PayStrategy;
+import org.dromara.pay.core.PayStrategyFactory;
+import org.dromara.pay.domain.PayChannel;
+import org.dromara.pay.domain.PayOrder;
+import org.dromara.pay.domain.PayRefund;
+import org.dromara.pay.domain.vo.PayNotifyResult;
+import org.dromara.pay.domain.vo.PayOrderSubmitRespVO;
+import org.dromara.pay.enums.PayChannelEnum;
+import org.dromara.pay.enums.PayOrderStatusEnum;
+import org.springframework.stereotype.Component;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 支付宝支付策略
+ *
+ * @author pengles
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Component
+public class AlipayStrategy implements PayStrategy {
+
+    private final PayStrategyFactory payStrategyFactory;
+
+    @PostConstruct
+    public void init() {
+        payStrategyFactory.register(PayChannelEnum.ALIPAY_PC.getCode(), this);
+        payStrategyFactory.register(PayChannelEnum.ALIPAY_WAP.getCode(), this);
+        payStrategyFactory.register(PayChannelEnum.ALIPAY_APP.getCode(), this);
+        payStrategyFactory.register(PayChannelEnum.ALIPAY_QR.getCode(), this);
+    }
+
+    @Override
+    public PayOrderSubmitRespVO unifiedOrder(PayOrder order, PayChannel channel) {
+        AlipayClient client = getClient(channel.getConfig());
+        String code = channel.getCode();
+        PayOrderSubmitRespVO resp = new PayOrderSubmitRespVO();
+        resp.setPayOrderNo(order.getNo());
+        resp.setStatus(0); // WAITING
+
+        try {
+            if (PayChannelEnum.ALIPAY_PC.getCode().equals(code)) {
+                AlipayTradePagePayRequest request = new AlipayTradePagePayRequest();
+                request.setNotifyUrl(order.getNotifyUrl());
+                request.setReturnUrl(order.getNotifyUrl()); // 暂时复用
+                AlipayTradePagePayModel model = new AlipayTradePagePayModel();
+                model.setOutTradeNo(order.getNo());
+                model.setSubject(order.getSubject());
+                model.setTotalAmount(String.valueOf(order.getPrice() / 100.0));
+                model.setProductCode("FAST_INSTANT_TRADE_PAY");
+                request.setBizModel(model);
+                AlipayTradePagePayResponse response = client.pageExecute(request);
+                resp.setPayData(response.getBody());
+            } else if (PayChannelEnum.ALIPAY_WAP.getCode().equals(code)) {
+                AlipayTradeWapPayRequest request = new AlipayTradeWapPayRequest();
+                request.setNotifyUrl(order.getNotifyUrl());
+                AlipayTradeWapPayModel model = new AlipayTradeWapPayModel();
+                model.setOutTradeNo(order.getNo());
+                model.setSubject(order.getSubject());
+                model.setTotalAmount(String.valueOf(order.getPrice() / 100.0));
+                model.setProductCode("QUICK_WAP_WAY");
+                request.setBizModel(model);
+                AlipayTradeWapPayResponse response = client.pageExecute(request);
+                resp.setPayData(response.getBody());
+            } else if (PayChannelEnum.ALIPAY_APP.getCode().equals(code)) {
+                AlipayTradeAppPayRequest request = new AlipayTradeAppPayRequest();
+                request.setNotifyUrl(order.getNotifyUrl());
+                AlipayTradeAppPayModel model = new AlipayTradeAppPayModel();
+                model.setOutTradeNo(order.getNo());
+                model.setSubject(order.getSubject());
+                model.setTotalAmount(String.valueOf(order.getPrice() / 100.0));
+                model.setProductCode("QUICK_MSECURITY_PAY");
+                request.setBizModel(model);
+                AlipayTradeAppPayResponse response = client.sdkExecute(request);
+                resp.setPayData(response.getBody());
+            } else if (PayChannelEnum.ALIPAY_QR.getCode().equals(code)) {
+                AlipayTradePrecreateRequest request = new AlipayTradePrecreateRequest();
+                request.setNotifyUrl(order.getNotifyUrl());
+                AlipayTradePrecreateModel model = new AlipayTradePrecreateModel();
+                model.setOutTradeNo(order.getNo());
+                model.setSubject(order.getSubject());
+                model.setTotalAmount(String.valueOf(order.getPrice() / 100.0));
+                request.setBizModel(model);
+                AlipayTradePrecreateResponse response = client.execute(request);
+                resp.setPayData(response.getQrCode());
+            }
+        } catch (AlipayApiException e) {
+            log.error("支付宝下单失败", e);
+            throw new ServiceException("支付宝下单失败: " + e.getMessage());
+        }
+        return resp;
+    }
+
+    @Override
+    public Boolean refund(PayRefund refund, PayChannel channel) {
+        AlipayClient client = getClient(channel.getConfig());
+        AlipayTradeRefundRequest request = new AlipayTradeRefundRequest();
+        AlipayTradeRefundModel model = new AlipayTradeRefundModel();
+        model.setOutTradeNo(refund.getOrderNo());
+        model.setRefundAmount(String.valueOf(refund.getRefundPrice() / 100.0));
+        model.setRefundReason(refund.getReason());
+        model.setOutRequestNo(refund.getNo());
+        request.setBizModel(model);
+        try {
+            AlipayTradeRefundResponse response = client.execute(request);
+            if (response.isSuccess()) {
+                refund.setChannelRefundNo(response.getTradeNo()); // 支付宝可能不返回退款单号，用TradeNo暂代
+                return true;
+            } else {
+                refund.setErrorMsg(response.getSubMsg());
+                refund.setErrorCode(response.getSubCode());
+                return false;
+            }
+        } catch (AlipayApiException e) {
+            log.error("支付宝退款失败", e);
+            throw new ServiceException("支付宝退款失败: " + e.getMessage());
+        }
+    }
+
+    @Override
+    public Integer queryOrder(PayOrder order, PayChannel channel) {
+        AlipayClient client = getClient(channel.getConfig());
+        AlipayTradeQueryRequest request = new AlipayTradeQueryRequest();
+        AlipayTradeQueryModel model = new AlipayTradeQueryModel();
+        model.setOutTradeNo(order.getNo());
+        request.setBizModel(model);
+        try {
+            AlipayTradeQueryResponse response = client.execute(request);
+            if (response.isSuccess()) {
+                if ("TRADE_SUCCESS".equals(response.getTradeStatus()) || "TRADE_FINISHED".equals(response.getTradeStatus())) {
+                    return PayOrderStatusEnum.SUCCESS.getStatus();
+                } else if ("TRADE_CLOSED".equals(response.getTradeStatus())) {
+                    return PayOrderStatusEnum.CLOSED.getStatus();
+                }
+            }
+        } catch (AlipayApiException e) {
+            log.error("支付宝查单失败", e);
+        }
+        return PayOrderStatusEnum.WAITING.getStatus();
+    }
+
+    @Override
+    public Boolean closeOrder(PayOrder order, PayChannel channel) {
+        AlipayClient client = getClient(channel.getConfig());
+        AlipayTradeCloseRequest request = new AlipayTradeCloseRequest();
+        AlipayTradeCloseModel model = new AlipayTradeCloseModel();
+        model.setOutTradeNo(order.getNo());
+        request.setBizModel(model);
+        try {
+            AlipayTradeCloseResponse response = client.execute(request);
+            if (response.isSuccess()) {
+                log.info("支付宝关单成功: {}", order.getNo());
+                return true;
+            } else {
+                log.error("支付宝关单失败: {}", response.getSubMsg());
+                return false;
+            }
+        } catch (AlipayApiException e) {
+             log.error("支付宝关单异常", e);
+             return false;
+        }
+    }
+
+    @Override
+    public Integer queryRefund(PayRefund refund, PayChannel channel) {
+        AlipayClient client = getClient(channel.getConfig());
+        AlipayTradeFastpayRefundQueryRequest request = new AlipayTradeFastpayRefundQueryRequest();
+        AlipayTradeFastpayRefundQueryModel model = new AlipayTradeFastpayRefundQueryModel();
+        model.setOutTradeNo(refund.getOrderNo());
+        model.setOutRequestNo(refund.getNo());
+        request.setBizModel(model);
+        try {
+             AlipayTradeFastpayRefundQueryResponse response = client.execute(request);
+             if (response.isSuccess()) {
+                 // 支付宝查询退款成功，一般表示退款成功，因为如果退款不存在会报错或返回空
+                 if (StrUtil.isNotBlank(response.getRefundAmount())) {
+                      return 10; // SUCCESS
+                 }
+             }
+        } catch (AlipayApiException e) {
+             log.error("支付宝退款查询失败", e);
+        }
+        return 0; // WAITING or UNKNOWN
+    }
+
+    @Override
+    public PayNotifyResult processNotify(HttpServletRequest request, PayChannel channel) {
+        PayNotifyResult result = new PayNotifyResult();
+        Map<String, String> params = new HashMap<>();
+        Map<String, String[]> requestParams = request.getParameterMap();
+        for (String name : requestParams.keySet()) {
+            String[] values = requestParams.get(name);
+            String valueStr = "";
+            for (int i = 0; i < values.length; i++) {
+                valueStr = (i == values.length - 1) ? valueStr + values[i] : valueStr + values[i] + ",";
+            }
+            params.put(name, valueStr);
+        }
+        
+        Map<String, Object> config = JsonUtils.parseMap(channel.getConfig());
+        String alipayPublicKey = (String) config.get("publicKey");
+        String signType = (String) config.get("signType");
+        String charset = "UTF-8"; // 默认UTF-8
+
+        try {
+            boolean verify = AlipaySignature.rsaCheckV1(params, alipayPublicKey, charset, signType);
+            result.setSuccess(verify);
+            if (verify) {
+                result.setOrderNo(params.get("out_trade_no"));
+                result.setTradeNo(params.get("trade_no"));
+                result.setResponseBody("success");
+            } else {
+                result.setResponseBody("failure");
+            }
+        } catch (AlipayApiException e) {
+            log.error("支付宝回调验签异常", e);
+            result.setSuccess(false);
+            result.setResponseBody("failure");
+        }
+        return result;
+    }
+
+    private AlipayClient getClient(String configJson) {
+        Map<String, Object> config = JsonUtils.parseMap(configJson);
+        return new DefaultAlipayClient(
+                (String) config.get("serverUrl"),
+                (String) config.get("appId"),
+                (String) config.get("privateKey"),
+                "json",
+                "UTF-8",
+                (String) config.get("publicKey"),
+                (String) config.get("signType")
+        );
+    }
+}
diff --git a/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/core/impl/WechatPayStrategy.java b/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/core/impl/WechatPayStrategy.java
new file mode 100644
index 0000000..29d84f4
--- /dev/null
+++ b/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/core/impl/WechatPayStrategy.java
@@ -0,0 +1,319 @@
+package org.dromara.pay.core.impl;
+
+import cn.hutool.core.util.StrUtil;
+import com.wechat.pay.java.core.Config;
+import com.wechat.pay.java.core.RSAAutoCertificateConfig;
+import com.wechat.pay.java.core.notification.NotificationConfig;
+import com.wechat.pay.java.core.notification.NotificationParser;
+import com.wechat.pay.java.core.notification.RequestParam;
+import com.wechat.pay.java.core.util.PemUtil;
+import com.wechat.pay.java.service.payments.app.AppService;
+import com.wechat.pay.java.service.payments.app.model.PrepayRequest;
+import com.wechat.pay.java.service.payments.app.model.PrepayResponse;
+import com.wechat.pay.java.service.payments.h5.H5Service;
+import com.wechat.pay.java.service.payments.jsapi.JsapiService;
+import com.wechat.pay.java.service.payments.jsapi.model.CloseOrderRequest;
+import com.wechat.pay.java.service.payments.jsapi.model.Payer;
+import com.wechat.pay.java.service.payments.nativepay.NativePayService;
+import com.wechat.pay.java.service.payments.model.Transaction;
+import com.wechat.pay.java.service.refund.RefundService;
+import com.wechat.pay.java.service.refund.model.AmountReq;
+import com.wechat.pay.java.service.refund.model.CreateRequest;
+import com.wechat.pay.java.service.refund.model.QueryByOutRefundNoRequest;
+import com.wechat.pay.java.service.refund.model.Refund;
+import com.wechat.pay.java.service.refund.model.Status;
+import jakarta.annotation.PostConstruct;
+import jakarta.servlet.http.HttpServletRequest;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.json.utils.JsonUtils;
+import org.dromara.pay.core.PayStrategy;
+import org.dromara.pay.core.PayStrategyFactory;
+import org.dromara.pay.domain.PayChannel;
+import org.dromara.pay.domain.PayOrder;
+import org.dromara.pay.domain.PayRefund;
+import org.dromara.pay.domain.vo.PayNotifyResult;
+import org.dromara.pay.domain.vo.PayOrderSubmitRespVO;
+import org.dromara.pay.enums.PayChannelEnum;
+import org.dromara.pay.enums.PayOrderStatusEnum;
+import org.springframework.stereotype.Component;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.security.PrivateKey;
+import java.util.Map;
+
+import static com.wechat.pay.java.core.http.Constant.*;
+
+/**
+ * 微信支付策略
+ *
+ * @author pengles
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Component
+public class WechatPayStrategy implements PayStrategy {
+
+    private final PayStrategyFactory payStrategyFactory;
+
+    @PostConstruct
+    public void init() {
+        payStrategyFactory.register(PayChannelEnum.WX_PUB.getCode(), this);
+        payStrategyFactory.register(PayChannelEnum.WX_LITE.getCode(), this);
+        payStrategyFactory.register(PayChannelEnum.WX_APP.getCode(), this);
+        payStrategyFactory.register(PayChannelEnum.WX_NATIVE.getCode(), this);
+        payStrategyFactory.register(PayChannelEnum.WX_H5.getCode(), this);
+    }
+
+    @Override
+    public PayOrderSubmitRespVO unifiedOrder(PayOrder order, PayChannel channel) {
+        Config config = getConfig(channel.getConfig());
+        String code = channel.getCode();
+        PayOrderSubmitRespVO resp = new PayOrderSubmitRespVO();
+        resp.setPayOrderNo(order.getNo());
+        resp.setStatus(0); // WAITING
+
+        Map<String, Object> channelConfig = JsonUtils.parseMap(channel.getConfig());
+        String appId = (String) channelConfig.get("appId");
+        String mchId = (String) channelConfig.get("mchId");
+        String privateKeyStr = (String) channelConfig.get("privateKey");
+        String mchSerialNo = (String) channelConfig.get("mchSerialNo");
+
+        try {
+            if (PayChannelEnum.WX_NATIVE.getCode().equals(code)) {
+                NativePayService service = new NativePayService.Builder().config(config).build();
+                com.wechat.pay.java.service.payments.nativepay.model.PrepayRequest request = new com.wechat.pay.java.service.payments.nativepay.model.PrepayRequest();
+                request.setAppid(appId);
+                request.setMchid(mchId);
+                request.setDescription(order.getSubject());
+                request.setOutTradeNo(order.getNo());
+                request.setNotifyUrl(order.getNotifyUrl());
+                com.wechat.pay.java.service.payments.nativepay.model.Amount amount = new com.wechat.pay.java.service.payments.nativepay.model.Amount();
+                amount.setTotal(order.getPrice());
+                request.setAmount(amount);
+                
+                com.wechat.pay.java.service.payments.nativepay.model.PrepayResponse response = service.prepay(request);
+                resp.setPayData(response.getCodeUrl());
+                
+            } else if (PayChannelEnum.WX_APP.getCode().equals(code)) {
+                AppService service = new AppService.Builder().config(config).build();
+                PrepayRequest request = new PrepayRequest();
+                request.setAppid(appId);
+                request.setMchid(mchId);
+                request.setDescription(order.getSubject());
+                request.setOutTradeNo(order.getNo());
+                request.setNotifyUrl(order.getNotifyUrl());
+                com.wechat.pay.java.service.payments.app.model.Amount amount = new com.wechat.pay.java.service.payments.app.model.Amount();
+                amount.setTotal(order.getPrice());
+                request.setAmount(amount);
+
+                PrepayResponse response = service.prepay(request);
+                
+                // 二次签名
+                PrivateKey privateKey = PemUtil.loadPrivateKeyFromString(privateKeyStr);
+                Map<String, String> signMap = WechatPayUtil.signApp(appId, mchId, response.getPrepayId(), privateKey, mchSerialNo);
+                resp.setPayData(JsonUtils.toJsonString(signMap));
+                
+            } else if (PayChannelEnum.WX_PUB.getCode().equals(code) || PayChannelEnum.WX_LITE.getCode().equals(code)) {
+                JsapiService service = new JsapiService.Builder().config(config).build();
+                com.wechat.pay.java.service.payments.jsapi.model.PrepayRequest request = new com.wechat.pay.java.service.payments.jsapi.model.PrepayRequest();
+                request.setAppid(appId);
+                request.setMchid(mchId);
+                request.setDescription(order.getSubject());
+                request.setOutTradeNo(order.getNo());
+                request.setNotifyUrl(order.getNotifyUrl());
+                com.wechat.pay.java.service.payments.jsapi.model.Amount amount = new com.wechat.pay.java.service.payments.jsapi.model.Amount();
+                amount.setTotal(order.getPrice());
+                request.setAmount(amount);
+                
+                Payer payer = new Payer();
+                payer.setOpenid(order.getChannelUserId()); // 必须传入 openid
+                request.setPayer(payer);
+
+                com.wechat.pay.java.service.payments.jsapi.model.PrepayResponse response = service.prepay(request);
+                
+                // 二次签名
+                PrivateKey privateKey = PemUtil.loadPrivateKeyFromString(privateKeyStr);
+                Map<String, String> signMap = WechatPayUtil.signJsapi(appId, response.getPrepayId(), privateKey, mchSerialNo);
+                resp.setPayData(JsonUtils.toJsonString(signMap));
+                
+            } else if (PayChannelEnum.WX_H5.getCode().equals(code)) {
+                H5Service service = new H5Service.Builder().config(config).build();
+                com.wechat.pay.java.service.payments.h5.model.PrepayRequest request = new com.wechat.pay.java.service.payments.h5.model.PrepayRequest();
+                request.setAppid(appId);
+                request.setMchid(mchId);
+                request.setDescription(order.getSubject());
+                request.setOutTradeNo(order.getNo());
+                request.setNotifyUrl(order.getNotifyUrl());
+                com.wechat.pay.java.service.payments.h5.model.Amount amount = new com.wechat.pay.java.service.payments.h5.model.Amount();
+                amount.setTotal(order.getPrice());
+                request.setAmount(amount);
+                
+                com.wechat.pay.java.service.payments.h5.model.PrepayResponse response = service.prepay(request);
+                resp.setPayData(response.getH5Url());
+            }
+        } catch (Exception e) {
+            log.error("微信下单失败", e);
+            throw new ServiceException("微信下单失败: " + e.getMessage());
+        }
+        return resp;
+    }
+
+    @Override
+    public Boolean refund(PayRefund refund, PayChannel channel) {
+        Config config = getConfig(channel.getConfig());
+        RefundService service = new RefundService.Builder().config(config).build();
+        
+        CreateRequest request = new CreateRequest();
+        request.setOutTradeNo(refund.getOrderNo());
+        request.setOutRefundNo(refund.getNo());
+        request.setReason(refund.getReason());
+        request.setNotifyUrl(refund.getNotifyUrl());
+        
+        AmountReq amount = new AmountReq();
+        amount.setRefund(Long.valueOf(refund.getRefundPrice()));
+        amount.setTotal(Long.valueOf(refund.getPayPrice()));
+        amount.setCurrency("CNY");
+        request.setAmount(amount);
+
+        try {
+            Refund response = service.create(request);
+            if (response.getStatus() == Status.SUCCESS || response.getStatus() == Status.PROCESSING) {
+                refund.setChannelRefundNo(response.getRefundId());
+                return true;
+            } else {
+                refund.setErrorMsg(response.getStatus().name());
+                return false;
+            }
+        } catch (Exception e) {
+            log.error("微信退款失败", e);
+            throw new ServiceException("微信退款失败: " + e.getMessage());
+        }
+    }
+
+    @Override
+    public Integer queryOrder(PayOrder order, PayChannel channel) {
+        Config config = getConfig(channel.getConfig());
+        JsapiService service = new JsapiService.Builder().config(config).build(); // Query is generic across services usually, using JsapiService for access
+        
+        com.wechat.pay.java.service.payments.jsapi.model.QueryOrderByOutTradeNoRequest request = new com.wechat.pay.java.service.payments.jsapi.model.QueryOrderByOutTradeNoRequest();
+        request.setMchid(getConfigMap(channel.getConfig()).get("mchId").toString());
+        request.setOutTradeNo(order.getNo());
+
+        try {
+            Transaction transaction = service.queryOrderByOutTradeNo(request);
+            if (transaction.getTradeState() == Transaction.TradeStateEnum.SUCCESS) {
+                return PayOrderStatusEnum.SUCCESS.getStatus();
+            } else if (transaction.getTradeState() == Transaction.TradeStateEnum.CLOSED || transaction.getTradeState() == Transaction.TradeStateEnum.REVOKED) {
+                return PayOrderStatusEnum.CLOSED.getStatus();
+            } else if (transaction.getTradeState() == Transaction.TradeStateEnum.REFUND) {
+                return PayOrderStatusEnum.REFUND.getStatus();
+            }
+        } catch (Exception e) {
+            log.error("微信查单失败", e);
+        }
+        return PayOrderStatusEnum.WAITING.getStatus();
+    }
+
+    @Override
+    public Boolean closeOrder(PayOrder order, PayChannel channel) {
+        Config config = getConfig(channel.getConfig());
+        JsapiService service = new JsapiService.Builder().config(config).build();
+        CloseOrderRequest request = new CloseOrderRequest();
+        request.setMchid(getConfigMap(channel.getConfig()).get("mchId").toString());
+        request.setOutTradeNo(order.getNo());
+        try {
+            service.closeOrder(request);
+            return true;
+        } catch (Exception e) {
+            log.error("微信关单失败", e);
+            return false;
+        }
+    }
+
+    @Override
+    public Integer queryRefund(PayRefund refund, PayChannel channel) {
+        Config config = getConfig(channel.getConfig());
+        RefundService service = new RefundService.Builder().config(config).build();
+        QueryByOutRefundNoRequest request = new QueryByOutRefundNoRequest();
+        request.setOutRefundNo(refund.getNo());
+        try {
+            Refund response = service.queryByOutRefundNo(request);
+            if (response.getStatus() == Status.SUCCESS) {
+                return 10; // SUCCESS
+            }
+        } catch (Exception e) {
+            log.error("微信退款查询失败", e);
+        }
+        return 0;
+    }
+
+    @Override
+    public PayNotifyResult processNotify(HttpServletRequest request, PayChannel channel) {
+        PayNotifyResult result = new PayNotifyResult();
+        try (BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(request.getInputStream()))) {
+            StringBuilder stringBuffer = new StringBuilder();
+            String line;
+            while ((line = bufferedReader.readLine()) != null) {
+                stringBuffer.append(line);
+            }
+            String requestBody = stringBuffer.toString();
+
+            String timestamp = request.getHeader(WECHAT_PAY_TIMESTAMP);
+            String nonce = request.getHeader(WECHAT_PAY_NONCE);
+            String serialNo = request.getHeader(WECHAT_PAY_SERIAL);
+            String signature = request.getHeader(WECHAT_PAY_SIGNATURE);
+
+            RequestParam requestParam = new RequestParam.Builder()
+                    .serialNumber(serialNo)
+                    .nonce(nonce)
+                    .signature(signature)
+                    .timestamp(timestamp)
+                    .body(requestBody)
+                    .build();
+
+            // Config config = getConfig(channel.getConfig());
+            // NotificationParser parser = new NotificationParser((NotificationConfig) config); // RSAAutoCertificateConfig implements NotificationConfig
+            
+            // Re-create config here or cast
+            NotificationConfig config = (NotificationConfig) getConfig(channel.getConfig());
+            NotificationParser parser = new NotificationParser(config);
+            
+            Transaction transaction = parser.parse(requestParam, Transaction.class);
+            if (transaction != null && transaction.getTradeState() == Transaction.TradeStateEnum.SUCCESS) {
+                result.setSuccess(true);
+                result.setOrderNo(transaction.getOutTradeNo());
+                result.setTradeNo(transaction.getTransactionId());
+                // 微信支付V3回调成功需要返回 HTTP 200 或 204，无特定body内容，但建议返回空JSON或success
+                // Spring MVC controller usually returns body.
+                // We should return a structure that controller can map to ResponseEntity
+                result.setResponseBody("{\"code\": \"SUCCESS\", \"message\": \"SUCCESS\"}");
+            } else {
+                result.setSuccess(false);
+                result.setResponseBody("{\"code\": \"FAIL\", \"message\": \"FAIL\"}");
+            }
+        } catch (Exception e) {
+            log.error("微信回调处理异常", e);
+            result.setSuccess(false);
+            result.setResponseBody("{\"code\": \"FAIL\", \"message\": \"EXCEPTION\"}");
+        }
+        return result;
+    }
+
+    private Config getConfig(String configJson) {
+        Map<String, Object> configMap = JsonUtils.parseMap(configJson);
+        return new RSAAutoCertificateConfig.Builder()
+                .merchantId((String) configMap.get("mchId"))
+                .privateKey((String) configMap.get("privateKey"))
+                .merchantSerialNumber((String) configMap.get("mchSerialNo"))
+                .apiV3Key((String) configMap.get("apiV3Key"))
+                .build();
+    }
+    
+    private Map<String, Object> getConfigMap(String configJson) {
+        return JsonUtils.parseMap(configJson);
+    }
+}
diff --git a/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/core/impl/WechatPayUtil.java b/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/core/impl/WechatPayUtil.java
new file mode 100644
index 0000000..90acdbd
--- /dev/null
+++ b/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/core/impl/WechatPayUtil.java
@@ -0,0 +1,53 @@
+package org.dromara.pay.core.impl;
+
+import cn.hutool.core.util.RandomUtil;
+import cn.hutool.core.util.StrUtil;
+import com.wechat.pay.java.core.cipher.RSASigner;
+import java.security.PrivateKey;
+import java.time.Instant;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 微信支付工具类
+ */
+public class WechatPayUtil {
+
+    public static Map<String, String> signApp(String appId, String mchId, String prepayId, PrivateKey privateKey, String certificateSerialNo) {
+        long timestamp = Instant.now().getEpochSecond();
+        String nonceStr = RandomUtil.randomString(32);
+        String message = appId + "\n" + timestamp + "\n" + nonceStr + "\n" + prepayId + "\n";
+        
+        RSASigner signer = new RSASigner(certificateSerialNo, privateKey);
+        String sign = signer.sign(message).getSign();
+
+        Map<String, String> map = new HashMap<>();
+        map.put("appid", appId);
+        map.put("partnerid", mchId);
+        map.put("prepayid", prepayId);
+        map.put("package", "Sign=WXPay");
+        map.put("noncestr", nonceStr);
+        map.put("timestamp", String.valueOf(timestamp));
+        map.put("sign", sign);
+        return map;
+    }
+
+    public static Map<String, String> signJsapi(String appId, String prepayId, PrivateKey privateKey, String certificateSerialNo) {
+        long timestamp = Instant.now().getEpochSecond();
+        String nonceStr = RandomUtil.randomString(32);
+        String packageStr = "prepay_id=" + prepayId;
+        String message = appId + "\n" + timestamp + "\n" + nonceStr + "\n" + packageStr + "\n";
+
+        RSASigner signer = new RSASigner(certificateSerialNo, privateKey);
+        String sign = signer.sign(message).getSign();
+
+        Map<String, String> map = new HashMap<>();
+        map.put("appId", appId);
+        map.put("timeStamp", String.valueOf(timestamp));
+        map.put("nonceStr", nonceStr);
+        map.put("package", packageStr);
+        map.put("signType", "RSA");
+        map.put("paySign", sign);
+        return map;
+    }
+}
diff --git a/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/domain/PayApp.java b/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/domain/PayApp.java
new file mode 100644
index 0000000..15fe393
--- /dev/null
+++ b/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/domain/PayApp.java
@@ -0,0 +1,77 @@
+package org.dromara.pay.domain;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 支付应用对象 pay_app
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode
+@TableName("pay_app")
+public class PayApp {
+
+    /**
+     * 应用ID
+     */
+    @TableId
+    private Long id;
+
+    /**
+     * 应用名
+     */
+    private String name;
+
+    /**
+     * 状态(0开启 1关闭)
+     */
+    private Integer status;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 支付结果回调地址
+     */
+    private String payNotifyUrl;
+
+    /**
+     * 退款结果回调地址
+     */
+    private String refundNotifyUrl;
+
+    /**
+     * 创建者
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createBy;
+
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 更新者
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateBy;
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+}
diff --git a/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/domain/PayChannel.java b/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/domain/PayChannel.java
new file mode 100644
index 0000000..11ab3c7
--- /dev/null
+++ b/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/domain/PayChannel.java
@@ -0,0 +1,82 @@
+package org.dromara.pay.domain;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 支付渠道对象 pay_channel
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode
+@TableName("pay_channel")
+public class PayChannel {
+
+    /**
+     * 渠道ID
+     */
+    @TableId
+    private Long id;
+
+    /**
+     * 渠道编码(alipay_pc, wx_pub)
+     */
+    private String code;
+
+    /**
+     * 状态(0开启 1关闭)
+     */
+    private Integer status;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 渠道费率(%)
+     */
+    private Double feeRate;
+
+    /**
+     * 应用ID
+     */
+    private Long appId;
+
+    /**
+     * 支付渠道配置(JSON)
+     */
+    private String config;
+
+    /**
+     * 创建者
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createBy;
+
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 更新者
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateBy;
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+}
diff --git a/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/domain/PayNotifyTask.java b/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/domain/PayNotifyTask.java
new file mode 100644
index 0000000..e74ed35
--- /dev/null
+++ b/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/domain/PayNotifyTask.java
@@ -0,0 +1,92 @@
+package org.dromara.pay.domain;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 支付通知任务对象 pay_notify_task
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode
+@TableName("pay_notify_task")
+public class PayNotifyTask {
+
+    /**
+     * 任务ID
+     */
+    @TableId
+    private Long id;
+
+    /**
+     * 订单ID
+     */
+    private Long orderId;
+
+    /**
+     * 订单号
+     */
+    private String orderNo;
+
+    /**
+     * 通知地址
+     */
+    private String notifyUrl;
+
+    /**
+     * 通知内容
+     */
+    private String notifyBody;
+
+    /**
+     * 重试次数
+     */
+    private Integer retryCount;
+
+    /**
+     * 最大重试次数
+     */
+    private Integer maxRetry;
+
+    /**
+     * 状态(0进行中 1成功 2失败)
+     */
+    private Integer status;
+
+    /**
+     * 下次通知时间
+     */
+    private Date nextNotifyTime;
+
+    /**
+     * 创建者
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createBy;
+
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 更新者
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateBy;
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+}
diff --git a/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/domain/PayOrder.java b/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/domain/PayOrder.java
new file mode 100644
index 0000000..3b0dc02
--- /dev/null
+++ b/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/domain/PayOrder.java
@@ -0,0 +1,149 @@
+package org.dromara.pay.domain;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+import java.util.Map;
+
+/**
+ * 支付订单对象 pay_order
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode
+@TableName(value = "pay_order", autoResultMap = true)
+public class PayOrder {
+
+    /**
+     * 订单ID
+     */
+    @TableId
+    private Long id;
+
+    /**
+     * 应用ID
+     */
+    private Long appId;
+
+    /**
+     * 渠道ID
+     */
+    private Long channelId;
+
+    /**
+     * 渠道编码
+     */
+    private String channelCode;
+
+    /**
+     * 商户订单编号
+     */
+    private String merchantOrderId;
+
+    /**
+     * 商品标题
+     */
+    private String subject;
+
+    /**
+     * 商品描述
+     */
+    private String body;
+
+    /**
+     * 异步通知地址
+     */
+    private String notifyUrl;
+
+    /**
+     * 支付金额(分)
+     */
+    private Integer price;
+
+    /**
+     * 渠道费率
+     */
+    private Double channelFeeRate;
+
+    /**
+     * 渠道手续费(分)
+     */
+    private Integer channelFeePrice;
+
+    /**
+     * 状态(0未支付 10已支付 20已退款 30已关闭)
+     */
+    private Integer status;
+
+    /**
+     * 用户IP
+     */
+    private String userIp;
+
+    /**
+     * 订单失效时间
+     */
+    private Date expireTime;
+
+    /**
+     * 支付成功时间
+     */
+    private Date successTime;
+
+    /**
+     * 拓展业务ID (如扫码支付的记录ID)
+     */
+    private Long extensionId;
+
+    /**
+     * 支付单号(内部生成)
+     */
+    private String no;
+
+    /**
+     * 渠道订单号(微信/支付宝)
+     */
+    private String channelOrderNo;
+
+    /**
+     * 渠道用户OpenId
+     */
+    private String channelUserId;
+
+    /**
+     * 渠道额外参数 (存储微信openid, 支付宝buyer_id等)
+     */
+    @TableField(typeHandler = JacksonTypeHandler.class)
+    private Map<String, Object> channelExtras;
+
+    /**
+     * 创建者
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createBy;
+
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 更新者
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateBy;
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+}
diff --git a/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/domain/PayRefund.java b/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/domain/PayRefund.java
new file mode 100644
index 0000000..189d2ff
--- /dev/null
+++ b/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/domain/PayRefund.java
@@ -0,0 +1,146 @@
+package org.dromara.pay.domain;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+
+/**
+ * 退款订单对象 pay_refund
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode
+@TableName("pay_refund")
+public class PayRefund {
+
+    /**
+     * 退款ID
+     */
+    @TableId
+    private Long id;
+
+    /**
+     * 退款单号
+     */
+    private String no;
+
+    /**
+     * 应用ID
+     */
+    private Long appId;
+
+    /**
+     * 渠道ID
+     */
+    private Long channelId;
+
+    /**
+     * 渠道编码
+     */
+    private String channelCode;
+
+    /**
+     * 支付订单ID
+     */
+    private Long orderId;
+
+    /**
+     * 支付订单no
+     */
+    private String orderNo;
+
+    /**
+     * 商户订单编号
+     */
+    private String merchantOrderId;
+
+    /**
+     * 商户退款编号
+     */
+    private String merchantRefundId;
+
+    /**
+     * 回调地址
+     */
+    private String notifyUrl;
+
+    /**
+     * 状态(0等待 10成功 20失败)
+     */
+    private Integer status;
+
+    /**
+     * 支付金额(分)
+     */
+    private Integer payPrice;
+
+    /**
+     * 退款金额(分)
+     */
+    private Integer refundPrice;
+
+    /**
+     * 退款原因
+     */
+    private String reason;
+
+    /**
+     * 用户IP
+     */
+    private String userIp;
+
+    /**
+     * 渠道订单号
+     */
+    private String channelOrderNo;
+
+    /**
+     * 渠道退款单号
+     */
+    private String channelRefundNo;
+
+    /**
+     * 退款成功时间
+     */
+    private Date successTime;
+
+    /**
+     * 渠道错误码
+     */
+    private String errorCode;
+
+    /**
+     * 渠道错误描述
+     */
+    private String errorMsg;
+
+    /**
+     * 创建者
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Long createBy;
+
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+
+    /**
+     * 更新者
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Long updateBy;
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+}
diff --git a/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/domain/bo/PayAppBo.java b/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/domain/bo/PayAppBo.java
new file mode 100644
index 0000000..91b880b
--- /dev/null
+++ b/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/domain/bo/PayAppBo.java
@@ -0,0 +1,54 @@
+package org.dromara.pay.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.dromara.pay.domain.PayApp;
+
+/**
+ * 支付应用业务对象 pay_app
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode
+@AutoMapper(target = PayApp.class, reverseConvertGenerate = false)
+public class PayAppBo {
+
+    /**
+     * 应用ID
+     */
+    private Long id;
+
+    /**
+     * 应用名
+     */
+    @NotBlank(message = "应用名不能为空")
+    private String name;
+
+    /**
+     * 状态(0开启 1关闭)
+     */
+    @NotNull(message = "状态不能为空")
+    private Integer status;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 支付结果回调地址
+     */
+    @NotBlank(message = "支付结果回调地址不能为空")
+    private String payNotifyUrl;
+
+    /**
+     * 退款结果回调地址
+     */
+    @NotBlank(message = "退款结果回调地址不能为空")
+    private String refundNotifyUrl;
+
+}
diff --git a/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/domain/bo/PayChannelBo.java b/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/domain/bo/PayChannelBo.java
new file mode 100644
index 0000000..9939f5d
--- /dev/null
+++ b/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/domain/bo/PayChannelBo.java
@@ -0,0 +1,60 @@
+package org.dromara.pay.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.dromara.pay.domain.PayChannel;
+
+/**
+ * 支付渠道业务对象 pay_channel
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode
+@AutoMapper(target = PayChannel.class, reverseConvertGenerate = false)
+public class PayChannelBo {
+
+    /**
+     * 渠道ID
+     */
+    private Long id;
+
+    /**
+     * 渠道编码(alipay_pc, wx_pub)
+     */
+    @NotBlank(message = "渠道编码不能为空")
+    private String code;
+
+    /**
+     * 状态(0开启 1关闭)
+     */
+    @NotNull(message = "状态不能为空")
+    private Integer status;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 渠道费率(%)
+     */
+    @NotNull(message = "渠道费率不能为空")
+    private Double feeRate;
+
+    /**
+     * 应用ID
+     */
+    @NotNull(message = "应用ID不能为空")
+    private Long appId;
+
+    /**
+     * 支付渠道配置(JSON)
+     */
+    @NotBlank(message = "支付渠道配置不能为空")
+    private String config;
+
+}
diff --git a/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/domain/bo/PayOrderBo.java b/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/domain/bo/PayOrderBo.java
new file mode 100644
index 0000000..9e08a07
--- /dev/null
+++ b/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/domain/bo/PayOrderBo.java
@@ -0,0 +1,117 @@
+package org.dromara.pay.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.pay.domain.PayOrder;
+import java.util.Date;
+
+/**
+ * 支付订单业务对象 pay_order
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode
+@AutoMapper(target = PayOrder.class, reverseConvertGenerate = false)
+public class PayOrderBo {
+
+    /**
+     * 订单ID
+     */
+    private Long id;
+
+    /**
+     * 应用ID
+     */
+    @NotNull(message = "应用ID不能为空")
+    private Long appId;
+
+    /**
+     * 渠道ID
+     */
+    private Long channelId;
+
+    /**
+     * 渠道编码
+     */
+    private String channelCode;
+
+    /**
+     * 商户订单编号
+     */
+    private String merchantOrderId;
+
+    /**
+     * 商品标题
+     */
+    private String subject;
+
+    /**
+     * 商品描述
+     */
+    private String body;
+
+    /**
+     * 异步通知地址
+     */
+    private String notifyUrl;
+
+    /**
+     * 支付金额(分)
+     */
+    @NotNull(message = "支付金额不能为空")
+    private Integer price;
+
+    /**
+     * 渠道费率
+     */
+    private Double channelFeeRate;
+
+    /**
+     * 渠道手续费(分)
+     */
+    private Integer channelFeePrice;
+
+    /**
+     * 状态(0未支付 10已支付 20已退款 30已关闭)
+     */
+    private Integer status;
+
+    /**
+     * 用户IP
+     */
+    private String userIp;
+
+    /**
+     * 订单失效时间
+     */
+    private Date expireTime;
+
+    /**
+     * 支付成功时间
+     */
+    private Date successTime;
+
+    /**
+     * 拓展业务ID (如扫码支付的记录ID)
+     */
+    private Long extensionId;
+
+    /**
+     * 支付单号(内部生成)
+     */
+    private String no;
+
+    /**
+     * 渠道订单号(微信/支付宝)
+     */
+    private String channelOrderNo;
+
+    /**
+     * 渠道用户OpenId
+     */
+    private String channelUserId;
+
+}
diff --git a/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/domain/bo/PayRefundBo.java b/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/domain/bo/PayRefundBo.java
new file mode 100644
index 0000000..52641e5
--- /dev/null
+++ b/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/domain/bo/PayRefundBo.java
@@ -0,0 +1,123 @@
+package org.dromara.pay.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.pay.domain.PayRefund;
+import java.util.Date;
+
+/**
+ * 退款订单业务对象 pay_refund
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode
+@AutoMapper(target = PayRefund.class, reverseConvertGenerate = false)
+public class PayRefundBo {
+
+    /**
+     * 退款ID
+     */
+    private Long id;
+
+    /**
+     * 退款单号
+     */
+    private String no;
+
+    /**
+     * 应用ID
+     */
+    @NotNull(message = "应用ID不能为空")
+    private Long appId;
+
+    /**
+     * 渠道ID
+     */
+    private Long channelId;
+
+    /**
+     * 渠道编码
+     */
+    private String channelCode;
+
+    /**
+     * 支付订单ID
+     */
+    @NotNull(message = "支付订单ID不能为空")
+    private Long orderId;
+
+    /**
+     * 支付订单no
+     */
+    private String orderNo;
+
+    /**
+     * 商户订单编号
+     */
+    private String merchantOrderId;
+
+    /**
+     * 商户退款编号
+     */
+    private String merchantRefundId;
+
+    /**
+     * 回调地址
+     */
+    private String notifyUrl;
+
+    /**
+     * 状态(0等待 10成功 20失败)
+     */
+    private Integer status;
+
+    /**
+     * 支付金额(分)
+     */
+    private Integer payPrice;
+
+    /**
+     * 退款金额(分)
+     */
+    @NotNull(message = "退款金额不能为空")
+    private Integer refundPrice;
+
+    /**
+     * 退款原因
+     */
+    private String reason;
+
+    /**
+     * 用户IP
+     */
+    private String userIp;
+
+    /**
+     * 渠道订单号
+     */
+    private String channelOrderNo;
+
+    /**
+     * 渠道退款单号
+     */
+    private String channelRefundNo;
+
+    /**
+     * 退款成功时间
+     */
+    private Date successTime;
+
+    /**
+     * 渠道错误码
+     */
+    private String errorCode;
+
+    /**
+     * 渠道错误描述
+     */
+    private String errorMsg;
+
+}
diff --git a/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/domain/vo/PayAppVo.java b/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/domain/vo/PayAppVo.java
new file mode 100644
index 0000000..e09046e
--- /dev/null
+++ b/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/domain/vo/PayAppVo.java
@@ -0,0 +1,61 @@
+package org.dromara.pay.domain.vo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.pay.domain.PayApp;
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 支付应用视图对象 pay_app
+ *
+ * @author pengles
+ */
+@Data
+@AutoMapper(target = PayApp.class)
+public class PayAppVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 应用ID
+     */
+    private Long id;
+
+    /**
+     * 应用名
+     */
+    private String name;
+
+    /**
+     * 状态(0开启 1关闭)
+     */
+    private Integer status;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 支付结果回调地址
+     */
+    private String payNotifyUrl;
+
+    /**
+     * 退款结果回调地址
+     */
+    private String refundNotifyUrl;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+}
diff --git a/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/domain/vo/PayChannelVo.java b/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/domain/vo/PayChannelVo.java
new file mode 100644
index 0000000..edabed2
--- /dev/null
+++ b/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/domain/vo/PayChannelVo.java
@@ -0,0 +1,66 @@
+package org.dromara.pay.domain.vo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.pay.domain.PayChannel;
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 支付渠道视图对象 pay_channel
+ *
+ * @author pengles
+ */
+@Data
+@AutoMapper(target = PayChannel.class)
+public class PayChannelVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 渠道ID
+     */
+    private Long id;
+
+    /**
+     * 渠道编码(alipay_pc, wx_pub)
+     */
+    private String code;
+
+    /**
+     * 状态(0开启 1关闭)
+     */
+    private Integer status;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 渠道费率(%)
+     */
+    private Double feeRate;
+
+    /**
+     * 应用ID
+     */
+    private Long appId;
+
+    /**
+     * 支付渠道配置(JSON)
+     */
+    private String config;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+}
diff --git a/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/domain/vo/PayNotifyResult.java b/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/domain/vo/PayNotifyResult.java
new file mode 100644
index 0000000..a8d2816
--- /dev/null
+++ b/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/domain/vo/PayNotifyResult.java
@@ -0,0 +1,31 @@
+package org.dromara.pay.domain.vo;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 支付回调处理结果
+ */
+@Data
+@Accessors(chain = true)
+public class PayNotifyResult {
+    /**
+     * 验签是否通过
+     */
+    private boolean success;
+    
+    /**
+     * 系统内部订单号
+     */
+    private String orderNo;
+    
+    /**
+     * 渠道交易单号
+     */
+    private String tradeNo;
+    
+    /**
+     * 返回给渠道的响应内容 (例如 "success" 或 XML)
+     */
+    private String responseBody;
+}
diff --git a/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/domain/vo/PayOrderSubmitRespVO.java b/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/domain/vo/PayOrderSubmitRespVO.java
new file mode 100644
index 0000000..5d65828
--- /dev/null
+++ b/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/domain/vo/PayOrderSubmitRespVO.java
@@ -0,0 +1,33 @@
+package org.dromara.pay.domain.vo;
+
+import lombok.Data;
+import java.io.Serializable;
+
+/**
+ * 支付订单提交响应 VO
+ *
+ * @author pengles
+ */
+@Data
+public class PayOrderSubmitRespVO implements Serializable {
+
+    /**
+     * 支付单号
+     */
+    private String payOrderNo;
+
+    /**
+     * 调起支付的参数 (JSON格式，或URL)
+     */
+    private String payData;
+
+    /**
+     * 支付状态 (10: 成功, 0: 等待)
+     */
+    private Integer status;
+    
+    /**
+     * 渠道返回的原始数据
+     */
+    private Object rawData;
+}
diff --git a/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/domain/vo/PayOrderVo.java b/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/domain/vo/PayOrderVo.java
new file mode 100644
index 0000000..b8e3818
--- /dev/null
+++ b/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/domain/vo/PayOrderVo.java
@@ -0,0 +1,126 @@
+package org.dromara.pay.domain.vo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.pay.domain.PayOrder;
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 支付订单视图对象 pay_order
+ *
+ * @author pengles
+ */
+@Data
+@AutoMapper(target = PayOrder.class)
+public class PayOrderVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 订单ID
+     */
+    private Long id;
+
+    /**
+     * 应用ID
+     */
+    private Long appId;
+
+    /**
+     * 渠道ID
+     */
+    private Long channelId;
+
+    /**
+     * 渠道编码
+     */
+    private String channelCode;
+
+    /**
+     * 商户订单编号
+     */
+    private String merchantOrderId;
+
+    /**
+     * 商品标题
+     */
+    private String subject;
+
+    /**
+     * 商品描述
+     */
+    private String body;
+
+    /**
+     * 异步通知地址
+     */
+    private String notifyUrl;
+
+    /**
+     * 支付金额(分)
+     */
+    private Integer price;
+
+    /**
+     * 渠道费率
+     */
+    private Double channelFeeRate;
+
+    /**
+     * 渠道手续费(分)
+     */
+    private Integer channelFeePrice;
+
+    /**
+     * 状态(0未支付 10已支付 20已退款 30已关闭)
+     */
+    private Integer status;
+
+    /**
+     * 用户IP
+     */
+    private String userIp;
+
+    /**
+     * 订单失效时间
+     */
+    private Date expireTime;
+
+    /**
+     * 支付成功时间
+     */
+    private Date successTime;
+
+    /**
+     * 拓展业务ID (如扫码支付的记录ID)
+     */
+    private Long extensionId;
+
+    /**
+     * 支付单号(内部生成)
+     */
+    private String no;
+
+    /**
+     * 渠道订单号(微信/支付宝)
+     */
+    private String channelOrderNo;
+
+    /**
+     * 渠道用户OpenId
+     */
+    private String channelUserId;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+}
diff --git a/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/domain/vo/PayRefundVo.java b/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/domain/vo/PayRefundVo.java
new file mode 100644
index 0000000..e79aa21
--- /dev/null
+++ b/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/domain/vo/PayRefundVo.java
@@ -0,0 +1,131 @@
+package org.dromara.pay.domain.vo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.pay.domain.PayRefund;
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 退款订单视图对象 pay_refund
+ *
+ * @author pengles
+ */
+@Data
+@AutoMapper(target = PayRefund.class)
+public class PayRefundVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 退款ID
+     */
+    private Long id;
+
+    /**
+     * 退款单号
+     */
+    private String no;
+
+    /**
+     * 应用ID
+     */
+    private Long appId;
+
+    /**
+     * 渠道ID
+     */
+    private Long channelId;
+
+    /**
+     * 渠道编码
+     */
+    private String channelCode;
+
+    /**
+     * 支付订单ID
+     */
+    private Long orderId;
+
+    /**
+     * 支付订单no
+     */
+    private String orderNo;
+
+    /**
+     * 商户订单编号
+     */
+    private String merchantOrderId;
+
+    /**
+     * 商户退款编号
+     */
+    private String merchantRefundId;
+
+    /**
+     * 回调地址
+     */
+    private String notifyUrl;
+
+    /**
+     * 状态(0等待 10成功 20失败)
+     */
+    private Integer status;
+
+    /**
+     * 支付金额(分)
+     */
+    private Integer payPrice;
+
+    /**
+     * 退款金额(分)
+     */
+    private Integer refundPrice;
+
+    /**
+     * 退款原因
+     */
+    private String reason;
+
+    /**
+     * 用户IP
+     */
+    private String userIp;
+
+    /**
+     * 渠道订单号
+     */
+    private String channelOrderNo;
+
+    /**
+     * 渠道退款单号
+     */
+    private String channelRefundNo;
+
+    /**
+     * 退款成功时间
+     */
+    private Date successTime;
+
+    /**
+     * 渠道错误码
+     */
+    private String errorCode;
+
+    /**
+     * 渠道错误描述
+     */
+    private String errorMsg;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+}
diff --git a/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/enums/PayChannelEnum.java b/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/enums/PayChannelEnum.java
new file mode 100644
index 0000000..93c5d1c
--- /dev/null
+++ b/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/enums/PayChannelEnum.java
@@ -0,0 +1,38 @@
+package org.dromara.pay.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 支付渠道枚举
+ *
+ * @author pengles
+ */
+@Getter
+@AllArgsConstructor
+public enum PayChannelEnum {
+
+    WX_PUB("wx_pub", "微信 JSAPI 支付"),
+    WX_LITE("wx_lite", "微信小程序支付"),
+    WX_APP("wx_app", "微信 App 支付"),
+    WX_NATIVE("wx_native", "微信 Native 支付"),
+    WX_H5("wx_h5", "微信 H5 支付"),
+    ALIPAY_PC("alipay_pc", "支付宝 PC 支付"),
+    ALIPAY_WAP("alipay_wap", "支付宝 Wap 支付"),
+    ALIPAY_APP("alipay_app", "支付宝 App 支付"),
+    ALIPAY_QR("alipay_qr", "支付宝扫码支付"),
+    MOCK("mock", "模拟支付"),
+    WALLET("wallet", "钱包支付");
+
+    private final String code;
+    private final String name;
+
+    public static PayChannelEnum getByCode(String code) {
+        for (PayChannelEnum value : values()) {
+            if (value.getCode().equals(code)) {
+                return value;
+            }
+        }
+        return null;
+    }
+}
diff --git a/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/enums/PayOrderStatusEnum.java b/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/enums/PayOrderStatusEnum.java
new file mode 100644
index 0000000..ca21960
--- /dev/null
+++ b/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/enums/PayOrderStatusEnum.java
@@ -0,0 +1,23 @@
+package org.dromara.pay.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 支付订单状态枚举
+ *
+ * @author pengles
+ */
+@Getter
+@AllArgsConstructor
+public enum PayOrderStatusEnum {
+
+    WAITING(0, "未支付"),
+    SUCCESS(10, "支付成功"),
+    REFUND(20, "已退款"),
+    CLOSED(30, "已关闭");
+
+    private final Integer status;
+    private final String name;
+
+}
diff --git a/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/enums/RefundStatusEnum.java b/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/enums/RefundStatusEnum.java
new file mode 100644
index 0000000..c64475a
--- /dev/null
+++ b/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/enums/RefundStatusEnum.java
@@ -0,0 +1,30 @@
+package org.dromara.pay.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 退款状态枚举
+ *
+ * @author pengles
+ */
+@Getter
+@AllArgsConstructor
+public enum RefundStatusEnum {
+
+    WAITING(0, "等待"),
+    SUCCESS(10, "成功"),
+    FAIL(20, "失败");
+
+    private final Integer code;
+    private final String name;
+
+    public static RefundStatusEnum getByCode(Integer code) {
+        for (RefundStatusEnum value : values()) {
+            if (value.getCode().equals(code)) {
+                return value;
+            }
+        }
+        return null;
+    }
+}
diff --git a/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/event/PaySuccessEvent.java b/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/event/PaySuccessEvent.java
new file mode 100644
index 0000000..b1caf37
--- /dev/null
+++ b/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/event/PaySuccessEvent.java
@@ -0,0 +1,21 @@
+package org.dromara.pay.event;
+
+import lombok.Getter;
+import org.dromara.pay.domain.PayOrder;
+import org.springframework.context.ApplicationEvent;
+
+/**
+ * 支付成功事件
+ *
+ * @author pengles
+ */
+@Getter
+public class PaySuccessEvent extends ApplicationEvent {
+
+    private final PayOrder order;
+
+    public PaySuccessEvent(Object source, PayOrder order) {
+        super(source);
+        this.order = order;
+    }
+}
diff --git a/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/job/PayNotifyJob.java b/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/job/PayNotifyJob.java
new file mode 100644
index 0000000..80a36d5
--- /dev/null
+++ b/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/job/PayNotifyJob.java
@@ -0,0 +1,38 @@
+package org.dromara.pay.job;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.pay.domain.PayNotifyTask;
+import org.dromara.pay.service.PayNotifyService;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * 支付通知重试任务
+ *
+ * @author pengles
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Component
+public class PayNotifyJob {
+
+    private final PayNotifyService payNotifyService;
+
+    /**
+     * 每30秒检查一次待通知任务
+     */
+    @Scheduled(cron = "0/30 * * * * ?")
+    public void retryNotify() {
+        List<PayNotifyTask> tasks = payNotifyService.getPendingTasks();
+        if (tasks.isEmpty()) {
+            return;
+        }
+        log.info("扫描到待执行回调任务: {}个", tasks.size());
+        for (PayNotifyTask task : tasks) {
+            payNotifyService.executeTask(task);
+        }
+    }
+}
diff --git a/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/job/PayOrderExpireJob.java b/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/job/PayOrderExpireJob.java
new file mode 100644
index 0000000..673767e
--- /dev/null
+++ b/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/job/PayOrderExpireJob.java
@@ -0,0 +1,63 @@
+package org.dromara.pay.job;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.pay.core.PayStrategy;
+import org.dromara.pay.core.PayStrategyFactory;
+import org.dromara.pay.domain.PayChannel;
+import org.dromara.pay.domain.PayOrder;
+import org.dromara.pay.enums.PayOrderStatusEnum;
+import org.dromara.pay.mapper.PayChannelMapper;
+import org.dromara.pay.mapper.PayOrderMapper;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 支付订单过期处理任务
+ *
+ * @author pengles
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Component
+public class PayOrderExpireJob {
+
+    private final PayOrderMapper payOrderMapper;
+    private final PayChannelMapper payChannelMapper;
+    private final PayStrategyFactory payStrategyFactory;
+
+    /**
+     * 每分钟检查一次过期订单
+     */
+    @Scheduled(cron = "0 0/1 * * * ?")
+    public void expireOrder() {
+        // 查询未支付且已过期的订单
+        Date now = new Date();
+        List<PayOrder> expiredOrders = payOrderMapper.selectList(new LambdaQueryWrapper<PayOrder>()
+                .eq(PayOrder::getStatus, PayOrderStatusEnum.WAITING.getStatus())
+                .lt(PayOrder::getExpireTime, now)
+                .last("LIMIT 100")); // 每次处理100条，防止积压
+
+        for (PayOrder order : expiredOrders) {
+            try {
+                log.info("处理过期订单: {}", order.getNo());
+                PayChannel channel = payChannelMapper.selectById(order.getChannelId());
+                if (channel != null) {
+                    PayStrategy strategy = payStrategyFactory.getStrategy(channel.getCode());
+                    // 调用三方关单
+                    strategy.closeOrder(order, channel);
+                }
+                
+                // 更新本地状态为已关闭
+                order.setStatus(PayOrderStatusEnum.CLOSED.getStatus());
+                payOrderMapper.updateById(order);
+            } catch (Exception e) {
+                log.error("处理过期订单异常: {}", order.getNo(), e);
+            }
+        }
+    }
+}
diff --git a/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/job/PayOrderSyncJob.java b/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/job/PayOrderSyncJob.java
new file mode 100644
index 0000000..3bd3fd8
--- /dev/null
+++ b/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/job/PayOrderSyncJob.java
@@ -0,0 +1,77 @@
+package org.dromara.pay.job;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.pay.core.PayStrategy;
+import org.dromara.pay.core.PayStrategyFactory;
+import org.dromara.pay.domain.PayChannel;
+import org.dromara.pay.domain.PayOrder;
+import org.dromara.pay.enums.PayOrderStatusEnum;
+import org.dromara.pay.mapper.PayChannelMapper;
+import org.dromara.pay.mapper.PayOrderMapper;
+import org.dromara.pay.service.PayOrderService;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 支付订单同步任务 (防掉单)
+ *
+ * @author pengles
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Component
+public class PayOrderSyncJob {
+
+    private final PayOrderMapper payOrderMapper;
+    private final PayChannelMapper payChannelMapper;
+    private final PayStrategyFactory payStrategyFactory;
+    private final PayOrderService payOrderService;
+
+    /**
+     * 每2分钟检查一次"支付中"的订单 (防掉单)
+     * 针对创建时间超过2分钟，且未过期的订单
+     */
+    @Scheduled(cron = "0 0/2 * * * ?")
+    public void syncOrder() {
+        Date now = new Date();
+        Date twoMinutesAgo = new Date(now.getTime() - 2 * 60 * 1000);
+        
+        // 查询 WAITING 状态，创建时间 < 2分钟前，过期时间 > 现在的订单
+        List<PayOrder> waitingOrders = payOrderMapper.selectList(new LambdaQueryWrapper<PayOrder>()
+                .eq(PayOrder::getStatus, PayOrderStatusEnum.WAITING.getStatus())
+                .lt(PayOrder::getCreateTime, twoMinutesAgo)
+                .gt(PayOrder::getExpireTime, now)
+                .last("LIMIT 100"));
+
+        for (PayOrder order : waitingOrders) {
+            try {
+                log.info("同步支付订单状态: {}", order.getNo());
+                PayChannel channel = payChannelMapper.selectById(order.getChannelId());
+                if (channel == null) {
+                    continue;
+                }
+                
+                PayStrategy strategy = payStrategyFactory.getStrategy(channel.getCode());
+                Integer status = strategy.queryOrder(order, channel);
+                
+                if (PayOrderStatusEnum.SUCCESS.getStatus().equals(status)) {
+                    log.info("同步发现订单已支付: {}", order.getNo());
+                    // 触发支付成功逻辑
+                    payOrderService.notifyOrderSuccess(order.getNo(), null);
+                } else if (PayOrderStatusEnum.CLOSED.getStatus().equals(status)) {
+                    log.info("同步发现订单已关闭: {}", order.getNo());
+                    order.setStatus(PayOrderStatusEnum.CLOSED.getStatus());
+                    payOrderMapper.updateById(order);
+                }
+                
+            } catch (Exception e) {
+                log.error("同步订单异常: {}", order.getNo(), e);
+            }
+        }
+    }
+}
diff --git a/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/listener/PayOrderListener.java b/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/listener/PayOrderListener.java
new file mode 100644
index 0000000..1a88eb9
--- /dev/null
+++ b/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/listener/PayOrderListener.java
@@ -0,0 +1,36 @@
+package org.dromara.pay.listener;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.pay.event.PaySuccessEvent;
+import org.dromara.pay.service.PayNotifyService;
+import org.springframework.context.event.EventListener;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Component;
+
+/**
+ * 支付订单事件监听
+ *
+ * @author pengles
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Component
+public class PayOrderListener {
+
+    private final PayNotifyService payNotifyService;
+
+    /**
+     * 监听支付成功事件，创建回调任务
+     */
+    @Async
+    @EventListener
+    public void onPaySuccess(PaySuccessEvent event) {
+        log.info("监听到支付成功事件: orderNo={}", event.getOrder().getNo());
+        try {
+            payNotifyService.createTask(event.getOrder());
+        } catch (Exception e) {
+            log.error("创建支付回调任务失败", e);
+        }
+    }
+}
diff --git a/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/mapper/PayAppMapper.java b/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/mapper/PayAppMapper.java
new file mode 100644
index 0000000..2109853
--- /dev/null
+++ b/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/mapper/PayAppMapper.java
@@ -0,0 +1,16 @@
+package org.dromara.pay.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.pay.domain.PayApp;
+import org.dromara.pay.domain.vo.PayAppVo;
+
+/**
+ * 支付应用Mapper接口
+ *
+ * @author pengles
+ */
+@Mapper
+public interface PayAppMapper extends BaseMapperPlus<PayApp, PayAppVo> {
+
+}
diff --git a/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/mapper/PayChannelMapper.java b/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/mapper/PayChannelMapper.java
new file mode 100644
index 0000000..606338c
--- /dev/null
+++ b/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/mapper/PayChannelMapper.java
@@ -0,0 +1,16 @@
+package org.dromara.pay.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.pay.domain.PayChannel;
+import org.dromara.pay.domain.vo.PayChannelVo;
+
+/**
+ * 支付渠道Mapper接口
+ *
+ * @author pengles
+ */
+@Mapper
+public interface PayChannelMapper extends BaseMapperPlus<PayChannel, PayChannelVo> {
+
+}
diff --git a/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/mapper/PayNotifyTaskMapper.java b/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/mapper/PayNotifyTaskMapper.java
new file mode 100644
index 0000000..31c8a58
--- /dev/null
+++ b/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/mapper/PayNotifyTaskMapper.java
@@ -0,0 +1,13 @@
+package org.dromara.pay.mapper;
+
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.pay.domain.PayNotifyTask;
+
+/**
+ * 支付通知任务Mapper接口
+ *
+ * @author pengles
+ */
+public interface PayNotifyTaskMapper extends BaseMapperPlus<PayNotifyTask, PayNotifyTask> {
+
+}
diff --git a/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/mapper/PayOrderMapper.java b/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/mapper/PayOrderMapper.java
new file mode 100644
index 0000000..50f21cb
--- /dev/null
+++ b/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/mapper/PayOrderMapper.java
@@ -0,0 +1,16 @@
+package org.dromara.pay.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.pay.domain.PayOrder;
+import org.dromara.pay.domain.vo.PayOrderVo;
+
+/**
+ * 支付订单Mapper接口
+ *
+ * @author pengles
+ */
+@Mapper
+public interface PayOrderMapper extends BaseMapperPlus<PayOrder, PayOrderVo> {
+
+}
diff --git a/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/mapper/PayRefundMapper.java b/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/mapper/PayRefundMapper.java
new file mode 100644
index 0000000..fd5f2ea
--- /dev/null
+++ b/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/mapper/PayRefundMapper.java
@@ -0,0 +1,16 @@
+package org.dromara.pay.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.pay.domain.PayRefund;
+import org.dromara.pay.domain.vo.PayRefundVo;
+
+/**
+ * 退款订单Mapper接口
+ *
+ * @author pengles
+ */
+@Mapper
+public interface PayRefundMapper extends BaseMapperPlus<PayRefund, PayRefundVo> {
+
+}
diff --git a/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/service/PayAppService.java b/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/service/PayAppService.java
new file mode 100644
index 0000000..cf29f74
--- /dev/null
+++ b/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/service/PayAppService.java
@@ -0,0 +1,46 @@
+package org.dromara.pay.service;
+
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.pay.domain.bo.PayAppBo;
+import org.dromara.pay.domain.vo.PayAppVo;
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 支付应用Service接口
+ *
+ * @author pengles
+ */
+public interface PayAppService {
+
+    /**
+     * 查询支付应用
+     */
+    PayAppVo queryById(Long id);
+
+    /**
+     * 查询支付应用列表
+     */
+    TableDataInfo<PayAppVo> queryPageList(PayAppBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询支付应用列表
+     */
+    List<PayAppVo> queryList(PayAppBo bo);
+
+    /**
+     * 新增支付应用
+     */
+    Boolean insertByBo(PayAppBo bo);
+
+    /**
+     * 修改支付应用
+     */
+    Boolean updateByBo(PayAppBo bo);
+
+    /**
+     * 校验并批量删除支付应用信息
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}
diff --git a/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/service/PayChannelService.java b/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/service/PayChannelService.java
new file mode 100644
index 0000000..21ba1e0
--- /dev/null
+++ b/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/service/PayChannelService.java
@@ -0,0 +1,46 @@
+package org.dromara.pay.service;
+
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.pay.domain.bo.PayChannelBo;
+import org.dromara.pay.domain.vo.PayChannelVo;
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 支付渠道Service接口
+ *
+ * @author pengles
+ */
+public interface PayChannelService {
+
+    /**
+     * 查询支付渠道
+     */
+    PayChannelVo queryById(Long id);
+
+    /**
+     * 查询支付渠道列表
+     */
+    TableDataInfo<PayChannelVo> queryPageList(PayChannelBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询支付渠道列表
+     */
+    List<PayChannelVo> queryList(PayChannelBo bo);
+
+    /**
+     * 新增支付渠道
+     */
+    Boolean insertByBo(PayChannelBo bo);
+
+    /**
+     * 修改支付渠道
+     */
+    Boolean updateByBo(PayChannelBo bo);
+
+    /**
+     * 校验并批量删除支付渠道信息
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}
diff --git a/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/service/PayNotifyService.java b/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/service/PayNotifyService.java
new file mode 100644
index 0000000..4a60113
--- /dev/null
+++ b/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/service/PayNotifyService.java
@@ -0,0 +1,131 @@
+package org.dromara.pay.service;
+
+import cn.hutool.http.HttpUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.json.utils.JsonUtils;
+import org.dromara.pay.domain.PayNotifyTask;
+import org.dromara.pay.domain.PayOrder;
+import org.dromara.pay.mapper.PayNotifyTaskMapper;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 支付通知服务
+ *
+ * @author pengles
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class PayNotifyService {
+
+    private final PayNotifyTaskMapper baseMapper;
+
+    /**
+     * 创建通知任务
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public void createTask(PayOrder order) {
+        if (StringUtils.isBlank(order.getNotifyUrl())) {
+            return;
+        }
+        PayNotifyTask task = new PayNotifyTask();
+        task.setOrderId(order.getId());
+        task.setOrderNo(order.getNo());
+        task.setNotifyUrl(order.getNotifyUrl());
+        
+        Map<String, Object> body = new HashMap<>();
+        body.put("orderNo", order.getNo());
+        body.put("merchantOrderId", order.getMerchantOrderId());
+        body.put("status", order.getStatus());
+        body.put("price", order.getPrice());
+        body.put("channelUserId", order.getChannelUserId());
+        body.put("successTime", order.getSuccessTime());
+        body.put("extensionId", order.getExtensionId());
+        body.put("channelExtras", order.getChannelExtras());
+        
+        task.setNotifyBody(JsonUtils.toJsonString(body));
+        task.setRetryCount(0);
+        task.setMaxRetry(5);
+        task.setStatus(0); // 进行中
+        task.setNextNotifyTime(new Date()); // 立即执行
+        
+        baseMapper.insert(task);
+        
+        // 尝试立即执行一次
+        executeTask(task);
+    }
+
+    /**
+     * 执行通知任务
+     */
+    public void executeTask(PayNotifyTask task) {
+        try {
+            log.info("开始执行支付回调通知: taskId={}, url={}", task.getId(), task.getNotifyUrl());
+            String result = HttpUtil.post(task.getNotifyUrl(), task.getNotifyBody(), 5000);
+            log.info("支付回调通知响应: taskId={}, result={}", task.getId(), result);
+            
+            // 判断成功：返回 "success" 或 JSON格式 {"code": 200}
+            boolean success = false;
+            if (StringUtils.isNotBlank(result)) {
+                String trimmed = result.trim();
+                if ("success".equalsIgnoreCase(trimmed)) {
+                    success = true;
+                } else {
+                    // 尝试解析JSON
+                    try {
+                        Map<String, Object> jsonResult = JsonUtils.parseMap(trimmed);
+                        Object code = jsonResult.get("code");
+                        if (code != null) {
+                            if (code instanceof Number && ((Number) code).intValue() == 200) {
+                                success = true;
+                            } else if ("200".equals(String.valueOf(code))) {
+                                success = true;
+                            }
+                        }
+                    } catch (Exception e) {
+                        // 不是JSON格式，忽略
+                    }
+                }
+            }
+            
+            if (success) {
+                task.setStatus(1); // 成功
+                baseMapper.updateById(task);
+                return;
+            }
+        } catch (Exception e) {
+            log.error("支付回调通知异常: taskId={}", task.getId(), e);
+        }
+
+        // 失败处理
+        task.setRetryCount(task.getRetryCount() + 1);
+        if (task.getRetryCount() >= task.getMaxRetry()) {
+            task.setStatus(2); // 失败
+        } else {
+            // 计算下次重试时间：指数退避
+            // 15s, 30s, 1m, 2m, 5m
+            int delaySeconds = 15 * (1 << (task.getRetryCount() - 1));
+            task.setNextNotifyTime(new Date(System.currentTimeMillis() + delaySeconds * 1000L));
+        }
+        baseMapper.updateById(task);
+    }
+
+    /**
+     * 获取待执行的任务
+     */
+    public List<PayNotifyTask> getPendingTasks() {
+        return baseMapper.selectList(new LambdaQueryWrapper<PayNotifyTask>()
+                .eq(PayNotifyTask::getStatus, 0)
+                .le(PayNotifyTask::getNextNotifyTime, new Date())
+                .last("LIMIT 100"));
+    }
+}
diff --git a/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/service/PayOrderService.java b/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/service/PayOrderService.java
new file mode 100644
index 0000000..398541b
--- /dev/null
+++ b/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/service/PayOrderService.java
@@ -0,0 +1,57 @@
+package org.dromara.pay.service;
+
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.pay.domain.bo.PayOrderBo;
+import org.dromara.pay.domain.vo.PayOrderSubmitRespVO;
+import org.dromara.pay.domain.vo.PayOrderVo;
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 支付订单Service接口
+ *
+ * @author pengles
+ */
+public interface PayOrderService {
+
+    /**
+     * 查询支付订单
+     */
+    PayOrderVo queryById(Long id);
+
+    /**
+     * 查询支付订单列表
+     */
+    TableDataInfo<PayOrderVo> queryPageList(PayOrderBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询支付订单列表
+     */
+    List<PayOrderVo> queryList(PayOrderBo bo);
+
+    /**
+     * 新增支付订单
+     */
+    Boolean insertByBo(PayOrderBo bo);
+
+    /**
+     * 修改支付订单
+     */
+    Boolean updateByBo(PayOrderBo bo);
+
+    /**
+     * 校验并批量删除支付订单信息
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    /**
+     * 提交支付订单
+     */
+    PayOrderSubmitRespVO submitOrder(PayOrderBo bo);
+    
+    /**
+     * 支付成功回调通知
+     */
+    void notifyOrderSuccess(String orderNo, String channelOrderNo);
+}
diff --git a/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/service/PayRefundService.java b/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/service/PayRefundService.java
new file mode 100644
index 0000000..8beac79
--- /dev/null
+++ b/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/service/PayRefundService.java
@@ -0,0 +1,56 @@
+package org.dromara.pay.service;
+
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.pay.domain.bo.PayRefundBo;
+import org.dromara.pay.domain.vo.PayRefundVo;
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 退款订单Service接口
+ *
+ * @author pengles
+ */
+public interface PayRefundService {
+
+    /**
+     * 查询退款订单
+     */
+    PayRefundVo queryById(Long id);
+
+    /**
+     * 查询退款订单列表
+     */
+    TableDataInfo<PayRefundVo> queryPageList(PayRefundBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询退款订单列表
+     */
+    List<PayRefundVo> queryList(PayRefundBo bo);
+
+    /**
+     * 新增退款订单
+     */
+    Boolean insertByBo(PayRefundBo bo);
+
+    /**
+     * 修改退款订单
+     */
+    Boolean updateByBo(PayRefundBo bo);
+
+    /**
+     * 校验并批量删除退款订单信息
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+    
+    /**
+     * 创建并执行退款
+     */
+    Boolean createRefund(PayRefundBo bo);
+
+    /**
+     * 处理退款回调成功
+     */
+    void notifyRefundSuccess(String refundNo, String channelRefundNo);
+}
diff --git a/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/service/impl/PayAppServiceImpl.java b/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/service/impl/PayAppServiceImpl.java
new file mode 100644
index 0000000..0b10450
--- /dev/null
+++ b/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/service/impl/PayAppServiceImpl.java
@@ -0,0 +1,132 @@
+package org.dromara.pay.service.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.pay.domain.PayApp;
+import org.dromara.pay.domain.bo.PayAppBo;
+import org.dromara.pay.domain.vo.PayAppVo;
+import org.dromara.pay.mapper.PayAppMapper;
+import org.dromara.pay.service.PayAppService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 支付应用Service业务层处理
+ *
+ * @author pengles
+ */
+@RequiredArgsConstructor
+@Service
+public class PayAppServiceImpl implements PayAppService {
+
+    private final PayAppMapper baseMapper;
+
+    /**
+     * 查询支付应用
+     */
+    @Override
+    public PayAppVo queryById(Long id) {
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 查询支付应用列表
+     */
+    @Override
+    public TableDataInfo<PayAppVo> queryPageList(PayAppBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<PayApp> lqw = buildQueryWrapper(bo);
+        Page<PayAppVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询支付应用列表
+     */
+    @Override
+    public List<PayAppVo> queryList(PayAppBo bo) {
+        LambdaQueryWrapper<PayApp> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<PayApp> buildQueryWrapper(PayAppBo bo) {
+        LambdaQueryWrapper<PayApp> lqw = new LambdaQueryWrapper<>();
+        lqw.like(StringUtils.isNotBlank(bo.getName()), PayApp::getName, bo.getName());
+        lqw.eq(bo.getStatus() != null, PayApp::getStatus, bo.getStatus());
+        return lqw;
+    }
+
+    /**
+     * 新增支付应用
+     */
+    @Override
+    public Boolean insertByBo(PayAppBo bo) {
+        PayApp add = MapstructUtils.convert(bo, PayApp.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改支付应用
+     */
+    @Override
+    public Boolean updateByBo(PayAppBo bo) {
+        PayApp update = MapstructUtils.convert(bo, PayApp.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(PayApp entity){
+        // 校验应用名称不能为空
+        if (StringUtils.isBlank(entity.getName())) {
+            throw new ServiceException("应用名称不能为空");
+        }
+        // 校验回调地址格式
+        if (StringUtils.isNotBlank(entity.getPayNotifyUrl())) {
+            if (!entity.getPayNotifyUrl().startsWith("http://") && !entity.getPayNotifyUrl().startsWith("https://")) {
+                throw new ServiceException("支付回调地址格式不正确");
+            }
+        }
+        if (StringUtils.isNotBlank(entity.getRefundNotifyUrl())) {
+            if (!entity.getRefundNotifyUrl().startsWith("http://") && !entity.getRefundNotifyUrl().startsWith("https://")) {
+                throw new ServiceException("退款回调地址格式不正确");
+            }
+        }
+    }
+
+    /**
+     * 批量删除支付应用
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            // 校验应用是否有关联的支付渠道
+            for (Long id : ids) {
+                // 这里可以添加检查是否有关联的支付渠道或订单
+                // 暂时只检查应用是否存在
+                PayApp app = baseMapper.selectById(id);
+                if (app == null) {
+                    throw new ServiceException("支付应用不存在");
+                }
+            }
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+}
diff --git a/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/service/impl/PayChannelServiceImpl.java b/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/service/impl/PayChannelServiceImpl.java
new file mode 100644
index 0000000..ce27f1b
--- /dev/null
+++ b/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/service/impl/PayChannelServiceImpl.java
@@ -0,0 +1,141 @@
+package org.dromara.pay.service.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.pay.domain.PayChannel;
+import org.dromara.pay.domain.bo.PayChannelBo;
+import org.dromara.pay.domain.vo.PayChannelVo;
+import org.dromara.pay.mapper.PayChannelMapper;
+import org.dromara.pay.service.PayChannelService;
+import org.springframework.stereotype.Service;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 支付渠道Service业务层处理
+ *
+ * @author pengles
+ */
+@RequiredArgsConstructor
+@Service
+public class PayChannelServiceImpl implements PayChannelService {
+
+    private final PayChannelMapper baseMapper;
+
+    /**
+     * 查询支付渠道
+     */
+    @Override
+    public PayChannelVo queryById(Long id) {
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 查询支付渠道列表
+     */
+    @Override
+    public TableDataInfo<PayChannelVo> queryPageList(PayChannelBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<PayChannel> lqw = buildQueryWrapper(bo);
+        Page<PayChannelVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询支付渠道列表
+     */
+    @Override
+    public List<PayChannelVo> queryList(PayChannelBo bo) {
+        LambdaQueryWrapper<PayChannel> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<PayChannel> buildQueryWrapper(PayChannelBo bo) {
+        LambdaQueryWrapper<PayChannel> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(StringUtils.isNotBlank(bo.getCode()), PayChannel::getCode, bo.getCode());
+        lqw.eq(bo.getStatus() != null, PayChannel::getStatus, bo.getStatus());
+        lqw.eq(bo.getAppId() != null, PayChannel::getAppId, bo.getAppId());
+        return lqw;
+    }
+
+    /**
+     * 新增支付渠道
+     */
+    @Override
+    public Boolean insertByBo(PayChannelBo bo) {
+        PayChannel add = MapstructUtils.convert(bo, PayChannel.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改支付渠道
+     */
+    @Override
+    public Boolean updateByBo(PayChannelBo bo) {
+        PayChannel update = MapstructUtils.convert(bo, PayChannel.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(PayChannel entity){
+        // 校验渠道编码不能为空
+        if (StringUtils.isBlank(entity.getCode())) {
+            throw new ServiceException("渠道编码不能为空");
+        }
+        // 校验渠道编码唯一性（同一应用下）
+        if (entity.getAppId() != null) {
+            LambdaQueryWrapper<PayChannel> wrapper = new LambdaQueryWrapper<>();
+            wrapper.eq(PayChannel::getAppId, entity.getAppId())
+                    .eq(PayChannel::getCode, entity.getCode());
+            if (entity.getId() != null) {
+                wrapper.ne(PayChannel::getId, entity.getId());
+            }
+            Long count = baseMapper.selectCount(wrapper);
+            if (count > 0) {
+                throw new ServiceException("该应用下渠道编码已存在");
+            }
+        }
+        // 校验配置JSON格式
+        if (StringUtils.isNotBlank(entity.getConfig())) {
+            try {
+                org.dromara.common.json.utils.JsonUtils.parseMap(entity.getConfig());
+            } catch (Exception e) {
+                throw new ServiceException("渠道配置JSON格式不正确");
+            }
+        }
+    }
+
+    /**
+     * 批量删除支付渠道
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            // 校验渠道是否存在
+            for (Long id : ids) {
+                PayChannel channel = baseMapper.selectById(id);
+                if (channel == null) {
+                    throw new ServiceException("支付渠道不存在");
+                }
+                // 可以添加检查是否有关联的订单
+            }
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+}
diff --git a/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/service/impl/PayOrderServiceImpl.java b/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/service/impl/PayOrderServiceImpl.java
new file mode 100644
index 0000000..8324449
--- /dev/null
+++ b/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/service/impl/PayOrderServiceImpl.java
@@ -0,0 +1,223 @@
+package org.dromara.pay.service.impl;
+
+import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.pay.core.PayStrategy;
+import org.dromara.pay.core.PayStrategyFactory;
+import org.dromara.pay.domain.PayApp;
+import org.dromara.pay.domain.PayChannel;
+import org.dromara.pay.domain.PayOrder;
+import org.dromara.pay.domain.bo.PayOrderBo;
+import org.dromara.pay.domain.vo.PayOrderSubmitRespVO;
+import org.dromara.pay.domain.vo.PayOrderVo;
+import org.dromara.pay.enums.PayOrderStatusEnum;
+import org.dromara.pay.event.PaySuccessEvent;
+import org.dromara.pay.mapper.PayAppMapper;
+import org.dromara.pay.mapper.PayChannelMapper;
+import org.dromara.pay.mapper.PayOrderMapper;
+import org.dromara.pay.service.PayOrderService;
+import org.springframework.context.ApplicationEventPublisher;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 支付订单Service业务层处理
+ *
+ * @author pengles
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class PayOrderServiceImpl implements PayOrderService {
+
+    private final PayOrderMapper baseMapper;
+    private final PayAppMapper payAppMapper;
+    private final PayChannelMapper payChannelMapper;
+    private final PayStrategyFactory payStrategyFactory;
+    private final ApplicationEventPublisher eventPublisher;
+
+    /**
+     * 查询支付订单
+     */
+    @Override
+    public PayOrderVo queryById(Long id) {
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 查询支付订单列表
+     */
+    @Override
+    public TableDataInfo<PayOrderVo> queryPageList(PayOrderBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<PayOrder> lqw = buildQueryWrapper(bo);
+        Page<PayOrderVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询支付订单列表
+     */
+    @Override
+    public List<PayOrderVo> queryList(PayOrderBo bo) {
+        LambdaQueryWrapper<PayOrder> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<PayOrder> buildQueryWrapper(PayOrderBo bo) {
+        LambdaQueryWrapper<PayOrder> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(bo.getAppId() != null, PayOrder::getAppId, bo.getAppId());
+        lqw.eq(bo.getChannelId() != null, PayOrder::getChannelId, bo.getChannelId());
+        lqw.eq(StringUtils.isNotBlank(bo.getChannelCode()), PayOrder::getChannelCode, bo.getChannelCode());
+        lqw.eq(StringUtils.isNotBlank(bo.getMerchantOrderId()), PayOrder::getMerchantOrderId, bo.getMerchantOrderId());
+        lqw.eq(bo.getStatus() != null, PayOrder::getStatus, bo.getStatus());
+        return lqw;
+    }
+
+    /**
+     * 新增支付订单
+     */
+    @Override
+    public Boolean insertByBo(PayOrderBo bo) {
+        PayOrder add = MapstructUtils.convert(bo, PayOrder.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改支付订单
+     */
+    @Override
+    public Boolean updateByBo(PayOrderBo bo) {
+        PayOrder update = MapstructUtils.convert(bo, PayOrder.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(PayOrder entity){
+        // 校验商户订单号唯一性（如果已存在）
+        if (StringUtils.isNotBlank(entity.getMerchantOrderId())) {
+            LambdaQueryWrapper<PayOrder> wrapper = new LambdaQueryWrapper<>();
+            wrapper.eq(PayOrder::getMerchantOrderId, entity.getMerchantOrderId());
+            if (entity.getId() != null) {
+                wrapper.ne(PayOrder::getId, entity.getId());
+            }
+            Long count = baseMapper.selectCount(wrapper);
+            if (count > 0) {
+                throw new ServiceException("商户订单号已存在");
+            }
+        }
+        // 校验支付单号唯一性
+        if (StringUtils.isNotBlank(entity.getNo())) {
+            LambdaQueryWrapper<PayOrder> wrapper = new LambdaQueryWrapper<>();
+            wrapper.eq(PayOrder::getNo, entity.getNo());
+            if (entity.getId() != null) {
+                wrapper.ne(PayOrder::getId, entity.getId());
+            }
+            Long count = baseMapper.selectCount(wrapper);
+            if (count > 0) {
+                throw new ServiceException("支付单号已存在");
+            }
+        }
+    }
+
+    /**
+     * 批量删除支付订单
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            // 校验订单是否可以删除（已支付的订单不能删除）
+            for (Long id : ids) {
+                PayOrder order = baseMapper.selectById(id);
+                if (order != null && PayOrderStatusEnum.SUCCESS.getStatus().equals(order.getStatus())) {
+                    throw new ServiceException("已支付的订单不能删除");
+                }
+            }
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public PayOrderSubmitRespVO submitOrder(PayOrderBo bo) {
+        // 1. 校验 App
+        PayApp app = payAppMapper.selectById(bo.getAppId());
+        if (app == null || app.getStatus() == 1) { // 假设 1 为关闭
+            throw new ServiceException("应用不存在或已禁用");
+        }
+
+        // 2. 校验 Channel
+        PayChannel channel = payChannelMapper.selectOne(new LambdaQueryWrapper<PayChannel>()
+                .eq(PayChannel::getAppId, bo.getAppId())
+                .eq(PayChannel::getCode, bo.getChannelCode()));
+        if (channel == null || channel.getStatus() == 1) {
+             throw new ServiceException("支付渠道不存在或已禁用");
+        }
+
+        // 3. 创建订单
+        PayOrder order = MapstructUtils.convert(bo, PayOrder.class);
+        order.setChannelId(channel.getId());
+        order.setNo(IdUtil.getSnowflakeNextIdStr()); // 生成内部单号
+        order.setStatus(PayOrderStatusEnum.WAITING.getStatus());
+        order.setExpireTime(new Date(System.currentTimeMillis() + 30 * 60 * 1000)); // 30分钟过期
+        // 补全 NotifyUrl
+        if (StringUtils.isBlank(order.getNotifyUrl())) {
+            String baseUrl = app.getPayNotifyUrl();
+            if (baseUrl.endsWith("/")) {
+                baseUrl = baseUrl.substring(0, baseUrl.length() - 1);
+            }
+            order.setNotifyUrl(baseUrl + "/" + channel.getCode() + "/" + channel.getId());
+        }
+        
+        baseMapper.insert(order);
+
+        // 4. 调用策略
+        PayStrategy strategy = payStrategyFactory.getStrategy(channel.getCode());
+        PayOrderSubmitRespVO resp = strategy.unifiedOrder(order, channel);
+        
+        return resp;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void notifyOrderSuccess(String orderNo, String channelOrderNo) {
+        PayOrder order = baseMapper.selectOne(new LambdaQueryWrapper<PayOrder>().eq(PayOrder::getNo, orderNo));
+        if (order == null) {
+            log.error("支付回调订单不存在: {}", orderNo);
+            return;
+        }
+        if (PayOrderStatusEnum.SUCCESS.getStatus().equals(order.getStatus())) {
+            log.info("订单已支付，忽略回调: {}", orderNo);
+            return;
+        }
+        
+        order.setStatus(PayOrderStatusEnum.SUCCESS.getStatus());
+        order.setSuccessTime(new Date());
+        order.setChannelOrderNo(channelOrderNo);
+        baseMapper.updateById(order);
+        
+        log.info("订单支付成功: {}", orderNo);
+        // 发布支付成功事件
+        eventPublisher.publishEvent(new PaySuccessEvent(this, order));
+    }
+}
diff --git a/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/service/impl/PayRefundServiceImpl.java b/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/service/impl/PayRefundServiceImpl.java
new file mode 100644
index 0000000..ccafd45
--- /dev/null
+++ b/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/service/impl/PayRefundServiceImpl.java
@@ -0,0 +1,234 @@
+package org.dromara.pay.service.impl;
+
+import cn.hutool.core.util.IdUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.pay.core.PayStrategy;
+import org.dromara.pay.core.PayStrategyFactory;
+import org.dromara.pay.domain.PayChannel;
+import org.dromara.pay.domain.PayOrder;
+import org.dromara.pay.domain.PayRefund;
+import org.dromara.pay.domain.bo.PayRefundBo;
+import org.dromara.pay.domain.vo.PayRefundVo;
+import org.dromara.pay.enums.PayOrderStatusEnum;
+import org.dromara.pay.mapper.PayChannelMapper;
+import org.dromara.pay.mapper.PayOrderMapper;
+import org.dromara.pay.mapper.PayRefundMapper;
+import org.dromara.pay.service.PayRefundService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 退款订单Service业务层处理
+ *
+ * @author pengles
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class PayRefundServiceImpl implements PayRefundService {
+
+    private final PayRefundMapper baseMapper;
+    private final PayOrderMapper payOrderMapper;
+    private final PayChannelMapper payChannelMapper;
+    private final PayStrategyFactory payStrategyFactory;
+
+    /**
+     * 查询退款订单
+     */
+    @Override
+    public PayRefundVo queryById(Long id) {
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 查询退款订单列表
+     */
+    @Override
+    public TableDataInfo<PayRefundVo> queryPageList(PayRefundBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<PayRefund> lqw = buildQueryWrapper(bo);
+        Page<PayRefundVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询退款订单列表
+     */
+    @Override
+    public List<PayRefundVo> queryList(PayRefundBo bo) {
+        LambdaQueryWrapper<PayRefund> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<PayRefund> buildQueryWrapper(PayRefundBo bo) {
+        LambdaQueryWrapper<PayRefund> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(bo.getAppId() != null, PayRefund::getAppId, bo.getAppId());
+        lqw.eq(bo.getChannelId() != null, PayRefund::getChannelId, bo.getChannelId());
+        lqw.eq(StringUtils.isNotBlank(bo.getChannelCode()), PayRefund::getChannelCode, bo.getChannelCode());
+        lqw.eq(StringUtils.isNotBlank(bo.getMerchantOrderId()), PayRefund::getMerchantOrderId, bo.getMerchantOrderId());
+        lqw.eq(StringUtils.isNotBlank(bo.getMerchantRefundId()), PayRefund::getMerchantRefundId, bo.getMerchantRefundId());
+        lqw.eq(bo.getStatus() != null, PayRefund::getStatus, bo.getStatus());
+        return lqw;
+    }
+
+    /**
+     * 新增退款订单
+     */
+    @Override
+    public Boolean insertByBo(PayRefundBo bo) {
+        PayRefund add = MapstructUtils.convert(bo, PayRefund.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改退款订单
+     */
+    @Override
+    public Boolean updateByBo(PayRefundBo bo) {
+        PayRefund update = MapstructUtils.convert(bo, PayRefund.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(PayRefund entity){
+        // 校验退款单号唯一性
+        if (StringUtils.isNotBlank(entity.getNo())) {
+            LambdaQueryWrapper<PayRefund> wrapper = new LambdaQueryWrapper<>();
+            wrapper.eq(PayRefund::getNo, entity.getNo());
+            if (entity.getId() != null) {
+                wrapper.ne(PayRefund::getId, entity.getId());
+            }
+            Long count = baseMapper.selectCount(wrapper);
+            if (count > 0) {
+                throw new ServiceException("退款单号已存在");
+            }
+        }
+        // 校验商户退款编号唯一性
+        if (StringUtils.isNotBlank(entity.getMerchantRefundId())) {
+            LambdaQueryWrapper<PayRefund> wrapper = new LambdaQueryWrapper<>();
+            wrapper.eq(PayRefund::getMerchantRefundId, entity.getMerchantRefundId());
+            if (entity.getId() != null) {
+                wrapper.ne(PayRefund::getId, entity.getId());
+            }
+            Long count = baseMapper.selectCount(wrapper);
+            if (count > 0) {
+                throw new ServiceException("商户退款编号已存在");
+            }
+        }
+        // 校验退款金额不能超过支付金额
+        if (entity.getRefundPrice() != null && entity.getPayPrice() != null) {
+            if (entity.getRefundPrice() > entity.getPayPrice()) {
+                throw new ServiceException("退款金额不能超过支付金额");
+            }
+        }
+    }
+
+    /**
+     * 批量删除退款订单
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            // 校验退款订单是否可以删除（处理中的退款不能删除）
+            for (Long id : ids) {
+                PayRefund refund = baseMapper.selectById(id);
+                if (refund != null && refund.getStatus() == 0) {
+                    throw new ServiceException("处理中的退款订单不能删除");
+                }
+            }
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean createRefund(PayRefundBo bo) {
+        // 1. 校验订单
+        PayOrder order = payOrderMapper.selectOne(new LambdaQueryWrapper<PayOrder>()
+                .eq(PayOrder::getNo, bo.getOrderNo()));
+        if (order == null) {
+            throw new ServiceException("订单不存在");
+        }
+        if (!PayOrderStatusEnum.SUCCESS.getStatus().equals(order.getStatus())) {
+            throw new ServiceException("订单未支付或已退款");
+        }
+        
+        // 2. 创建退款单
+        PayRefund refund = MapstructUtils.convert(bo, PayRefund.class);
+        refund.setAppId(order.getAppId());
+        refund.setChannelId(order.getChannelId());
+        refund.setChannelCode(order.getChannelCode());
+        refund.setMerchantOrderId(order.getMerchantOrderId());
+        refund.setPayPrice(order.getPrice());
+        refund.setNo(IdUtil.getSnowflakeNextIdStr()); // 生成退款单号
+        refund.setStatus(0); // WAITING
+        // NotifyUrl 可以从 App 配置获取，或者 BO 传入
+        
+        baseMapper.insert(refund);
+        
+        // 3. 执行退款策略
+        PayChannel channel = payChannelMapper.selectById(order.getChannelId());
+        PayStrategy strategy = payStrategyFactory.getStrategy(channel.getCode());
+        Boolean success = strategy.refund(refund, channel);
+        
+        // 4. 更新状态
+        if (success) {
+            refund.setStatus(10); // SUCCESS (假设 10 为成功)
+            refund.setSuccessTime(new Date());
+            baseMapper.updateById(refund);
+            
+            // 更新订单状态 (如果是全额退款，可以标记为已退款)
+            // 简单处理：只要退款成功，订单状态改为已退款 (20)
+            order.setStatus(PayOrderStatusEnum.REFUND.getStatus());
+            payOrderMapper.updateById(order);
+        } else {
+            refund.setStatus(20); // FAIL (假设 20 为失败)
+            baseMapper.updateById(refund);
+        }
+        
+        return success;
+    }
+
+    /**
+     * 处理退款回调成功
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void notifyRefundSuccess(String refundNo, String channelRefundNo) {
+        PayRefund refund = baseMapper.selectOne(new LambdaQueryWrapper<PayRefund>().eq(PayRefund::getNo, refundNo));
+        if (refund == null) {
+            log.error("退款回调订单不存在: {}", refundNo);
+            return;
+        }
+        if (refund.getStatus() == 10) { // 已成功
+            log.info("退款已成功，忽略回调: {}", refundNo);
+            return;
+        }
+        
+        refund.setStatus(10); // SUCCESS
+        refund.setSuccessTime(new Date());
+        refund.setChannelRefundNo(channelRefundNo);
+        baseMapper.updateById(refund);
+        
+        log.info("退款成功: {}", refundNo);
+    }
+}
diff --git a/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/util/WechatPayUtil.java b/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/util/WechatPayUtil.java
new file mode 100644
index 0000000..5866ce5
--- /dev/null
+++ b/ruoyi-modules/ruoyi-pay/src/main/java/org/dromara/pay/util/WechatPayUtil.java
@@ -0,0 +1,72 @@
+package org.dromara.pay.util;
+
+import com.wechat.pay.java.core.cipher.RSASigner;
+import java.security.PrivateKey;
+import java.time.Instant;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
+/**
+ * 微信支付 V3 工具类
+ *
+ * @author pengles
+ */
+public class WechatPayUtil {
+
+    /**
+     * App 支付二次签名
+     *
+     * @param appId       应用ID
+     * @param mchId       商户ID
+     * @param prepayId    预支付交易会话ID
+     * @param privateKey  商户私钥
+     * @param mchSerialNo 商户API证书序列号
+     * @return 返回给 App 的参数
+     */
+    public static Map<String, String> signApp(String appId, String mchId, String prepayId, PrivateKey privateKey, String mchSerialNo) {
+        long timestamp = Instant.now().getEpochSecond();
+        String nonceStr = UUID.randomUUID().toString().replace("-", "");
+        String message = appId + "\n" + timestamp + "\n" + nonceStr + "\n" + prepayId + "\n";
+        
+        RSASigner signer = new RSASigner(mchSerialNo, privateKey);
+        String sign = signer.sign(message).getSign();
+
+        Map<String, String> map = new HashMap<>();
+        map.put("appid", appId);
+        map.put("partnerid", mchId);
+        map.put("prepayid", prepayId);
+        map.put("package", "Sign=WXPay");
+        map.put("noncestr", nonceStr);
+        map.put("timestamp", String.valueOf(timestamp));
+        map.put("sign", sign);
+        return map;
+    }
+
+    /**
+     * JSAPI/小程序 支付二次签名
+     *
+     * @param appId      应用ID
+     * @param prepayId   预支付交易会话ID
+     * @param privateKey 商户私钥
+     * @return 返回给 JSAPI/小程序的参数
+     */
+    public static Map<String, String> signJsapi(String appId, String prepayId, PrivateKey privateKey, String mchSerialNo) {
+        long timestamp = Instant.now().getEpochSecond();
+        String nonceStr = UUID.randomUUID().toString().replace("-", "");
+        String packageStr = "prepay_id=" + prepayId;
+        String message = appId + "\n" + timestamp + "\n" + nonceStr + "\n" + packageStr + "\n";
+        
+        RSASigner signer = new RSASigner(mchSerialNo, privateKey);
+        String sign = signer.sign(message).getSign();
+
+        Map<String, String> map = new HashMap<>();
+        map.put("appId", appId);
+        map.put("timeStamp", String.valueOf(timestamp));
+        map.put("nonceStr", nonceStr);
+        map.put("package", packageStr);
+        map.put("signType", "RSA");
+        map.put("paySign", sign);
+        return map;
+    }
+}
diff --git a/ruoyi-modules/ruoyi-pay/src/main/resources/mapper/pay/PayAppMapper.xml b/ruoyi-modules/ruoyi-pay/src/main/resources/mapper/pay/PayAppMapper.xml
new file mode 100644
index 0000000..743d500
--- /dev/null
+++ b/ruoyi-modules/ruoyi-pay/src/main/resources/mapper/pay/PayAppMapper.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.pay.mapper.PayAppMapper">
+
+</mapper>
diff --git a/ruoyi-modules/ruoyi-pay/src/main/resources/mapper/pay/PayChannelMapper.xml b/ruoyi-modules/ruoyi-pay/src/main/resources/mapper/pay/PayChannelMapper.xml
new file mode 100644
index 0000000..bda4804
--- /dev/null
+++ b/ruoyi-modules/ruoyi-pay/src/main/resources/mapper/pay/PayChannelMapper.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.pay.mapper.PayChannelMapper">
+
+</mapper>
diff --git a/ruoyi-modules/ruoyi-pay/src/main/resources/mapper/pay/PayOrderMapper.xml b/ruoyi-modules/ruoyi-pay/src/main/resources/mapper/pay/PayOrderMapper.xml
new file mode 100644
index 0000000..0e354df
--- /dev/null
+++ b/ruoyi-modules/ruoyi-pay/src/main/resources/mapper/pay/PayOrderMapper.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.pay.mapper.PayOrderMapper">
+
+</mapper>
diff --git a/ruoyi-modules/ruoyi-pay/src/main/resources/mapper/pay/PayRefundMapper.xml b/ruoyi-modules/ruoyi-pay/src/main/resources/mapper/pay/PayRefundMapper.xml
new file mode 100644
index 0000000..fa04e79
--- /dev/null
+++ b/ruoyi-modules/ruoyi-pay/src/main/resources/mapper/pay/PayRefundMapper.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.pay.mapper.PayRefundMapper">
+
+</mapper>
diff --git a/ruoyi-modules/ruoyi-system/pom.xml b/ruoyi-modules/ruoyi-system/pom.xml
new file mode 100644
index 0000000..18711bc
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/pom.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>org.dromara</groupId>
+        <artifactId>ruoyi-modules</artifactId>
+        <version>${revision}</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>ruoyi-system</artifactId>
+
+    <description>
+        system系统模块
+    </description>
+
+    <dependencies>
+        <!-- 通用工具-->
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-core</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-doc</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-mybatis</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-translation</artifactId>
+        </dependency>
+
+        <!-- OSS功能模块 -->
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-oss</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-log</artifactId>
+        </dependency>
+
+        <!-- excel-->
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-excel</artifactId>
+        </dependency>
+
+        <!-- SMS功能模块 -->
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-sms</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-security</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-web</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-idempotent</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-sensitive</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-encrypt</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-websocket</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-sse</artifactId>
+        </dependency>
+
+    </dependencies>
+
+</project>
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/CacheController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/CacheController.java
new file mode 100644
index 0000000..a8fddbd
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/CacheController.java
@@ -0,0 +1,59 @@
+package org.dromara.system.controller.monitor;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.utils.StringUtils;
+import org.redisson.spring.data.connection.RedissonConnectionFactory;
+import org.springframework.data.redis.connection.RedisConnection;
+import org.springframework.data.redis.core.RedisConnectionUtils;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.*;
+
+/**
+ * 缓存监控
+ *
+ * @author pengles
+ */
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/monitor/cache")
+public class CacheController {
+
+    private final RedissonConnectionFactory connectionFactory;
+
+    /**
+     * 获取缓存监控列表
+     */
+    @SaCheckPermission("monitor:cache:list")
+    @GetMapping()
+    public R<CacheListInfoVo> getInfo() throws Exception {
+        RedisConnection connection = connectionFactory.getConnection();
+        try {
+            Properties commandStats = connection.commands().info("commandstats");
+            List<Map<String, String>> pieList = new ArrayList<>();
+            if (commandStats != null) {
+                commandStats.stringPropertyNames().forEach(key -> {
+                    Map<String, String> data = new HashMap<>(2);
+                    String property = commandStats.getProperty(key);
+                    data.put("name", StringUtils.removeStart(key, "cmdstat_"));
+                    data.put("value", StringUtils.substringBetween(property, "calls=", ",usec"));
+                    pieList.add(data);
+                });
+            }
+            return R.ok(new CacheListInfoVo(
+                    connection.commands().info(),
+                    connection.commands().dbSize(), pieList));
+        } finally {
+            // 归还连接给连接池
+            RedisConnectionUtils.releaseConnection(connection, connectionFactory);
+        }
+    }
+
+    public record CacheListInfoVo(Properties info, Long dbSize, List<Map<String, String>> commandStats) {
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysLogininforController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysLogininforController.java
new file mode 100644
index 0000000..4c3e425
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysLogininforController.java
@@ -0,0 +1,90 @@
+package org.dromara.system.controller.monitor;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.constant.CacheConstants;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.redis.utils.RedisUtils;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.system.domain.bo.SysLogininforBo;
+import org.dromara.system.domain.vo.SysLogininforVo;
+import org.dromara.system.service.SysLogininforService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 系统访问记录
+ *
+ * @author pengles
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/monitor/logininfor")
+public class SysLogininforController extends BaseController {
+
+    private final SysLogininforService logininforService;
+
+    /**
+     * 获取系统访问记录列表
+     */
+    @SaCheckPermission("monitor:logininfor:list")
+    @GetMapping("/list")
+    public TableDataInfo<SysLogininforVo> list(SysLogininforBo logininfor, PageQuery pageQuery) {
+        return logininforService.selectPageLogininforList(logininfor, pageQuery);
+    }
+
+    /**
+     * 导出系统访问记录列表
+     */
+    @Log(title = "登录日志", businessType = BusinessType.EXPORT)
+    @SaCheckPermission("monitor:logininfor:export")
+    @PostMapping("/export")
+    public void export(SysLogininforBo logininfor, HttpServletResponse response) {
+        List<SysLogininforVo> list = logininforService.selectLogininforList(logininfor);
+        ExcelUtil.exportExcel(list, "登录日志", SysLogininforVo.class, response);
+    }
+
+    /**
+     * 批量删除登录日志
+     *
+     * @param infoIds 日志ids
+     */
+    @SaCheckPermission("monitor:logininfor:remove")
+    @Log(title = "登录日志", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{infoIds}")
+    public R<Void> remove(@PathVariable Long[] infoIds) {
+        return toAjax(logininforService.deleteLogininforByIds(infoIds));
+    }
+
+    /**
+     * 清理系统访问记录
+     */
+    @SaCheckPermission("monitor:logininfor:remove")
+    @Log(title = "登录日志", businessType = BusinessType.CLEAN)
+    @DeleteMapping("/clean")
+    public R<Void> clean() {
+        logininforService.cleanLogininfor();
+        return R.ok();
+    }
+
+    @SaCheckPermission("monitor:logininfor:unlock")
+    @Log(title = "账户解锁", businessType = BusinessType.OTHER)
+    @GetMapping("/unlock/{userName}")
+    public R<Void> unlock(@PathVariable("userName") String userName) {
+        String loginName = CacheConstants.PWD_ERR_CNT_KEY + userName;
+        if (RedisUtils.hasKey(loginName)) {
+            RedisUtils.deleteObject(loginName);
+        }
+        return R.ok();
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysOperlogController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysOperlogController.java
new file mode 100644
index 0000000..0721374
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysOperlogController.java
@@ -0,0 +1,76 @@
+package org.dromara.system.controller.monitor;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.system.domain.bo.SysOperLogBo;
+import org.dromara.system.domain.vo.SysOperLogVo;
+import org.dromara.system.service.SysOperLogService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 操作日志记录
+ *
+ * @author pengles
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/monitor/operlog")
+public class SysOperlogController extends BaseController {
+
+    private final SysOperLogService operLogService;
+
+    /**
+     * 获取操作日志记录列表
+     */
+    @SaCheckPermission("monitor:operlog:list")
+    @GetMapping("/list")
+    public TableDataInfo<SysOperLogVo> list(SysOperLogBo operLog, PageQuery pageQuery) {
+        return operLogService.selectPageOperLogList(operLog, pageQuery);
+    }
+
+    /**
+     * 导出操作日志记录列表
+     */
+    @Log(title = "操作日志", businessType = BusinessType.EXPORT)
+    @SaCheckPermission("monitor:operlog:export")
+    @PostMapping("/export")
+    public void export(SysOperLogBo operLog, HttpServletResponse response) {
+        List<SysOperLogVo> list = operLogService.selectOperLogList(operLog);
+        ExcelUtil.exportExcel(list, "操作日志", SysOperLogVo.class, response);
+    }
+
+    /**
+     * 批量删除操作日志记录
+     *
+     * @param operIds 日志ids
+     */
+    @Log(title = "操作日志", businessType = BusinessType.DELETE)
+    @SaCheckPermission("monitor:operlog:remove")
+    @DeleteMapping("/{operIds}")
+    public R<Void> remove(@PathVariable Long[] operIds) {
+        return toAjax(operLogService.deleteOperLogByIds(operIds));
+    }
+
+    /**
+     * 清理操作日志记录
+     */
+    @Log(title = "操作日志", businessType = BusinessType.CLEAN)
+    @SaCheckPermission("monitor:operlog:remove")
+    @DeleteMapping("/clean")
+    public R<Void> clean() {
+        operLogService.cleanOperLog();
+        return R.ok();
+    }
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysUserOnlineController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysUserOnlineController.java
new file mode 100644
index 0000000..d014ab6
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysUserOnlineController.java
@@ -0,0 +1,131 @@
+package org.dromara.system.controller.monitor;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.exception.NotLoginException;
+import cn.dev33.satoken.stp.StpUtil;
+import cn.hutool.core.bean.BeanUtil;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.constant.CacheConstants;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.domain.dto.UserOnlineDTO;
+import org.dromara.common.core.utils.StreamUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.redis.utils.RedisUtils;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.system.domain.SysUserOnline;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 在线用户监控
+ *
+ * @author pengles
+ */
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/monitor/online")
+public class SysUserOnlineController extends BaseController {
+
+    /**
+     * 获取在线用户监控列表
+     *
+     * @param ipaddr   IP地址
+     * @param userName 用户名
+     */
+    @SaCheckPermission("monitor:online:list")
+    @GetMapping("/list")
+    public TableDataInfo<SysUserOnline> list(String ipaddr, String userName) {
+        // 获取所有未过期的 token
+        Collection<String> keys = RedisUtils.keys(CacheConstants.ONLINE_TOKEN_KEY + "*");
+        List<UserOnlineDTO> userOnlineDTOList = new ArrayList<>();
+        for (String key : keys) {
+            String token = StringUtils.substringAfterLast(key, ":");
+            // 如果已经过期则跳过
+            if (StpUtil.stpLogic.getTokenActiveTimeoutByToken(token) < -1) {
+                continue;
+            }
+            userOnlineDTOList.add(RedisUtils.getCacheObject(CacheConstants.ONLINE_TOKEN_KEY + token));
+        }
+        if (StringUtils.isNotEmpty(ipaddr) && StringUtils.isNotEmpty(userName)) {
+            userOnlineDTOList = StreamUtils.filter(userOnlineDTOList, userOnline ->
+                    StringUtils.equals(ipaddr, userOnline.getIpaddr()) &&
+                            StringUtils.equals(userName, userOnline.getUserName())
+            );
+        } else if (StringUtils.isNotEmpty(ipaddr)) {
+            userOnlineDTOList = StreamUtils.filter(userOnlineDTOList, userOnline ->
+                    StringUtils.equals(ipaddr, userOnline.getIpaddr())
+            );
+        } else if (StringUtils.isNotEmpty(userName)) {
+            userOnlineDTOList = StreamUtils.filter(userOnlineDTOList, userOnline ->
+                    StringUtils.equals(userName, userOnline.getUserName())
+            );
+        }
+        Collections.reverse(userOnlineDTOList);
+        userOnlineDTOList.removeAll(Collections.singleton(null));
+        List<SysUserOnline> userOnlineList = BeanUtil.copyToList(userOnlineDTOList, SysUserOnline.class);
+        return TableDataInfo.build(userOnlineList);
+    }
+
+    /**
+     * 强退用户
+     *
+     * @param tokenId token值
+     */
+    @SaCheckPermission("monitor:online:forceLogout")
+    @Log(title = "在线用户", businessType = BusinessType.FORCE)
+    @DeleteMapping("/{tokenId}")
+    public R<Void> forceLogout(@PathVariable String tokenId) {
+        try {
+            StpUtil.kickoutByTokenValue(tokenId);
+        } catch (NotLoginException ignored) {
+        }
+        return R.ok();
+    }
+
+    /**
+     * 获取当前用户登录在线设备
+     */
+    @GetMapping()
+    public TableDataInfo<SysUserOnline> getInfo() {
+        // 获取指定账号 id 的 token 集合
+        List<String> tokenIds = StpUtil.getTokenValueListByLoginId(StpUtil.getLoginIdAsString());
+        List<UserOnlineDTO> userOnlineDTOList = tokenIds.stream()
+                .filter(token -> StpUtil.stpLogic.getTokenActiveTimeoutByToken(token) >= -1)
+                .map(token -> (UserOnlineDTO) RedisUtils.getCacheObject(CacheConstants.ONLINE_TOKEN_KEY + token))
+                .collect(Collectors.toList());
+        //复制和处理 SysUserOnline 对象列表
+        Collections.reverse(userOnlineDTOList);
+        userOnlineDTOList.removeAll(Collections.singleton(null));
+        List<SysUserOnline> userOnlineList = BeanUtil.copyToList(userOnlineDTOList, SysUserOnline.class);
+        return TableDataInfo.build(userOnlineList);
+    }
+
+    /**
+     * 强退当前在线设备
+     *
+     * @param tokenId token值
+     */
+    @Log(title = "在线设备", businessType = BusinessType.FORCE)
+    @DeleteMapping("/myself/{tokenId}")
+    public R<Void> remove(@PathVariable("tokenId") String tokenId) {
+        try {
+            // 获取指定账号 id 的 token 集合
+            List<String> keys = StpUtil.getTokenValueListByLoginId(StpUtil.getLoginIdAsString());
+            keys.stream()
+                    .filter(key -> key.equals(tokenId))
+                    .findFirst()
+                    .ifPresent(key -> StpUtil.kickoutByTokenValue(tokenId));
+        } catch (NotLoginException ignored) {
+        }
+        return R.ok();
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysClientController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysClientController.java
new file mode 100644
index 0000000..8029701
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysClientController.java
@@ -0,0 +1,116 @@
+package org.dromara.system.controller.system;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.system.domain.bo.SysClientBo;
+import org.dromara.system.domain.vo.SysClientVo;
+import org.dromara.system.service.SysClientService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 客户端管理
+ *
+ * @author pengles
+ * @date 2023-06-18
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/system/client")
+public class SysClientController extends BaseController {
+
+    private final SysClientService sysClientService;
+
+    /**
+     * 查询客户端管理列表
+     */
+    @SaCheckPermission("system:client:list")
+    @GetMapping("/list")
+    public TableDataInfo<SysClientVo> list(SysClientBo bo, PageQuery pageQuery) {
+        return sysClientService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出客户端管理列表
+     */
+    @SaCheckPermission("system:client:export")
+    @Log(title = "客户端管理", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(SysClientBo bo, HttpServletResponse response) {
+        List<SysClientVo> list = sysClientService.queryList(bo);
+        ExcelUtil.exportExcel(list, "客户端管理", SysClientVo.class, response);
+    }
+
+    /**
+     * 获取客户端管理详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("system:client:query")
+    @GetMapping("/{id}")
+    public R<SysClientVo> getInfo(@NotNull(message = "主键不能为空")
+                                  @PathVariable Long id) {
+        return R.ok(sysClientService.queryById(id));
+    }
+
+    /**
+     * 新增客户端管理
+     */
+    @SaCheckPermission("system:client:add")
+    @Log(title = "客户端管理", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody SysClientBo bo) {
+        return toAjax(sysClientService.insertByBo(bo));
+    }
+
+    /**
+     * 修改客户端管理
+     */
+    @SaCheckPermission("system:client:edit")
+    @Log(title = "客户端管理", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody SysClientBo bo) {
+        return toAjax(sysClientService.updateByBo(bo));
+    }
+
+    /**
+     * 状态修改
+     */
+    @SaCheckPermission("system:client:edit")
+    @Log(title = "客户端管理", businessType = BusinessType.UPDATE)
+    @PutMapping("/changeStatus")
+    public R<Void> changeStatus(@RequestBody SysClientBo bo) {
+        return toAjax(sysClientService.updateClientStatus(bo.getClientId(), bo.getStatus()));
+    }
+
+    /**
+     * 删除客户端管理
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("system:client:remove")
+    @Log(title = "客户端管理", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(sysClientService.deleteWithValidByIds(List.of(ids), true));
+    }
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysConfigController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysConfigController.java
new file mode 100644
index 0000000..d7ae2c4
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysConfigController.java
@@ -0,0 +1,138 @@
+package org.dromara.system.controller.system;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.system.domain.bo.SysConfigBo;
+import org.dromara.system.domain.vo.SysConfigVo;
+import org.dromara.system.service.SysConfigService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 参数配置 信息操作处理
+ *
+ * @author pengles
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/system/config")
+public class SysConfigController extends BaseController {
+
+    private final SysConfigService configService;
+
+    /**
+     * 获取参数配置列表
+     */
+    @SaCheckPermission("system:config:list")
+    @GetMapping("/list")
+    public TableDataInfo<SysConfigVo> list(SysConfigBo config, PageQuery pageQuery) {
+        return configService.selectPageConfigList(config, pageQuery);
+    }
+
+    /**
+     * 导出参数配置列表
+     */
+    @Log(title = "参数管理", businessType = BusinessType.EXPORT)
+    @SaCheckPermission("system:config:export")
+    @PostMapping("/export")
+    public void export(SysConfigBo config, HttpServletResponse response) {
+        List<SysConfigVo> list = configService.selectConfigList(config);
+        ExcelUtil.exportExcel(list, "参数数据", SysConfigVo.class, response);
+    }
+
+    /**
+     * 根据参数编号获取详细信息
+     *
+     * @param configId 参数ID
+     */
+    @SaCheckPermission("system:config:query")
+    @GetMapping(value = "/{configId}")
+    public R<SysConfigVo> getInfo(@PathVariable Long configId) {
+        return R.ok(configService.selectConfigById(configId));
+    }
+
+    /**
+     * 根据参数键名查询参数值
+     *
+     * @param configKey 参数Key
+     */
+    @GetMapping(value = "/configKey/{configKey}")
+    public R<String> getConfigKey(@PathVariable String configKey) {
+        return R.ok("操作成功", configService.selectConfigByKey(configKey));
+    }
+
+    /**
+     * 新增参数配置
+     */
+    @SaCheckPermission("system:config:add")
+    @Log(title = "参数管理", businessType = BusinessType.INSERT)
+    @PostMapping
+    public R<Void> add(@Validated @RequestBody SysConfigBo config) {
+        if (!configService.checkConfigKeyUnique(config)) {
+            return R.fail("新增参数'" + config.getConfigName() + "'失败，参数键名已存在");
+        }
+        configService.insertConfig(config);
+        return R.ok();
+    }
+
+    /**
+     * 修改参数配置
+     */
+    @SaCheckPermission("system:config:edit")
+    @Log(title = "参数管理", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public R<Void> edit(@Validated @RequestBody SysConfigBo config) {
+        if (!configService.checkConfigKeyUnique(config)) {
+            return R.fail("修改参数'" + config.getConfigName() + "'失败，参数键名已存在");
+        }
+        configService.updateConfig(config);
+        return R.ok();
+    }
+
+    /**
+     * 根据参数键名修改参数配置
+     */
+    @SaCheckPermission("system:config:edit")
+    @Log(title = "参数管理", businessType = BusinessType.UPDATE)
+    @PutMapping("/updateByKey")
+    public R<Void> updateByKey(@RequestBody SysConfigBo config) {
+        configService.updateConfig(config);
+        return R.ok();
+    }
+
+    /**
+     * 删除参数配置
+     *
+     * @param configIds 参数ID串
+     */
+    @SaCheckPermission("system:config:remove")
+    @Log(title = "参数管理", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{configIds}")
+    public R<Void> remove(@PathVariable Long[] configIds) {
+        configService.deleteConfigByIds(Arrays.asList(configIds));
+        return R.ok();
+    }
+
+    /**
+     * 刷新参数缓存
+     */
+    @SaCheckPermission("system:config:remove")
+    @Log(title = "参数管理", businessType = BusinessType.CLEAN)
+    @DeleteMapping("/refreshCache")
+    public R<Void> refreshCache() {
+        configService.resetConfigCache();
+        return R.ok();
+    }
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDeptController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDeptController.java
new file mode 100644
index 0000000..8b4d276
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDeptController.java
@@ -0,0 +1,143 @@
+package org.dromara.system.controller.system;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.convert.Convert;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.constant.SystemConstants;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.system.domain.bo.SysDeptBo;
+import org.dromara.system.domain.vo.SysDeptVo;
+import org.dromara.system.service.SysDeptService;
+import org.dromara.system.service.SysPostService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 部门信息
+ *
+ * @author pengles
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/system/dept")
+public class SysDeptController extends BaseController {
+
+    private final SysDeptService deptService;
+    private final SysPostService postService;
+
+    /**
+     * 获取部门列表
+     */
+    @SaCheckPermission("system:dept:list")
+    @GetMapping("/list")
+    public R<List<SysDeptVo>> list(SysDeptBo dept) {
+        List<SysDeptVo> depts = deptService.selectDeptList(dept);
+        return R.ok(depts);
+    }
+
+    /**
+     * 查询部门列表（排除节点）
+     *
+     * @param deptId 部门ID
+     */
+    @SaCheckPermission("system:dept:list")
+    @GetMapping("/list/exclude/{deptId}")
+    public R<List<SysDeptVo>> excludeChild(@PathVariable(value = "deptId", required = false) Long deptId) {
+        List<SysDeptVo> depts = deptService.selectDeptList(new SysDeptBo());
+        depts.removeIf(d -> d.getDeptId().equals(deptId)
+                || StringUtils.splitList(d.getAncestors()).contains(Convert.toStr(deptId)));
+        return R.ok(depts);
+    }
+
+    /**
+     * 根据部门编号获取详细信息
+     *
+     * @param deptId 部门ID
+     */
+    @SaCheckPermission("system:dept:query")
+    @GetMapping(value = "/{deptId}")
+    public R<SysDeptVo> getInfo(@PathVariable Long deptId) {
+        deptService.checkDeptDataScope(deptId);
+        return R.ok(deptService.selectDeptById(deptId));
+    }
+
+    /**
+     * 新增部门
+     */
+    @SaCheckPermission("system:dept:add")
+    @Log(title = "部门管理", businessType = BusinessType.INSERT)
+    @PostMapping
+    public R<Void> add(@Validated @RequestBody SysDeptBo dept) {
+        if (!deptService.checkDeptNameUnique(dept)) {
+            return R.fail("新增部门'" + dept.getDeptName() + "'失败，部门名称已存在");
+        }
+        return toAjax(deptService.insertDept(dept));
+    }
+
+    /**
+     * 修改部门
+     */
+    @SaCheckPermission("system:dept:edit")
+    @Log(title = "部门管理", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public R<Void> edit(@Validated @RequestBody SysDeptBo dept) {
+        Long deptId = dept.getDeptId();
+        deptService.checkDeptDataScope(deptId);
+        if (!deptService.checkDeptNameUnique(dept)) {
+            return R.fail("修改部门'" + dept.getDeptName() + "'失败，部门名称已存在");
+        } else if (dept.getParentId().equals(deptId)) {
+            return R.fail("修改部门'" + dept.getDeptName() + "'失败，上级部门不能是自己");
+        } else if (StringUtils.equals(SystemConstants.DISABLE, dept.getStatus())) {
+            if (deptService.selectNormalChildrenDeptById(deptId) > 0) {
+                return R.fail("该部门包含未停用的子部门!");
+            } else if (deptService.checkDeptExistUser(deptId)) {
+                return R.fail("该部门下存在已分配用户，不能禁用!");
+            }
+        }
+        return toAjax(deptService.updateDept(dept));
+    }
+
+    /**
+     * 删除部门
+     *
+     * @param deptId 部门ID
+     */
+    @SaCheckPermission("system:dept:remove")
+    @Log(title = "部门管理", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{deptId}")
+    public R<Void> remove(@PathVariable Long deptId) {
+        if (SystemConstants.DEFAULT_DEPT_ID.equals(deptId)) {
+            return R.warn("默认部门,不允许删除");
+        }
+        if (deptService.hasChildByDeptId(deptId)) {
+            return R.warn("存在下级部门,不允许删除");
+        }
+        if (deptService.checkDeptExistUser(deptId)) {
+            return R.warn("部门存在用户,不允许删除");
+        }
+        if (postService.countPostByDeptId(deptId) > 0) {
+            return R.warn("部门存在岗位,不允许删除");
+        }
+        deptService.checkDeptDataScope(deptId);
+        return toAjax(deptService.deleteDeptById(deptId));
+    }
+
+    /**
+     * 获取部门选择框列表
+     *
+     * @param deptIds 部门ID串
+     */
+    @SaCheckPermission("system:dept:query")
+    @GetMapping("/optionselect")
+    public R<List<SysDeptVo>> optionselect(@RequestParam(required = false) Long[] deptIds) {
+        return R.ok(deptService.selectDeptByIds(deptIds == null ? null : List.of(deptIds)));
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictDataController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictDataController.java
new file mode 100644
index 0000000..1acdc23
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictDataController.java
@@ -0,0 +1,124 @@
+package org.dromara.system.controller.system;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.util.ObjectUtil;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.system.domain.bo.SysDictDataBo;
+import org.dromara.system.domain.vo.SysDictDataVo;
+import org.dromara.system.service.SysDictDataService;
+import org.dromara.system.service.SysDictTypeService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 数据字典信息
+ *
+ * @author pengles
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/system/dict/data")
+public class SysDictDataController extends BaseController {
+
+    private final SysDictDataService dictDataService;
+    private final SysDictTypeService dictTypeService;
+
+    /**
+     * 查询字典数据列表
+     */
+    @SaCheckPermission("system:dict:list")
+    @GetMapping("/list")
+    public TableDataInfo<SysDictDataVo> list(SysDictDataBo dictData, PageQuery pageQuery) {
+        return dictDataService.selectPageDictDataList(dictData, pageQuery);
+    }
+
+    /**
+     * 导出字典数据列表
+     */
+    @Log(title = "字典数据", businessType = BusinessType.EXPORT)
+    @SaCheckPermission("system:dict:export")
+    @PostMapping("/export")
+    public void export(SysDictDataBo dictData, HttpServletResponse response) {
+        List<SysDictDataVo> list = dictDataService.selectDictDataList(dictData);
+        ExcelUtil.exportExcel(list, "字典数据", SysDictDataVo.class, response);
+    }
+
+    /**
+     * 查询字典数据详细
+     *
+     * @param dictCode 字典code
+     */
+    @SaCheckPermission("system:dict:query")
+    @GetMapping(value = "/{dictCode}")
+    public R<SysDictDataVo> getInfo(@PathVariable Long dictCode) {
+        return R.ok(dictDataService.selectDictDataById(dictCode));
+    }
+
+    /**
+     * 根据字典类型查询字典数据信息
+     *
+     * @param dictType 字典类型
+     */
+    @GetMapping(value = "/type/{dictType}")
+    public R<List<SysDictDataVo>> dictType(@PathVariable String dictType) {
+        List<SysDictDataVo> data = dictTypeService.selectDictDataByType(dictType);
+        if (ObjectUtil.isNull(data)) {
+            data = new ArrayList<>();
+        }
+        return R.ok(data);
+    }
+
+    /**
+     * 新增字典类型
+     */
+    @SaCheckPermission("system:dict:add")
+    @Log(title = "字典数据", businessType = BusinessType.INSERT)
+    @PostMapping
+    public R<Void> add(@Validated @RequestBody SysDictDataBo dict) {
+        if (!dictDataService.checkDictDataUnique(dict)) {
+            return R.fail("新增字典数据'" + dict.getDictValue() + "'失败，字典键值已存在");
+        }
+        dictDataService.insertDictData(dict);
+        return R.ok();
+    }
+
+    /**
+     * 修改保存字典类型
+     */
+    @SaCheckPermission("system:dict:edit")
+    @Log(title = "字典数据", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public R<Void> edit(@Validated @RequestBody SysDictDataBo dict) {
+        if (!dictDataService.checkDictDataUnique(dict)) {
+            return R.fail("修改字典数据'" + dict.getDictValue() + "'失败，字典键值已存在");
+        }
+        dictDataService.updateDictData(dict);
+        return R.ok();
+    }
+
+    /**
+     * 删除字典类型
+     *
+     * @param dictCodes 字典code串
+     */
+    @SaCheckPermission("system:dict:remove")
+    @Log(title = "字典类型", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{dictCodes}")
+    public R<Void> remove(@PathVariable Long[] dictCodes) {
+        dictDataService.deleteDictDataByIds(Arrays.asList(dictCodes));
+        return R.ok();
+    }
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictTypeController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictTypeController.java
new file mode 100644
index 0000000..106792b
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictTypeController.java
@@ -0,0 +1,126 @@
+package org.dromara.system.controller.system;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.system.domain.bo.SysDictTypeBo;
+import org.dromara.system.domain.vo.SysDictTypeVo;
+import org.dromara.system.service.SysDictTypeService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 数据字典信息
+ *
+ * @author pengles
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/system/dict/type")
+public class SysDictTypeController extends BaseController {
+
+    private final SysDictTypeService dictTypeService;
+
+    /**
+     * 查询字典类型列表
+     */
+    @SaCheckPermission("system:dict:list")
+    @GetMapping("/list")
+    public TableDataInfo<SysDictTypeVo> list(SysDictTypeBo dictType, PageQuery pageQuery) {
+        return dictTypeService.selectPageDictTypeList(dictType, pageQuery);
+    }
+
+    /**
+     * 导出字典类型列表
+     */
+    @Log(title = "字典类型", businessType = BusinessType.EXPORT)
+    @SaCheckPermission("system:dict:export")
+    @PostMapping("/export")
+    public void export(SysDictTypeBo dictType, HttpServletResponse response) {
+        List<SysDictTypeVo> list = dictTypeService.selectDictTypeList(dictType);
+        ExcelUtil.exportExcel(list, "字典类型", SysDictTypeVo.class, response);
+    }
+
+    /**
+     * 查询字典类型详细
+     *
+     * @param dictId 字典ID
+     */
+    @SaCheckPermission("system:dict:query")
+    @GetMapping(value = "/{dictId}")
+    public R<SysDictTypeVo> getInfo(@PathVariable Long dictId) {
+        return R.ok(dictTypeService.selectDictTypeById(dictId));
+    }
+
+    /**
+     * 新增字典类型
+     */
+    @SaCheckPermission("system:dict:add")
+    @Log(title = "字典类型", businessType = BusinessType.INSERT)
+    @PostMapping
+    public R<Void> add(@Validated @RequestBody SysDictTypeBo dict) {
+        if (!dictTypeService.checkDictTypeUnique(dict)) {
+            return R.fail("新增字典'" + dict.getDictName() + "'失败，字典类型已存在");
+        }
+        dictTypeService.insertDictType(dict);
+        return R.ok();
+    }
+
+    /**
+     * 修改字典类型
+     */
+    @SaCheckPermission("system:dict:edit")
+    @Log(title = "字典类型", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public R<Void> edit(@Validated @RequestBody SysDictTypeBo dict) {
+        if (!dictTypeService.checkDictTypeUnique(dict)) {
+            return R.fail("修改字典'" + dict.getDictName() + "'失败，字典类型已存在");
+        }
+        dictTypeService.updateDictType(dict);
+        return R.ok();
+    }
+
+    /**
+     * 删除字典类型
+     *
+     * @param dictIds 字典ID串
+     */
+    @SaCheckPermission("system:dict:remove")
+    @Log(title = "字典类型", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{dictIds}")
+    public R<Void> remove(@PathVariable Long[] dictIds) {
+        dictTypeService.deleteDictTypeByIds(Arrays.asList(dictIds));
+        return R.ok();
+    }
+
+    /**
+     * 刷新字典缓存
+     */
+    @SaCheckPermission("system:dict:remove")
+    @Log(title = "字典类型", businessType = BusinessType.CLEAN)
+    @DeleteMapping("/refreshCache")
+    public R<Void> refreshCache() {
+        dictTypeService.resetDictCache();
+        return R.ok();
+    }
+
+    /**
+     * 获取字典选择框列表
+     */
+    @GetMapping("/optionselect")
+    public R<List<SysDictTypeVo>> optionselect() {
+        List<SysDictTypeVo> dictTypes = dictTypeService.selectDictTypeAll();
+        return R.ok(dictTypes);
+    }
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysMenuController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysMenuController.java
new file mode 100644
index 0000000..35fe036
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysMenuController.java
@@ -0,0 +1,171 @@
+package org.dromara.system.controller.system;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.annotation.SaCheckRole;
+import cn.dev33.satoken.annotation.SaMode;
+import cn.hutool.core.lang.tree.Tree;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.constant.SystemConstants;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.system.domain.SysMenu;
+import org.dromara.system.domain.bo.SysMenuBo;
+import org.dromara.system.domain.vo.RouterVo;
+import org.dromara.system.domain.vo.SysMenuVo;
+import org.dromara.system.service.SysMenuService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 菜单信息
+ *
+ * @author pengles
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/system/menu")
+public class SysMenuController extends BaseController {
+
+    private final SysMenuService menuService;
+
+    /**
+     * 获取路由信息
+     *
+     * @return 路由信息
+     */
+    @GetMapping("/getRouters")
+    public R<List<RouterVo>> getRouters() {
+        List<SysMenu> menus = menuService.selectMenuTreeByUserId(LoginHelper.getUserId());
+        return R.ok(menuService.buildMenus(menus));
+    }
+
+    /**
+     * 获取菜单列表
+     */
+    @SaCheckRole(value = {SystemConstants.SUPER_ADMIN_ROLE_KEY}, mode = SaMode.OR)
+    @SaCheckPermission("system:menu:list")
+    @GetMapping("/list")
+    public R<List<SysMenuVo>> list(SysMenuBo menu) {
+        List<SysMenuVo> menus = menuService.selectMenuList(menu, LoginHelper.getUserId());
+        return R.ok(menus);
+    }
+
+    /**
+     * 根据菜单编号获取详细信息
+     *
+     * @param menuId 菜单ID
+     */
+    @SaCheckRole(value = {SystemConstants.SUPER_ADMIN_ROLE_KEY}, mode = SaMode.OR)
+    @SaCheckPermission("system:menu:query")
+    @GetMapping(value = "/{menuId}")
+    public R<SysMenuVo> getInfo(@PathVariable Long menuId) {
+        return R.ok(menuService.selectMenuById(menuId));
+    }
+
+    /**
+     * 获取菜单下拉树列表
+     */
+    @SaCheckPermission("system:menu:query")
+    @GetMapping("/treeselect")
+    public R<List<Tree<Long>>> treeselect(SysMenuBo menu) {
+        List<SysMenuVo> menus = menuService.selectMenuList(menu, LoginHelper.getUserId());
+        return R.ok(menuService.buildMenuTreeSelect(menus));
+    }
+
+    /**
+     * 加载对应角色菜单列表树
+     *
+     * @param roleId 角色ID
+     */
+    @SaCheckPermission("system:menu:query")
+    @GetMapping(value = "/roleMenuTreeselect/{roleId}")
+    public R<MenuTreeSelectVo> roleMenuTreeselect(@PathVariable("roleId") Long roleId) {
+        List<SysMenuVo> menus = menuService.selectMenuList(LoginHelper.getUserId());
+        MenuTreeSelectVo selectVo = new MenuTreeSelectVo(
+                menuService.selectMenuListByRoleId(roleId),
+                menuService.buildMenuTreeSelect(menus));
+        return R.ok(selectVo);
+    }
+
+    /**
+     * 新增菜单
+     */
+    @SaCheckRole(SystemConstants.SUPER_ADMIN_ROLE_KEY)
+    @SaCheckPermission("system:menu:add")
+    @Log(title = "菜单管理", businessType = BusinessType.INSERT)
+    @PostMapping
+    public R<Void> add(@Validated @RequestBody SysMenuBo menu) {
+        if (!menuService.checkMenuNameUnique(menu)) {
+            return R.fail("新增菜单'" + menu.getMenuName() + "'失败，菜单名称已存在");
+        } else if (SystemConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath())) {
+            return R.fail("新增菜单'" + menu.getMenuName() + "'失败，地址必须以http(s)://开头");
+        }
+        return toAjax(menuService.insertMenu(menu));
+    }
+
+    /**
+     * 修改菜单
+     */
+    @SaCheckRole(SystemConstants.SUPER_ADMIN_ROLE_KEY)
+    @SaCheckPermission("system:menu:edit")
+    @Log(title = "菜单管理", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public R<Void> edit(@Validated @RequestBody SysMenuBo menu) {
+        if (!menuService.checkMenuNameUnique(menu)) {
+            return R.fail("修改菜单'" + menu.getMenuName() + "'失败，菜单名称已存在");
+        } else if (SystemConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath())) {
+            return R.fail("修改菜单'" + menu.getMenuName() + "'失败，地址必须以http(s)://开头");
+        } else if (menu.getMenuId().equals(menu.getParentId())) {
+            return R.fail("修改菜单'" + menu.getMenuName() + "'失败，上级菜单不能选择自己");
+        }
+        return toAjax(menuService.updateMenu(menu));
+    }
+
+    /**
+     * 删除菜单
+     *
+     * @param menuId 菜单ID
+     */
+    @SaCheckRole(SystemConstants.SUPER_ADMIN_ROLE_KEY)
+    @SaCheckPermission("system:menu:remove")
+    @Log(title = "菜单管理", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{menuId}")
+    public R<Void> remove(@PathVariable("menuId") Long menuId) {
+        if (menuService.hasChildByMenuId(menuId)) {
+            return R.warn("存在子菜单,不允许删除");
+        }
+        if (menuService.checkMenuExistRole(menuId)) {
+            return R.warn("菜单已分配,不允许删除");
+        }
+        return toAjax(menuService.deleteMenuById(menuId));
+    }
+
+    /**
+     * 批量级联删除菜单
+     *
+     * @param menuIds 菜单ID串
+     */
+    @SaCheckRole(SystemConstants.SUPER_ADMIN_ROLE_KEY)
+    @SaCheckPermission("system:menu:remove")
+    @Log(title = "菜单管理", businessType = BusinessType.DELETE)
+    @DeleteMapping("/cascade/{menuIds}")
+    public R<Void> remove(@PathVariable("menuIds") Long[] menuIds) {
+        List<Long> menuIdList = List.of(menuIds);
+        if (menuService.hasChildByMenuId(menuIdList)) {
+            return R.warn("存在子菜单,不允许删除");
+        }
+        menuService.deleteMenuById(menuIdList);
+        return R.ok();
+    }
+
+    public record MenuTreeSelectVo(List<Long> checkedKeys, List<Tree<Long>> menus) {
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysNoticeController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysNoticeController.java
new file mode 100644
index 0000000..3f70e51
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysNoticeController.java
@@ -0,0 +1,90 @@
+package org.dromara.system.controller.system;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.service.DictService;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.sse.utils.SseMessageUtils;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.system.domain.bo.SysNoticeBo;
+import org.dromara.system.domain.vo.SysNoticeVo;
+import org.dromara.system.service.SysNoticeService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 公告 信息操作处理
+ *
+ * @author pengles
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/system/notice")
+public class SysNoticeController extends BaseController {
+
+    private final SysNoticeService noticeService;
+    private final DictService dictService;
+
+    /**
+     * 获取通知公告列表
+     */
+    @SaCheckPermission("system:notice:list")
+    @GetMapping("/list")
+    public TableDataInfo<SysNoticeVo> list(SysNoticeBo notice, PageQuery pageQuery) {
+        return noticeService.selectPageNoticeList(notice, pageQuery);
+    }
+
+    /**
+     * 根据通知公告编号获取详细信息
+     *
+     * @param noticeId 公告ID
+     */
+    @SaCheckPermission("system:notice:query")
+    @GetMapping(value = "/{noticeId}")
+    public R<SysNoticeVo> getInfo(@PathVariable Long noticeId) {
+        return R.ok(noticeService.selectNoticeById(noticeId));
+    }
+
+    /**
+     * 新增通知公告
+     */
+    @SaCheckPermission("system:notice:add")
+    @Log(title = "通知公告", businessType = BusinessType.INSERT)
+    @PostMapping
+    public R<Void> add(@Validated @RequestBody SysNoticeBo notice) {
+        int rows = noticeService.insertNotice(notice);
+        if (rows <= 0) {
+            return R.fail();
+        }
+        String type = dictService.getDictLabel("sys_notice_type", notice.getNoticeType());
+        SseMessageUtils.publishAll("[" + type + "] " + notice.getNoticeTitle());
+        return R.ok();
+    }
+
+    /**
+     * 修改通知公告
+     */
+    @SaCheckPermission("system:notice:edit")
+    @Log(title = "通知公告", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public R<Void> edit(@Validated @RequestBody SysNoticeBo notice) {
+        return toAjax(noticeService.updateNotice(notice));
+    }
+
+    /**
+     * 删除通知公告
+     *
+     * @param noticeIds 公告ID串
+     */
+    @SaCheckPermission("system:notice:remove")
+    @Log(title = "通知公告", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{noticeIds}")
+    public R<Void> remove(@PathVariable Long[] noticeIds) {
+        return toAjax(noticeService.deleteNoticeByIds(noticeIds));
+    }
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssConfigController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssConfigController.java
new file mode 100644
index 0000000..c2ea35f
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssConfigController.java
@@ -0,0 +1,105 @@
+package org.dromara.system.controller.system;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.core.validate.QueryGroup;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.system.domain.bo.SysOssConfigBo;
+import org.dromara.system.domain.vo.SysOssConfigVo;
+import org.dromara.system.service.SysOssConfigService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 对象存储配置
+ *
+ * @author pengles
+ * @author 孤舟烟雨
+ * @date 2021-08-13
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/resource/oss/config")
+public class SysOssConfigController extends BaseController {
+
+    private final SysOssConfigService ossConfigService;
+
+    /**
+     * 查询对象存储配置列表
+     */
+    @SaCheckPermission("system:ossConfig:list")
+    @GetMapping("/list")
+    public TableDataInfo<SysOssConfigVo> list(@Validated(QueryGroup.class) SysOssConfigBo bo, PageQuery pageQuery) {
+        return ossConfigService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 获取对象存储配置详细信息
+     *
+     * @param ossConfigId OSS配置ID
+     */
+    @SaCheckPermission("system:ossConfig:list")
+    @GetMapping("/{ossConfigId}")
+    public R<SysOssConfigVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long ossConfigId) {
+        return R.ok(ossConfigService.queryById(ossConfigId));
+    }
+
+    /**
+     * 新增对象存储配置
+     */
+    @SaCheckPermission("system:ossConfig:add")
+    @Log(title = "对象存储配置", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody SysOssConfigBo bo) {
+        return toAjax(ossConfigService.insertByBo(bo));
+    }
+
+    /**
+     * 修改对象存储配置
+     */
+    @SaCheckPermission("system:ossConfig:edit")
+    @Log(title = "对象存储配置", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody SysOssConfigBo bo) {
+        return toAjax(ossConfigService.updateByBo(bo));
+    }
+
+    /**
+     * 删除对象存储配置
+     *
+     * @param ossConfigIds OSS配置ID串
+     */
+    @SaCheckPermission("system:ossConfig:remove")
+    @Log(title = "对象存储配置", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ossConfigIds}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ossConfigIds) {
+        return toAjax(ossConfigService.deleteWithValidByIds(List.of(ossConfigIds), true));
+    }
+
+    /**
+     * 状态修改
+     */
+    @SaCheckPermission("system:ossConfig:edit")
+    @Log(title = "对象存储状态修改", businessType = BusinessType.UPDATE)
+    @PutMapping("/changeStatus")
+    public R<Void> changeStatus(@RequestBody SysOssConfigBo bo) {
+        return toAjax(ossConfigService.updateOssConfigStatus(bo));
+    }
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssController.java
new file mode 100644
index 0000000..6265af9
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssController.java
@@ -0,0 +1,108 @@
+package org.dromara.system.controller.system;
+
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.util.ObjectUtil;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.NotEmpty;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.QueryGroup;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.system.domain.bo.SysOssBo;
+import org.dromara.system.domain.vo.SysOssUploadVo;
+import org.dromara.system.domain.vo.SysOssVo;
+import org.dromara.system.service.SysOssService;
+import org.springframework.http.MediaType;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 文件上传 控制层
+ *
+ * @author pengles
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/resource/oss")
+public class SysOssController extends BaseController {
+
+    private final SysOssService ossService;
+
+    /**
+     * 查询OSS对象存储列表
+     */
+    @SaCheckPermission("system:oss:list")
+    @GetMapping("/list")
+    public TableDataInfo<SysOssVo> list(@Validated(QueryGroup.class) SysOssBo bo, PageQuery pageQuery) {
+        return ossService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 查询OSS对象基于id串
+     *
+     * @param ossIds OSS对象ID串
+     */
+    @SaCheckPermission("system:oss:query")
+    @GetMapping("/listByIds/{ossIds}")
+    public R<List<SysOssVo>> listByIds(@NotEmpty(message = "主键不能为空")
+                                       @PathVariable Long[] ossIds) {
+        List<SysOssVo> list = ossService.listByIds(Arrays.asList(ossIds));
+        return R.ok(list);
+    }
+
+    /**
+     * 上传OSS对象存储
+     *
+     * @param file 文件
+     */
+    @SaCheckPermission("system:oss:upload")
+    @Log(title = "OSS对象存储", businessType = BusinessType.INSERT)
+    @PostMapping(value = "/upload", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    public R<SysOssUploadVo> upload(@RequestPart("file") MultipartFile file) {
+        if (ObjectUtil.isNull(file)) {
+            return R.fail("上传文件不能为空");
+        }
+        SysOssVo oss = ossService.upload(file);
+        SysOssUploadVo uploadVo = new SysOssUploadVo();
+        uploadVo.setUrl(oss.getUrl());
+        uploadVo.setFileName(oss.getOriginalName());
+        uploadVo.setOssId(oss.getOssId().toString());
+        return R.ok(uploadVo);
+    }
+
+    /**
+     * 下载OSS对象
+     *
+     * @param ossId OSS对象ID
+     */
+    @SaCheckPermission("system:oss:download")
+    @GetMapping("/download/{ossId}")
+    public void download(@PathVariable Long ossId, HttpServletResponse response) throws IOException {
+        ossService.download(ossId, response);
+    }
+
+    /**
+     * 删除OSS对象存储
+     *
+     * @param ossIds OSS对象ID串
+     */
+    @SaCheckPermission("system:oss:remove")
+    @Log(title = "OSS对象存储", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ossIds}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ossIds) {
+        return toAjax(ossService.deleteWithValidByIds(List.of(ossIds), true));
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysPostController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysPostController.java
new file mode 100644
index 0000000..26fc72a
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysPostController.java
@@ -0,0 +1,133 @@
+package org.dromara.system.controller.system;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.util.ObjectUtil;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.constant.SystemConstants;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.system.domain.bo.SysPostBo;
+import org.dromara.system.domain.vo.SysPostVo;
+import org.dromara.system.service.SysPostService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 岗位信息操作处理
+ *
+ * @author pengles
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/system/post")
+public class SysPostController extends BaseController {
+
+    private final SysPostService postService;
+
+    /**
+     * 获取岗位列表
+     */
+    @SaCheckPermission("system:post:list")
+    @GetMapping("/list")
+    public TableDataInfo<SysPostVo> list(SysPostBo post, PageQuery pageQuery) {
+        return postService.selectPagePostList(post, pageQuery);
+    }
+
+    /**
+     * 导出岗位列表
+     */
+    @Log(title = "岗位管理", businessType = BusinessType.EXPORT)
+    @SaCheckPermission("system:post:export")
+    @PostMapping("/export")
+    public void export(SysPostBo post, HttpServletResponse response) {
+        List<SysPostVo> list = postService.selectPostList(post);
+        ExcelUtil.exportExcel(list, "岗位数据", SysPostVo.class, response);
+    }
+
+    /**
+     * 根据岗位编号获取详细信息
+     *
+     * @param postId 岗位ID
+     */
+    @SaCheckPermission("system:post:query")
+    @GetMapping(value = "/{postId}")
+    public R<SysPostVo> getInfo(@PathVariable Long postId) {
+        return R.ok(postService.selectPostById(postId));
+    }
+
+    /**
+     * 新增岗位
+     */
+    @SaCheckPermission("system:post:add")
+    @Log(title = "岗位管理", businessType = BusinessType.INSERT)
+    @PostMapping
+    public R<Void> add(@Validated @RequestBody SysPostBo post) {
+        if (!postService.checkPostNameUnique(post)) {
+            return R.fail("新增岗位'" + post.getPostName() + "'失败，岗位名称已存在");
+        } else if (!postService.checkPostCodeUnique(post)) {
+            return R.fail("新增岗位'" + post.getPostName() + "'失败，岗位编码已存在");
+        }
+        return toAjax(postService.insertPost(post));
+    }
+
+    /**
+     * 修改岗位
+     */
+    @SaCheckPermission("system:post:edit")
+    @Log(title = "岗位管理", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public R<Void> edit(@Validated @RequestBody SysPostBo post) {
+        if (!postService.checkPostNameUnique(post)) {
+            return R.fail("修改岗位'" + post.getPostName() + "'失败，岗位名称已存在");
+        } else if (!postService.checkPostCodeUnique(post)) {
+            return R.fail("修改岗位'" + post.getPostName() + "'失败，岗位编码已存在");
+        } else if (SystemConstants.DISABLE.equals(post.getStatus())
+                && postService.countUserPostById(post.getPostId()) > 0) {
+            return R.fail("该岗位下存在已分配用户，不能禁用!");
+        }
+        return toAjax(postService.updatePost(post));
+    }
+
+    /**
+     * 删除岗位
+     *
+     * @param postIds 岗位ID串
+     */
+    @SaCheckPermission("system:post:remove")
+    @Log(title = "岗位管理", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{postIds}")
+    public R<Void> remove(@PathVariable Long[] postIds) {
+        return toAjax(postService.deletePostByIds(postIds));
+    }
+
+    /**
+     * 获取岗位选择框列表
+     *
+     * @param postIds 岗位ID串
+     * @param deptId  部门id
+     */
+    @SaCheckPermission("system:post:query")
+    @GetMapping("/optionselect")
+    public R<List<SysPostVo>> optionselect(@RequestParam(required = false) Long[] postIds, @RequestParam(required = false) Long deptId) {
+        List<SysPostVo> list = new ArrayList<>();
+        if (ObjectUtil.isNotNull(deptId)) {
+            SysPostBo post = new SysPostBo();
+            post.setDeptId(deptId);
+            list = postService.selectPostList(post);
+        } else if (postIds != null) {
+            list = postService.selectPostByIds(List.of(postIds));
+        }
+        return R.ok(list);
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysProfileController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysProfileController.java
new file mode 100644
index 0000000..194ef35
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysProfileController.java
@@ -0,0 +1,135 @@
+package org.dromara.system.controller.system;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.io.FileUtil;
+import cn.hutool.crypto.digest.BCrypt;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.core.utils.file.MimeTypeUtils;
+import org.dromara.common.encrypt.annotation.ApiEncrypt;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.helper.DataPermissionHelper;
+import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.system.domain.bo.SysUserBo;
+import org.dromara.system.domain.bo.SysUserPasswordBo;
+import org.dromara.system.domain.bo.SysUserProfileBo;
+import org.dromara.system.domain.vo.SysOssVo;
+import org.dromara.system.domain.vo.SysUserVo;
+import org.dromara.system.service.SysOssService;
+import org.dromara.system.service.SysUserService;
+import org.springframework.http.MediaType;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.Arrays;
+
+/**
+ * 个人信息 业务处理
+ *
+ * @author pengles
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/system/user/profile")
+public class SysProfileController extends BaseController {
+
+    private final SysUserService userService;
+    private final SysOssService ossService;
+
+    /**
+     * 个人信息
+     */
+    @GetMapping
+    public R<ProfileVo> profile() {
+        SysUserVo user = userService.selectUserById(LoginHelper.getUserId());
+        String roleGroup = userService.selectUserRoleGroup(user.getUserId());
+        String postGroup = userService.selectUserPostGroup(user.getUserId());
+        ProfileVo profileVo = new ProfileVo(user, roleGroup, postGroup);
+        return R.ok(profileVo);
+    }
+
+    /**
+     * 修改用户信息
+     */
+    @RepeatSubmit
+    @Log(title = "个人信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public R<Void> updateProfile(@Validated @RequestBody SysUserProfileBo profile) {
+        SysUserBo user = BeanUtil.toBean(profile, SysUserBo.class);
+        user.setUserId(LoginHelper.getUserId());
+        String username = LoginHelper.getUsername();
+        if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user)) {
+            return R.fail("修改用户'" + username + "'失败，手机号码已存在");
+        }
+        if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user)) {
+            return R.fail("修改用户'" + username + "'失败，邮箱账号已存在");
+        }
+        int rows = DataPermissionHelper.ignore(() -> userService.updateUserProfile(user));
+        if (rows > 0) {
+            return R.ok();
+        }
+        return R.fail("修改个人信息异常，请联系管理员");
+    }
+
+    /**
+     * 重置密码
+     *
+     * @param bo 新旧密码
+     */
+    @RepeatSubmit
+    @ApiEncrypt
+    @Log(title = "个人信息", businessType = BusinessType.UPDATE)
+    @PutMapping("/updatePwd")
+    public R<Void> updatePwd(@Validated @RequestBody SysUserPasswordBo bo) {
+        SysUserVo user = userService.selectUserById(LoginHelper.getUserId());
+        String password = user.getPassword();
+        if (!BCrypt.checkpw(bo.getOldPassword(), password)) {
+            return R.fail("修改密码失败，旧密码错误");
+        }
+        if (BCrypt.checkpw(bo.getNewPassword(), password)) {
+            return R.fail("新密码不能与旧密码相同");
+        }
+        int rows = DataPermissionHelper.ignore(() -> userService.resetUserPwd(user.getUserId(), BCrypt.hashpw(bo.getNewPassword())));
+        if (rows > 0) {
+            return R.ok();
+        }
+        return R.fail("修改密码异常，请联系管理员");
+    }
+
+    /**
+     * 头像上传
+     *
+     * @param avatarfile 用户头像
+     */
+    @RepeatSubmit
+    @Log(title = "用户头像", businessType = BusinessType.UPDATE)
+    @PostMapping(value = "/avatar", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    public R<AvatarVo> avatar(@RequestPart("avatarfile") MultipartFile avatarfile) {
+        if (!avatarfile.isEmpty()) {
+            String extension = FileUtil.extName(avatarfile.getOriginalFilename());
+            if (!StringUtils.equalsAnyIgnoreCase(extension, MimeTypeUtils.IMAGE_EXTENSION)) {
+                return R.fail("文件格式不正确，请上传" + Arrays.toString(MimeTypeUtils.IMAGE_EXTENSION) + "格式");
+            }
+            SysOssVo oss = ossService.upload(avatarfile);
+            String avatar = oss.getUrl();
+            boolean updateSuccess = DataPermissionHelper.ignore(() -> userService.updateUserAvatar(LoginHelper.getUserId(), oss.getOssId()));
+            if (updateSuccess) {
+                return R.ok(new AvatarVo(avatar));
+            }
+        }
+        return R.fail("上传图片异常，请联系管理员");
+    }
+
+    public record AvatarVo(String imgUrl) {
+    }
+
+    public record ProfileVo(SysUserVo user, String roleGroup, String postGroup) {
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysRoleController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysRoleController.java
new file mode 100644
index 0000000..15e7a73
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysRoleController.java
@@ -0,0 +1,233 @@
+package org.dromara.system.controller.system;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.lang.tree.Tree;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.system.domain.SysUserRole;
+import org.dromara.system.domain.bo.SysDeptBo;
+import org.dromara.system.domain.bo.SysRoleBo;
+import org.dromara.system.domain.bo.SysUserBo;
+import org.dromara.system.domain.vo.SysRoleVo;
+import org.dromara.system.domain.vo.SysUserVo;
+import org.dromara.system.service.SysDeptService;
+import org.dromara.system.service.SysRoleService;
+import org.dromara.system.service.SysUserService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 角色信息
+ *
+ * @author pengles
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/system/role")
+public class SysRoleController extends BaseController {
+
+    private final SysRoleService roleService;
+    private final SysUserService userService;
+    private final SysDeptService deptService;
+
+    /**
+     * 获取角色信息列表
+     */
+    @SaCheckPermission("system:role:list")
+    @GetMapping("/list")
+    public TableDataInfo<SysRoleVo> list(SysRoleBo role, PageQuery pageQuery) {
+        return roleService.selectPageRoleList(role, pageQuery);
+    }
+
+    /**
+     * 导出角色信息列表
+     */
+    @Log(title = "角色管理", businessType = BusinessType.EXPORT)
+    @SaCheckPermission("system:role:export")
+    @PostMapping("/export")
+    public void export(SysRoleBo role, HttpServletResponse response) {
+        List<SysRoleVo> list = roleService.selectRoleList(role);
+        ExcelUtil.exportExcel(list, "角色数据", SysRoleVo.class, response);
+    }
+
+    /**
+     * 根据角色编号获取详细信息
+     *
+     * @param roleId 角色ID
+     */
+    @SaCheckPermission("system:role:query")
+    @GetMapping(value = "/{roleId}")
+    public R<SysRoleVo> getInfo(@PathVariable Long roleId) {
+        roleService.checkRoleDataScope(roleId);
+        return R.ok(roleService.selectRoleById(roleId));
+    }
+
+    /**
+     * 新增角色
+     */
+    @SaCheckPermission("system:role:add")
+    @Log(title = "角色管理", businessType = BusinessType.INSERT)
+    @PostMapping
+    public R<Void> add(@Validated @RequestBody SysRoleBo role) {
+        roleService.checkRoleAllowed(role);
+        if (!roleService.checkRoleNameUnique(role)) {
+            return R.fail("新增角色'" + role.getRoleName() + "'失败，角色名称已存在");
+        } else if (!roleService.checkRoleKeyUnique(role)) {
+            return R.fail("新增角色'" + role.getRoleName() + "'失败，角色权限已存在");
+        }
+        return toAjax(roleService.insertRole(role));
+
+    }
+
+    /**
+     * 修改保存角色
+     */
+    @SaCheckPermission("system:role:edit")
+    @Log(title = "角色管理", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public R<Void> edit(@Validated @RequestBody SysRoleBo role) {
+        roleService.checkRoleAllowed(role);
+        roleService.checkRoleDataScope(role.getRoleId());
+        if (!roleService.checkRoleNameUnique(role)) {
+            return R.fail("修改角色'" + role.getRoleName() + "'失败，角色名称已存在");
+        } else if (!roleService.checkRoleKeyUnique(role)) {
+            return R.fail("修改角色'" + role.getRoleName() + "'失败，角色权限已存在");
+        }
+
+        if (roleService.updateRole(role) > 0) {
+            roleService.cleanOnlineUserByRole(role.getRoleId());
+            return R.ok();
+        }
+        return R.fail("修改角色'" + role.getRoleName() + "'失败，请联系管理员");
+    }
+
+    /**
+     * 修改保存数据权限
+     */
+    @SaCheckPermission("system:role:edit")
+    @Log(title = "角色管理", businessType = BusinessType.UPDATE)
+    @PutMapping("/dataScope")
+    public R<Void> dataScope(@RequestBody SysRoleBo role) {
+        roleService.checkRoleAllowed(role);
+        roleService.checkRoleDataScope(role.getRoleId());
+        return toAjax(roleService.authDataScope(role));
+    }
+
+    /**
+     * 状态修改
+     */
+    @SaCheckPermission("system:role:edit")
+    @Log(title = "角色管理", businessType = BusinessType.UPDATE)
+    @PutMapping("/changeStatus")
+    public R<Void> changeStatus(@RequestBody SysRoleBo role) {
+        roleService.checkRoleAllowed(role);
+        roleService.checkRoleDataScope(role.getRoleId());
+        return toAjax(roleService.updateRoleStatus(role.getRoleId(), role.getStatus()));
+    }
+
+    /**
+     * 删除角色
+     *
+     * @param roleIds 角色ID串
+     */
+    @SaCheckPermission("system:role:remove")
+    @Log(title = "角色管理", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{roleIds}")
+    public R<Void> remove(@PathVariable Long[] roleIds) {
+        return toAjax(roleService.deleteRoleByIds(roleIds));
+    }
+
+    /**
+     * 获取角色选择框列表
+     *
+     * @param roleIds 角色ID串
+     */
+    @SaCheckPermission("system:role:query")
+    @GetMapping("/optionselect")
+    public R<List<SysRoleVo>> optionselect(@RequestParam(required = false) Long[] roleIds) {
+        return R.ok(roleService.selectRoleByIds(roleIds == null ? null : List.of(roleIds)));
+    }
+
+    /**
+     * 查询已分配用户角色列表
+     */
+    @SaCheckPermission("system:role:list")
+    @GetMapping("/authUser/allocatedList")
+    public TableDataInfo<SysUserVo> allocatedList(SysUserBo user, PageQuery pageQuery) {
+        return userService.selectAllocatedList(user, pageQuery);
+    }
+
+    /**
+     * 查询未分配用户角色列表
+     */
+    @SaCheckPermission("system:role:list")
+    @GetMapping("/authUser/unallocatedList")
+    public TableDataInfo<SysUserVo> unallocatedList(SysUserBo user, PageQuery pageQuery) {
+        return userService.selectUnallocatedList(user, pageQuery);
+    }
+
+    /**
+     * 取消授权用户
+     */
+    @SaCheckPermission("system:role:edit")
+    @Log(title = "角色管理", businessType = BusinessType.GRANT)
+    @PutMapping("/authUser/cancel")
+    public R<Void> cancelAuthUser(@RequestBody SysUserRole userRole) {
+        return toAjax(roleService.deleteAuthUser(userRole));
+    }
+
+    /**
+     * 批量取消授权用户
+     *
+     * @param roleId  角色ID
+     * @param userIds 用户ID串
+     */
+    @SaCheckPermission("system:role:edit")
+    @Log(title = "角色管理", businessType = BusinessType.GRANT)
+    @PutMapping("/authUser/cancelAll")
+    public R<Void> cancelAuthUserAll(Long roleId, Long[] userIds) {
+        return toAjax(roleService.deleteAuthUsers(roleId, userIds));
+    }
+
+    /**
+     * 批量选择用户授权
+     *
+     * @param roleId  角色ID
+     * @param userIds 用户ID串
+     */
+    @SaCheckPermission("system:role:edit")
+    @Log(title = "角色管理", businessType = BusinessType.GRANT)
+    @PutMapping("/authUser/selectAll")
+    public R<Void> selectAuthUserAll(Long roleId, Long[] userIds) {
+        roleService.checkRoleDataScope(roleId);
+        return toAjax(roleService.insertAuthUsers(roleId, userIds));
+    }
+
+    /**
+     * 获取对应角色部门树列表
+     *
+     * @param roleId 角色ID
+     */
+    @SaCheckPermission("system:role:list")
+    @GetMapping(value = "/deptTree/{roleId}")
+    public R<DeptTreeSelectVo> roleDeptTreeselect(@PathVariable("roleId") Long roleId) {
+        DeptTreeSelectVo selectVo = new DeptTreeSelectVo(
+                deptService.selectDeptListByRoleId(roleId),
+                deptService.selectDeptTreeList(new SysDeptBo()));
+        return R.ok(selectVo);
+    }
+
+    public record DeptTreeSelectVo(List<Long> checkedKeys, List<Tree<Long>> depts) {
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysSocialController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysSocialController.java
new file mode 100644
index 0000000..4145859
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysSocialController.java
@@ -0,0 +1,38 @@
+package org.dromara.system.controller.system;
+
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.system.domain.vo.SysSocialVo;
+import org.dromara.system.service.SysSocialService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * 社会化关系
+ *
+ * @author thiszhc
+ * @date 2023-06-16
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/system/social")
+public class SysSocialController extends BaseController {
+
+    private final SysSocialService socialUserService;
+
+    /**
+     * 查询社会化关系列表
+     */
+    @GetMapping("/list")
+    public R<List<SysSocialVo>> list() {
+        return R.ok(socialUserService.queryListByUserId(LoginHelper.getUserId()));
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java
new file mode 100644
index 0000000..b4dcaa3
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java
@@ -0,0 +1,292 @@
+package org.dromara.system.controller.system;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.lang.tree.Tree;
+import cn.hutool.core.util.ArrayUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.crypto.digest.BCrypt;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.constant.SystemConstants;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.domain.model.LoginUser;
+import org.dromara.common.core.utils.StreamUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.encrypt.annotation.ApiEncrypt;
+import org.dromara.common.excel.core.ExcelResult;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.system.domain.bo.SysDeptBo;
+import org.dromara.system.domain.bo.SysPostBo;
+import org.dromara.system.domain.bo.SysRoleBo;
+import org.dromara.system.domain.bo.SysUserBo;
+import org.dromara.system.domain.vo.*;
+import org.dromara.system.listener.SysUserImportListener;
+import org.dromara.system.service.SysDeptService;
+import org.dromara.system.service.SysPostService;
+import org.dromara.system.service.SysRoleService;
+import org.dromara.system.service.SysUserService;
+import org.springframework.http.MediaType;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 用户信息
+ *
+ * @author pengles
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/system/user")
+public class SysUserController extends BaseController {
+
+    private final SysUserService userService;
+    private final SysRoleService roleService;
+    private final SysPostService postService;
+    private final SysDeptService deptService;
+
+    /**
+     * 获取用户列表
+     */
+    @SaCheckPermission("system:user:list")
+    @GetMapping("/list")
+    public TableDataInfo<SysUserVo> list(SysUserBo user, PageQuery pageQuery) {
+        return userService.selectPageUserList(user, pageQuery);
+    }
+
+    /**
+     * 导出用户列表
+     */
+    @Log(title = "用户管理", businessType = BusinessType.EXPORT)
+    @SaCheckPermission("system:user:export")
+    @PostMapping("/export")
+    public void export(SysUserBo user, HttpServletResponse response) {
+        List<SysUserExportVo> list = userService.selectUserExportList(user);
+        ExcelUtil.exportExcel(list, "用户数据", SysUserExportVo.class, response);
+    }
+
+    /**
+     * 导入数据
+     *
+     * @param file          导入文件
+     * @param updateSupport 是否更新已存在数据
+     */
+    @Log(title = "用户管理", businessType = BusinessType.IMPORT)
+    @SaCheckPermission("system:user:import")
+    @PostMapping(value = "/importData", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    public R<Void> importData(@RequestPart("file") MultipartFile file, boolean updateSupport) throws Exception {
+        ExcelResult<SysUserImportVo> result = ExcelUtil.importExcel(file.getInputStream(), SysUserImportVo.class, new SysUserImportListener(updateSupport));
+        return R.ok(result.getAnalysis());
+    }
+
+    /**
+     * 获取导入模板
+     */
+    @PostMapping("/importTemplate")
+    public void importTemplate(HttpServletResponse response) {
+        ExcelUtil.exportExcel(new ArrayList<>(), "用户数据", SysUserImportVo.class, response);
+    }
+
+    /**
+     * 获取用户信息
+     *
+     * @return 用户信息
+     */
+    @GetMapping("/getInfo")
+    public R<UserInfoVo> getInfo() {
+        UserInfoVo userInfoVo = new UserInfoVo();
+        LoginUser loginUser = LoginHelper.getLoginUser();
+        SysUserVo user = userService.selectUserById(loginUser.getUserId());
+        if (ObjectUtil.isNull(user)) {
+            return R.fail("没有权限访问用户数据!");
+        }
+        userInfoVo.setUser(user);
+        userInfoVo.setPermissions(loginUser.getMenuPermission());
+        userInfoVo.setRoles(loginUser.getRolePermission());
+        return R.ok(userInfoVo);
+    }
+
+    /**
+     * 根据用户编号获取详细信息
+     *
+     * @param userId 用户ID
+     */
+    @SaCheckPermission("system:user:query")
+    @GetMapping(value = {"/", "/{userId}"})
+    public R<SysUserInfoVo> getInfo(@PathVariable(value = "userId", required = false) Long userId) {
+        SysUserInfoVo userInfoVo = new SysUserInfoVo();
+        if (ObjectUtil.isNotNull(userId)) {
+            userService.checkUserDataScope(userId);
+            SysUserVo sysUser = userService.selectUserById(userId);
+            userInfoVo.setUser(sysUser);
+            userInfoVo.setRoleIds(roleService.selectRoleListByUserId(userId));
+            Long deptId = sysUser.getDeptId();
+            if (ObjectUtil.isNotNull(deptId)) {
+                SysPostBo postBo = new SysPostBo();
+                postBo.setDeptId(deptId);
+                userInfoVo.setPosts(postService.selectPostList(postBo));
+                userInfoVo.setPostIds(postService.selectPostListByUserId(userId));
+            }
+        }
+        SysRoleBo roleBo = new SysRoleBo();
+        roleBo.setStatus(SystemConstants.NORMAL);
+        List<SysRoleVo> roles = roleService.selectRoleList(roleBo);
+        userInfoVo.setRoles(LoginHelper.isSuperAdmin(userId) ? roles : StreamUtils.filter(roles, r -> !r.isSuperAdmin()));
+        return R.ok(userInfoVo);
+    }
+
+    /**
+     * 新增用户
+     */
+    @SaCheckPermission("system:user:add")
+    @Log(title = "用户管理", businessType = BusinessType.INSERT)
+    @PostMapping
+    public R<Void> add(@Validated @RequestBody SysUserBo user) {
+        deptService.checkDeptDataScope(user.getDeptId());
+        if (!userService.checkUserNameUnique(user)) {
+            return R.fail("新增用户'" + user.getUserName() + "'失败，登录账号已存在");
+        } else if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user)) {
+            return R.fail("新增用户'" + user.getUserName() + "'失败，手机号码已存在");
+        } else if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user)) {
+            return R.fail("新增用户'" + user.getUserName() + "'失败，邮箱账号已存在");
+        }
+        user.setPassword(BCrypt.hashpw(user.getPassword()));
+        return toAjax(userService.insertUser(user));
+    }
+
+    /**
+     * 修改用户
+     */
+    @SaCheckPermission("system:user:edit")
+    @Log(title = "用户管理", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public R<Void> edit(@Validated @RequestBody SysUserBo user) {
+        userService.checkUserAllowed(user.getUserId());
+        userService.checkUserDataScope(user.getUserId());
+        deptService.checkDeptDataScope(user.getDeptId());
+        if (!userService.checkUserNameUnique(user)) {
+            return R.fail("修改用户'" + user.getUserName() + "'失败，登录账号已存在");
+        } else if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user)) {
+            return R.fail("修改用户'" + user.getUserName() + "'失败，手机号码已存在");
+        } else if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user)) {
+            return R.fail("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");
+        }
+        return toAjax(userService.updateUser(user));
+    }
+
+    /**
+     * 删除用户
+     *
+     * @param userIds 角色ID串
+     */
+    @SaCheckPermission("system:user:remove")
+    @Log(title = "用户管理", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{userIds}")
+    public R<Void> remove(@PathVariable Long[] userIds) {
+        if (ArrayUtil.contains(userIds, LoginHelper.getUserId())) {
+            return R.fail("当前用户不能删除");
+        }
+        return toAjax(userService.deleteUserByIds(userIds));
+    }
+
+    /**
+     * 根据用户ID串批量获取用户基础信息
+     *
+     * @param userIds 用户ID串
+     * @param deptId  部门ID
+     */
+    @SaCheckPermission("system:user:query")
+    @GetMapping("/optionselect")
+    public R<List<SysUserVo>> optionselect(@RequestParam(required = false) Long[] userIds,
+                                           @RequestParam(required = false) Long deptId) {
+        return R.ok(userService.selectUserByIds(ArrayUtil.isEmpty(userIds) ? null : List.of(userIds), deptId));
+    }
+
+    /**
+     * 重置密码
+     */
+    @ApiEncrypt
+    @SaCheckPermission("system:user:resetPwd")
+    @Log(title = "用户管理", businessType = BusinessType.UPDATE)
+    @PutMapping("/resetPwd")
+    public R<Void> resetPwd(@RequestBody SysUserBo user) {
+        userService.checkUserAllowed(user.getUserId());
+        userService.checkUserDataScope(user.getUserId());
+        user.setPassword(BCrypt.hashpw(user.getPassword()));
+        return toAjax(userService.resetUserPwd(user.getUserId(), user.getPassword()));
+    }
+
+    /**
+     * 状态修改
+     */
+    @SaCheckPermission("system:user:edit")
+    @Log(title = "用户管理", businessType = BusinessType.UPDATE)
+    @PutMapping("/changeStatus")
+    public R<Void> changeStatus(@RequestBody SysUserBo user) {
+        userService.checkUserAllowed(user.getUserId());
+        userService.checkUserDataScope(user.getUserId());
+        return toAjax(userService.updateUserStatus(user.getUserId(), user.getStatus()));
+    }
+
+    /**
+     * 根据用户编号获取授权角色
+     *
+     * @param userId 用户ID
+     */
+    @SaCheckPermission("system:user:query")
+    @GetMapping("/authRole/{userId}")
+    public R<SysUserInfoVo> authRole(@PathVariable Long userId) {
+        userService.checkUserDataScope(userId);
+        SysUserVo user = userService.selectUserById(userId);
+        List<SysRoleVo> roles = roleService.selectRolesAuthByUserId(userId);
+        SysUserInfoVo userInfoVo = new SysUserInfoVo();
+        userInfoVo.setUser(user);
+        userInfoVo.setRoles(LoginHelper.isSuperAdmin(userId) ? roles : StreamUtils.filter(roles, r -> !r.isSuperAdmin()));
+        return R.ok(userInfoVo);
+    }
+
+    /**
+     * 用户授权角色
+     *
+     * @param userId  用户Id
+     * @param roleIds 角色ID串
+     */
+    @SaCheckPermission("system:user:edit")
+    @Log(title = "用户管理", businessType = BusinessType.GRANT)
+    @PutMapping("/authRole")
+    public R<Void> insertAuthRole(Long userId, Long[] roleIds) {
+        userService.checkUserDataScope(userId);
+        userService.insertUserAuth(userId, roleIds);
+        return R.ok();
+    }
+
+    /**
+     * 获取部门树列表
+     */
+    @SaCheckPermission("system:user:list")
+    @GetMapping("/deptTree")
+    public R<List<Tree<Long>>> deptTree(SysDeptBo dept) {
+        return R.ok(deptService.selectDeptTreeList(dept));
+    }
+
+    /**
+     * 获取部门下的所有用户信息
+     */
+    @SaCheckPermission("system:user:list")
+    @GetMapping("/list/dept/{deptId}")
+    public R<List<SysUserVo>> listByDept(@PathVariable @NotNull Long deptId) {
+        return R.ok(userService.selectUserListByDept(deptId));
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysCache.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysCache.java
new file mode 100644
index 0000000..431beeb
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysCache.java
@@ -0,0 +1,47 @@
+package org.dromara.system.domain;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.dromara.common.core.utils.StringUtils;
+
+/**
+ * 缓存信息
+ *
+ * @author pengles
+ */
+@Data
+@NoArgsConstructor
+public class SysCache {
+
+    /**
+     * 缓存名称
+     */
+    private String cacheName = "";
+
+    /**
+     * 缓存键名
+     */
+    private String cacheKey = "";
+
+    /**
+     * 缓存内容
+     */
+    private String cacheValue = "";
+
+    /**
+     * 备注
+     */
+    private String remark = "";
+
+    public SysCache(String cacheName, String remark) {
+        this.cacheName = cacheName;
+        this.remark = remark;
+    }
+
+    public SysCache(String cacheName, String cacheKey, String cacheValue) {
+        this.cacheName = StringUtils.replace(cacheName, ":", "");
+        this.cacheKey = StringUtils.replace(cacheKey, cacheName, "");
+        this.cacheValue = cacheValue;
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysClient.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysClient.java
new file mode 100644
index 0000000..aaeeeae
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysClient.java
@@ -0,0 +1,79 @@
+package org.dromara.system.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+
+import java.io.Serial;
+
+/**
+ * 授权管理对象 sys_client
+ *
+ * @author pengles
+ * @date 2023-05-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("sys_client")
+public class SysClient extends BaseEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 客户端id
+     */
+    private String clientId;
+
+    /**
+     * 客户端key
+     */
+    private String clientKey;
+
+    /**
+     * 客户端秘钥
+     */
+    private String clientSecret;
+
+    /**
+     * 授权类型
+     */
+    private String grantType;
+
+    /**
+     * 设备类型
+     */
+    private String deviceType;
+
+    /**
+     * token活跃超时时间
+     */
+    private Long activeTimeout;
+
+    /**
+     * token固定超时时间
+     */
+    private Long timeout;
+
+    /**
+     * 状态（0正常 1停用）
+     */
+    private String status;
+
+    /**
+     * 删除标志（0代表存在 1代表删除）
+     */
+    @TableLogic
+    private String delFlag;
+
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysConfig.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysConfig.java
new file mode 100644
index 0000000..8f04bc6
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysConfig.java
@@ -0,0 +1,50 @@
+package org.dromara.system.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+
+/**
+ * 参数配置表 sys_config
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("sys_config")
+public class SysConfig extends BaseEntity {
+
+    /**
+     * 参数主键
+     */
+    @TableId(value = "config_id")
+    private Long configId;
+
+    /**
+     * 参数名称
+     */
+    private String configName;
+
+    /**
+     * 参数键名
+     */
+    private String configKey;
+
+    /**
+     * 参数键值
+     */
+    private String configValue;
+
+    /**
+     * 系统内置（Y是 N否）
+     */
+    private String configType;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDept.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDept.java
new file mode 100644
index 0000000..5bc6d13
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDept.java
@@ -0,0 +1,92 @@
+package org.dromara.system.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+
+import java.io.Serial;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 部门表 sys_dept
+ *
+ * @author pengles
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("sys_dept")
+public class SysDept extends BaseEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 部门ID
+     */
+    @TableId(value = "dept_id")
+    private Long deptId;
+
+    /**
+     * 父部门ID
+     */
+    private Long parentId;
+
+    /**
+     * 部门名称
+     */
+    private String deptName;
+
+    /**
+     * 部门类别编码
+     */
+    private String deptCategory;
+
+    /**
+     * 显示顺序
+     */
+    private Integer orderNum;
+
+    /**
+     * 负责人
+     */
+    private Long leader;
+
+    /**
+     * 联系电话
+     */
+    private String phone;
+
+    /**
+     * 邮箱
+     */
+    private String email;
+
+    /**
+     * 部门状态:0正常,1停用
+     */
+    private String status;
+
+    /**
+     * 删除标志（0代表存在 1代表删除）
+     */
+    @TableLogic
+    private String delFlag;
+
+    /**
+     * 祖级列表
+     */
+    private String ancestors;
+
+    /**
+     * 子部门
+     */
+    @TableField(exist = false)
+    private List<SysDept> children = new ArrayList<>();
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDictData.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDictData.java
new file mode 100644
index 0000000..200ef7b
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDictData.java
@@ -0,0 +1,71 @@
+package org.dromara.system.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.core.constant.SystemConstants;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+
+/**
+ * 字典数据表 sys_dict_data
+ *
+ * @author pengles
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("sys_dict_data")
+public class SysDictData extends BaseEntity {
+
+    /**
+     * 字典编码
+     */
+    @TableId(value = "dict_code")
+    private Long dictCode;
+
+    /**
+     * 字典排序
+     */
+    private Integer dictSort;
+
+    /**
+     * 字典标签
+     */
+    private String dictLabel;
+
+    /**
+     * 字典键值
+     */
+    private String dictValue;
+
+    /**
+     * 字典类型
+     */
+    private String dictType;
+
+    /**
+     * 样式属性（其他样式扩展）
+     */
+    private String cssClass;
+
+    /**
+     * 表格字典样式
+     */
+    private String listClass;
+
+    /**
+     * 是否默认（Y是 N否）
+     */
+    private String isDefault;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    public boolean getDefault() {
+        return SystemConstants.YES.equals(this.isDefault);
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDictType.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDictType.java
new file mode 100644
index 0000000..defbd78
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDictType.java
@@ -0,0 +1,41 @@
+package org.dromara.system.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+
+/**
+ * 字典类型表 sys_dict_type
+ *
+ * @author pengles
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("sys_dict_type")
+public class SysDictType extends BaseEntity {
+
+    /**
+     * 字典主键
+     */
+    @TableId(value = "dict_id")
+    private Long dictId;
+
+    /**
+     * 字典名称
+     */
+    private String dictName;
+
+    /**
+     * 字典类型
+     */
+    private String dictType;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysLogininfor.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysLogininfor.java
new file mode 100644
index 0000000..942c239
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysLogininfor.java
@@ -0,0 +1,80 @@
+package org.dromara.system.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 系统访问记录表 sys_logininfor
+ *
+ * @author pengles
+ */
+
+@Data
+@TableName("sys_logininfor")
+public class SysLogininfor implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @TableId(value = "info_id")
+    private Long infoId;
+
+    /**
+     * 用户账号
+     */
+    private String userName;
+
+    /**
+     * 客户端
+     */
+    private String clientKey;
+
+    /**
+     * 设备类型
+     */
+    private String deviceType;
+
+    /**
+     * 登录状态 0成功 1失败
+     */
+    private String status;
+
+    /**
+     * 登录IP地址
+     */
+    private String ipaddr;
+
+    /**
+     * 登录地点
+     */
+    private String loginLocation;
+
+    /**
+     * 浏览器类型
+     */
+    private String browser;
+
+    /**
+     * 操作系统
+     */
+    private String os;
+
+    /**
+     * 提示消息
+     */
+    private String msg;
+
+    /**
+     * 访问时间
+     */
+    private Date loginTime;
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysMenu.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysMenu.java
new file mode 100644
index 0000000..4a2efbd
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysMenu.java
@@ -0,0 +1,191 @@
+package org.dromara.system.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.core.constant.Constants;
+import org.dromara.common.core.constant.SystemConstants;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 菜单权限表 sys_menu
+ *
+ * @author pengles
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("sys_menu")
+public class SysMenu extends BaseEntity {
+
+    /**
+     * 菜单ID
+     */
+    @TableId(value = "menu_id")
+    private Long menuId;
+
+    /**
+     * 父菜单ID
+     */
+    private Long parentId;
+
+    /**
+     * 菜单名称
+     */
+    private String menuName;
+
+    /**
+     * 显示顺序
+     */
+    private Integer orderNum;
+
+    /**
+     * 路由地址
+     */
+    private String path;
+
+    /**
+     * 组件路径
+     */
+    private String component;
+
+    /**
+     * 路由参数
+     */
+    private String queryParam;
+
+    /**
+     * 是否为外链（0是 1否）
+     */
+    private String isFrame;
+
+    /**
+     * 是否缓存（0缓存 1不缓存）
+     */
+    private String isCache;
+
+    /**
+     * 类型（M目录 C菜单 F按钮）
+     */
+    private String menuType;
+
+    /**
+     * 显示状态（0显示 1隐藏）
+     */
+    private String visible;
+
+    /**
+     * 菜单状态（0正常 1停用）
+     */
+    private String status;
+
+    /**
+     * 权限字符串
+     */
+    private String perms;
+
+    /**
+     * 菜单图标
+     */
+    private String icon;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 父菜单名称
+     */
+    @TableField(exist = false)
+    private String parentName;
+
+    /**
+     * 子菜单
+     */
+    @TableField(exist = false)
+    private List<SysMenu> children = new ArrayList<>();
+
+    /**
+     * 内链域名特殊字符替换
+     */
+    public static String innerLinkReplaceEach(String path) {
+        return StringUtils.replaceEach(path, new String[]{Constants.HTTP, Constants.HTTPS, Constants.WWW, ".", ":"},
+                new String[]{"", "", "", "/", "/"});
+    }
+
+    /**
+     * 获取路由名称
+     */
+    public String getRouteName() {
+        String routerName = StringUtils.capitalize(path);
+        // 非外链并且是一级目录（类型为目录）
+        if (isMenuFrame()) {
+            routerName = StringUtils.EMPTY;
+        }
+        return routerName;
+    }
+
+    /**
+     * 获取路由地址
+     */
+    public String getRouterPath() {
+        String routerPath = this.path;
+        // 内链打开外网方式
+        if (getParentId() != 0L && isInnerLink()) {
+            routerPath = innerLinkReplaceEach(routerPath);
+        }
+        // 非外链并且是一级目录（类型为目录）
+        if (0L == getParentId() && SystemConstants.TYPE_DIR.equals(getMenuType())
+                && SystemConstants.NO_FRAME.equals(getIsFrame())) {
+            routerPath = "/" + this.path;
+        }
+        // 非外链并且是一级目录（类型为菜单）
+        else if (isMenuFrame()) {
+            routerPath = "/";
+        }
+        return routerPath;
+    }
+
+    /**
+     * 获取组件信息
+     */
+    public String getComponentInfo() {
+        String component = SystemConstants.LAYOUT;
+        if (StringUtils.isNotEmpty(this.component) && !isMenuFrame()) {
+            component = this.component;
+        } else if (StringUtils.isEmpty(this.component) && getParentId() != 0L && isInnerLink()) {
+            component = SystemConstants.INNER_LINK;
+        } else if (StringUtils.isEmpty(this.component) && isParentView()) {
+            component = SystemConstants.PARENT_VIEW;
+        }
+        return component;
+    }
+
+    /**
+     * 是否为菜单内部跳转
+     */
+    public boolean isMenuFrame() {
+        return getParentId() == 0L && SystemConstants.TYPE_MENU.equals(menuType) && isFrame.equals(SystemConstants.NO_FRAME);
+    }
+
+    /**
+     * 是否为内链组件
+     */
+    public boolean isInnerLink() {
+        return isFrame.equals(SystemConstants.NO_FRAME) && StringUtils.ishttp(path);
+    }
+
+    /**
+     * 是否为parent_view组件
+     */
+    public boolean isParentView() {
+        return getParentId() != 0L && SystemConstants.TYPE_DIR.equals(menuType);
+    }
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysNotice.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysNotice.java
new file mode 100644
index 0000000..651e69a
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysNotice.java
@@ -0,0 +1,51 @@
+package org.dromara.system.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+
+
+/**
+ * 通知公告表 sys_notice
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("sys_notice")
+public class SysNotice extends BaseEntity {
+
+    /**
+     * 公告ID
+     */
+    @TableId(value = "notice_id")
+    private Long noticeId;
+
+    /**
+     * 公告标题
+     */
+    private String noticeTitle;
+
+    /**
+     * 公告类型（1通知 2公告）
+     */
+    private String noticeType;
+
+    /**
+     * 公告内容
+     */
+    private String noticeContent;
+
+    /**
+     * 公告状态（0正常 1关闭）
+     */
+    private String status;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOperLog.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOperLog.java
new file mode 100644
index 0000000..0398bd5
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOperLog.java
@@ -0,0 +1,111 @@
+package org.dromara.system.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 操作日志记录表 oper_log
+ *
+ * @author pengles
+ */
+
+@Data
+@TableName("sys_oper_log")
+public class SysOperLog implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 日志主键
+     */
+    @TableId(value = "oper_id")
+    private Long operId;
+
+
+    /**
+     * 操作模块
+     */
+    private String title;
+
+    /**
+     * 业务类型（0其它 1新增 2修改 3删除）
+     */
+    private Integer businessType;
+
+    /**
+     * 请求方法
+     */
+    private String method;
+
+    /**
+     * 请求方式
+     */
+    private String requestMethod;
+
+    /**
+     * 操作类别（0其它 1后台用户 2手机端用户）
+     */
+    private Integer operatorType;
+
+    /**
+     * 操作人员
+     */
+    private String operName;
+
+    /**
+     * 部门名称
+     */
+    private String deptName;
+
+    /**
+     * 请求url
+     */
+    private String operUrl;
+
+    /**
+     * 操作地址
+     */
+    private String operIp;
+
+    /**
+     * 操作地点
+     */
+    private String operLocation;
+
+    /**
+     * 请求参数
+     */
+    private String operParam;
+
+    /**
+     * 返回参数
+     */
+    private String jsonResult;
+
+    /**
+     * 操作状态（0正常 1异常）
+     */
+    private Integer status;
+
+    /**
+     * 错误消息
+     */
+    private String errorMsg;
+
+    /**
+     * 操作时间
+     */
+    private Date operTime;
+
+    /**
+     * 消耗时间
+     */
+    private Long costTime;
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOss.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOss.java
new file mode 100644
index 0000000..f086220
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOss.java
@@ -0,0 +1,55 @@
+package org.dromara.system.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+
+/**
+ * OSS对象存储对象
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("sys_oss")
+public class SysOss extends BaseEntity {
+
+    /**
+     * 对象存储主键
+     */
+    @TableId(value = "oss_id")
+    private Long ossId;
+
+    /**
+     * 文件名
+     */
+    private String fileName;
+
+    /**
+     * 原名
+     */
+    private String originalName;
+
+    /**
+     * 文件后缀名
+     */
+    private String fileSuffix;
+
+    /**
+     * URL地址
+     */
+    private String url;
+
+    /**
+     * 扩展字段
+     */
+    private String ext1;
+
+    /**
+     * 服务商
+     */
+    private String service;
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOssConfig.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOssConfig.java
new file mode 100644
index 0000000..08903f1
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOssConfig.java
@@ -0,0 +1,89 @@
+package org.dromara.system.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+
+/**
+ * 对象存储配置对象 sys_oss_config
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("sys_oss_config")
+public class SysOssConfig extends BaseEntity {
+
+    /**
+     * 主键
+     */
+    @TableId(value = "oss_config_id")
+    private Long ossConfigId;
+
+    /**
+     * 配置key
+     */
+    private String configKey;
+
+    /**
+     * accessKey
+     */
+    private String accessKey;
+
+    /**
+     * 秘钥
+     */
+    private String secretKey;
+
+    /**
+     * 桶名称
+     */
+    private String bucketName;
+
+    /**
+     * 前缀
+     */
+    private String prefix;
+
+    /**
+     * 访问站点
+     */
+    private String endpoint;
+
+    /**
+     * 自定义域名
+     */
+    private String domain;
+
+    /**
+     * 是否https（0否 1是）
+     */
+    private String isHttps;
+
+    /**
+     * 域
+     */
+    private String region;
+
+    /**
+     * 是否默认（0=是,1=否）
+     */
+    private String status;
+
+    /**
+     * 扩展字段
+     */
+    private String ext1;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 桶权限类型(0private 1public 2custom)
+     */
+    private String accessPolicy;
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysPost.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysPost.java
new file mode 100644
index 0000000..37f1f7b
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysPost.java
@@ -0,0 +1,61 @@
+package org.dromara.system.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+
+/**
+ * 岗位表 sys_post
+ *
+ * @author pengles
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("sys_post")
+public class SysPost extends BaseEntity {
+
+    /**
+     * 岗位序号
+     */
+    @TableId(value = "post_id")
+    private Long postId;
+
+    /**
+     * 部门id
+     */
+    private Long deptId;
+
+    /**
+     * 岗位编码
+     */
+    private String postCode;
+
+    /**
+     * 岗位名称
+     */
+    private String postName;
+
+    /**
+     * 岗位类别编码
+     */
+    private String postCategory;
+
+    /**
+     * 岗位排序
+     */
+    private Integer postSort;
+
+    /**
+     * 状态（0正常 1停用）
+     */
+    private String status;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysRole.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysRole.java
new file mode 100644
index 0000000..e5b6394
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysRole.java
@@ -0,0 +1,79 @@
+package org.dromara.system.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+
+/**
+ * 角色表 sys_role
+ *
+ * @author pengles
+ */
+
+@Data
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+@TableName("sys_role")
+public class SysRole extends BaseEntity {
+
+    /**
+     * 角色ID
+     */
+    @TableId(value = "role_id")
+    private Long roleId;
+
+    /**
+     * 角色名称
+     */
+    private String roleName;
+
+    /**
+     * 角色权限
+     */
+    private String roleKey;
+
+    /**
+     * 角色排序
+     */
+    private Integer roleSort;
+
+    /**
+     * 数据范围（1：全部数据权限 2：自定数据权限 3：本部门数据权限 4：本部门及以下数据权限 5：仅本人数据权限 6：部门及以下或本人数据权限）
+     */
+    private String dataScope;
+
+    /**
+     * 菜单树选择项是否关联显示（ 0：父子不互相关联显示 1：父子互相关联显示）
+     */
+    private Boolean menuCheckStrictly;
+
+    /**
+     * 部门树选择项是否关联显示（0：父子不互相关联显示 1：父子互相关联显示 ）
+     */
+    private Boolean deptCheckStrictly;
+
+    /**
+     * 角色状态（0正常 1停用）
+     */
+    private String status;
+
+    /**
+     * 删除标志（0代表存在 1代表删除）
+     */
+    @TableLogic
+    private String delFlag;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    public SysRole(Long roleId) {
+        this.roleId = roleId;
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysRoleDept.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysRoleDept.java
new file mode 100644
index 0000000..0946e4e
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysRoleDept.java
@@ -0,0 +1,29 @@
+package org.dromara.system.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+/**
+ * 角色和部门关联 sys_role_dept
+ *
+ * @author pengles
+ */
+
+@Data
+@TableName("sys_role_dept")
+public class SysRoleDept {
+
+    /**
+     * 角色ID
+     */
+    @TableId(type = IdType.INPUT)
+    private Long roleId;
+
+    /**
+     * 部门ID
+     */
+    private Long deptId;
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysRoleMenu.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysRoleMenu.java
new file mode 100644
index 0000000..3d71a4e
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysRoleMenu.java
@@ -0,0 +1,29 @@
+package org.dromara.system.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+/**
+ * 角色和菜单关联 sys_role_menu
+ *
+ * @author pengles
+ */
+
+@Data
+@TableName("sys_role_menu")
+public class SysRoleMenu {
+
+    /**
+     * 角色ID
+     */
+    @TableId(type = IdType.INPUT)
+    private Long roleId;
+
+    /**
+     * 菜单ID
+     */
+    private Long menuId;
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysSocial.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysSocial.java
new file mode 100644
index 0000000..6210036
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysSocial.java
@@ -0,0 +1,136 @@
+package org.dromara.system.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+
+import java.io.Serial;
+
+/**
+ * 社会化关系对象 sys_social
+ *
+ * @author thiszhc
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("sys_social")
+public class SysSocial extends BaseEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 用户ID
+     */
+    private Long userId;
+
+    /**
+     * 的唯一ID
+     */
+    private String authId;
+
+    /**
+     * 用户来源
+     */
+    private String source;
+
+    /**
+     * 用户的授权令牌
+     */
+    private String accessToken;
+
+    /**
+     * 用户的授权令牌的有效期，部分平台可能没有
+     */
+    private int expireIn;
+
+    /**
+     * 刷新令牌，部分平台可能没有
+     */
+    private String refreshToken;
+
+    /**
+     * 用户的 open id
+     */
+    private String openId;
+
+    /**
+     * 授权的第三方账号
+     */
+    private String userName;
+
+    /**
+     * 授权的第三方昵称
+     */
+    private String nickName;
+
+    /**
+     * 授权的第三方邮箱
+     */
+    private String email;
+
+    /**
+     * 授权的第三方头像地址
+     */
+    private String avatar;
+
+    /**
+     * 平台的授权信息，部分平台可能没有
+     */
+    private String accessCode;
+
+    /**
+     * 用户的 unionid
+     */
+    private String unionId;
+
+    /**
+     * 授予的权限，部分平台可能没有
+     */
+    private String scope;
+
+    /**
+     * 个别平台的授权信息，部分平台可能没有
+     */
+    private String tokenType;
+
+    /**
+     * id token，部分平台可能没有
+     */
+    private String idToken;
+
+    /**
+     * 小米平台用户的附带属性，部分平台可能没有
+     */
+    private String macAlgorithm;
+
+    /**
+     * 小米平台用户的附带属性，部分平台可能没有
+     */
+    private String macKey;
+
+    /**
+     * 用户的授权code，部分平台可能没有
+     */
+    private String code;
+
+    /**
+     * Twitter平台用户的附带属性，部分平台可能没有
+     */
+    private String oauthToken;
+
+    /**
+     * Twitter平台用户的附带属性，部分平台可能没有
+     */
+    private String oauthTokenSecret;
+
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUser.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUser.java
new file mode 100644
index 0000000..fe01dc4
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUser.java
@@ -0,0 +1,115 @@
+package org.dromara.system.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import org.dromara.common.core.constant.SystemConstants;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+
+import java.util.Date;
+
+/**
+ * 用户对象 sys_user
+ *
+ * @author pengles
+ */
+
+@Data
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+@TableName("sys_user")
+public class SysUser extends BaseEntity {
+
+    /**
+     * 用户ID
+     */
+    @TableId(value = "user_id")
+    private Long userId;
+
+    /**
+     * 部门ID
+     */
+    private Long deptId;
+
+    /**
+     * 用户账号
+     */
+    private String userName;
+
+    /**
+     * 用户昵称
+     */
+    private String nickName;
+
+    /**
+     * 用户类型（sys_user系统用户）
+     */
+    private String userType;
+
+    /**
+     * 用户邮箱
+     */
+    private String email;
+
+    /**
+     * 手机号码
+     */
+    private String phonenumber;
+
+    /**
+     * 用户性别
+     */
+    private String sex;
+
+    /**
+     * 用户头像
+     */
+    private Long avatar;
+
+    /**
+     * 密码
+     */
+    @TableField(
+            insertStrategy = FieldStrategy.NOT_EMPTY,
+            updateStrategy = FieldStrategy.NOT_EMPTY,
+            whereStrategy = FieldStrategy.NOT_EMPTY
+    )
+    private String password;
+
+    /**
+     * 帐号状态（0正常 1停用）
+     */
+    private String status;
+
+    /**
+     * 删除标志（0代表存在 1代表删除）
+     */
+    @TableLogic
+    private String delFlag;
+
+    /**
+     * 最后登录IP
+     */
+    private String loginIp;
+
+    /**
+     * 最后登录时间
+     */
+    private Date loginDate;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+    public SysUser(Long userId) {
+        this.userId = userId;
+    }
+
+    public boolean isSuperAdmin() {
+        return SystemConstants.SUPER_ADMIN_ID.equals(this.userId);
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUserOnline.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUserOnline.java
new file mode 100644
index 0000000..137ddc0
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUserOnline.java
@@ -0,0 +1,63 @@
+package org.dromara.system.domain;
+
+import lombok.Data;
+
+/**
+ * 当前在线会话
+ *
+ * @author pengles
+ */
+@Data
+public class SysUserOnline {
+
+    /**
+     * 会话编号
+     */
+    private String tokenId;
+
+    /**
+     * 部门名称
+     */
+    private String deptName;
+
+    /**
+     * 用户名称
+     */
+    private String userName;
+
+    /**
+     * 客户端
+     */
+    private String clientKey;
+
+    /**
+     * 设备类型
+     */
+    private String deviceType;
+
+    /**
+     * 登录IP地址
+     */
+    private String ipaddr;
+
+    /**
+     * 登录地址
+     */
+    private String loginLocation;
+
+    /**
+     * 浏览器类型
+     */
+    private String browser;
+
+    /**
+     * 操作系统
+     */
+    private String os;
+
+    /**
+     * 登录时间
+     */
+    private Long loginTime;
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUserPost.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUserPost.java
new file mode 100644
index 0000000..6dd54a5
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUserPost.java
@@ -0,0 +1,29 @@
+package org.dromara.system.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+/**
+ * 用户和岗位关联 sys_user_post
+ *
+ * @author pengles
+ */
+
+@Data
+@TableName("sys_user_post")
+public class SysUserPost {
+
+    /**
+     * 用户ID
+     */
+    @TableId(type = IdType.INPUT)
+    private Long userId;
+
+    /**
+     * 岗位ID
+     */
+    private Long postId;
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUserRole.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUserRole.java
new file mode 100644
index 0000000..d1f272a
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUserRole.java
@@ -0,0 +1,29 @@
+package org.dromara.system.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+/**
+ * 用户和角色关联 sys_user_role
+ *
+ * @author pengles
+ */
+
+@Data
+@TableName("sys_user_role")
+public class SysUserRole {
+
+    /**
+     * 用户ID
+     */
+    @TableId(type = IdType.INPUT)
+    private Long userId;
+
+    /**
+     * 角色ID
+     */
+    private Long roleId;
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysClientBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysClientBo.java
new file mode 100644
index 0000000..51559a4
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysClientBo.java
@@ -0,0 +1,81 @@
+package org.dromara.system.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.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.system.domain.SysClient;
+
+import java.util.List;
+
+/**
+ * 授权管理业务对象 sys_client
+ *
+ * @author pengles
+ * @date 2023-05-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = SysClient.class, reverseConvertGenerate = false)
+public class SysClientBo extends BaseEntity {
+
+    /**
+     * id
+     */
+    @NotNull(message = "id不能为空", groups = {EditGroup.class})
+    private Long id;
+
+    /**
+     * 客户端id
+     */
+    private String clientId;
+
+    /**
+     * 客户端key
+     */
+    @NotBlank(message = "客户端key不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String clientKey;
+
+    /**
+     * 客户端秘钥
+     */
+    @NotBlank(message = "客户端秘钥不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String clientSecret;
+
+    /**
+     * 授权类型
+     */
+    @NotNull(message = "授权类型不能为空", groups = {AddGroup.class, EditGroup.class})
+    private List<String> grantTypeList;
+
+    /**
+     * 授权类型
+     */
+    private String grantType;
+
+    /**
+     * 设备类型
+     */
+    private String deviceType;
+
+    /**
+     * token活跃超时时间
+     */
+    private Long activeTimeout;
+
+    /**
+     * token固定超时时间
+     */
+    private Long timeout;
+
+    /**
+     * 状态（0正常 1停用）
+     */
+    private String status;
+
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysConfigBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysConfigBo.java
new file mode 100644
index 0000000..e1742e9
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysConfigBo.java
@@ -0,0 +1,59 @@
+package org.dromara.system.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Size;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.system.domain.SysConfig;
+
+/**
+ * 参数配置业务对象 sys_config
+ *
+ * @author pengles
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = SysConfig.class, reverseConvertGenerate = false)
+public class SysConfigBo extends BaseEntity {
+
+    /**
+     * 参数主键
+     */
+    private Long configId;
+
+    /**
+     * 参数名称
+     */
+    @NotBlank(message = "参数名称不能为空")
+    @Size(min = 0, max = 100, message = "参数名称不能超过{max}个字符")
+    private String configName;
+
+    /**
+     * 参数键名
+     */
+    @NotBlank(message = "参数键名不能为空")
+    @Size(min = 0, max = 100, message = "参数键名长度不能超过{max}个字符")
+    private String configKey;
+
+    /**
+     * 参数键值
+     */
+    @NotBlank(message = "参数键值不能为空")
+    @Size(min = 0, max = 500, message = "参数键值长度不能超过{max}个字符")
+    private String configValue;
+
+    /**
+     * 系统内置（Y是 N否）
+     */
+    private String configType;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDeptBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDeptBo.java
new file mode 100644
index 0000000..ccedb2d
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDeptBo.java
@@ -0,0 +1,81 @@
+package org.dromara.system.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.Email;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.system.domain.SysDept;
+
+/**
+ * 部门业务对象 sys_dept
+ *
+ * @author pengles
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = SysDept.class, reverseConvertGenerate = false)
+public class SysDeptBo extends BaseEntity {
+
+    /**
+     * 部门id
+     */
+    private Long deptId;
+
+    /**
+     * 父部门ID
+     */
+    private Long parentId;
+
+    /**
+     * 部门名称
+     */
+    @NotBlank(message = "部门名称不能为空")
+    @Size(min = 0, max = 30, message = "部门名称长度不能超过{max}个字符")
+    private String deptName;
+
+    /**
+     * 部门类别编码
+     */
+    @Size(min = 0, max = 100, message = "部门类别编码长度不能超过{max}个字符")
+    private String deptCategory;
+
+    /**
+     * 显示顺序
+     */
+    @NotNull(message = "显示顺序不能为空")
+    private Integer orderNum;
+
+    /**
+     * 负责人
+     */
+    private Long leader;
+
+    /**
+     * 联系电话
+     */
+    @Size(min = 0, max = 11, message = "联系电话长度不能超过{max}个字符")
+    private String phone;
+
+    /**
+     * 邮箱
+     */
+    @Email(message = "邮箱格式不正确")
+    @Size(min = 0, max = 50, message = "邮箱长度不能超过{max}个字符")
+    private String email;
+
+    /**
+     * 部门状态（0正常 1停用）
+     */
+    private String status;
+
+    /**
+     * 归属部门id（部门树）
+     */
+    private Long belongDeptId;
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDictDataBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDictDataBo.java
new file mode 100644
index 0000000..ab4c556
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDictDataBo.java
@@ -0,0 +1,79 @@
+package org.dromara.system.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Size;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.system.domain.SysDictData;
+
+/**
+ * 字典数据业务对象 sys_dict_data
+ *
+ * @author pengles
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = SysDictData.class, reverseConvertGenerate = false)
+public class SysDictDataBo extends BaseEntity {
+
+    /**
+     * 字典编码
+     */
+    private Long dictCode;
+
+    /**
+     * 字典排序
+     */
+    private Integer dictSort;
+
+    /**
+     * 字典标签
+     */
+    @NotBlank(message = "字典标签不能为空")
+    @Size(min = 0, max = 100, message = "字典标签长度不能超过{max}个字符")
+    private String dictLabel;
+
+    /**
+     * 字典键值
+     */
+    @NotBlank(message = "字典键值不能为空")
+    @Size(min = 0, max = 100, message = "字典键值长度不能超过{max}个字符")
+    private String dictValue;
+
+    /**
+     * 字典类型
+     */
+    @NotBlank(message = "字典类型不能为空")
+    @Size(min = 0, max = 100, message = "字典类型长度不能超过{max}个字符")
+    private String dictType;
+
+    /**
+     * 样式属性（其他样式扩展）
+     */
+    @Size(min = 0, max = 100, message = "样式属性长度不能超过{max}个字符")
+    private String cssClass;
+
+    /**
+     * 表格回显样式
+     */
+    private String listClass;
+
+    /**
+     * 是否默认（Y是 N否）
+     */
+    private String isDefault;
+
+    /**
+     * 创建部门
+     */
+    private Long createDept;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDictTypeBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDictTypeBo.java
new file mode 100644
index 0000000..56790f0
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDictTypeBo.java
@@ -0,0 +1,50 @@
+package org.dromara.system.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Pattern;
+import jakarta.validation.constraints.Size;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.core.constant.RegexConstants;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.system.domain.SysDictType;
+
+/**
+ * 字典类型业务对象 sys_dict_type
+ *
+ * @author pengles
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = SysDictType.class, reverseConvertGenerate = false)
+public class SysDictTypeBo extends BaseEntity {
+
+    /**
+     * 字典主键
+     */
+    private Long dictId;
+
+    /**
+     * 字典名称
+     */
+    @NotBlank(message = "字典名称不能为空")
+    @Size(min = 0, max = 100, message = "字典类型名称长度不能超过{max}个字符")
+    private String dictName;
+
+    /**
+     * 字典类型
+     */
+    @NotBlank(message = "字典类型不能为空")
+    @Size(min = 0, max = 100, message = "字典类型类型长度不能超过{max}个字符")
+    @Pattern(regexp = RegexConstants.DICTIONARY_TYPE, message = "字典类型必须以字母开头，且只能为（小写字母，数字，下滑线）")
+    private String dictType;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysLogininforBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysLogininforBo.java
new file mode 100644
index 0000000..a773ffe
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysLogininforBo.java
@@ -0,0 +1,82 @@
+package org.dromara.system.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.system.domain.SysLogininfor;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 系统访问记录业务对象 sys_logininfor
+ *
+ * @author pengles
+ */
+
+@Data
+@AutoMapper(target = SysLogininfor.class, reverseConvertGenerate = false)
+public class SysLogininforBo {
+
+    /**
+     * 访问ID
+     */
+    private Long infoId;
+
+    /**
+     * 用户账号
+     */
+    private String userName;
+
+    /**
+     * 客户端
+     */
+    private String clientKey;
+
+    /**
+     * 设备类型
+     */
+    private String deviceType;
+
+    /**
+     * 登录IP地址
+     */
+    private String ipaddr;
+
+    /**
+     * 登录地点
+     */
+    private String loginLocation;
+
+    /**
+     * 浏览器类型
+     */
+    private String browser;
+
+    /**
+     * 操作系统
+     */
+    private String os;
+
+    /**
+     * 登录状态（0成功 1失败）
+     */
+    private String status;
+
+    /**
+     * 提示消息
+     */
+    private String msg;
+
+    /**
+     * 访问时间
+     */
+    private Date loginTime;
+
+    /**
+     * 请求参数
+     */
+    private Map<String, Object> params = new HashMap<>();
+
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysMenuBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysMenuBo.java
new file mode 100644
index 0000000..eae4eb4
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysMenuBo.java
@@ -0,0 +1,109 @@
+package org.dromara.system.domain.bo;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Pattern;
+import jakarta.validation.constraints.Size;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.core.constant.RegexConstants;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.system.domain.SysMenu;
+
+/**
+ * 菜单权限业务对象 sys_menu
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = SysMenu.class, reverseConvertGenerate = false)
+public class SysMenuBo extends BaseEntity {
+
+    /**
+     * 菜单ID
+     */
+    private Long menuId;
+
+    /**
+     * 父菜单ID
+     */
+    private Long parentId;
+
+    /**
+     * 菜单名称
+     */
+    @NotBlank(message = "菜单名称不能为空")
+    @Size(min = 0, max = 50, message = "菜单名称长度不能超过{max}个字符")
+    private String menuName;
+
+    /**
+     * 显示顺序
+     */
+    @NotNull(message = "显示顺序不能为空")
+    private Integer orderNum;
+
+    /**
+     * 路由地址
+     */
+    @Size(min = 0, max = 200, message = "路由地址不能超过{max}个字符")
+    private String path;
+
+    /**
+     * 组件路径
+     */
+    @Size(min = 0, max = 200, message = "组件路径不能超过{max}个字符")
+    private String component;
+
+    /**
+     * 路由参数
+     */
+    private String queryParam;
+
+    /**
+     * 是否为外链（0是 1否）
+     */
+    private String isFrame;
+
+    /**
+     * 是否缓存（0缓存 1不缓存）
+     */
+    private String isCache;
+
+    /**
+     * 菜单类型（M目录 C菜单 F按钮）
+     */
+    @NotBlank(message = "菜单类型不能为空")
+    private String menuType;
+
+    /**
+     * 显示状态（0显示 1隐藏）
+     */
+    private String visible;
+
+    /**
+     * 菜单状态（0正常 1停用）
+     */
+    private String status;
+
+    /**
+     * 权限标识
+     */
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    @Size(min = 0, max = 100, message = "权限标识长度不能超过{max}个字符")
+    @Pattern(regexp = RegexConstants.PERMISSION_STRING, message = "权限标识必须符合 tool:build:list 格式")
+    private String perms;
+
+    /**
+     * 菜单图标
+     */
+    private String icon;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysNoticeBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysNoticeBo.java
new file mode 100644
index 0000000..251b214
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysNoticeBo.java
@@ -0,0 +1,60 @@
+package org.dromara.system.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Size;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.core.xss.Xss;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.system.domain.SysNotice;
+
+/**
+ * 通知公告业务对象 sys_notice
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = SysNotice.class, reverseConvertGenerate = false)
+public class SysNoticeBo extends BaseEntity {
+
+    /**
+     * 公告ID
+     */
+    private Long noticeId;
+
+    /**
+     * 公告标题
+     */
+    @Xss(message = "公告标题不能包含脚本字符")
+    @NotBlank(message = "公告标题不能为空")
+    @Size(min = 0, max = 50, message = "公告标题不能超过{max}个字符")
+    private String noticeTitle;
+
+    /**
+     * 公告类型（1通知 2公告）
+     */
+    private String noticeType;
+
+    /**
+     * 公告内容
+     */
+    private String noticeContent;
+
+    /**
+     * 公告状态（0正常 1关闭）
+     */
+    private String status;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 创建人名称
+     */
+    private String createByName;
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOperLogBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOperLogBo.java
new file mode 100644
index 0000000..92e8c6b
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOperLogBo.java
@@ -0,0 +1,116 @@
+package org.dromara.system.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.system.domain.SysOperLog;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 操作日志记录业务对象 sys_oper_log
+ *
+ * @author pengles
+ */
+@Data
+@AutoMapper(target = SysOperLog.class, reverseConvertGenerate = false)
+public class SysOperLogBo {
+
+    /**
+     * 日志主键
+     */
+    private Long operId;
+
+
+    /**
+     * 模块标题
+     */
+    private String title;
+
+    /**
+     * 业务类型（0其它 1新增 2修改 3删除）
+     */
+    private Integer businessType;
+
+    /**
+     * 业务类型数组
+     */
+    private Integer[] businessTypes;
+
+    /**
+     * 方法名称
+     */
+    private String method;
+
+    /**
+     * 请求方式
+     */
+    private String requestMethod;
+
+    /**
+     * 操作类别（0其它 1后台用户 2手机端用户）
+     */
+    private Integer operatorType;
+
+    /**
+     * 操作人员
+     */
+    private String operName;
+
+    /**
+     * 部门名称
+     */
+    private String deptName;
+
+    /**
+     * 请求URL
+     */
+    private String operUrl;
+
+    /**
+     * 主机地址
+     */
+    private String operIp;
+
+    /**
+     * 操作地点
+     */
+    private String operLocation;
+
+    /**
+     * 请求参数
+     */
+    private String operParam;
+
+    /**
+     * 返回参数
+     */
+    private String jsonResult;
+
+    /**
+     * 操作状态（0正常 1异常）
+     */
+    private Integer status;
+
+    /**
+     * 错误消息
+     */
+    private String errorMsg;
+
+    /**
+     * 操作时间
+     */
+    private Date operTime;
+
+    /**
+     * 消耗时间
+     */
+    private Long costTime;
+
+    /**
+     * 请求参数
+     */
+    private Map<String, Object> params = new HashMap<>();
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOssBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOssBo.java
new file mode 100644
index 0000000..cd77811
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOssBo.java
@@ -0,0 +1,54 @@
+package org.dromara.system.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.system.domain.SysOss;
+
+/**
+ * OSS对象存储分页查询对象 sys_oss
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = SysOss.class, reverseConvertGenerate = false)
+public class SysOssBo extends BaseEntity {
+
+    /**
+     * ossId
+     */
+    private Long ossId;
+
+    /**
+     * 文件名
+     */
+    private String fileName;
+
+    /**
+     * 原名
+     */
+    private String originalName;
+
+    /**
+     * 文件后缀名
+     */
+    private String fileSuffix;
+
+    /**
+     * URL地址
+     */
+    private String url;
+
+    /**
+     * 扩展字段
+     */
+    private String ext1;
+
+    /**
+     * 服务商
+     */
+    private String service;
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOssConfigBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOssConfigBo.java
new file mode 100644
index 0000000..5ff06d0
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOssConfigBo.java
@@ -0,0 +1,109 @@
+package org.dromara.system.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.system.domain.SysOssConfig;
+
+/**
+ * 对象存储配置业务对象 sys_oss_config
+ *
+ * @author pengles
+ * @author 孤舟烟雨
+ * @date 2021-08-13
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = SysOssConfig.class, reverseConvertGenerate = false)
+public class SysOssConfigBo extends BaseEntity {
+
+    /**
+     * 主键
+     */
+    @NotNull(message = "主键不能为空", groups = {EditGroup.class})
+    private Long ossConfigId;
+
+    /**
+     * 配置key
+     */
+    @NotBlank(message = "配置key不能为空", groups = {AddGroup.class, EditGroup.class})
+    @Size(min = 2, max = 100, message = "configKey长度必须介于{min}和{max} 之间")
+    private String configKey;
+
+    /**
+     * accessKey
+     */
+    @NotBlank(message = "accessKey不能为空", groups = {AddGroup.class, EditGroup.class})
+    @Size(min = 2, max = 100, message = "accessKey长度必须介于{min}和{max} 之间")
+    private String accessKey;
+
+    /**
+     * 秘钥
+     */
+    @NotBlank(message = "secretKey不能为空", groups = {AddGroup.class, EditGroup.class})
+    @Size(min = 2, max = 100, message = "secretKey长度必须介于{min}和{max} 之间")
+    private String secretKey;
+
+    /**
+     * 桶名称
+     */
+    @NotBlank(message = "桶名称不能为空", groups = {AddGroup.class, EditGroup.class})
+    @Size(min = 2, max = 100, message = "bucketName长度必须介于{min}和{max}之间")
+    private String bucketName;
+
+    /**
+     * 前缀
+     */
+    private String prefix;
+
+    /**
+     * 访问站点
+     */
+    @NotBlank(message = "访问站点不能为空", groups = {AddGroup.class, EditGroup.class})
+    @Size(min = 2, max = 100, message = "endpoint长度必须介于{min}和{max}之间")
+    private String endpoint;
+
+    /**
+     * 自定义域名
+     */
+    private String domain;
+
+    /**
+     * 是否https（Y=是,N=否）
+     */
+    private String isHttps;
+
+    /**
+     * 是否默认（0=是,1=否）
+     */
+    private String status;
+
+    /**
+     * 域
+     */
+    private String region;
+
+    /**
+     * 扩展字段
+     */
+    private String ext1;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 桶权限类型(0private 1public 2custom)
+     */
+    @NotBlank(message = "桶权限类型不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String accessPolicy;
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysPostBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysPostBo.java
new file mode 100644
index 0000000..09bc888
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysPostBo.java
@@ -0,0 +1,75 @@
+package org.dromara.system.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.system.domain.SysPost;
+
+/**
+ * 岗位信息业务对象 sys_post
+ *
+ * @author pengles
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = SysPost.class, reverseConvertGenerate = false)
+public class SysPostBo extends BaseEntity {
+
+    /**
+     * 岗位ID
+     */
+    private Long postId;
+
+    /**
+     * 部门id（单部门）
+     */
+    @NotNull(message = "部门id不能为空")
+    private Long deptId;
+
+    /**
+     * 归属部门id（部门树）
+     */
+    private Long belongDeptId;
+
+    /**
+     * 岗位编码
+     */
+    @NotBlank(message = "岗位编码不能为空")
+    @Size(min = 0, max = 64, message = "岗位编码长度不能超过{max}个字符")
+    private String postCode;
+
+    /**
+     * 岗位名称
+     */
+    @NotBlank(message = "岗位名称不能为空")
+    @Size(min = 0, max = 50, message = "岗位名称长度不能超过{max}个字符")
+    private String postName;
+
+    /**
+     * 岗位类别编码
+     */
+    @Size(min = 0, max = 100, message = "类别编码长度不能超过{max}个字符")
+    private String postCategory;
+
+    /**
+     * 显示顺序
+     */
+    @NotNull(message = "显示顺序不能为空")
+    private Integer postSort;
+
+    /**
+     * 状态（0正常 1停用）
+     */
+    private String status;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysRoleBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysRoleBo.java
new file mode 100644
index 0000000..f236f46
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysRoleBo.java
@@ -0,0 +1,94 @@
+package org.dromara.system.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import org.dromara.common.core.constant.SystemConstants;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.system.domain.SysRole;
+
+/**
+ * 角色信息业务对象 sys_role
+ *
+ * @author pengles
+ */
+
+@Data
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = SysRole.class, reverseConvertGenerate = false)
+public class SysRoleBo extends BaseEntity {
+
+    /**
+     * 角色ID
+     */
+    private Long roleId;
+
+    /**
+     * 角色名称
+     */
+    @NotBlank(message = "角色名称不能为空")
+    @Size(min = 0, max = 30, message = "角色名称长度不能超过{max}个字符")
+    private String roleName;
+
+    /**
+     * 角色权限字符串
+     */
+    @NotBlank(message = "角色权限字符串不能为空")
+    @Size(min = 0, max = 100, message = "权限字符长度不能超过{max}个字符")
+    private String roleKey;
+
+    /**
+     * 显示顺序
+     */
+    @NotNull(message = "显示顺序不能为空")
+    private Integer roleSort;
+
+    /**
+     * 数据范围（1：全部数据权限 2：自定数据权限 3：本部门数据权限 4：本部门及以下数据权限 5：仅本人数据权限 6：部门及以下或本人数据权限）
+     */
+    private String dataScope;
+
+    /**
+     * 菜单树选择项是否关联显示
+     */
+    private Boolean menuCheckStrictly;
+
+    /**
+     * 部门树选择项是否关联显示
+     */
+    private Boolean deptCheckStrictly;
+
+    /**
+     * 角色状态（0正常 1停用）
+     */
+    private String status;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 菜单组
+     */
+    private Long[] menuIds;
+
+    /**
+     * 部门组（数据权限）
+     */
+    private Long[] deptIds;
+
+    public SysRoleBo(Long roleId) {
+        this.roleId = roleId;
+    }
+
+    public boolean isSuperAdmin() {
+        return SystemConstants.SUPER_ADMIN_ID.equals(this.roleId);
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysSocialBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysSocialBo.java
new file mode 100644
index 0000000..5111758
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysSocialBo.java
@@ -0,0 +1,141 @@
+package org.dromara.system.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 lombok.NoArgsConstructor;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.system.domain.SysSocial;
+
+/**
+ * 社会化关系业务对象 sys_social
+ *
+ * @author pengles
+ */
+@Data
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = SysSocial.class, reverseConvertGenerate = false)
+public class SysSocialBo extends BaseEntity {
+
+    /**
+     * 主键
+     */
+    @NotNull(message = "主键不能为空", groups = {EditGroup.class})
+    private Long id;
+
+    /**
+     * 认证唯一ID
+     */
+    @NotBlank(message = "认证唯一ID不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String authId;
+
+    /**
+     * 用户来源
+     */
+    @NotBlank(message = "用户来源不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String source;
+
+    /**
+     * 用户的授权令牌
+     */
+    @NotBlank(message = "用户的授权令牌不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String accessToken;
+
+    /**
+     * 用户的授权令牌的有效期，部分平台可能没有
+     */
+    private int expireIn;
+
+    /**
+     * 刷新令牌，部分平台可能没有
+     */
+    private String refreshToken;
+
+    /**
+     * 平台唯一id
+     */
+    private String openId;
+
+    /**
+     * 用户的 ID
+     */
+    @NotBlank(message = "用户的ID不能为空", groups = {AddGroup.class, EditGroup.class})
+    private Long userId;
+
+    /**
+     * 平台的授权信息，部分平台可能没有
+     */
+    private String accessCode;
+
+    /**
+     * 用户的 unionid
+     */
+    private String unionId;
+
+    /**
+     * 授予的权限，部分平台可能没有
+     */
+    private String scope;
+
+    /**
+     * 授权的第三方账号
+     */
+    private String userName;
+
+    /**
+     * 授权的第三方昵称
+     */
+    private String nickName;
+
+    /**
+     * 授权的第三方邮箱
+     */
+    private String email;
+
+    /**
+     * 授权的第三方头像地址
+     */
+    private String avatar;
+
+    /**
+     * 个别平台的授权信息，部分平台可能没有
+     */
+    private String tokenType;
+
+    /**
+     * id token，部分平台可能没有
+     */
+    private String idToken;
+
+    /**
+     * 小米平台用户的附带属性，部分平台可能没有
+     */
+    private String macAlgorithm;
+
+    /**
+     * 小米平台用户的附带属性，部分平台可能没有
+     */
+    private String macKey;
+
+    /**
+     * 用户的授权code，部分平台可能没有
+     */
+    private String code;
+
+    /**
+     * Twitter平台用户的附带属性，部分平台可能没有
+     */
+    private String oauthToken;
+
+    /**
+     * Twitter平台用户的附带属性，部分平台可能没有
+     */
+    private String oauthTokenSecret;
+
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserBo.java
new file mode 100644
index 0000000..848089f
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserBo.java
@@ -0,0 +1,124 @@
+package org.dromara.system.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.Email;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Size;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import org.dromara.common.core.constant.SystemConstants;
+import org.dromara.common.core.xss.Xss;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.system.domain.SysUser;
+
+/**
+ * 用户信息业务对象 sys_user
+ *
+ * @author pengles
+ */
+
+@Data
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = SysUser.class, reverseConvertGenerate = false)
+public class SysUserBo extends BaseEntity {
+
+    /**
+     * 用户ID
+     */
+    private Long userId;
+
+    /**
+     * 部门ID
+     */
+    private Long deptId;
+
+    /**
+     * 用户账号
+     */
+    @Xss(message = "用户账号不能包含脚本字符")
+    @NotBlank(message = "用户账号不能为空")
+    @Size(min = 0, max = 30, message = "用户账号长度不能超过{max}个字符")
+    private String userName;
+
+    /**
+     * 用户昵称
+     */
+    @Xss(message = "用户昵称不能包含脚本字符")
+    @NotBlank(message = "用户昵称不能为空")
+    @Size(min = 0, max = 30, message = "用户昵称长度不能超过{max}个字符")
+    private String nickName;
+
+    /**
+     * 用户类型（sys_user系统用户）
+     */
+    private String userType;
+
+    /**
+     * 用户邮箱
+     */
+    @Email(message = "邮箱格式不正确")
+    @Size(min = 0, max = 50, message = "邮箱长度不能超过{max}个字符")
+    private String email;
+
+    /**
+     * 手机号码
+     */
+    private String phonenumber;
+
+    /**
+     * 用户性别（0男 1女 2未知）
+     */
+    private String sex;
+
+    /**
+     * 密码
+     */
+    private String password;
+
+    /**
+     * 帐号状态（0正常 1停用）
+     */
+    private String status;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 角色组
+     */
+    @Size(min = 1, message = "用户角色不能为空")
+    private Long[] roleIds;
+
+    /**
+     * 岗位组
+     */
+    private Long[] postIds;
+
+    /**
+     * 数据权限 当前角色ID
+     */
+    private Long roleId;
+
+    /**
+     * 用户ID
+     */
+    private String userIds;
+
+    /**
+     * 排除不查询的用户(工作流用)
+     */
+    private String excludeUserIds;
+
+    public SysUserBo(Long userId) {
+        this.userId = userId;
+    }
+
+    public boolean isSuperAdmin() {
+        return SystemConstants.SUPER_ADMIN_ID.equals(this.userId);
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserPasswordBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserPasswordBo.java
new file mode 100644
index 0000000..8615fcd
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserPasswordBo.java
@@ -0,0 +1,29 @@
+package org.dromara.system.domain.bo;
+
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 用户密码修改bo
+ */
+@Data
+public class SysUserPasswordBo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 旧密码
+     */
+    @NotBlank(message = "旧密码不能为空")
+    private String oldPassword;
+
+    /**
+     * 新密码
+     */
+    @NotBlank(message = "新密码不能为空")
+    private String newPassword;
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserProfileBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserProfileBo.java
new file mode 100644
index 0000000..d8c9d35
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserProfileBo.java
@@ -0,0 +1,53 @@
+package org.dromara.system.domain.bo;
+
+import jakarta.validation.constraints.Email;
+import jakarta.validation.constraints.Pattern;
+import jakarta.validation.constraints.Size;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import org.dromara.common.core.constant.RegexConstants;
+import org.dromara.common.core.xss.Xss;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.sensitive.annotation.Sensitive;
+import org.dromara.common.sensitive.core.SensitiveStrategy;
+
+/**
+ * 个人信息业务处理
+ *
+ * @author pengles
+ */
+
+@Data
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+public class SysUserProfileBo extends BaseEntity {
+
+    /**
+     * 用户昵称
+     */
+    @Xss(message = "用户昵称不能包含脚本字符")
+    @Size(min = 0, max = 30, message = "用户昵称长度不能超过{max}个字符")
+    private String nickName;
+
+    /**
+     * 用户邮箱
+     */
+    @Sensitive(strategy = SensitiveStrategy.EMAIL)
+    @Email(message = "邮箱格式不正确")
+    @Size(min = 0, max = 50, message = "邮箱长度不能超过{max}个字符")
+    private String email;
+
+    /**
+     * 手机号码
+     */
+    @Pattern(regexp = RegexConstants.MOBILE, message = "手机号格式不正确")
+    @Sensitive(strategy = SensitiveStrategy.PHONE)
+    private String phonenumber;
+
+    /**
+     * 用户性别（0男 1女 2未知）
+     */
+    private String sex;
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/MetaVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/MetaVo.java
new file mode 100644
index 0000000..075b592
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/MetaVo.java
@@ -0,0 +1,61 @@
+package org.dromara.system.domain.vo;
+
+import lombok.Data;
+import org.dromara.common.core.utils.StringUtils;
+
+/**
+ * 路由显示信息
+ *
+ * @author pengles
+ */
+
+@Data
+public class MetaVo {
+
+    /**
+     * 设置该路由在侧边栏和面包屑中展示的名字
+     */
+    private String title;
+
+    /**
+     * 设置该路由的图标，对应路径src/assets/icons/svg
+     */
+    private String icon;
+
+    /**
+     * 设置为true，则不会被 <keep-alive>缓存
+     */
+    private Boolean noCache;
+
+    /**
+     * 内链地址（http(s)://开头）
+     */
+    private String link;
+
+    public MetaVo(String title, String icon) {
+        this.title = title;
+        this.icon = icon;
+    }
+
+    public MetaVo(String title, String icon, Boolean noCache) {
+        this.title = title;
+        this.icon = icon;
+        this.noCache = noCache;
+    }
+
+    public MetaVo(String title, String icon, String link) {
+        this.title = title;
+        this.icon = icon;
+        this.link = link;
+    }
+
+    public MetaVo(String title, String icon, Boolean noCache, String link) {
+        this.title = title;
+        this.icon = icon;
+        this.noCache = noCache;
+        if (StringUtils.ishttp(link)) {
+            this.link = link;
+        }
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/RouterVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/RouterVo.java
new file mode 100644
index 0000000..42da7e9
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/RouterVo.java
@@ -0,0 +1,62 @@
+package org.dromara.system.domain.vo;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 路由配置信息
+ *
+ * @author pengles
+ */
+@Data
+@JsonInclude(JsonInclude.Include.NON_EMPTY)
+public class RouterVo {
+
+    /**
+     * 路由名字
+     */
+    private String name;
+
+    /**
+     * 路由地址
+     */
+    private String path;
+
+    /**
+     * 是否隐藏路由，当设置 true 的时候该路由不会再侧边栏出现
+     */
+    private Boolean hidden;
+
+    /**
+     * 重定向地址，当设置 noRedirect 的时候该路由在面包屑导航中不可被点击
+     */
+    private String redirect;
+
+    /**
+     * 组件地址
+     */
+    private String component;
+
+    /**
+     * 路由参数：如 {"id": 1, "name": "ry"}
+     */
+    private String query;
+
+    /**
+     * 当你一个路由下面的 children 声明的路由大于1个时，自动会变成嵌套的模式--如组件页面
+     */
+    private Boolean alwaysShow;
+
+    /**
+     * 其他元素
+     */
+    private MetaVo meta;
+
+    /**
+     * 子路由
+     */
+    private List<RouterVo> children;
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysClientVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysClientVo.java
new file mode 100644
index 0000000..0308c74
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysClientVo.java
@@ -0,0 +1,90 @@
+package org.dromara.system.domain.vo;
+
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import org.dromara.system.domain.SysClient;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.List;
+
+
+/**
+ * 授权管理视图对象 sys_client
+ *
+ * @author pengles
+ * @date 2023-05-15
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = SysClient.class)
+public class SysClientVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @ExcelProperty(value = "id")
+    private Long id;
+
+    /**
+     * 客户端id
+     */
+    @ExcelProperty(value = "客户端id")
+    private String clientId;
+
+    /**
+     * 客户端key
+     */
+    @ExcelProperty(value = "客户端key")
+    private String clientKey;
+
+    /**
+     * 客户端秘钥
+     */
+    @ExcelProperty(value = "客户端秘钥")
+    private String clientSecret;
+
+    /**
+     * 授权类型
+     */
+    @ExcelProperty(value = "授权类型")
+    private List<String> grantTypeList;
+
+    /**
+     * 授权类型
+     */
+    private String grantType;
+
+    /**
+     * 设备类型
+     */
+    private String deviceType;
+
+    /**
+     * token活跃超时时间
+     */
+    @ExcelProperty(value = "token活跃超时时间")
+    private Long activeTimeout;
+
+    /**
+     * token固定超时时间
+     */
+    @ExcelProperty(value = "token固定超时时间")
+    private Long timeout;
+
+    /**
+     * 状态（0正常 1停用）
+     */
+    @ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "0=正常,1=停用")
+    private String status;
+
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysConfigVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysConfigVo.java
new file mode 100644
index 0000000..f6c513d
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysConfigVo.java
@@ -0,0 +1,71 @@
+package org.dromara.system.domain.vo;
+
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import org.dromara.system.domain.SysConfig;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 参数配置视图对象 sys_config
+ *
+ * @author pengles
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = SysConfig.class)
+public class SysConfigVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 参数主键
+     */
+    @ExcelProperty(value = "参数主键")
+    private Long configId;
+
+    /**
+     * 参数名称
+     */
+    @ExcelProperty(value = "参数名称")
+    private String configName;
+
+    /**
+     * 参数键名
+     */
+    @ExcelProperty(value = "参数键名")
+    private String configKey;
+
+    /**
+     * 参数键值
+     */
+    @ExcelProperty(value = "参数键值")
+    private String configValue;
+
+    /**
+     * 系统内置（Y是 N否）
+     */
+    @ExcelProperty(value = "系统内置", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "sys_yes_no")
+    private String configType;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "创建时间")
+    private Date createTime;
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDeptVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDeptVo.java
new file mode 100644
index 0000000..79a3ba7
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDeptVo.java
@@ -0,0 +1,109 @@
+package org.dromara.system.domain.vo;
+
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import org.dromara.system.domain.SysDept;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 部门视图对象 sys_dept
+ *
+ * @author pengles
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = SysDept.class)
+public class SysDeptVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 部门id
+     */
+    @ExcelProperty(value = "部门id")
+    private Long deptId;
+
+    /**
+     * 父部门id
+     */
+    private Long parentId;
+
+    /**
+     * 父部门名称
+     */
+    private String parentName;
+
+    /**
+     * 祖级列表
+     */
+    private String ancestors;
+
+    /**
+     * 部门名称
+     */
+    @ExcelProperty(value = "部门名称")
+    private String deptName;
+
+    /**
+     * 部门类别编码
+     */
+    @ExcelProperty(value = "部门类别编码")
+    private String deptCategory;
+
+    /**
+     * 显示顺序
+     */
+    private Integer orderNum;
+
+    /**
+     * 负责人ID
+     */
+    private Long leader;
+
+    /**
+     * 负责人
+     */
+    @ExcelProperty(value = "负责人")
+    private String leaderName;
+
+    /**
+     * 联系电话
+     */
+    @ExcelProperty(value = "联系电话")
+    private String phone;
+
+    /**
+     * 邮箱
+     */
+    @ExcelProperty(value = "邮箱")
+    private String email;
+
+    /**
+     * 部门状态（0正常 1停用）
+     */
+    @ExcelProperty(value = "部门状态", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "sys_normal_disable")
+    private String status;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "创建时间")
+    private Date createTime;
+
+    /**
+     * 子部门
+     */
+    private List<SysDept> children = new ArrayList<>();
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDictDataVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDictDataVo.java
new file mode 100644
index 0000000..b34efed
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDictDataVo.java
@@ -0,0 +1,88 @@
+package org.dromara.system.domain.vo;
+
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import org.dromara.system.domain.SysDictData;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 字典数据视图对象 sys_dict_data
+ *
+ * @author pengles
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = SysDictData.class)
+public class SysDictDataVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 字典编码
+     */
+    @ExcelProperty(value = "字典编码")
+    private Long dictCode;
+
+    /**
+     * 字典排序
+     */
+    @ExcelProperty(value = "字典排序")
+    private Integer dictSort;
+
+    /**
+     * 字典标签
+     */
+    @ExcelProperty(value = "字典标签")
+    private String dictLabel;
+
+    /**
+     * 字典键值
+     */
+    @ExcelProperty(value = "字典键值")
+    private String dictValue;
+
+    /**
+     * 字典类型
+     */
+    @ExcelProperty(value = "字典类型")
+    private String dictType;
+
+    /**
+     * 样式属性（其他样式扩展）
+     */
+    private String cssClass;
+
+    /**
+     * 表格回显样式
+     */
+    private String listClass;
+
+    /**
+     * 是否默认（Y是 N否）
+     */
+    @ExcelProperty(value = "是否默认", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "sys_yes_no")
+    private String isDefault;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "创建时间")
+    private Date createTime;
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDictTypeVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDictTypeVo.java
new file mode 100644
index 0000000..8bd4197
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDictTypeVo.java
@@ -0,0 +1,57 @@
+package org.dromara.system.domain.vo;
+
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.system.domain.SysDictType;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 字典类型视图对象 sys_dict_type
+ *
+ * @author pengles
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = SysDictType.class)
+public class SysDictTypeVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 字典主键
+     */
+    @ExcelProperty(value = "字典主键")
+    private Long dictId;
+
+    /**
+     * 字典名称
+     */
+    @ExcelProperty(value = "字典名称")
+    private String dictName;
+
+    /**
+     * 字典类型
+     */
+    @ExcelProperty(value = "字典类型")
+    private String dictType;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "创建时间")
+    private Date createTime;
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysLogininforVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysLogininforVo.java
new file mode 100644
index 0000000..21ab91a
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysLogininforVo.java
@@ -0,0 +1,100 @@
+package org.dromara.system.domain.vo;
+
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import org.dromara.system.domain.SysLogininfor;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 系统访问记录视图对象 sys_logininfor
+ *
+ * @author pengles
+ * @date 2023-02-07
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = SysLogininfor.class)
+public class SysLogininforVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 访问ID
+     */
+    @ExcelProperty(value = "序号")
+    private Long infoId;
+
+    /**
+     * 用户账号
+     */
+    @ExcelProperty(value = "用户账号")
+    private String userName;
+
+    /**
+     * 客户端
+     */
+    @ExcelProperty(value = "客户端")
+    private String clientKey;
+
+    /**
+     * 设备类型
+     */
+    @ExcelProperty(value = "设备类型", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "sys_device_type")
+    private String deviceType;
+
+    /**
+     * 登录状态（0成功 1失败）
+     */
+    @ExcelProperty(value = "登录状态", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "sys_common_status")
+    private String status;
+
+    /**
+     * 登录IP地址
+     */
+    @ExcelProperty(value = "登录地址")
+    private String ipaddr;
+
+    /**
+     * 登录地点
+     */
+    @ExcelProperty(value = "登录地点")
+    private String loginLocation;
+
+    /**
+     * 浏览器类型
+     */
+    @ExcelProperty(value = "浏览器")
+    private String browser;
+
+    /**
+     * 操作系统
+     */
+    @ExcelProperty(value = "操作系统")
+    private String os;
+
+
+    /**
+     * 提示消息
+     */
+    @ExcelProperty(value = "提示消息")
+    private String msg;
+
+    /**
+     * 访问时间
+     */
+    @ExcelProperty(value = "访问时间")
+    private Date loginTime;
+
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysMenuVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysMenuVo.java
new file mode 100644
index 0000000..f4a57ae
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysMenuVo.java
@@ -0,0 +1,116 @@
+package org.dromara.system.domain.vo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.system.domain.SysMenu;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+
+/**
+ * 菜单权限视图对象 sys_menu
+ *
+ * @author pengles
+ */
+@Data
+@AutoMapper(target = SysMenu.class)
+public class SysMenuVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 菜单ID
+     */
+    private Long menuId;
+
+    /**
+     * 菜单名称
+     */
+    private String menuName;
+
+    /**
+     * 父菜单ID
+     */
+    private Long parentId;
+
+    /**
+     * 显示顺序
+     */
+    private Integer orderNum;
+
+    /**
+     * 路由地址
+     */
+    private String path;
+
+    /**
+     * 组件路径
+     */
+    private String component;
+
+    /**
+     * 路由参数
+     */
+    private String queryParam;
+
+    /**
+     * 是否为外链（0是 1否）
+     */
+    private String isFrame;
+
+    /**
+     * 是否缓存（0缓存 1不缓存）
+     */
+    private String isCache;
+
+    /**
+     * 菜单类型（M目录 C菜单 F按钮）
+     */
+    private String menuType;
+
+    /**
+     * 显示状态（0显示 1隐藏）
+     */
+    private String visible;
+
+    /**
+     * 菜单状态（0正常 1停用）
+     */
+    private String status;
+
+    /**
+     * 权限标识
+     */
+    private String perms;
+
+    /**
+     * 菜单图标
+     */
+    private String icon;
+
+    /**
+     * 创建部门
+     */
+    private Long createDept;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 子菜单
+     */
+    private List<SysMenuVo> children = new ArrayList<>();
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysNoticeVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysNoticeVo.java
new file mode 100644
index 0000000..0500018
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysNoticeVo.java
@@ -0,0 +1,72 @@
+package org.dromara.system.domain.vo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.common.translation.annotation.Translation;
+import org.dromara.common.translation.constant.TransConstant;
+import org.dromara.system.domain.SysNotice;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 通知公告视图对象 sys_notice
+ *
+ * @author pengles
+ */
+@Data
+@AutoMapper(target = SysNotice.class)
+public class SysNoticeVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 公告ID
+     */
+    private Long noticeId;
+
+    /**
+     * 公告标题
+     */
+    private String noticeTitle;
+
+    /**
+     * 公告类型（1通知 2公告）
+     */
+    private String noticeType;
+
+    /**
+     * 公告内容
+     */
+    private String noticeContent;
+
+    /**
+     * 公告状态（0正常 1关闭）
+     */
+    private String status;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 创建者
+     */
+    private Long createBy;
+
+    /**
+     * 创建人名称
+     */
+    @Translation(type = TransConstant.USER_ID_TO_NAME, mapper = "createBy")
+    private String createByName;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOperLogVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOperLogVo.java
new file mode 100644
index 0000000..15a6d0a
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOperLogVo.java
@@ -0,0 +1,139 @@
+package org.dromara.system.domain.vo;
+
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import org.dromara.system.domain.SysOperLog;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 操作日志记录视图对象 sys_oper_log
+ *
+ * @author pengles
+ * @date 2023-02-07
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = SysOperLog.class)
+public class SysOperLogVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 日志主键
+     */
+    @ExcelProperty(value = "日志主键")
+    private Long operId;
+
+    /**
+     * 模块标题
+     */
+    @ExcelProperty(value = "操作模块")
+    private String title;
+
+    /**
+     * 业务类型（0其它 1新增 2修改 3删除）
+     */
+    @ExcelProperty(value = "业务类型", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "sys_oper_type")
+    private Integer businessType;
+
+    /**
+     * 业务类型数组
+     */
+    private Integer[] businessTypes;
+
+    /**
+     * 方法名称
+     */
+    @ExcelProperty(value = "请求方法")
+    private String method;
+
+    /**
+     * 请求方式
+     */
+    @ExcelProperty(value = "请求方式")
+    private String requestMethod;
+
+    /**
+     * 操作类别（0其它 1后台用户 2手机端用户）
+     */
+    @ExcelProperty(value = "操作类别", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "0=其它,1=后台用户,2=手机端用户")
+    private Integer operatorType;
+
+    /**
+     * 操作人员
+     */
+    @ExcelProperty(value = "操作人员")
+    private String operName;
+
+    /**
+     * 部门名称
+     */
+    @ExcelProperty(value = "部门名称")
+    private String deptName;
+
+    /**
+     * 请求URL
+     */
+    @ExcelProperty(value = "请求地址")
+    private String operUrl;
+
+    /**
+     * 主机地址
+     */
+    @ExcelProperty(value = "操作地址")
+    private String operIp;
+
+    /**
+     * 操作地点
+     */
+    @ExcelProperty(value = "操作地点")
+    private String operLocation;
+
+    /**
+     * 请求参数
+     */
+    @ExcelProperty(value = "请求参数")
+    private String operParam;
+
+    /**
+     * 返回参数
+     */
+    @ExcelProperty(value = "返回参数")
+    private String jsonResult;
+
+    /**
+     * 操作状态（0正常 1异常）
+     */
+    @ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "sys_common_status")
+    private Integer status;
+
+    /**
+     * 错误消息
+     */
+    @ExcelProperty(value = "错误消息")
+    private String errorMsg;
+
+    /**
+     * 操作时间
+     */
+    @ExcelProperty(value = "操作时间")
+    private Date operTime;
+
+    /**
+     * 消耗时间
+     */
+    @ExcelProperty(value = "消耗时间")
+    private Long costTime;
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssConfigVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssConfigVo.java
new file mode 100644
index 0000000..3700c69
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssConfigVo.java
@@ -0,0 +1,97 @@
+package org.dromara.system.domain.vo;
+
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.system.domain.SysOssConfig;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+
+/**
+ * 对象存储配置视图对象 sys_oss_config
+ *
+ * @author pengles
+ * @author 孤舟烟雨
+ * @date 2021-08-13
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = SysOssConfig.class)
+public class SysOssConfigVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    private Long ossConfigId;
+
+    /**
+     * 配置key
+     */
+    private String configKey;
+
+    /**
+     * accessKey
+     */
+    private String accessKey;
+
+    /**
+     * 秘钥
+     */
+    private String secretKey;
+
+    /**
+     * 桶名称
+     */
+    private String bucketName;
+
+    /**
+     * 前缀
+     */
+    private String prefix;
+
+    /**
+     * 访问站点
+     */
+    private String endpoint;
+
+    /**
+     * 自定义域名
+     */
+    private String domain;
+
+    /**
+     * 是否https（Y=是,N=否）
+     */
+    private String isHttps;
+
+    /**
+     * 域
+     */
+    private String region;
+
+    /**
+     * 是否默认（0=是,1=否）
+     */
+    private String status;
+
+    /**
+     * 扩展字段
+     */
+    private String ext1;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 桶权限类型(0private 1public 2custom)
+     */
+    private String accessPolicy;
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssUploadVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssUploadVo.java
new file mode 100644
index 0000000..5a8a085
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssUploadVo.java
@@ -0,0 +1,28 @@
+package org.dromara.system.domain.vo;
+
+import lombok.Data;
+
+/**
+ * 上传对象信息
+ *
+ * @author pengles
+ */
+@Data
+public class SysOssUploadVo {
+
+    /**
+     * URL地址
+     */
+    private String url;
+
+    /**
+     * 文件名
+     */
+    private String fileName;
+
+    /**
+     * 对象存储主键
+     */
+    private String ossId;
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssVo.java
new file mode 100644
index 0000000..c1b8bce
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssVo.java
@@ -0,0 +1,77 @@
+package org.dromara.system.domain.vo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.common.translation.annotation.Translation;
+import org.dromara.common.translation.constant.TransConstant;
+import org.dromara.system.domain.SysOss;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * OSS对象存储视图对象 sys_oss
+ *
+ * @author pengles
+ */
+@Data
+@AutoMapper(target = SysOss.class)
+public class SysOssVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 对象存储主键
+     */
+    private Long ossId;
+
+    /**
+     * 文件名
+     */
+    private String fileName;
+
+    /**
+     * 原名
+     */
+    private String originalName;
+
+    /**
+     * 文件后缀名
+     */
+    private String fileSuffix;
+
+    /**
+     * URL地址
+     */
+    private String url;
+
+    /**
+     * 扩展字段
+     */
+    private String ext1;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 上传人
+     */
+    private Long createBy;
+
+    /**
+     * 上传人名称
+     */
+    @Translation(type = TransConstant.USER_ID_TO_NAME, mapper = "createBy")
+    private String createByName;
+
+    /**
+     * 服务商
+     */
+    private String service;
+
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysPostVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysPostVo.java
new file mode 100644
index 0000000..6da6c62
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysPostVo.java
@@ -0,0 +1,91 @@
+package org.dromara.system.domain.vo;
+
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import org.dromara.common.translation.annotation.Translation;
+import org.dromara.common.translation.constant.TransConstant;
+import org.dromara.system.domain.SysPost;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 岗位信息视图对象 sys_post
+ *
+ * @author pengles
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = SysPost.class)
+public class SysPostVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 岗位ID
+     */
+    @ExcelProperty(value = "岗位序号")
+    private Long postId;
+
+    /**
+     * 部门id
+     */
+    @ExcelProperty(value = "部门id")
+    private Long deptId;
+
+    /**
+     * 岗位编码
+     */
+    @ExcelProperty(value = "岗位编码")
+    private String postCode;
+
+    /**
+     * 岗位名称
+     */
+    @ExcelProperty(value = "岗位名称")
+    private String postName;
+
+    /**
+     * 岗位类别编码
+     */
+    @ExcelProperty(value = "类别编码")
+    private String postCategory;
+
+    /**
+     * 显示顺序
+     */
+    @ExcelProperty(value = "岗位排序")
+    private Integer postSort;
+
+    /**
+     * 状态（0正常 1停用）
+     */
+    @ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "sys_normal_disable")
+    private String status;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "创建时间")
+    private Date createTime;
+
+    /**
+     * 部门名
+     */
+    @Translation(type = TransConstant.DEPT_ID_TO_NAME, mapper = "deptId")
+    private String deptName;
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysRoleVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysRoleVo.java
new file mode 100644
index 0000000..ffa051d
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysRoleVo.java
@@ -0,0 +1,100 @@
+package org.dromara.system.domain.vo;
+
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.common.core.constant.SystemConstants;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import org.dromara.system.domain.SysRole;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 角色信息视图对象 sys_role
+ *
+ * @author pengles
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = SysRole.class)
+public class SysRoleVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 角色ID
+     */
+    @ExcelProperty(value = "角色序号")
+    private Long roleId;
+
+    /**
+     * 角色名称
+     */
+    @ExcelProperty(value = "角色名称")
+    private String roleName;
+
+    /**
+     * 角色权限字符串
+     */
+    @ExcelProperty(value = "角色权限")
+    private String roleKey;
+
+    /**
+     * 显示顺序
+     */
+    @ExcelProperty(value = "角色排序")
+    private Integer roleSort;
+
+    /**
+     * 数据范围（1：全部数据权限 2：自定数据权限 3：本部门数据权限 4：本部门及以下数据权限 5：仅本人数据权限 6：部门及以下或本人数据权限）
+     */
+    @ExcelProperty(value = "数据范围", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "1=全部数据权限,2=自定义数据权限,3=本部门数据权限,4=本部门及以下数据权限,5=仅本人数据权限,6=部门及以下或本人数据权限")
+    private String dataScope;
+
+    /**
+     * 菜单树选择项是否关联显示
+     */
+    @ExcelProperty(value = "菜单树选择项是否关联显示")
+    private Boolean menuCheckStrictly;
+
+    /**
+     * 部门树选择项是否关联显示
+     */
+    @ExcelProperty(value = "部门树选择项是否关联显示")
+    private Boolean deptCheckStrictly;
+
+    /**
+     * 角色状态（0正常 1停用）
+     */
+    @ExcelProperty(value = "角色状态", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "sys_normal_disable")
+    private String status;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "创建时间")
+    private Date createTime;
+
+    /**
+     * 用户是否存在此角色标识 默认不存在
+     */
+    private boolean flag = false;
+
+    public boolean isSuperAdmin() {
+        return SystemConstants.SUPER_ADMIN_ID.equals(this.roleId);
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysSocialVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysSocialVo.java
new file mode 100644
index 0000000..4e4e00d
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysSocialVo.java
@@ -0,0 +1,139 @@
+package org.dromara.system.domain.vo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.system.domain.SysSocial;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 社会化关系视图对象 sys_social
+ *
+ * @author thiszhc
+ */
+@Data
+@AutoMapper(target = SysSocial.class)
+public class SysSocialVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    private Long id;
+
+    /**
+     * 用户ID
+     */
+    private Long userId;
+
+    /**
+     * 的唯一ID
+     */
+    private String authId;
+
+    /**
+     * 用户来源
+     */
+    private String source;
+
+    /**
+     * 用户的授权令牌
+     */
+    private String accessToken;
+
+    /**
+     * 用户的授权令牌的有效期，部分平台可能没有
+     */
+    private int expireIn;
+
+    /**
+     * 刷新令牌，部分平台可能没有
+     */
+    private String refreshToken;
+
+    /**
+     * 用户的 open id
+     */
+    private String openId;
+
+    /**
+     * 授权的第三方账号
+     */
+    private String userName;
+
+    /**
+     * 授权的第三方昵称
+     */
+    private String nickName;
+
+    /**
+     * 授权的第三方邮箱
+     */
+    private String email;
+
+    /**
+     * 授权的第三方头像地址
+     */
+    private String avatar;
+
+
+    /**
+     * 平台的授权信息，部分平台可能没有
+     */
+    private String accessCode;
+
+    /**
+     * 用户的 unionid
+     */
+    private String unionId;
+
+    /**
+     * 授予的权限，部分平台可能没有
+     */
+    private String scope;
+
+    /**
+     * 个别平台的授权信息，部分平台可能没有
+     */
+    private String tokenType;
+
+    /**
+     * id token，部分平台可能没有
+     */
+    private String idToken;
+
+    /**
+     * 小米平台用户的附带属性，部分平台可能没有
+     */
+    private String macAlgorithm;
+
+    /**
+     * 小米平台用户的附带属性，部分平台可能没有
+     */
+    private String macKey;
+
+    /**
+     * 用户的授权code，部分平台可能没有
+     */
+    private String code;
+
+    /**
+     * Twitter平台用户的附带属性，部分平台可能没有
+     */
+    private String oauthToken;
+
+    /**
+     * Twitter平台用户的附带属性，部分平台可能没有
+     */
+    private String oauthTokenSecret;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserExportVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserExportVo.java
new file mode 100644
index 0000000..3fe21ff
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserExportVo.java
@@ -0,0 +1,94 @@
+package org.dromara.system.domain.vo;
+
+import cn.idev.excel.annotation.ExcelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 用户对象导出VO
+ *
+ * @author pengles
+ */
+
+@Data
+@NoArgsConstructor
+public class SysUserExportVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 用户ID
+     */
+    @ExcelProperty(value = "用户序号")
+    private Long userId;
+
+    /**
+     * 用户账号
+     */
+    @ExcelProperty(value = "登录名称")
+    private String userName;
+
+    /**
+     * 用户昵称
+     */
+    @ExcelProperty(value = "用户名称")
+    private String nickName;
+
+    /**
+     * 用户邮箱
+     */
+    @ExcelProperty(value = "用户邮箱")
+    private String email;
+
+    /**
+     * 手机号码
+     */
+    @ExcelProperty(value = "手机号码")
+    private String phonenumber;
+
+    /**
+     * 用户性别
+     */
+    @ExcelProperty(value = "用户性别", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "sys_user_sex")
+    private String sex;
+
+    /**
+     * 帐号状态（0正常 1停用）
+     */
+    @ExcelProperty(value = "帐号状态", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "sys_normal_disable")
+    private String status;
+
+    /**
+     * 最后登录IP
+     */
+    @ExcelProperty(value = "最后登录IP")
+    private String loginIp;
+
+    /**
+     * 最后登录时间
+     */
+    @ExcelProperty(value = "最后登录时间")
+    private Date loginDate;
+
+    /**
+     * 部门名称
+     */
+    @ExcelProperty(value = "部门名称")
+    private String deptName;
+
+    /**
+     * 负责人
+     */
+    @ExcelProperty(value = "部门负责人")
+    private String leaderName;
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserImportVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserImportVo.java
new file mode 100644
index 0000000..6334829
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserImportVo.java
@@ -0,0 +1,76 @@
+package org.dromara.system.domain.vo;
+
+import cn.idev.excel.annotation.ExcelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 用户对象导入VO
+ *
+ * @author pengles
+ */
+
+@Data
+@NoArgsConstructor
+// @Accessors(chain = true) // 导入不允许使用 会找不到set方法
+public class SysUserImportVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 用户ID
+     */
+    @ExcelProperty(value = "用户序号")
+    private Long userId;
+
+    /**
+     * 部门ID
+     */
+    @ExcelProperty(value = "部门编号")
+    private Long deptId;
+
+    /**
+     * 用户账号
+     */
+    @ExcelProperty(value = "登录名称")
+    private String userName;
+
+    /**
+     * 用户昵称
+     */
+    @ExcelProperty(value = "用户名称")
+    private String nickName;
+
+    /**
+     * 用户邮箱
+     */
+    @ExcelProperty(value = "用户邮箱")
+    private String email;
+
+    /**
+     * 手机号码
+     */
+    @ExcelProperty(value = "手机号码")
+    private String phonenumber;
+
+    /**
+     * 用户性别
+     */
+    @ExcelProperty(value = "用户性别", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "sys_user_sex")
+    private String sex;
+
+    /**
+     * 帐号状态（0正常 1停用）
+     */
+    @ExcelProperty(value = "帐号状态", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "sys_normal_disable")
+    private String status;
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserInfoVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserInfoVo.java
new file mode 100644
index 0000000..88e0a6e
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserInfoVo.java
@@ -0,0 +1,40 @@
+package org.dromara.system.domain.vo;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 用户信息
+ *
+ * @author pengles
+ */
+@Data
+public class SysUserInfoVo {
+
+    /**
+     * 用户信息
+     */
+    private SysUserVo user;
+
+    /**
+     * 角色ID列表
+     */
+    private List<Long> roleIds;
+
+    /**
+     * 角色列表
+     */
+    private List<SysRoleVo> roles;
+
+    /**
+     * 岗位ID列表
+     */
+    private List<Long> postIds;
+
+    /**
+     * 岗位列表
+     */
+    private List<SysPostVo> posts;
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserVo.java
new file mode 100644
index 0000000..d28fa08
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserVo.java
@@ -0,0 +1,137 @@
+package org.dromara.system.domain.vo;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.common.sensitive.annotation.Sensitive;
+import org.dromara.common.sensitive.core.SensitiveStrategy;
+import org.dromara.common.translation.annotation.Translation;
+import org.dromara.common.translation.constant.TransConstant;
+import org.dromara.system.domain.SysUser;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+
+/**
+ * 用户信息视图对象 sys_user
+ *
+ * @author pengles
+ */
+@Data
+@AutoMapper(target = SysUser.class)
+public class SysUserVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 用户ID
+     */
+    private Long userId;
+
+    /**
+     * 部门ID
+     */
+    private Long deptId;
+
+    /**
+     * 用户账号
+     */
+    private String userName;
+
+    /**
+     * 用户昵称
+     */
+    private String nickName;
+
+    /**
+     * 用户类型（sys_user系统用户）
+     */
+    private String userType;
+
+    /**
+     * 用户邮箱
+     */
+    @Sensitive(strategy = SensitiveStrategy.EMAIL, perms = "system:user:edit")
+    private String email;
+
+    /**
+     * 手机号码
+     */
+    @Sensitive(strategy = SensitiveStrategy.PHONE, perms = "system:user:edit")
+    private String phonenumber;
+
+    /**
+     * 用户性别（0男 1女 2未知）
+     */
+    private String sex;
+
+    /**
+     * 头像地址
+     */
+    @Translation(type = TransConstant.OSS_ID_TO_URL)
+    private Long avatar;
+
+    /**
+     * 密码
+     */
+    @JsonIgnore
+    @JsonProperty
+    private String password;
+
+    /**
+     * 帐号状态（0正常 1停用）
+     */
+    private String status;
+
+    /**
+     * 最后登录IP
+     */
+    private String loginIp;
+
+    /**
+     * 最后登录时间
+     */
+    private Date loginDate;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 部门名
+     */
+    @Translation(type = TransConstant.DEPT_ID_TO_NAME, mapper = "deptId")
+    private String deptName;
+
+    /**
+     * 角色对象
+     */
+    private List<SysRoleVo> roles;
+
+    /**
+     * 角色组
+     */
+    private Long[] roleIds;
+
+    /**
+     * 岗位组
+     */
+    private Long[] postIds;
+
+    /**
+     * 数据权限 当前角色ID
+     */
+    private Long roleId;
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/UserInfoVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/UserInfoVo.java
new file mode 100644
index 0000000..9bfeb8b
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/UserInfoVo.java
@@ -0,0 +1,30 @@
+package org.dromara.system.domain.vo;
+
+import lombok.Data;
+
+import java.util.Set;
+
+/**
+ * 登录用户信息
+ *
+ * @author pengles
+ */
+@Data
+public class UserInfoVo {
+
+    /**
+     * 用户基本信息
+     */
+    private SysUserVo user;
+
+    /**
+     * 菜单权限
+     */
+    private Set<String> permissions;
+
+    /**
+     * 角色权限
+     */
+    private Set<String> roles;
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/listener/SysUserImportListener.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/listener/SysUserImportListener.java
new file mode 100644
index 0000000..4e95a6e
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/listener/SysUserImportListener.java
@@ -0,0 +1,126 @@
+package org.dromara.system.listener;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.crypto.digest.BCrypt;
+import cn.hutool.http.HtmlUtil;
+import cn.idev.excel.context.AnalysisContext;
+import cn.idev.excel.event.AnalysisEventListener;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.ConstraintViolationException;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.utils.SpringUtils;
+import org.dromara.common.core.utils.StreamUtils;
+import org.dromara.common.core.utils.ValidatorUtils;
+import org.dromara.common.excel.core.ExcelListener;
+import org.dromara.common.excel.core.ExcelResult;
+import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.system.domain.bo.SysUserBo;
+import org.dromara.system.domain.vo.SysUserImportVo;
+import org.dromara.system.domain.vo.SysUserVo;
+import org.dromara.system.service.SysConfigService;
+import org.dromara.system.service.SysUserService;
+
+import java.util.List;
+
+/**
+ * 系统用户自定义导入
+ *
+ * @author pengles
+ */
+@Slf4j
+public class SysUserImportListener extends AnalysisEventListener<SysUserImportVo> implements ExcelListener<SysUserImportVo> {
+
+    private final SysUserService userService;
+
+    private final String password;
+
+    private final Boolean isUpdateSupport;
+
+    private final Long operUserId;
+    private final StringBuilder successMsg = new StringBuilder();
+    private final StringBuilder failureMsg = new StringBuilder();
+    private int successNum = 0;
+    private int failureNum = 0;
+
+    public SysUserImportListener(Boolean isUpdateSupport) {
+        String initPassword = SpringUtils.getBean(SysConfigService.class).selectConfigByKey("sys.user.initPassword");
+        this.userService = SpringUtils.getBean(SysUserService.class);
+        this.password = BCrypt.hashpw(initPassword);
+        this.isUpdateSupport = isUpdateSupport;
+        this.operUserId = LoginHelper.getUserId();
+    }
+
+    @Override
+    public void invoke(SysUserImportVo userVo, AnalysisContext context) {
+        SysUserVo sysUser = this.userService.selectUserByUserName(userVo.getUserName());
+        try {
+            // 验证是否存在这个用户
+            if (ObjectUtil.isNull(sysUser)) {
+                SysUserBo user = BeanUtil.toBean(userVo, SysUserBo.class);
+                ValidatorUtils.validate(user);
+                user.setPassword(password);
+                user.setCreateBy(operUserId);
+                userService.insertUser(user);
+                successNum++;
+                successMsg.append("<br/>").append(successNum).append("、账号 ").append(user.getUserName()).append(" 导入成功");
+            } else if (isUpdateSupport) {
+                Long userId = sysUser.getUserId();
+                SysUserBo user = BeanUtil.toBean(userVo, SysUserBo.class);
+                user.setUserId(userId);
+                ValidatorUtils.validate(user);
+                userService.checkUserAllowed(user.getUserId());
+                userService.checkUserDataScope(user.getUserId());
+                user.setUpdateBy(operUserId);
+                userService.updateUser(user);
+                successNum++;
+                successMsg.append("<br/>").append(successNum).append("、账号 ").append(user.getUserName()).append(" 更新成功");
+            } else {
+                failureNum++;
+                failureMsg.append("<br/>").append(failureNum).append("、账号 ").append(sysUser.getUserName()).append(" 已存在");
+            }
+        } catch (Exception e) {
+            failureNum++;
+            String msg = "<br/>" + failureNum + "、账号 " + HtmlUtil.cleanHtmlTag(userVo.getUserName()) + " 导入失败：";
+            String message = e.getMessage();
+            if (e instanceof ConstraintViolationException cvException) {
+                message = StreamUtils.join(cvException.getConstraintViolations(), ConstraintViolation::getMessage, ", ");
+            }
+            failureMsg.append(msg).append(message);
+            log.error(msg, e);
+        }
+    }
+
+    @Override
+    public void doAfterAllAnalysed(AnalysisContext context) {
+
+    }
+
+    @Override
+    public ExcelResult<SysUserImportVo> getExcelResult() {
+        return new ExcelResult<>() {
+
+            @Override
+            public String getAnalysis() {
+                if (failureNum > 0) {
+                    failureMsg.insert(0, "很抱歉，导入失败！共 " + failureNum + " 条数据格式不正确，错误如下：");
+                    throw new ServiceException(failureMsg.toString());
+                } else {
+                    successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条，数据如下：");
+                }
+                return successMsg.toString();
+            }
+
+            @Override
+            public List<SysUserImportVo> getList() {
+                return null;
+            }
+
+            @Override
+            public List<String> getErrorList() {
+                return null;
+            }
+        };
+    }
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysClientMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysClientMapper.java
new file mode 100644
index 0000000..99740e0
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysClientMapper.java
@@ -0,0 +1,15 @@
+package org.dromara.system.mapper;
+
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.system.domain.SysClient;
+import org.dromara.system.domain.vo.SysClientVo;
+
+/**
+ * 授权管理Mapper接口
+ *
+ * @author pengles
+ * @date 2023-05-15
+ */
+public interface SysClientMapper extends BaseMapperPlus<SysClient, SysClientVo> {
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysConfigMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysConfigMapper.java
new file mode 100644
index 0000000..e847753
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysConfigMapper.java
@@ -0,0 +1,14 @@
+package org.dromara.system.mapper;
+
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.system.domain.SysConfig;
+import org.dromara.system.domain.vo.SysConfigVo;
+
+/**
+ * 参数配置 数据层
+ *
+ * @author pengles
+ */
+public interface SysConfigMapper extends BaseMapperPlus<SysConfig, SysConfigVo> {
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDeptMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDeptMapper.java
new file mode 100644
index 0000000..5042726
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDeptMapper.java
@@ -0,0 +1,84 @@
+package org.dromara.system.mapper;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
+import org.dromara.common.mybatis.annotation.DataColumn;
+import org.dromara.common.mybatis.annotation.DataPermission;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.common.mybatis.helper.DataBaseHelper;
+import org.dromara.system.domain.SysDept;
+import org.dromara.system.domain.vo.SysDeptVo;
+
+import java.util.List;
+
+/**
+ * 部门管理 数据层
+ *
+ * @author pengles
+ */
+public interface SysDeptMapper extends BaseMapperPlus<SysDept, SysDeptVo> {
+
+    /**
+     * 查询部门管理数据
+     *
+     * @param queryWrapper 查询条件
+     * @return 部门信息集合
+     */
+    @DataPermission({
+            @DataColumn(key = "deptName", value = "dept_id")
+    })
+    default List<SysDeptVo> selectDeptList(Wrapper<SysDept> queryWrapper) {
+        return this.selectVoList(queryWrapper);
+    }
+
+    /**
+     * 分页查询部门管理数据
+     *
+     * @param page         分页信息
+     * @param queryWrapper 查询条件
+     * @return 部门信息集合
+     */
+    @DataPermission({
+            @DataColumn(key = "deptName", value = "dept_id"),
+    })
+    default Page<SysDeptVo> selectPageDeptList(Page<SysDept> page, Wrapper<SysDept> queryWrapper) {
+        return this.selectVoPage(page, queryWrapper);
+    }
+
+    /**
+     * 统计指定部门ID的部门数量
+     *
+     * @param deptId 部门ID
+     * @return 该部门ID的部门数量
+     */
+    @DataPermission({
+            @DataColumn(key = "deptName", value = "dept_id")
+    })
+    default long countDeptById(Long deptId) {
+        return this.selectCount(new LambdaQueryWrapper<SysDept>().eq(SysDept::getDeptId, deptId));
+    }
+
+    /**
+     * 根据父部门ID查询其所有子部门的列表
+     *
+     * @param parentId 父部门ID
+     * @return 包含子部门的列表
+     */
+    default List<SysDept> selectListByParentId(Long parentId) {
+        return this.selectList(new LambdaQueryWrapper<SysDept>()
+                .select(SysDept::getDeptId)
+                .apply(DataBaseHelper.findInSet(parentId, "ancestors")));
+    }
+
+    /**
+     * 根据角色ID查询部门树信息
+     *
+     * @param roleId            角色ID
+     * @param deptCheckStrictly 部门树选择项是否关联显示
+     * @return 选中部门列表
+     */
+    List<Long> selectDeptListByRoleId(@Param("roleId") Long roleId, @Param("deptCheckStrictly") boolean deptCheckStrictly);
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDictDataMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDictDataMapper.java
new file mode 100644
index 0000000..d55cdb8
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDictDataMapper.java
@@ -0,0 +1,29 @@
+package org.dromara.system.mapper;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.system.domain.SysDictData;
+import org.dromara.system.domain.vo.SysDictDataVo;
+
+import java.util.List;
+
+/**
+ * 字典表 数据层
+ *
+ * @author pengles
+ */
+public interface SysDictDataMapper extends BaseMapperPlus<SysDictData, SysDictDataVo> {
+
+    /**
+     * 根据字典类型查询字典数据列表
+     *
+     * @param dictType 字典类型
+     * @return 符合条件的字典数据列表
+     */
+    default List<SysDictDataVo> selectDictDataByType(String dictType) {
+        return selectVoList(
+                new LambdaQueryWrapper<SysDictData>()
+                        .eq(SysDictData::getDictType, dictType)
+                        .orderByAsc(SysDictData::getDictSort));
+    }
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDictTypeMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDictTypeMapper.java
new file mode 100644
index 0000000..c2b7d07
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysDictTypeMapper.java
@@ -0,0 +1,14 @@
+package org.dromara.system.mapper;
+
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.system.domain.SysDictType;
+import org.dromara.system.domain.vo.SysDictTypeVo;
+
+/**
+ * 字典表 数据层
+ *
+ * @author pengles
+ */
+public interface SysDictTypeMapper extends BaseMapperPlus<SysDictType, SysDictTypeVo> {
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysLogininforMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysLogininforMapper.java
new file mode 100644
index 0000000..8be7831
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysLogininforMapper.java
@@ -0,0 +1,14 @@
+package org.dromara.system.mapper;
+
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.system.domain.SysLogininfor;
+import org.dromara.system.domain.vo.SysLogininforVo;
+
+/**
+ * 系统访问日志情况信息 数据层
+ *
+ * @author pengles
+ */
+public interface SysLogininforMapper extends BaseMapperPlus<SysLogininfor, SysLogininforVo> {
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysMenuMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysMenuMapper.java
new file mode 100644
index 0000000..26bb4bc
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysMenuMapper.java
@@ -0,0 +1,76 @@
+package org.dromara.system.mapper;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import org.apache.ibatis.annotations.Param;
+import org.dromara.common.core.constant.SystemConstants;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.system.domain.SysMenu;
+import org.dromara.system.domain.vo.SysMenuVo;
+
+import java.util.List;
+
+/**
+ * 菜单表 数据层
+ *
+ * @author pengles
+ */
+public interface SysMenuMapper extends BaseMapperPlus<SysMenu, SysMenuVo> {
+
+    /**
+     * 根据用户查询系统菜单列表
+     *
+     * @param queryWrapper 查询条件
+     * @return 菜单列表
+     */
+    List<SysMenu> selectMenuListByUserId(@Param(Constants.WRAPPER) Wrapper<SysMenu> queryWrapper);
+
+    /**
+     * 根据用户ID查询权限
+     *
+     * @param userId 用户ID
+     * @return 权限列表
+     */
+    List<String> selectMenuPermsByUserId(Long userId);
+
+    /**
+     * 根据角色ID查询权限
+     *
+     * @param roleId 角色ID
+     * @return 权限列表
+     */
+    List<String> selectMenuPermsByRoleId(Long roleId);
+
+    /**
+     * 根据用户ID查询菜单
+     *
+     * @return 菜单列表
+     */
+    default List<SysMenu> selectMenuTreeAll() {
+        LambdaQueryWrapper<SysMenu> lqw = new LambdaQueryWrapper<SysMenu>()
+                .in(SysMenu::getMenuType, SystemConstants.TYPE_DIR, SystemConstants.TYPE_MENU)
+                .eq(SysMenu::getStatus, SystemConstants.NORMAL)
+                .orderByAsc(SysMenu::getParentId)
+                .orderByAsc(SysMenu::getOrderNum);
+        return this.selectList(lqw);
+    }
+
+    /**
+     * 根据用户ID查询菜单
+     *
+     * @param userId 用户ID
+     * @return 菜单列表
+     */
+    List<SysMenu> selectMenuTreeByUserId(Long userId);
+
+    /**
+     * 根据角色ID查询菜单树信息
+     *
+     * @param roleId            角色ID
+     * @param menuCheckStrictly 菜单树选择项是否关联显示
+     * @return 选中菜单列表
+     */
+    List<Long> selectMenuListByRoleId(@Param("roleId") Long roleId, @Param("menuCheckStrictly") boolean menuCheckStrictly);
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysNoticeMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysNoticeMapper.java
new file mode 100644
index 0000000..7f9ab7e
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysNoticeMapper.java
@@ -0,0 +1,14 @@
+package org.dromara.system.mapper;
+
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.system.domain.SysNotice;
+import org.dromara.system.domain.vo.SysNoticeVo;
+
+/**
+ * 通知公告表 数据层
+ *
+ * @author pengles
+ */
+public interface SysNoticeMapper extends BaseMapperPlus<SysNotice, SysNoticeVo> {
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysOperLogMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysOperLogMapper.java
new file mode 100644
index 0000000..0989bab
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysOperLogMapper.java
@@ -0,0 +1,14 @@
+package org.dromara.system.mapper;
+
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.system.domain.SysOperLog;
+import org.dromara.system.domain.vo.SysOperLogVo;
+
+/**
+ * 操作日志 数据层
+ *
+ * @author pengles
+ */
+public interface SysOperLogMapper extends BaseMapperPlus<SysOperLog, SysOperLogVo> {
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysOssConfigMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysOssConfigMapper.java
new file mode 100644
index 0000000..bd29ca9
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysOssConfigMapper.java
@@ -0,0 +1,14 @@
+package org.dromara.system.mapper;
+
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.system.domain.SysOssConfig;
+import org.dromara.system.domain.vo.SysOssConfigVo;
+
+/**
+ * 对象存储配置Mapper接口
+ *
+ * @author pengles
+ */
+public interface SysOssConfigMapper extends BaseMapperPlus<SysOssConfig, SysOssConfigVo> {
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysOssMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysOssMapper.java
new file mode 100644
index 0000000..d560ef2
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysOssMapper.java
@@ -0,0 +1,13 @@
+package org.dromara.system.mapper;
+
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.system.domain.SysOss;
+import org.dromara.system.domain.vo.SysOssVo;
+
+/**
+ * 文件上传 数据层
+ *
+ * @author pengles
+ */
+public interface SysOssMapper extends BaseMapperPlus<SysOss, SysOssVo> {
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysPostMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysPostMapper.java
new file mode 100644
index 0000000..fa4b963
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysPostMapper.java
@@ -0,0 +1,43 @@
+package org.dromara.system.mapper;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.dromara.common.mybatis.annotation.DataColumn;
+import org.dromara.common.mybatis.annotation.DataPermission;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.system.domain.SysPost;
+import org.dromara.system.domain.vo.SysPostVo;
+
+import java.util.List;
+
+/**
+ * 岗位信息 数据层
+ *
+ * @author pengles
+ */
+public interface SysPostMapper extends BaseMapperPlus<SysPost, SysPostVo> {
+
+    /**
+     * 分页查询岗位列表
+     *
+     * @param page         分页对象
+     * @param queryWrapper 查询条件
+     * @return 包含岗位信息的分页结果
+     */
+    @DataPermission({
+            @DataColumn(key = "deptName", value = "dept_id"),
+            @DataColumn(key = "userName", value = "create_by")
+    })
+    default Page<SysPostVo> selectPagePostList(Page<SysPost> page, Wrapper<SysPost> queryWrapper) {
+        return this.selectVoPage(page, queryWrapper);
+    }
+
+    /**
+     * 查询用户所属岗位组
+     *
+     * @param userId 用户ID
+     * @return 结果
+     */
+    List<SysPostVo> selectPostsByUserId(Long userId);
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysRoleDeptMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysRoleDeptMapper.java
new file mode 100644
index 0000000..48ac461
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysRoleDeptMapper.java
@@ -0,0 +1,13 @@
+package org.dromara.system.mapper;
+
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.system.domain.SysRoleDept;
+
+/**
+ * 角色与部门关联表 数据层
+ *
+ * @author pengles
+ */
+public interface SysRoleDeptMapper extends BaseMapperPlus<SysRoleDept, SysRoleDept> {
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysRoleMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysRoleMapper.java
new file mode 100644
index 0000000..10da450
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysRoleMapper.java
@@ -0,0 +1,75 @@
+package org.dromara.system.mapper;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
+import org.dromara.common.mybatis.annotation.DataColumn;
+import org.dromara.common.mybatis.annotation.DataPermission;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.system.domain.SysRole;
+import org.dromara.system.domain.vo.SysRoleVo;
+
+import java.util.List;
+
+/**
+ * 角色表 数据层
+ *
+ * @author pengles
+ */
+public interface SysRoleMapper extends BaseMapperPlus<SysRole, SysRoleVo> {
+
+    /**
+     * 分页查询角色列表
+     *
+     * @param page         分页对象
+     * @param queryWrapper 查询条件
+     * @return 包含角色信息的分页结果
+     */
+    @DataPermission({
+            @DataColumn(key = "deptName", value = "d.dept_id"),
+            @DataColumn(key = "userName", value = "r.create_by")
+    })
+    Page<SysRoleVo> selectPageRoleList(@Param("page") Page<SysRole> page, @Param(Constants.WRAPPER) Wrapper<SysRole> queryWrapper);
+
+    /**
+     * 根据条件分页查询角色数据
+     *
+     * @param queryWrapper 查询条件
+     * @return 角色数据集合信息
+     */
+    @DataPermission({
+            @DataColumn(key = "deptName", value = "d.dept_id"),
+            @DataColumn(key = "userName", value = "r.create_by")
+    })
+    List<SysRoleVo> selectRoleList(@Param(Constants.WRAPPER) Wrapper<SysRole> queryWrapper);
+
+    /**
+     * 根据角色ID查询角色信息
+     *
+     * @param roleId 角色ID
+     * @return 对应的角色信息
+     */
+    @DataPermission({
+            @DataColumn(key = "deptName", value = "d.dept_id"),
+            @DataColumn(key = "userName", value = "r.create_by")
+    })
+    SysRoleVo selectRoleById(Long roleId);
+
+    /**
+     * 根据用户ID查询角色
+     *
+     * @param userId 用户ID
+     * @return 角色列表
+     */
+    List<SysRoleVo> selectRolePermissionByUserId(Long userId);
+
+    /**
+     * 根据用户ID查询角色
+     *
+     * @param userId 用户ID
+     * @return 角色列表
+     */
+    List<SysRoleVo> selectRolesByUserId(Long userId);
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysRoleMenuMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysRoleMenuMapper.java
new file mode 100644
index 0000000..13567f0
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysRoleMenuMapper.java
@@ -0,0 +1,26 @@
+package org.dromara.system.mapper;
+
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.system.domain.SysRoleMenu;
+
+import java.util.List;
+
+/**
+ * 角色与菜单关联表 数据层
+ *
+ * @author pengles
+ */
+public interface SysRoleMenuMapper extends BaseMapperPlus<SysRoleMenu, SysRoleMenu> {
+
+    /**
+     * 根据菜单ID串删除关联关系
+     *
+     * @param menuIds 菜单ID串
+     * @return 结果
+     */
+    default int deleteByMenuIds(List<Long> menuIds) {
+        return this.delete(new LambdaUpdateWrapper<SysRoleMenu>().in(SysRoleMenu::getMenuId, menuIds));
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysSocialMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysSocialMapper.java
new file mode 100644
index 0000000..eb2bd2f
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysSocialMapper.java
@@ -0,0 +1,16 @@
+package org.dromara.system.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.system.domain.SysSocial;
+import org.dromara.system.domain.vo.SysSocialVo;
+
+/**
+ * 社会化关系Mapper接口
+ *
+ * @author thiszhc
+ */
+@Mapper
+public interface SysSocialMapper extends BaseMapperPlus<SysSocial, SysSocialVo> {
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserMapper.java
new file mode 100644
index 0000000..a0e67f6
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserMapper.java
@@ -0,0 +1,133 @@
+package org.dromara.system.mapper;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.dromara.common.mybatis.annotation.DataColumn;
+import org.dromara.common.mybatis.annotation.DataPermission;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.system.domain.SysUser;
+import org.dromara.system.domain.vo.SysUserExportVo;
+import org.dromara.system.domain.vo.SysUserVo;
+
+import java.util.List;
+
+/**
+ * 用户表 数据层
+ *
+ * @author pengles
+ */
+@Mapper
+public interface SysUserMapper extends BaseMapperPlus<SysUser, SysUserVo> {
+
+    /**
+     * 分页查询用户列表，并进行数据权限控制
+     *
+     * @param page         分页参数
+     * @param queryWrapper 查询条件
+     * @return 分页的用户信息
+     */
+    @DataPermission({
+            @DataColumn(key = "deptName", value = "dept_id"),
+            @DataColumn(key = "userName", value = "user_id")
+    })
+    default Page<SysUserVo> selectPageUserList(Page<SysUser> page, Wrapper<SysUser> queryWrapper) {
+        return this.selectVoPage(page, queryWrapper);
+    }
+
+    /**
+     * 查询用户列表，并进行数据权限控制
+     *
+     * @param queryWrapper 查询条件
+     * @return 用户信息集合
+     */
+    @DataPermission({
+            @DataColumn(key = "deptName", value = "dept_id"),
+            @DataColumn(key = "userName", value = "user_id")
+    })
+    default List<SysUserVo> selectUserList(Wrapper<SysUser> queryWrapper) {
+        return this.selectVoList(queryWrapper);
+    }
+
+    /**
+     * 根据条件分页查询用户列表
+     *
+     * @param queryWrapper 查询条件
+     * @return 用户信息集合信息
+     */
+    @DataPermission({
+            @DataColumn(key = "deptName", value = "d.dept_id"),
+            @DataColumn(key = "userName", value = "u.user_id")
+    })
+    List<SysUserExportVo> selectUserExportList(@Param(Constants.WRAPPER) Wrapper<SysUser> queryWrapper);
+
+    /**
+     * 根据条件分页查询已配用户角色列表
+     *
+     * @param page         分页信息
+     * @param queryWrapper 查询条件
+     * @return 用户信息集合信息
+     */
+    @DataPermission({
+            @DataColumn(key = "deptName", value = "d.dept_id"),
+            @DataColumn(key = "userName", value = "u.user_id")
+    })
+    Page<SysUserVo> selectAllocatedList(@Param("page") Page<SysUser> page, @Param(Constants.WRAPPER) Wrapper<SysUser> queryWrapper);
+
+    /**
+     * 根据条件分页查询未分配用户角色列表
+     *
+     * @param queryWrapper 查询条件
+     * @return 用户信息集合信息
+     */
+    @DataPermission({
+            @DataColumn(key = "deptName", value = "d.dept_id"),
+            @DataColumn(key = "userName", value = "u.user_id")
+    })
+    Page<SysUserVo> selectUnallocatedList(@Param("page") Page<SysUser> page, @Param(Constants.WRAPPER) Wrapper<SysUser> queryWrapper);
+
+    /**
+     * 根据用户ID统计用户数量
+     *
+     * @param userId 用户ID
+     * @return 用户数量
+     */
+    @DataPermission({
+            @DataColumn(key = "deptName", value = "dept_id"),
+            @DataColumn(key = "userName", value = "user_id")
+    })
+    default long countUserById(Long userId) {
+        return this.selectCount(new LambdaQueryWrapper<SysUser>().eq(SysUser::getUserId, userId));
+    }
+
+    /**
+     * 根据条件更新用户数据
+     *
+     * @param user          要更新的用户实体
+     * @param updateWrapper 更新条件封装器
+     * @return 更新操作影响的行数
+     */
+    @Override
+    @DataPermission({
+            @DataColumn(key = "deptName", value = "dept_id"),
+            @DataColumn(key = "userName", value = "user_id")
+    })
+    int update(@Param(Constants.ENTITY) SysUser user, @Param(Constants.WRAPPER) Wrapper<SysUser> updateWrapper);
+
+    /**
+     * 根据用户ID更新用户数据
+     *
+     * @param user 要更新的用户实体
+     * @return 更新操作影响的行数
+     */
+    @Override
+    @DataPermission({
+            @DataColumn(key = "deptName", value = "dept_id"),
+            @DataColumn(key = "userName", value = "user_id")
+    })
+    int updateById(@Param(Constants.ENTITY) SysUser user);
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserPostMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserPostMapper.java
new file mode 100644
index 0000000..1fb9c8f
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserPostMapper.java
@@ -0,0 +1,13 @@
+package org.dromara.system.mapper;
+
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.system.domain.SysUserPost;
+
+/**
+ * 用户与岗位关联表 数据层
+ *
+ * @author pengles
+ */
+public interface SysUserPostMapper extends BaseMapperPlus<SysUserPost, SysUserPost> {
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserRoleMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserRoleMapper.java
new file mode 100644
index 0000000..159d17c
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysUserRoleMapper.java
@@ -0,0 +1,23 @@
+package org.dromara.system.mapper;
+
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.system.domain.SysUserRole;
+
+import java.util.List;
+
+/**
+ * 用户与角色关联表 数据层
+ *
+ * @author pengles
+ */
+public interface SysUserRoleMapper extends BaseMapperPlus<SysUserRole, SysUserRole> {
+
+    /**
+     * 根据角色ID查询关联的用户ID列表
+     *
+     * @param roleId 角色ID
+     * @return 关联到指定角色的用户ID列表
+     */
+    List<Long> selectUserIdsByRoleId(Long roleId);
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/runner/SystemApplicationRunner.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/runner/SystemApplicationRunner.java
new file mode 100644
index 0000000..6aa7ceb
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/runner/SystemApplicationRunner.java
@@ -0,0 +1,28 @@
+package org.dromara.system.runner;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.system.service.SysOssConfigService;
+import org.springframework.boot.ApplicationArguments;
+import org.springframework.boot.ApplicationRunner;
+import org.springframework.stereotype.Component;
+
+/**
+ * 初始化 system 模块对应业务数据
+ *
+ * @author pengles
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Component
+public class SystemApplicationRunner implements ApplicationRunner {
+
+    private final SysOssConfigService ossConfigService;
+
+    @Override
+    public void run(ApplicationArguments args) throws Exception {
+        ossConfigService.init();
+        log.info("初始化OSS配置成功");
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/SysClientService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/SysClientService.java
new file mode 100644
index 0000000..9d85025
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/SysClientService.java
@@ -0,0 +1,58 @@
+package org.dromara.system.service;
+
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.system.domain.bo.SysClientBo;
+import org.dromara.system.domain.vo.SysClientVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 客户端管理Service接口
+ *
+ * @author pengles
+ */
+public interface SysClientService {
+
+    /**
+     * 查询客户端管理
+     */
+    SysClientVo queryById(Long id);
+
+    /**
+     * 查询客户端信息基于客户端id
+     */
+    SysClientVo queryByClientId(String clientId);
+
+    /**
+     * 查询客户端管理列表
+     */
+    TableDataInfo<SysClientVo> queryPageList(SysClientBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询客户端管理列表
+     */
+    List<SysClientVo> queryList(SysClientBo bo);
+
+    /**
+     * 新增客户端管理
+     */
+    Boolean insertByBo(SysClientBo bo);
+
+    /**
+     * 修改客户端管理
+     */
+    Boolean updateByBo(SysClientBo bo);
+
+    /**
+     * 修改状态
+     */
+    int updateClientStatus(String clientId, String status);
+
+    /**
+     * 校验并批量删除客户端管理信息
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/SysConfigService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/SysConfigService.java
new file mode 100644
index 0000000..a196288
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/SysConfigService.java
@@ -0,0 +1,87 @@
+package org.dromara.system.service;
+
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.system.domain.bo.SysConfigBo;
+import org.dromara.system.domain.vo.SysConfigVo;
+
+import java.util.List;
+
+/**
+ * 参数配置 服务层
+ *
+ * @author pengles
+ */
+public interface SysConfigService {
+
+
+    TableDataInfo<SysConfigVo> selectPageConfigList(SysConfigBo config, PageQuery pageQuery);
+
+    /**
+     * 查询参数配置信息
+     *
+     * @param configId 参数配置ID
+     * @return 参数配置信息
+     */
+    SysConfigVo selectConfigById(Long configId);
+
+    /**
+     * 根据键名查询参数配置信息
+     *
+     * @param configKey 参数键名
+     * @return 参数键值
+     */
+    String selectConfigByKey(String configKey);
+
+    /**
+     * 获取注册开关
+     *
+     * @return true开启，false关闭
+     */
+    boolean selectRegisterEnabled();
+
+    /**
+     * 查询参数配置列表
+     *
+     * @param config 参数配置信息
+     * @return 参数配置集合
+     */
+    List<SysConfigVo> selectConfigList(SysConfigBo config);
+
+    /**
+     * 新增参数配置
+     *
+     * @param bo 参数配置信息
+     * @return 结果
+     */
+    String insertConfig(SysConfigBo bo);
+
+    /**
+     * 修改参数配置
+     *
+     * @param bo 参数配置信息
+     * @return 结果
+     */
+    String updateConfig(SysConfigBo bo);
+
+    /**
+     * 批量删除参数信息
+     *
+     * @param configIds 需要删除的参数ID
+     */
+    void deleteConfigByIds(List<Long> configIds);
+
+    /**
+     * 重置参数缓存数据
+     */
+    void resetConfigCache();
+
+    /**
+     * 校验参数键名是否唯一
+     *
+     * @param config 参数信息
+     * @return 结果
+     */
+    boolean checkConfigKeyUnique(SysConfigBo config);
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/SysDataScopeService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/SysDataScopeService.java
new file mode 100644
index 0000000..fe1306f
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/SysDataScopeService.java
@@ -0,0 +1,26 @@
+package org.dromara.system.service;
+
+/**
+ * 通用 数据权限 服务
+ *
+ * @author pengles
+ */
+public interface SysDataScopeService {
+
+    /**
+     * 获取角色自定义权限
+     *
+     * @param roleId 角色id
+     * @return 部门id组
+     */
+    String getRoleCustom(Long roleId);
+
+    /**
+     * 获取部门及以下权限
+     *
+     * @param deptId 部门id
+     * @return 部门id组
+     */
+    String getDeptAndChild(Long deptId);
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/SysDeptService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/SysDeptService.java
new file mode 100644
index 0000000..b708d4c
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/SysDeptService.java
@@ -0,0 +1,137 @@
+package org.dromara.system.service;
+
+import cn.hutool.core.lang.tree.Tree;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.system.domain.bo.SysDeptBo;
+import org.dromara.system.domain.vo.SysDeptVo;
+
+import java.util.List;
+
+/**
+ * 部门管理 服务层
+ *
+ * @author pengles
+ */
+public interface SysDeptService {
+
+    /**
+     * 分页查询部门管理数据
+     *
+     * @param dept      部门信息
+     * @param pageQuery 分页对象
+     * @return 部门信息集合
+     */
+    TableDataInfo<SysDeptVo> selectPageDeptList(SysDeptBo dept, PageQuery pageQuery);
+
+    /**
+     * 查询部门管理数据
+     *
+     * @param dept 部门信息
+     * @return 部门信息集合
+     */
+    List<SysDeptVo> selectDeptList(SysDeptBo dept);
+
+    /**
+     * 查询部门树结构信息
+     *
+     * @param dept 部门信息
+     * @return 部门树信息集合
+     */
+    List<Tree<Long>> selectDeptTreeList(SysDeptBo dept);
+
+    /**
+     * 构建前端所需要下拉树结构
+     *
+     * @param depts 部门列表
+     * @return 下拉树结构列表
+     */
+    List<Tree<Long>> buildDeptTreeSelect(List<SysDeptVo> depts);
+
+    /**
+     * 根据角色ID查询部门树信息
+     *
+     * @param roleId 角色ID
+     * @return 选中部门列表
+     */
+    List<Long> selectDeptListByRoleId(Long roleId);
+
+    /**
+     * 根据部门ID查询信息
+     *
+     * @param deptId 部门ID
+     * @return 部门信息
+     */
+    SysDeptVo selectDeptById(Long deptId);
+
+    /**
+     * 通过部门ID串查询部门
+     *
+     * @param deptIds 部门id串
+     * @return 部门列表信息
+     */
+    List<SysDeptVo> selectDeptByIds(List<Long> deptIds);
+
+    /**
+     * 根据ID查询所有子部门数（正常状态）
+     *
+     * @param deptId 部门ID
+     * @return 子部门数
+     */
+    long selectNormalChildrenDeptById(Long deptId);
+
+    /**
+     * 是否存在部门子节点
+     *
+     * @param deptId 部门ID
+     * @return 结果
+     */
+    boolean hasChildByDeptId(Long deptId);
+
+    /**
+     * 查询部门是否存在用户
+     *
+     * @param deptId 部门ID
+     * @return 结果 true 存在 false 不存在
+     */
+    boolean checkDeptExistUser(Long deptId);
+
+    /**
+     * 校验部门名称是否唯一
+     *
+     * @param dept 部门信息
+     * @return 结果
+     */
+    boolean checkDeptNameUnique(SysDeptBo dept);
+
+    /**
+     * 校验部门是否有数据权限
+     *
+     * @param deptId 部门id
+     */
+    void checkDeptDataScope(Long deptId);
+
+    /**
+     * 新增保存部门信息
+     *
+     * @param bo 部门信息
+     * @return 结果
+     */
+    int insertDept(SysDeptBo bo);
+
+    /**
+     * 修改保存部门信息
+     *
+     * @param bo 部门信息
+     * @return 结果
+     */
+    int updateDept(SysDeptBo bo);
+
+    /**
+     * 删除部门管理信息
+     *
+     * @param deptId 部门ID
+     * @return 结果
+     */
+    int deleteDeptById(Long deptId);
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/SysDictDataService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/SysDictDataService.java
new file mode 100644
index 0000000..5b62d6a
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/SysDictDataService.java
@@ -0,0 +1,76 @@
+package org.dromara.system.service;
+
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.system.domain.bo.SysDictDataBo;
+import org.dromara.system.domain.vo.SysDictDataVo;
+
+import java.util.List;
+
+/**
+ * 字典 业务层
+ *
+ * @author pengles
+ */
+public interface SysDictDataService {
+
+
+    TableDataInfo<SysDictDataVo> selectPageDictDataList(SysDictDataBo dictData, PageQuery pageQuery);
+
+    /**
+     * 根据条件分页查询字典数据
+     *
+     * @param dictData 字典数据信息
+     * @return 字典数据集合信息
+     */
+    List<SysDictDataVo> selectDictDataList(SysDictDataBo dictData);
+
+    /**
+     * 根据字典类型和字典键值查询字典数据信息
+     *
+     * @param dictType  字典类型
+     * @param dictValue 字典键值
+     * @return 字典标签
+     */
+    String selectDictLabel(String dictType, String dictValue);
+
+    /**
+     * 根据字典数据ID查询信息
+     *
+     * @param dictCode 字典数据ID
+     * @return 字典数据
+     */
+    SysDictDataVo selectDictDataById(Long dictCode);
+
+    /**
+     * 批量删除字典数据信息
+     *
+     * @param dictCodes 需要删除的字典数据ID
+     */
+    void deleteDictDataByIds(List<Long> dictCodes);
+
+    /**
+     * 新增保存字典数据信息
+     *
+     * @param bo 字典数据信息
+     * @return 结果
+     */
+    List<SysDictDataVo> insertDictData(SysDictDataBo bo);
+
+    /**
+     * 修改保存字典数据信息
+     *
+     * @param bo 字典数据信息
+     * @return 结果
+     */
+    List<SysDictDataVo> updateDictData(SysDictDataBo bo);
+
+    /**
+     * 校验字典键值是否唯一
+     *
+     * @param dict 字典数据
+     * @return 结果
+     */
+    boolean checkDictDataUnique(SysDictDataBo dict);
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/SysDictTypeService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/SysDictTypeService.java
new file mode 100644
index 0000000..b6a0a51
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/SysDictTypeService.java
@@ -0,0 +1,95 @@
+package org.dromara.system.service;
+
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.system.domain.bo.SysDictTypeBo;
+import org.dromara.system.domain.vo.SysDictDataVo;
+import org.dromara.system.domain.vo.SysDictTypeVo;
+
+import java.util.List;
+
+/**
+ * 字典 业务层
+ *
+ * @author pengles
+ */
+public interface SysDictTypeService {
+
+
+    TableDataInfo<SysDictTypeVo> selectPageDictTypeList(SysDictTypeBo dictType, PageQuery pageQuery);
+
+    /**
+     * 根据条件分页查询字典类型
+     *
+     * @param dictType 字典类型信息
+     * @return 字典类型集合信息
+     */
+    List<SysDictTypeVo> selectDictTypeList(SysDictTypeBo dictType);
+
+    /**
+     * 根据所有字典类型
+     *
+     * @return 字典类型集合信息
+     */
+    List<SysDictTypeVo> selectDictTypeAll();
+
+    /**
+     * 根据字典类型查询字典数据
+     *
+     * @param dictType 字典类型
+     * @return 字典数据集合信息
+     */
+    List<SysDictDataVo> selectDictDataByType(String dictType);
+
+    /**
+     * 根据字典类型ID查询信息
+     *
+     * @param dictId 字典类型ID
+     * @return 字典类型
+     */
+    SysDictTypeVo selectDictTypeById(Long dictId);
+
+    /**
+     * 根据字典类型查询信息
+     *
+     * @param dictType 字典类型
+     * @return 字典类型
+     */
+    SysDictTypeVo selectDictTypeByType(String dictType);
+
+    /**
+     * 批量删除字典信息
+     *
+     * @param dictIds 需要删除的字典ID
+     */
+    void deleteDictTypeByIds(List<Long> dictIds);
+
+    /**
+     * 重置字典缓存数据
+     */
+    void resetDictCache();
+
+    /**
+     * 新增保存字典类型信息
+     *
+     * @param bo 字典类型信息
+     * @return 结果
+     */
+    List<SysDictDataVo> insertDictType(SysDictTypeBo bo);
+
+    /**
+     * 修改保存字典类型信息
+     *
+     * @param bo 字典类型信息
+     * @return 结果
+     */
+    List<SysDictDataVo> updateDictType(SysDictTypeBo bo);
+
+    /**
+     * 校验字典类型称是否唯一
+     *
+     * @param dictType 字典类型
+     * @return 结果
+     */
+    boolean checkDictTypeUnique(SysDictTypeBo dictType);
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/SysLogininforService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/SysLogininforService.java
new file mode 100644
index 0000000..c21f1b6
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/SysLogininforService.java
@@ -0,0 +1,47 @@
+package org.dromara.system.service;
+
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.system.domain.bo.SysLogininforBo;
+import org.dromara.system.domain.vo.SysLogininforVo;
+
+import java.util.List;
+
+/**
+ * 系统访问日志情况信息 服务层
+ *
+ * @author pengles
+ */
+public interface SysLogininforService {
+
+
+    TableDataInfo<SysLogininforVo> selectPageLogininforList(SysLogininforBo logininfor, PageQuery pageQuery);
+
+    /**
+     * 新增系统登录日志
+     *
+     * @param bo 访问日志对象
+     */
+    void insertLogininfor(SysLogininforBo bo);
+
+    /**
+     * 查询系统登录日志集合
+     *
+     * @param logininfor 访问日志对象
+     * @return 登录记录集合
+     */
+    List<SysLogininforVo> selectLogininforList(SysLogininforBo logininfor);
+
+    /**
+     * 批量删除系统登录日志
+     *
+     * @param infoIds 需要删除的登录日志ID
+     * @return 结果
+     */
+    int deleteLogininforByIds(Long[] infoIds);
+
+    /**
+     * 清空系统登录日志
+     */
+    void cleanLogininfor();
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/SysMenuService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/SysMenuService.java
new file mode 100644
index 0000000..755baad
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/SysMenuService.java
@@ -0,0 +1,155 @@
+package org.dromara.system.service;
+
+import cn.hutool.core.lang.tree.Tree;
+import org.dromara.system.domain.SysMenu;
+import org.dromara.system.domain.bo.SysMenuBo;
+import org.dromara.system.domain.vo.RouterVo;
+import org.dromara.system.domain.vo.SysMenuVo;
+
+import java.util.List;
+import java.util.Set;
+
+/**
+ * 菜单 业务层
+ *
+ * @author pengles
+ */
+public interface SysMenuService {
+
+    /**
+     * 根据用户查询系统菜单列表
+     *
+     * @param userId 用户ID
+     * @return 菜单列表
+     */
+    List<SysMenuVo> selectMenuList(Long userId);
+
+    /**
+     * 根据用户查询系统菜单列表
+     *
+     * @param menu   菜单信息
+     * @param userId 用户ID
+     * @return 菜单列表
+     */
+    List<SysMenuVo> selectMenuList(SysMenuBo menu, Long userId);
+
+    /**
+     * 根据用户ID查询权限
+     *
+     * @param userId 用户ID
+     * @return 权限列表
+     */
+    Set<String> selectMenuPermsByUserId(Long userId);
+
+    /**
+     * 根据角色ID查询权限
+     *
+     * @param roleId 角色ID
+     * @return 权限列表
+     */
+    Set<String> selectMenuPermsByRoleId(Long roleId);
+
+    /**
+     * 根据用户ID查询菜单树信息
+     *
+     * @param userId 用户ID
+     * @return 菜单列表
+     */
+    List<SysMenu> selectMenuTreeByUserId(Long userId);
+
+    /**
+     * 根据角色ID查询菜单树信息
+     *
+     * @param roleId 角色ID
+     * @return 选中菜单列表
+     */
+    List<Long> selectMenuListByRoleId(Long roleId);
+
+    /**
+     * 构建前端路由所需要的菜单
+     *
+     * @param menus 菜单列表
+     * @return 路由列表
+     */
+    List<RouterVo> buildMenus(List<SysMenu> menus);
+
+    /**
+     * 构建前端所需要下拉树结构
+     *
+     * @param menus 菜单列表
+     * @return 下拉树结构列表
+     */
+    List<Tree<Long>> buildMenuTreeSelect(List<SysMenuVo> menus);
+
+    /**
+     * 根据菜单ID查询信息
+     *
+     * @param menuId 菜单ID
+     * @return 菜单信息
+     */
+    SysMenuVo selectMenuById(Long menuId);
+
+    /**
+     * 是否存在菜单子节点
+     *
+     * @param menuId 菜单ID
+     * @return 结果 true 存在 false 不存在
+     */
+    boolean hasChildByMenuId(Long menuId);
+
+    /**
+     * 是否存在菜单子节点
+     *
+     * @param menuIds 菜单ID串
+     * @return 结果 true 存在 false 不存在
+     */
+    boolean hasChildByMenuId(List<Long> menuIds);
+
+    /**
+     * 查询菜单是否存在角色
+     *
+     * @param menuId 菜单ID
+     * @return 结果 true 存在 false 不存在
+     */
+    boolean checkMenuExistRole(Long menuId);
+
+    /**
+     * 新增保存菜单信息
+     *
+     * @param bo 菜单信息
+     * @return 结果
+     */
+    int insertMenu(SysMenuBo bo);
+
+    /**
+     * 修改保存菜单信息
+     *
+     * @param bo 菜单信息
+     * @return 结果
+     */
+    int updateMenu(SysMenuBo bo);
+
+    /**
+     * 删除菜单管理信息
+     *
+     * @param menuId 菜单ID
+     * @return 结果
+     */
+    int deleteMenuById(Long menuId);
+
+    /**
+     * 批量删除菜单管理信息
+     *
+     * @param menuIds 菜单ID串
+     * @return 结果
+     */
+    void deleteMenuById(List<Long> menuIds);
+
+    /**
+     * 校验菜单名称是否唯一
+     *
+     * @param menu 菜单信息
+     * @return 结果
+     */
+    boolean checkMenuNameUnique(SysMenuBo menu);
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/SysNoticeService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/SysNoticeService.java
new file mode 100644
index 0000000..b3e3eb7
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/SysNoticeService.java
@@ -0,0 +1,67 @@
+package org.dromara.system.service;
+
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.system.domain.bo.SysNoticeBo;
+import org.dromara.system.domain.vo.SysNoticeVo;
+
+import java.util.List;
+
+/**
+ * 公告 服务层
+ *
+ * @author pengles
+ */
+public interface SysNoticeService {
+
+
+    TableDataInfo<SysNoticeVo> selectPageNoticeList(SysNoticeBo notice, PageQuery pageQuery);
+
+    /**
+     * 查询公告信息
+     *
+     * @param noticeId 公告ID
+     * @return 公告信息
+     */
+    SysNoticeVo selectNoticeById(Long noticeId);
+
+    /**
+     * 查询公告列表
+     *
+     * @param notice 公告信息
+     * @return 公告集合
+     */
+    List<SysNoticeVo> selectNoticeList(SysNoticeBo notice);
+
+    /**
+     * 新增公告
+     *
+     * @param bo 公告信息
+     * @return 结果
+     */
+    int insertNotice(SysNoticeBo bo);
+
+    /**
+     * 修改公告
+     *
+     * @param bo 公告信息
+     * @return 结果
+     */
+    int updateNotice(SysNoticeBo bo);
+
+    /**
+     * 删除公告信息
+     *
+     * @param noticeId 公告ID
+     * @return 结果
+     */
+    int deleteNoticeById(Long noticeId);
+
+    /**
+     * 批量删除公告信息
+     *
+     * @param noticeIds 需要删除的公告ID
+     * @return 结果
+     */
+    int deleteNoticeByIds(Long[] noticeIds);
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/SysOperLogService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/SysOperLogService.java
new file mode 100644
index 0000000..0836631
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/SysOperLogService.java
@@ -0,0 +1,54 @@
+package org.dromara.system.service;
+
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.system.domain.bo.SysOperLogBo;
+import org.dromara.system.domain.vo.SysOperLogVo;
+
+import java.util.List;
+
+/**
+ * 操作日志 服务层
+ *
+ * @author pengles
+ */
+public interface SysOperLogService {
+
+    TableDataInfo<SysOperLogVo> selectPageOperLogList(SysOperLogBo operLog, PageQuery pageQuery);
+
+    /**
+     * 新增操作日志
+     *
+     * @param bo 操作日志对象
+     */
+    void insertOperlog(SysOperLogBo bo);
+
+    /**
+     * 查询系统操作日志集合
+     *
+     * @param operLog 操作日志对象
+     * @return 操作日志集合
+     */
+    List<SysOperLogVo> selectOperLogList(SysOperLogBo operLog);
+
+    /**
+     * 批量删除系统操作日志
+     *
+     * @param operIds 需要删除的操作日志ID
+     * @return 结果
+     */
+    int deleteOperLogByIds(Long[] operIds);
+
+    /**
+     * 查询操作日志详细
+     *
+     * @param operId 操作ID
+     * @return 操作日志对象
+     */
+    SysOperLogVo selectOperLogById(Long operId);
+
+    /**
+     * 清空操作日志
+     */
+    void cleanOperLog();
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/SysOssConfigService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/SysOssConfigService.java
new file mode 100644
index 0000000..7aa7a4f
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/SysOssConfigService.java
@@ -0,0 +1,64 @@
+package org.dromara.system.service;
+
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.system.domain.bo.SysOssConfigBo;
+import org.dromara.system.domain.vo.SysOssConfigVo;
+
+import java.util.Collection;
+
+/**
+ * 对象存储配置Service接口
+ *
+ * @author pengles
+ * @author 孤舟烟雨
+ * @date 2021-08-13
+ */
+public interface SysOssConfigService {
+
+    /**
+     * 初始化OSS配置
+     */
+    void init();
+
+    /**
+     * 查询单个
+     */
+    SysOssConfigVo queryById(Long ossConfigId);
+
+    /**
+     * 查询列表
+     */
+    TableDataInfo<SysOssConfigVo> queryPageList(SysOssConfigBo bo, PageQuery pageQuery);
+
+    /**
+     * 根据新增业务对象插入对象存储配置
+     *
+     * @param bo 对象存储配置新增业务对象
+     * @return 结果
+     */
+    Boolean insertByBo(SysOssConfigBo bo);
+
+    /**
+     * 根据编辑业务对象修改对象存储配置
+     *
+     * @param bo 对象存储配置编辑业务对象
+     * @return 结果
+     */
+    Boolean updateByBo(SysOssConfigBo bo);
+
+    /**
+     * 校验并删除数据
+     *
+     * @param ids     主键集合
+     * @param isValid 是否校验,true-删除前校验,false-不校验
+     * @return 结果
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    /**
+     * 启用停用状态
+     */
+    int updateOssConfigStatus(SysOssConfigBo bo);
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/SysOssService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/SysOssService.java
new file mode 100644
index 0000000..9d07de0
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/SysOssService.java
@@ -0,0 +1,80 @@
+package org.dromara.system.service;
+
+import jakarta.servlet.http.HttpServletResponse;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.system.domain.bo.SysOssBo;
+import org.dromara.system.domain.vo.SysOssVo;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 文件上传 服务层
+ *
+ * @author pengles
+ */
+public interface SysOssService {
+
+    /**
+     * 查询OSS对象存储列表
+     *
+     * @param sysOss    OSS对象存储分页查询对象
+     * @param pageQuery 分页查询实体类
+     * @return 结果
+     */
+    TableDataInfo<SysOssVo> queryPageList(SysOssBo sysOss, PageQuery pageQuery);
+
+    /**
+     * 根据一组 ossIds 获取对应的 SysOssVo 列表
+     *
+     * @param ossIds 一组文件在数据库中的唯一标识集合
+     * @return 包含 SysOssVo 对象的列表
+     */
+    List<SysOssVo> listByIds(Collection<Long> ossIds);
+
+    /**
+     * 根据 ossId 从缓存或数据库中获取 SysOssVo 对象
+     *
+     * @param ossId 文件在数据库中的唯一标识
+     * @return SysOssVo 对象，包含文件信息
+     */
+    SysOssVo getById(Long ossId);
+
+    /**
+     * 上传 MultipartFile 到对象存储服务，并保存文件信息到数据库
+     *
+     * @param file 要上传的 MultipartFile 对象
+     * @return 上传成功后的 SysOssVo 对象，包含文件信息
+     */
+    SysOssVo upload(MultipartFile file);
+
+    /**
+     * 上传文件到对象存储服务，并保存文件信息到数据库
+     *
+     * @param file 要上传的文件对象
+     * @return 上传成功后的 SysOssVo 对象，包含文件信息
+     */
+    SysOssVo upload(File file);
+
+    /**
+     * 文件下载方法，支持一次性下载完整文件
+     *
+     * @param ossId    OSS对象ID
+     * @param response HttpServletResponse对象，用于设置响应头和向客户端发送文件内容
+     */
+    void download(Long ossId, HttpServletResponse response) throws IOException;
+
+    /**
+     * 删除OSS对象存储
+     *
+     * @param ids     OSS对象ID串
+     * @param isValid 判断是否需要校验
+     * @return 结果
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/SysPermissionService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/SysPermissionService.java
new file mode 100644
index 0000000..6c9ab66
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/SysPermissionService.java
@@ -0,0 +1,28 @@
+package org.dromara.system.service;
+
+import java.util.Set;
+
+/**
+ * 用户权限处理
+ *
+ * @author pengles
+ */
+public interface SysPermissionService {
+
+    /**
+     * 获取角色数据权限
+     *
+     * @param userId 用户id
+     * @return 角色权限信息
+     */
+    Set<String> getRolePermission(Long userId);
+
+    /**
+     * 获取菜单数据权限
+     *
+     * @param userId 用户id
+     * @return 菜单权限信息
+     */
+    Set<String> getMenuPermission(Long userId);
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/SysPostService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/SysPostService.java
new file mode 100644
index 0000000..302a488
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/SysPostService.java
@@ -0,0 +1,135 @@
+package org.dromara.system.service;
+
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.system.domain.bo.SysPostBo;
+import org.dromara.system.domain.vo.SysPostVo;
+
+import java.util.List;
+
+/**
+ * 岗位信息 服务层
+ *
+ * @author pengles
+ */
+public interface SysPostService {
+
+    /**
+     * 分页查询岗位信息集合
+     *
+     * @param post 岗位信息
+     * @return 岗位信息集合
+     */
+    TableDataInfo<SysPostVo> selectPagePostList(SysPostBo post, PageQuery pageQuery);
+
+    /**
+     * 查询岗位信息集合
+     *
+     * @param post 岗位信息
+     * @return 岗位列表
+     */
+    List<SysPostVo> selectPostList(SysPostBo post);
+
+    /**
+     * 查询用户所属岗位组
+     *
+     * @param userId 用户ID
+     * @return 岗位ID
+     */
+    List<SysPostVo> selectPostsByUserId(Long userId);
+
+    /**
+     * 查询所有岗位
+     *
+     * @return 岗位列表
+     */
+    List<SysPostVo> selectPostAll();
+
+    /**
+     * 通过岗位ID查询岗位信息
+     *
+     * @param postId 岗位ID
+     * @return 角色对象信息
+     */
+    SysPostVo selectPostById(Long postId);
+
+    /**
+     * 根据用户ID获取岗位选择框列表
+     *
+     * @param userId 用户ID
+     * @return 选中岗位ID列表
+     */
+    List<Long> selectPostListByUserId(Long userId);
+
+    /**
+     * 通过岗位ID串查询岗位
+     *
+     * @param postIds 岗位id串
+     * @return 岗位列表信息
+     */
+    List<SysPostVo> selectPostByIds(List<Long> postIds);
+
+    /**
+     * 校验岗位名称
+     *
+     * @param post 岗位信息
+     * @return 结果
+     */
+    boolean checkPostNameUnique(SysPostBo post);
+
+    /**
+     * 校验岗位编码
+     *
+     * @param post 岗位信息
+     * @return 结果
+     */
+    boolean checkPostCodeUnique(SysPostBo post);
+
+    /**
+     * 通过岗位ID查询岗位使用数量
+     *
+     * @param postId 岗位ID
+     * @return 结果
+     */
+    long countUserPostById(Long postId);
+
+    /**
+     * 通过部门ID查询岗位使用数量
+     *
+     * @param deptId 部门id
+     * @return 结果
+     */
+    long countPostByDeptId(Long deptId);
+
+    /**
+     * 删除岗位信息
+     *
+     * @param postId 岗位ID
+     * @return 结果
+     */
+    int deletePostById(Long postId);
+
+    /**
+     * 批量删除岗位信息
+     *
+     * @param postIds 需要删除的岗位ID
+     * @return 结果
+     */
+    int deletePostByIds(Long[] postIds);
+
+    /**
+     * 新增保存岗位信息
+     *
+     * @param bo 岗位信息
+     * @return 结果
+     */
+    int insertPost(SysPostBo bo);
+
+    /**
+     * 修改保存岗位信息
+     *
+     * @param bo 岗位信息
+     * @return 结果
+     */
+    int updatePost(SysPostBo bo);
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/SysRoleService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/SysRoleService.java
new file mode 100644
index 0000000..5380d13
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/SysRoleService.java
@@ -0,0 +1,207 @@
+package org.dromara.system.service;
+
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.system.domain.SysUserRole;
+import org.dromara.system.domain.bo.SysRoleBo;
+import org.dromara.system.domain.vo.SysRoleVo;
+
+import java.util.List;
+import java.util.Set;
+
+/**
+ * 角色业务层
+ *
+ * @author pengles
+ */
+public interface SysRoleService {
+
+    /**
+     * 根据条件分页查询角色数据
+     *
+     * @param role 角色信息
+     * @return 角色数据集合信息
+     */
+    TableDataInfo<SysRoleVo> selectPageRoleList(SysRoleBo role, PageQuery pageQuery);
+
+    /**
+     * 根据条件分页查询角色数据
+     *
+     * @param role 角色信息
+     * @return 角色数据集合信息
+     */
+    List<SysRoleVo> selectRoleList(SysRoleBo role);
+
+    /**
+     * 根据用户ID查询角色列表
+     *
+     * @param userId 用户ID
+     * @return 角色列表
+     */
+    List<SysRoleVo> selectRolesByUserId(Long userId);
+
+    /**
+     * 根据用户ID查询角色列表(包含被授权状态)
+     *
+     * @param userId 用户ID
+     * @return 角色列表
+     */
+    List<SysRoleVo> selectRolesAuthByUserId(Long userId);
+
+    /**
+     * 根据用户ID查询角色权限
+     *
+     * @param userId 用户ID
+     * @return 权限列表
+     */
+    Set<String> selectRolePermissionByUserId(Long userId);
+
+    /**
+     * 查询所有角色
+     *
+     * @return 角色列表
+     */
+    List<SysRoleVo> selectRoleAll();
+
+    /**
+     * 根据用户ID获取角色选择框列表
+     *
+     * @param userId 用户ID
+     * @return 选中角色ID列表
+     */
+    List<Long> selectRoleListByUserId(Long userId);
+
+    /**
+     * 通过角色ID查询角色
+     *
+     * @param roleId 角色ID
+     * @return 角色对象信息
+     */
+    SysRoleVo selectRoleById(Long roleId);
+
+    /**
+     * 通过角色ID串查询角色
+     *
+     * @param roleIds 角色ID串
+     * @return 角色列表信息
+     */
+    List<SysRoleVo> selectRoleByIds(List<Long> roleIds);
+
+    /**
+     * 校验角色名称是否唯一
+     *
+     * @param role 角色信息
+     * @return 结果
+     */
+    boolean checkRoleNameUnique(SysRoleBo role);
+
+    /**
+     * 校验角色权限是否唯一
+     *
+     * @param role 角色信息
+     * @return 结果
+     */
+    boolean checkRoleKeyUnique(SysRoleBo role);
+
+    /**
+     * 校验角色是否允许操作
+     *
+     * @param role 角色信息
+     */
+    void checkRoleAllowed(SysRoleBo role);
+
+    /**
+     * 校验角色是否有数据权限
+     *
+     * @param roleId 角色id
+     */
+    void checkRoleDataScope(Long roleId);
+
+    /**
+     * 通过角色ID查询角色使用数量
+     *
+     * @param roleId 角色ID
+     * @return 结果
+     */
+    long countUserRoleByRoleId(Long roleId);
+
+    /**
+     * 新增保存角色信息
+     *
+     * @param bo 角色信息
+     * @return 结果
+     */
+    int insertRole(SysRoleBo bo);
+
+    /**
+     * 修改保存角色信息
+     *
+     * @param bo 角色信息
+     * @return 结果
+     */
+    int updateRole(SysRoleBo bo);
+
+    /**
+     * 修改角色状态
+     *
+     * @param roleId 角色ID
+     * @param status 角色状态
+     * @return 结果
+     */
+    int updateRoleStatus(Long roleId, String status);
+
+    /**
+     * 修改数据权限信息
+     *
+     * @param bo 角色信息
+     * @return 结果
+     */
+    int authDataScope(SysRoleBo bo);
+
+    /**
+     * 通过角色ID删除角色
+     *
+     * @param roleId 角色ID
+     * @return 结果
+     */
+    int deleteRoleById(Long roleId);
+
+    /**
+     * 批量删除角色信息
+     *
+     * @param roleIds 需要删除的角色ID
+     * @return 结果
+     */
+    int deleteRoleByIds(Long[] roleIds);
+
+    /**
+     * 取消授权用户角色
+     *
+     * @param userRole 用户和角色关联信息
+     * @return 结果
+     */
+    int deleteAuthUser(SysUserRole userRole);
+
+    /**
+     * 批量取消授权用户角色
+     *
+     * @param roleId  角色ID
+     * @param userIds 需要取消授权的用户数据ID
+     * @return 结果
+     */
+    int deleteAuthUsers(Long roleId, Long[] userIds);
+
+    /**
+     * 批量选择授权用户角色
+     *
+     * @param roleId  角色ID
+     * @param userIds 需要删除的用户数据ID
+     * @return 结果
+     */
+    int insertAuthUsers(Long roleId, Long[] userIds);
+
+    void cleanOnlineUserByRole(Long roleId);
+
+    void cleanOnlineUser(List<Long> userIds);
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/SysSocialService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/SysSocialService.java
new file mode 100644
index 0000000..44dd4a4
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/SysSocialService.java
@@ -0,0 +1,53 @@
+package org.dromara.system.service;
+
+import org.dromara.system.domain.bo.SysSocialBo;
+import org.dromara.system.domain.vo.SysSocialVo;
+
+import java.util.List;
+
+/**
+ * 社会化关系Service接口
+ *
+ * @author pengles
+ */
+public interface SysSocialService {
+
+
+    /**
+     * 查询社会化关系
+     */
+    SysSocialVo queryById(String id);
+
+    /**
+     * 查询社会化关系列表
+     */
+    List<SysSocialVo> queryList(SysSocialBo bo);
+
+    /**
+     * 查询社会化关系列表
+     */
+    List<SysSocialVo> queryListByUserId(Long userId);
+
+    /**
+     * 新增授权关系
+     */
+    Boolean insertByBo(SysSocialBo bo);
+
+    /**
+     * 更新社会化关系
+     */
+    Boolean updateByBo(SysSocialBo bo);
+
+    /**
+     * 删除社会化关系信息
+     */
+    Boolean deleteWithValidById(Long id);
+
+
+    /**
+     * 根据 authId 查询
+     */
+    List<SysSocialVo> selectByAuthId(String authId);
+
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/SysUserService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/SysUserService.java
new file mode 100644
index 0000000..ec98e6f
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/SysUserService.java
@@ -0,0 +1,247 @@
+package org.dromara.system.service;
+
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.system.domain.bo.SysUserBo;
+import org.dromara.system.domain.vo.SysUserExportVo;
+import org.dromara.system.domain.vo.SysUserVo;
+
+import java.util.List;
+
+/**
+ * 用户 业务层
+ *
+ * @author pengles
+ */
+public interface SysUserService {
+
+
+    /**
+     * 根据条件分页查询用户列表
+     *
+     * @param user      用户信息
+     * @param pageQuery 发呢也
+     * @return 用户信息
+     */
+    TableDataInfo<SysUserVo> selectPageUserList(SysUserBo user, PageQuery pageQuery);
+
+    /**
+     * 导出用户列表
+     *
+     * @param user 用户信息
+     * @return 用户信息集合信息
+     */
+    List<SysUserExportVo> selectUserExportList(SysUserBo user);
+
+    /**
+     * 根据条件分页查询已分配用户角色列表
+     *
+     * @param user      用户信息
+     * @param pageQuery 分页
+     * @return 用户信息集合信息
+     */
+    TableDataInfo<SysUserVo> selectAllocatedList(SysUserBo user, PageQuery pageQuery);
+
+    /**
+     * 根据条件分页查询未分配用户角色列表
+     *
+     * @param user      用户信息
+     * @param pageQuery 分页
+     * @return 用户信息集合信息
+     */
+    TableDataInfo<SysUserVo> selectUnallocatedList(SysUserBo user, PageQuery pageQuery);
+
+    /**
+     * 通过用户名查询用户
+     *
+     * @param userName 用户名
+     * @return 用户对象信息
+     */
+    SysUserVo selectUserByUserName(String userName);
+
+    /**
+     * 通过手机号查询用户
+     *
+     * @param phonenumber 手机号
+     * @return 用户对象信息
+     */
+    SysUserVo selectUserByPhonenumber(String phonenumber);
+
+    /**
+     * 通过邮箱查询用户
+     *
+     * @param email 邮箱
+     * @return 用户对象信息
+     */
+    SysUserVo selectUserByEmail(String email);
+
+    /**
+     * 更新用户登录信息
+     *
+     * @param userId 用户ID
+     * @param ip     登录IP
+     */
+    void updateLoginInfo(Long userId, String ip);
+
+    /**
+     * 通过用户ID查询用户
+     *
+     * @param userId 用户ID
+     * @return 用户对象信息
+     */
+    SysUserVo selectUserById(Long userId);
+
+    /**
+     * 通过用户ID串查询用户
+     *
+     * @param userIds 用户ID串
+     * @param deptId  部门id
+     * @return 用户列表信息
+     */
+    List<SysUserVo> selectUserByIds(List<Long> userIds, Long deptId);
+
+    /**
+     * 根据用户ID查询用户所属角色组
+     *
+     * @param userId 用户ID
+     * @return 结果
+     */
+    String selectUserRoleGroup(Long userId);
+
+    /**
+     * 根据用户ID查询用户所属岗位组
+     *
+     * @param userId 用户ID
+     * @return 结果
+     */
+    String selectUserPostGroup(Long userId);
+
+    /**
+     * 校验用户名称是否唯一
+     *
+     * @param user 用户信息
+     * @return 结果
+     */
+    boolean checkUserNameUnique(SysUserBo user);
+
+    /**
+     * 校验手机号码是否唯一
+     *
+     * @param user 用户信息
+     * @return 结果
+     */
+    boolean checkPhoneUnique(SysUserBo user);
+
+    /**
+     * 校验email是否唯一
+     *
+     * @param user 用户信息
+     * @return 结果
+     */
+    boolean checkEmailUnique(SysUserBo user);
+
+    /**
+     * 校验用户是否允许操作
+     *
+     * @param userId 用户ID
+     */
+    void checkUserAllowed(Long userId);
+
+    /**
+     * 校验用户是否有数据权限
+     *
+     * @param userId 用户id
+     */
+    void checkUserDataScope(Long userId);
+
+    /**
+     * 新增用户信息
+     *
+     * @param user 用户信息
+     * @return 结果
+     */
+    int insertUser(SysUserBo user);
+
+    /**
+     * 注册用户信息
+     *
+     * @param user 用户信息
+     * @return 结果
+     */
+    boolean registerUser(SysUserBo user);
+
+    /**
+     * 修改用户信息
+     *
+     * @param user 用户信息
+     * @return 结果
+     */
+    int updateUser(SysUserBo user);
+
+    /**
+     * 用户授权角色
+     *
+     * @param userId  用户ID
+     * @param roleIds 角色组
+     */
+    void insertUserAuth(Long userId, Long[] roleIds);
+
+    /**
+     * 修改用户状态
+     *
+     * @param userId 用户ID
+     * @param status 帐号状态
+     * @return 结果
+     */
+    int updateUserStatus(Long userId, String status);
+
+    /**
+     * 修改用户基本信息
+     *
+     * @param user 用户信息
+     * @return 结果
+     */
+    int updateUserProfile(SysUserBo user);
+
+    /**
+     * 修改用户头像
+     *
+     * @param userId 用户ID
+     * @param avatar 头像地址
+     * @return 结果
+     */
+    boolean updateUserAvatar(Long userId, Long avatar);
+
+    /**
+     * 重置用户密码
+     *
+     * @param userId   用户ID
+     * @param password 密码
+     * @return 结果
+     */
+    int resetUserPwd(Long userId, String password);
+
+    /**
+     * 通过用户ID删除用户
+     *
+     * @param userId 用户ID
+     * @return 结果
+     */
+    int deleteUserById(Long userId);
+
+    /**
+     * 批量删除用户信息
+     *
+     * @param userIds 需要删除的用户ID
+     * @return 结果
+     */
+    int deleteUserByIds(Long[] userIds);
+
+    /**
+     * 通过部门id查询当前部门所有用户
+     *
+     * @param deptId 部门id
+     * @return 结果
+     */
+    List<SysUserVo> selectUserListByDept(Long deptId);
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysClientServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysClientServiceImpl.java
new file mode 100644
index 0000000..3920e9a
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysClientServiceImpl.java
@@ -0,0 +1,138 @@
+package org.dromara.system.service.impl;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.crypto.SecureUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.constant.CacheNames;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.system.domain.SysClient;
+import org.dromara.system.domain.bo.SysClientBo;
+import org.dromara.system.domain.vo.SysClientVo;
+import org.dromara.system.mapper.SysClientMapper;
+import org.dromara.system.service.SysClientService;
+import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.cache.annotation.Cacheable;
+import org.springframework.stereotype.Service;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 客户端管理Service业务层处理
+ *
+ * @author pengles
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class SysClientServiceImpl implements SysClientService {
+
+    private final SysClientMapper baseMapper;
+
+    /**
+     * 查询客户端管理
+     */
+    @Override
+    public SysClientVo queryById(Long id) {
+        SysClientVo vo = baseMapper.selectVoById(id);
+        vo.setGrantTypeList(StringUtils.splitList(vo.getGrantType()));
+        return vo;
+    }
+
+    /**
+     * 查询客户端管理
+     */
+    @Cacheable(cacheNames = CacheNames.SYS_CLIENT, key = "#clientId")
+    @Override
+    public SysClientVo queryByClientId(String clientId) {
+        return baseMapper.selectVoOne(new LambdaQueryWrapper<SysClient>().eq(SysClient::getClientId, clientId));
+    }
+
+    /**
+     * 查询客户端管理列表
+     */
+    @Override
+    public TableDataInfo<SysClientVo> queryPageList(SysClientBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<SysClient> lqw = buildQueryWrapper(bo);
+        Page<SysClientVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        result.getRecords().forEach(r -> r.setGrantTypeList(StringUtils.splitList(r.getGrantType())));
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询客户端管理列表
+     */
+    @Override
+    public List<SysClientVo> queryList(SysClientBo bo) {
+        LambdaQueryWrapper<SysClient> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<SysClient> buildQueryWrapper(SysClientBo bo) {
+        LambdaQueryWrapper<SysClient> lqw = Wrappers.lambdaQuery();
+        lqw.eq(StringUtils.isNotBlank(bo.getClientId()), SysClient::getClientId, bo.getClientId());
+        lqw.eq(StringUtils.isNotBlank(bo.getClientKey()), SysClient::getClientKey, bo.getClientKey());
+        lqw.eq(StringUtils.isNotBlank(bo.getClientSecret()), SysClient::getClientSecret, bo.getClientSecret());
+        lqw.eq(StringUtils.isNotBlank(bo.getStatus()), SysClient::getStatus, bo.getStatus());
+        lqw.orderByAsc(SysClient::getId);
+        return lqw;
+    }
+
+    /**
+     * 新增客户端管理
+     */
+    @Override
+    public Boolean insertByBo(SysClientBo bo) {
+        SysClient add = MapstructUtils.convert(bo, SysClient.class);
+        add.setGrantType(CollUtil.join(bo.getGrantTypeList(), StringUtils.SEPARATOR));
+        // 生成clientid
+        String clientKey = bo.getClientKey();
+        String clientSecret = bo.getClientSecret();
+        add.setClientId(SecureUtil.md5(clientKey + clientSecret));
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改客户端管理
+     */
+    @CacheEvict(cacheNames = CacheNames.SYS_CLIENT, key = "#bo.clientId")
+    @Override
+    public Boolean updateByBo(SysClientBo bo) {
+        SysClient update = MapstructUtils.convert(bo, SysClient.class);
+        update.setGrantType(String.join(",", bo.getGrantTypeList()));
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 修改状态
+     */
+    @CacheEvict(cacheNames = CacheNames.SYS_CLIENT, key = "#clientId")
+    @Override
+    public int updateClientStatus(String clientId, String status) {
+        return baseMapper.update(null,
+                new LambdaUpdateWrapper<SysClient>()
+                        .set(SysClient::getStatus, status)
+                        .eq(SysClient::getClientId, clientId));
+    }
+
+    /**
+     * 批量删除客户端管理
+     */
+    @CacheEvict(cacheNames = CacheNames.SYS_CLIENT, allEntries = true)
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysConfigServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysConfigServiceImpl.java
new file mode 100644
index 0000000..716493d
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysConfigServiceImpl.java
@@ -0,0 +1,205 @@
+package org.dromara.system.service.impl;
+
+import cn.hutool.core.convert.Convert;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.constant.CacheNames;
+import org.dromara.common.core.constant.SystemConstants;
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.service.ConfigService;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.ObjectUtils;
+import org.dromara.common.core.utils.SpringUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.redis.utils.CacheUtils;
+import org.dromara.system.domain.SysConfig;
+import org.dromara.system.domain.bo.SysConfigBo;
+import org.dromara.system.domain.vo.SysConfigVo;
+import org.dromara.system.mapper.SysConfigMapper;
+import org.dromara.system.service.SysConfigService;
+import org.springframework.cache.annotation.CachePut;
+import org.springframework.cache.annotation.Cacheable;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 参数配置 服务层实现
+ *
+ * @author pengles
+ */
+@RequiredArgsConstructor
+@Service
+public class SysConfigServiceImpl implements SysConfigService, ConfigService {
+
+    private final SysConfigMapper baseMapper;
+
+    @Override
+    public TableDataInfo<SysConfigVo> selectPageConfigList(SysConfigBo config, PageQuery pageQuery) {
+        LambdaQueryWrapper<SysConfig> lqw = buildQueryWrapper(config);
+        Page<SysConfigVo> page = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(page);
+    }
+
+    /**
+     * 查询参数配置信息
+     *
+     * @param configId 参数配置ID
+     * @return 参数配置信息
+     */
+    @Override
+    public SysConfigVo selectConfigById(Long configId) {
+        return baseMapper.selectVoById(configId);
+    }
+
+    /**
+     * 根据键名查询参数配置信息
+     *
+     * @param configKey 参数key
+     * @return 参数键值
+     */
+    @Cacheable(cacheNames = CacheNames.SYS_CONFIG, key = "#configKey")
+    @Override
+    public String selectConfigByKey(String configKey) {
+        SysConfig retConfig = baseMapper.selectOne(new LambdaQueryWrapper<SysConfig>()
+                .eq(SysConfig::getConfigKey, configKey));
+        return ObjectUtils.notNullGetter(retConfig, SysConfig::getConfigValue, StringUtils.EMPTY);
+    }
+
+    /**
+     * 获取注册开关
+     *
+     * @return true开启，false关闭
+     */
+    @Override
+    public boolean selectRegisterEnabled() {
+        String configValue = this.selectConfigByKey("sys.account.registerUser");
+        return Convert.toBool(configValue);
+    }
+
+    /**
+     * 查询参数配置列表
+     *
+     * @param config 参数配置信息
+     * @return 参数配置集合
+     */
+    @Override
+    public List<SysConfigVo> selectConfigList(SysConfigBo config) {
+        LambdaQueryWrapper<SysConfig> lqw = buildQueryWrapper(config);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<SysConfig> buildQueryWrapper(SysConfigBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<SysConfig> lqw = Wrappers.lambdaQuery();
+        lqw.like(StringUtils.isNotBlank(bo.getConfigName()), SysConfig::getConfigName, bo.getConfigName());
+        lqw.eq(StringUtils.isNotBlank(bo.getConfigType()), SysConfig::getConfigType, bo.getConfigType());
+        lqw.like(StringUtils.isNotBlank(bo.getConfigKey()), SysConfig::getConfigKey, bo.getConfigKey());
+        lqw.between(params.get("beginTime") != null && params.get("endTime") != null,
+                SysConfig::getCreateTime, params.get("beginTime"), params.get("endTime"));
+        lqw.orderByAsc(SysConfig::getConfigId);
+        return lqw;
+    }
+
+    /**
+     * 新增参数配置
+     *
+     * @param bo 参数配置信息
+     * @return 结果
+     */
+    @CachePut(cacheNames = CacheNames.SYS_CONFIG, key = "#bo.configKey")
+    @Override
+    public String insertConfig(SysConfigBo bo) {
+        SysConfig config = MapstructUtils.convert(bo, SysConfig.class);
+        int row = baseMapper.insert(config);
+        if (row > 0) {
+            return config.getConfigValue();
+        }
+        throw new ServiceException("操作失败");
+    }
+
+    /**
+     * 修改参数配置
+     *
+     * @param bo 参数配置信息
+     * @return 结果
+     */
+    @CachePut(cacheNames = CacheNames.SYS_CONFIG, key = "#bo.configKey")
+    @Override
+    public String updateConfig(SysConfigBo bo) {
+        int row = 0;
+        SysConfig config = MapstructUtils.convert(bo, SysConfig.class);
+        if (config.getConfigId() != null) {
+            SysConfig temp = baseMapper.selectById(config.getConfigId());
+            if (!StringUtils.equals(temp.getConfigKey(), config.getConfigKey())) {
+                CacheUtils.evict(CacheNames.SYS_CONFIG, temp.getConfigKey());
+            }
+            row = baseMapper.updateById(config);
+        } else {
+            CacheUtils.evict(CacheNames.SYS_CONFIG, config.getConfigKey());
+            row = baseMapper.update(config, new LambdaQueryWrapper<SysConfig>()
+                    .eq(SysConfig::getConfigKey, config.getConfigKey()));
+        }
+        if (row > 0) {
+            return config.getConfigValue();
+        }
+        throw new ServiceException("操作失败");
+    }
+
+    /**
+     * 批量删除参数信息
+     *
+     * @param configIds 需要删除的参数ID
+     */
+    @Override
+    public void deleteConfigByIds(List<Long> configIds) {
+        List<SysConfig> list = baseMapper.selectByIds(configIds);
+        list.forEach(config -> {
+            if (StringUtils.equals(SystemConstants.YES, config.getConfigType())) {
+                throw new ServiceException(String.format("内置参数【%s】不能删除", config.getConfigKey()));
+            }
+            CacheUtils.evict(CacheNames.SYS_CONFIG, config.getConfigKey());
+        });
+        baseMapper.deleteByIds(configIds);
+    }
+
+    /**
+     * 重置参数缓存数据
+     */
+    @Override
+    public void resetConfigCache() {
+        CacheUtils.clear(CacheNames.SYS_CONFIG);
+    }
+
+    /**
+     * 校验参数键名是否唯一
+     *
+     * @param config 参数配置信息
+     * @return 结果
+     */
+    @Override
+    public boolean checkConfigKeyUnique(SysConfigBo config) {
+        boolean exist = baseMapper.exists(new LambdaQueryWrapper<SysConfig>()
+                .eq(SysConfig::getConfigKey, config.getConfigKey())
+                .ne(ObjectUtil.isNotNull(config.getConfigId()), SysConfig::getConfigId, config.getConfigId()));
+        return !exist;
+    }
+
+    /**
+     * 根据参数 key 获取参数值
+     *
+     * @param configKey 参数 key
+     * @return 参数值
+     */
+    @Override
+    public String getConfigValue(String configKey) {
+        return SpringUtils.getAopProxy(this).selectConfigByKey(configKey);
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDataScopeServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDataScopeServiceImpl.java
new file mode 100644
index 0000000..a742dc5
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDataScopeServiceImpl.java
@@ -0,0 +1,78 @@
+package org.dromara.system.service.impl;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.convert.Convert;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.constant.CacheNames;
+import org.dromara.common.core.utils.StreamUtils;
+import org.dromara.system.domain.SysDept;
+import org.dromara.system.domain.SysRoleDept;
+import org.dromara.system.mapper.SysDeptMapper;
+import org.dromara.system.mapper.SysRoleDeptMapper;
+import org.dromara.system.service.SysDataScopeService;
+import org.springframework.cache.annotation.Cacheable;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 数据权限 实现
+ * <p>
+ * 注意: 此Service内不允许调用标注`数据权限`注解的方法
+ * 例如: deptMapper.selectList 此 selectList 方法标注了`数据权限`注解 会出现循环解析的问题
+ *
+ * @author pengles
+ */
+@RequiredArgsConstructor
+@Service("sdss")
+public class SysDataScopeServiceImpl implements SysDataScopeService {
+
+    private final SysRoleDeptMapper roleDeptMapper;
+    private final SysDeptMapper deptMapper;
+
+    /**
+     * 获取角色自定义权限
+     *
+     * @param roleId 角色Id
+     * @return 部门Id组
+     */
+    @Cacheable(cacheNames = CacheNames.SYS_ROLE_CUSTOM, key = "#roleId", condition = "#roleId != null")
+    @Override
+    public String getRoleCustom(Long roleId) {
+        if (ObjectUtil.isNull(roleId)) {
+            return "-1";
+        }
+        List<SysRoleDept> list = roleDeptMapper.selectList(
+                new LambdaQueryWrapper<SysRoleDept>()
+                        .select(SysRoleDept::getDeptId)
+                        .eq(SysRoleDept::getRoleId, roleId));
+        if (CollUtil.isNotEmpty(list)) {
+            return StreamUtils.join(list, rd -> Convert.toStr(rd.getDeptId()));
+        }
+        return "-1";
+    }
+
+    /**
+     * 获取部门及以下权限
+     *
+     * @param deptId 部门Id
+     * @return 部门Id组
+     */
+    @Cacheable(cacheNames = CacheNames.SYS_DEPT_AND_CHILD, key = "#deptId", condition = "#deptId != null")
+    @Override
+    public String getDeptAndChild(Long deptId) {
+        if (ObjectUtil.isNull(deptId)) {
+            return "-1";
+        }
+        List<SysDept> deptList = deptMapper.selectListByParentId(deptId);
+        List<Long> ids = StreamUtils.toList(deptList, SysDept::getDeptId);
+        ids.add(deptId);
+        if (CollUtil.isNotEmpty(ids)) {
+            return StreamUtils.join(ids, Convert::toStr);
+        }
+        return "-1";
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java
new file mode 100644
index 0000000..fc29ebd
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java
@@ -0,0 +1,412 @@
+package org.dromara.system.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.convert.Convert;
+import cn.hutool.core.lang.tree.Tree;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.constant.CacheNames;
+import org.dromara.common.core.constant.SystemConstants;
+import org.dromara.common.core.domain.dto.DeptDTO;
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.service.DeptService;
+import org.dromara.common.core.utils.*;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.helper.DataBaseHelper;
+import org.dromara.common.redis.utils.CacheUtils;
+import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.system.domain.SysDept;
+import org.dromara.system.domain.SysRole;
+import org.dromara.system.domain.SysUser;
+import org.dromara.system.domain.bo.SysDeptBo;
+import org.dromara.system.domain.vo.SysDeptVo;
+import org.dromara.system.mapper.SysDeptMapper;
+import org.dromara.system.mapper.SysRoleMapper;
+import org.dromara.system.mapper.SysUserMapper;
+import org.dromara.system.service.SysDeptService;
+import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.cache.annotation.Cacheable;
+import org.springframework.cache.annotation.Caching;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 部门管理 服务实现
+ *
+ * @author pengles
+ */
+@RequiredArgsConstructor
+@Service
+public class SysDeptServiceImpl implements SysDeptService, DeptService {
+
+    private final SysDeptMapper baseMapper;
+    private final SysRoleMapper roleMapper;
+    private final SysUserMapper userMapper;
+
+    /**
+     * 分页查询部门管理数据
+     *
+     * @param dept      部门信息
+     * @param pageQuery 分页对象
+     * @return 部门信息集合
+     */
+    @Override
+    public TableDataInfo<SysDeptVo> selectPageDeptList(SysDeptBo dept, PageQuery pageQuery) {
+        Page<SysDeptVo> page = baseMapper.selectPageDeptList(pageQuery.build(), buildQueryWrapper(dept));
+        return TableDataInfo.build(page);
+    }
+
+    /**
+     * 查询部门管理数据
+     *
+     * @param dept 部门信息
+     * @return 部门信息集合
+     */
+    @Override
+    public List<SysDeptVo> selectDeptList(SysDeptBo dept) {
+        LambdaQueryWrapper<SysDept> lqw = buildQueryWrapper(dept);
+        return baseMapper.selectDeptList(lqw);
+    }
+
+    /**
+     * 查询部门树结构信息
+     *
+     * @param bo 部门信息
+     * @return 部门树信息集合
+     */
+    @Override
+    public List<Tree<Long>> selectDeptTreeList(SysDeptBo bo) {
+        LambdaQueryWrapper<SysDept> lqw = buildQueryWrapper(bo);
+        List<SysDeptVo> depts = baseMapper.selectDeptList(lqw);
+        return buildDeptTreeSelect(depts);
+    }
+
+    private LambdaQueryWrapper<SysDept> buildQueryWrapper(SysDeptBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<SysDept> lqw = Wrappers.lambdaQuery();
+        lqw.eq(SysDept::getDelFlag, SystemConstants.NORMAL);
+        lqw.eq(ObjectUtil.isNotNull(bo.getDeptId()), SysDept::getDeptId, bo.getDeptId());
+        lqw.eq(ObjectUtil.isNotNull(bo.getParentId()), SysDept::getParentId, bo.getParentId());
+        lqw.like(StringUtils.isNotBlank(bo.getDeptName()), SysDept::getDeptName, bo.getDeptName());
+        lqw.like(StringUtils.isNotBlank(bo.getDeptCategory()), SysDept::getDeptCategory, bo.getDeptCategory());
+        lqw.eq(StringUtils.isNotBlank(bo.getStatus()), SysDept::getStatus, bo.getStatus());
+        lqw.between(params.get("beginTime") != null && params.get("endTime") != null,
+                SysDept::getCreateTime, params.get("beginTime"), params.get("endTime"));
+        lqw.orderByAsc(SysDept::getAncestors);
+        lqw.orderByAsc(SysDept::getParentId);
+        lqw.orderByAsc(SysDept::getOrderNum);
+        lqw.orderByAsc(SysDept::getDeptId);
+        if (ObjectUtil.isNotNull(bo.getBelongDeptId())) {
+            //部门树搜索
+            lqw.and(x -> {
+                Long parentId = bo.getBelongDeptId();
+                List<SysDept> deptList = baseMapper.selectListByParentId(parentId);
+                List<Long> deptIds = StreamUtils.toList(deptList, SysDept::getDeptId);
+                deptIds.add(parentId);
+                x.in(SysDept::getDeptId, deptIds);
+            });
+        }
+        return lqw;
+    }
+
+    /**
+     * 构建前端所需要下拉树结构
+     *
+     * @param depts 部门列表
+     * @return 下拉树结构列表
+     */
+    @Override
+    public List<Tree<Long>> buildDeptTreeSelect(List<SysDeptVo> depts) {
+        if (CollUtil.isEmpty(depts)) {
+            return CollUtil.newArrayList();
+        }
+        return TreeBuildUtils.buildMultiRoot(
+                depts,
+                SysDeptVo::getDeptId,
+                SysDeptVo::getParentId,
+                (node, treeNode) -> treeNode
+                        .setId(node.getDeptId())
+                        .setParentId(node.getParentId())
+                        .setName(node.getDeptName())
+                        .setWeight(node.getOrderNum())
+                        .putExtra("disabled", SystemConstants.DISABLE.equals(node.getStatus()))
+        );
+    }
+
+    /**
+     * 根据角色ID查询部门树信息
+     *
+     * @param roleId 角色ID
+     * @return 选中部门列表
+     */
+    @Override
+    public List<Long> selectDeptListByRoleId(Long roleId) {
+        SysRole role = roleMapper.selectById(roleId);
+        return baseMapper.selectDeptListByRoleId(roleId, role.getDeptCheckStrictly());
+    }
+
+    /**
+     * 根据部门ID查询信息
+     *
+     * @param deptId 部门ID
+     * @return 部门信息
+     */
+    @Cacheable(cacheNames = CacheNames.SYS_DEPT, key = "#deptId")
+    @Override
+    public SysDeptVo selectDeptById(Long deptId) {
+        SysDeptVo dept = baseMapper.selectVoById(deptId);
+        if (ObjectUtil.isNull(dept)) {
+            return null;
+        }
+        SysDeptVo parentDept = baseMapper.selectVoOne(new LambdaQueryWrapper<SysDept>()
+                .select(SysDept::getDeptName).eq(SysDept::getDeptId, dept.getParentId()));
+        dept.setParentName(ObjectUtils.notNullGetter(parentDept, SysDeptVo::getDeptName));
+        return dept;
+    }
+
+    @Override
+    public List<SysDeptVo> selectDeptByIds(List<Long> deptIds) {
+        return baseMapper.selectDeptList(new LambdaQueryWrapper<SysDept>()
+                .select(SysDept::getDeptId, SysDept::getDeptName, SysDept::getLeader)
+                .eq(SysDept::getStatus, SystemConstants.NORMAL)
+                .in(CollUtil.isNotEmpty(deptIds), SysDept::getDeptId, deptIds));
+    }
+
+    /**
+     * 通过部门ID查询部门名称
+     *
+     * @param deptIds 部门ID串逗号分隔
+     * @return 部门名称串逗号分隔
+     */
+    @Override
+    public String selectDeptNameByIds(String deptIds) {
+        List<String> list = new ArrayList<>();
+        for (Long id : StringUtils.splitTo(deptIds, Convert::toLong)) {
+            SysDeptVo vo = SpringUtils.getAopProxy(this).selectDeptById(id);
+            if (ObjectUtil.isNotNull(vo)) {
+                list.add(vo.getDeptName());
+            }
+        }
+        return String.join(StringUtils.SEPARATOR, list);
+    }
+
+    /**
+     * 根据部门ID查询部门负责人
+     *
+     * @param deptId 部门ID，用于指定需要查询的部门
+     * @return 返回该部门的负责人ID
+     */
+    @Override
+    public Long selectDeptLeaderById(Long deptId) {
+        SysDeptVo vo = SpringUtils.getAopProxy(this).selectDeptById(deptId);
+        return vo.getLeader();
+    }
+
+    /**
+     * 查询部门
+     *
+     * @return 部门列表
+     */
+    @Override
+    public List<DeptDTO> selectDeptsByList() {
+        List<SysDeptVo> list = baseMapper.selectDeptList(new LambdaQueryWrapper<SysDept>()
+                .select(SysDept::getDeptId, SysDept::getDeptName, SysDept::getParentId)
+                .eq(SysDept::getStatus, SystemConstants.NORMAL));
+        return BeanUtil.copyToList(list, DeptDTO.class);
+    }
+
+    /**
+     * 根据ID查询所有子部门数（正常状态）
+     *
+     * @param deptId 部门ID
+     * @return 子部门数
+     */
+    @Override
+    public long selectNormalChildrenDeptById(Long deptId) {
+        return baseMapper.selectCount(new LambdaQueryWrapper<SysDept>()
+                .eq(SysDept::getStatus, SystemConstants.NORMAL)
+                .apply(DataBaseHelper.findInSet(deptId, "ancestors")));
+    }
+
+    /**
+     * 是否存在子节点
+     *
+     * @param deptId 部门ID
+     * @return 结果
+     */
+    @Override
+    public boolean hasChildByDeptId(Long deptId) {
+        return baseMapper.exists(new LambdaQueryWrapper<SysDept>()
+                .eq(SysDept::getParentId, deptId));
+    }
+
+    /**
+     * 查询部门是否存在用户
+     *
+     * @param deptId 部门ID
+     * @return 结果 true 存在 false 不存在
+     */
+    @Override
+    public boolean checkDeptExistUser(Long deptId) {
+        return userMapper.exists(new LambdaQueryWrapper<SysUser>()
+                .eq(SysUser::getDeptId, deptId));
+    }
+
+    /**
+     * 校验部门名称是否唯一
+     *
+     * @param dept 部门信息
+     * @return 结果
+     */
+    @Override
+    public boolean checkDeptNameUnique(SysDeptBo dept) {
+        boolean exist = baseMapper.exists(new LambdaQueryWrapper<SysDept>()
+                .eq(SysDept::getDeptName, dept.getDeptName())
+                .eq(SysDept::getParentId, dept.getParentId())
+                .ne(ObjectUtil.isNotNull(dept.getDeptId()), SysDept::getDeptId, dept.getDeptId()));
+        return !exist;
+    }
+
+    /**
+     * 校验部门是否有数据权限
+     *
+     * @param deptId 部门id
+     */
+    @Override
+    public void checkDeptDataScope(Long deptId) {
+        if (ObjectUtil.isNull(deptId)) {
+            return;
+        }
+        if (LoginHelper.isSuperAdmin()) {
+            return;
+        }
+        if (baseMapper.countDeptById(deptId) == 0) {
+            throw new ServiceException("没有权限访问部门数据！");
+        }
+    }
+
+    /**
+     * 新增保存部门信息
+     *
+     * @param bo 部门信息
+     * @return 结果
+     */
+    @CacheEvict(cacheNames = CacheNames.SYS_DEPT_AND_CHILD, allEntries = true)
+    @Override
+    public int insertDept(SysDeptBo bo) {
+        SysDept info = baseMapper.selectById(bo.getParentId());
+        // 如果父节点不为正常状态,则不允许新增子节点
+        if (!SystemConstants.NORMAL.equals(info.getStatus())) {
+            throw new ServiceException("部门停用，不允许新增");
+        }
+        SysDept dept = MapstructUtils.convert(bo, SysDept.class);
+        dept.setAncestors(info.getAncestors() + StringUtils.SEPARATOR + dept.getParentId());
+        return baseMapper.insert(dept);
+    }
+
+    /**
+     * 修改保存部门信息
+     *
+     * @param bo 部门信息
+     * @return 结果
+     */
+    @Caching(evict = {
+            @CacheEvict(cacheNames = CacheNames.SYS_DEPT, key = "#bo.deptId"),
+            @CacheEvict(cacheNames = CacheNames.SYS_DEPT_AND_CHILD, allEntries = true)
+    })
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int updateDept(SysDeptBo bo) {
+        SysDept dept = MapstructUtils.convert(bo, SysDept.class);
+        SysDept oldDept = baseMapper.selectById(dept.getDeptId());
+        if (ObjectUtil.isNull(oldDept)) {
+            throw new ServiceException("部门不存在，无法修改");
+        }
+        if (!oldDept.getParentId().equals(dept.getParentId())) {
+            // 如果是新父部门 则校验是否具有新父部门权限 避免越权
+            this.checkDeptDataScope(dept.getParentId());
+            SysDept newParentDept = baseMapper.selectById(dept.getParentId());
+            if (ObjectUtil.isNotNull(newParentDept)) {
+                String newAncestors = newParentDept.getAncestors() + StringUtils.SEPARATOR + newParentDept.getDeptId();
+                String oldAncestors = oldDept.getAncestors();
+                dept.setAncestors(newAncestors);
+                updateDeptChildren(dept.getDeptId(), newAncestors, oldAncestors);
+            }
+        } else {
+            dept.setAncestors(oldDept.getAncestors());
+        }
+        int result = baseMapper.updateById(dept);
+        // 如果部门状态为启用，且部门祖级列表不为空，且部门祖级列表不等于根部门祖级列表（如果部门祖级列表不等于根部门祖级列表，则说明存在上级部门）
+        if (SystemConstants.NORMAL.equals(dept.getStatus())
+                && StringUtils.isNotEmpty(dept.getAncestors())
+                && !StringUtils.equals(SystemConstants.ROOT_DEPT_ANCESTORS, dept.getAncestors())) {
+            // 如果该部门是启用状态，则启用该部门的所有上级部门
+            updateParentDeptStatusNormal(dept);
+        }
+        return result;
+    }
+
+    /**
+     * 修改该部门的父级部门状态
+     *
+     * @param dept 当前部门
+     */
+    private void updateParentDeptStatusNormal(SysDept dept) {
+        String ancestors = dept.getAncestors();
+        Long[] deptIds = Convert.toLongArray(ancestors);
+        baseMapper.update(null, new LambdaUpdateWrapper<SysDept>()
+                .set(SysDept::getStatus, SystemConstants.NORMAL)
+                .in(SysDept::getDeptId, Arrays.asList(deptIds)));
+    }
+
+    /**
+     * 修改子元素关系
+     *
+     * @param deptId       被修改的部门ID
+     * @param newAncestors 新的父ID集合
+     * @param oldAncestors 旧的父ID集合
+     */
+    private void updateDeptChildren(Long deptId, String newAncestors, String oldAncestors) {
+        List<SysDept> children = baseMapper.selectList(new LambdaQueryWrapper<SysDept>()
+                .apply(DataBaseHelper.findInSet(deptId, "ancestors")));
+        List<SysDept> list = new ArrayList<>();
+        for (SysDept child : children) {
+            SysDept dept = new SysDept();
+            dept.setDeptId(child.getDeptId());
+            dept.setAncestors(child.getAncestors().replaceFirst(oldAncestors, newAncestors));
+            list.add(dept);
+        }
+        if (CollUtil.isNotEmpty(list)) {
+            if (baseMapper.updateBatchById(list)) {
+                list.forEach(dept -> CacheUtils.evict(CacheNames.SYS_DEPT, dept.getDeptId()));
+            }
+        }
+    }
+
+    /**
+     * 删除部门管理信息
+     *
+     * @param deptId 部门ID
+     * @return 结果
+     */
+    @Caching(evict = {
+            @CacheEvict(cacheNames = CacheNames.SYS_DEPT, key = "#deptId"),
+            @CacheEvict(cacheNames = CacheNames.SYS_DEPT_AND_CHILD, key = "#deptId")
+    })
+    @Override
+    public int deleteDeptById(Long deptId) {
+        return baseMapper.deleteById(deptId);
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictDataServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictDataServiceImpl.java
new file mode 100644
index 0000000..972b774
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictDataServiceImpl.java
@@ -0,0 +1,152 @@
+package org.dromara.system.service.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.constant.CacheNames;
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.redis.utils.CacheUtils;
+import org.dromara.system.domain.SysDictData;
+import org.dromara.system.domain.bo.SysDictDataBo;
+import org.dromara.system.domain.vo.SysDictDataVo;
+import org.dromara.system.mapper.SysDictDataMapper;
+import org.dromara.system.service.SysDictDataService;
+import org.springframework.cache.annotation.CachePut;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 字典 业务层处理
+ *
+ * @author pengles
+ */
+@RequiredArgsConstructor
+@Service
+public class SysDictDataServiceImpl implements SysDictDataService {
+
+    private final SysDictDataMapper baseMapper;
+
+    @Override
+    public TableDataInfo<SysDictDataVo> selectPageDictDataList(SysDictDataBo dictData, PageQuery pageQuery) {
+        LambdaQueryWrapper<SysDictData> lqw = buildQueryWrapper(dictData);
+        Page<SysDictDataVo> page = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(page);
+    }
+
+    /**
+     * 根据条件分页查询字典数据
+     *
+     * @param dictData 字典数据信息
+     * @return 字典数据集合信息
+     */
+    @Override
+    public List<SysDictDataVo> selectDictDataList(SysDictDataBo dictData) {
+        LambdaQueryWrapper<SysDictData> lqw = buildQueryWrapper(dictData);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<SysDictData> buildQueryWrapper(SysDictDataBo bo) {
+        LambdaQueryWrapper<SysDictData> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getDictSort() != null, SysDictData::getDictSort, bo.getDictSort());
+        lqw.like(StringUtils.isNotBlank(bo.getDictLabel()), SysDictData::getDictLabel, bo.getDictLabel());
+        lqw.eq(StringUtils.isNotBlank(bo.getDictType()), SysDictData::getDictType, bo.getDictType());
+        lqw.orderByAsc(SysDictData::getDictSort, SysDictData::getDictCode);
+        return lqw;
+    }
+
+    /**
+     * 根据字典类型和字典键值查询字典数据信息
+     *
+     * @param dictType  字典类型
+     * @param dictValue 字典键值
+     * @return 字典标签
+     */
+    @Override
+    public String selectDictLabel(String dictType, String dictValue) {
+        return baseMapper.selectOne(new LambdaQueryWrapper<SysDictData>()
+                        .select(SysDictData::getDictLabel)
+                        .eq(SysDictData::getDictType, dictType)
+                        .eq(SysDictData::getDictValue, dictValue))
+                .getDictLabel();
+    }
+
+    /**
+     * 根据字典数据ID查询信息
+     *
+     * @param dictCode 字典数据ID
+     * @return 字典数据
+     */
+    @Override
+    public SysDictDataVo selectDictDataById(Long dictCode) {
+        return baseMapper.selectVoById(dictCode);
+    }
+
+    /**
+     * 批量删除字典数据信息
+     *
+     * @param dictCodes 需要删除的字典数据ID
+     */
+    @Override
+    public void deleteDictDataByIds(List<Long> dictCodes) {
+        List<SysDictData> list = baseMapper.selectByIds(dictCodes);
+        baseMapper.deleteByIds(dictCodes);
+        list.forEach(x -> CacheUtils.evict(CacheNames.SYS_DICT, x.getDictType()));
+    }
+
+    /**
+     * 新增保存字典数据信息
+     *
+     * @param bo 字典数据信息
+     * @return 结果
+     */
+    @CachePut(cacheNames = CacheNames.SYS_DICT, key = "#bo.dictType")
+    @Override
+    public List<SysDictDataVo> insertDictData(SysDictDataBo bo) {
+        SysDictData data = MapstructUtils.convert(bo, SysDictData.class);
+        int row = baseMapper.insert(data);
+        if (row > 0) {
+            return baseMapper.selectDictDataByType(data.getDictType());
+        }
+        throw new ServiceException("操作失败");
+    }
+
+    /**
+     * 修改保存字典数据信息
+     *
+     * @param bo 字典数据信息
+     * @return 结果
+     */
+    @CachePut(cacheNames = CacheNames.SYS_DICT, key = "#bo.dictType")
+    @Override
+    public List<SysDictDataVo> updateDictData(SysDictDataBo bo) {
+        SysDictData data = MapstructUtils.convert(bo, SysDictData.class);
+        int row = baseMapper.updateById(data);
+        if (row > 0) {
+            return baseMapper.selectDictDataByType(data.getDictType());
+        }
+        throw new ServiceException("操作失败");
+    }
+
+    /**
+     * 校验字典键值是否唯一
+     *
+     * @param dict 字典数据
+     * @return 结果
+     */
+    @Override
+    public boolean checkDictDataUnique(SysDictDataBo dict) {
+        boolean exist = baseMapper.exists(new LambdaQueryWrapper<SysDictData>()
+                .eq(SysDictData::getDictType, dict.getDictType())
+                .eq(SysDictData::getDictValue, dict.getDictValue())
+                .ne(ObjectUtil.isNotNull(dict.getDictCode()), SysDictData::getDictCode, dict.getDictCode()));
+        return !exist;
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictTypeServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictTypeServiceImpl.java
new file mode 100644
index 0000000..75d885c
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictTypeServiceImpl.java
@@ -0,0 +1,297 @@
+package org.dromara.system.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.constant.CacheNames;
+import org.dromara.common.core.domain.dto.DictDataDTO;
+import org.dromara.common.core.domain.dto.DictTypeDTO;
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.service.DictService;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.SpringUtils;
+import org.dromara.common.core.utils.StreamUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.redis.utils.CacheUtils;
+import org.dromara.system.domain.SysDictData;
+import org.dromara.system.domain.SysDictType;
+import org.dromara.system.domain.bo.SysDictTypeBo;
+import org.dromara.system.domain.vo.SysDictDataVo;
+import org.dromara.system.domain.vo.SysDictTypeVo;
+import org.dromara.system.mapper.SysDictDataMapper;
+import org.dromara.system.mapper.SysDictTypeMapper;
+import org.dromara.system.service.SysDictTypeService;
+import org.springframework.cache.annotation.CachePut;
+import org.springframework.cache.annotation.Cacheable;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * 字典 业务层处理
+ *
+ * @author pengles
+ */
+@RequiredArgsConstructor
+@Service
+public class SysDictTypeServiceImpl implements SysDictTypeService, DictService {
+
+    private final SysDictTypeMapper baseMapper;
+    private final SysDictDataMapper dictDataMapper;
+
+    @Override
+    public TableDataInfo<SysDictTypeVo> selectPageDictTypeList(SysDictTypeBo dictType, PageQuery pageQuery) {
+        LambdaQueryWrapper<SysDictType> lqw = buildQueryWrapper(dictType);
+        Page<SysDictTypeVo> page = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(page);
+    }
+
+    /**
+     * 根据条件分页查询字典类型
+     *
+     * @param dictType 字典类型信息
+     * @return 字典类型集合信息
+     */
+    @Override
+    public List<SysDictTypeVo> selectDictTypeList(SysDictTypeBo dictType) {
+        LambdaQueryWrapper<SysDictType> lqw = buildQueryWrapper(dictType);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<SysDictType> buildQueryWrapper(SysDictTypeBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<SysDictType> lqw = Wrappers.lambdaQuery();
+        lqw.like(StringUtils.isNotBlank(bo.getDictName()), SysDictType::getDictName, bo.getDictName());
+        lqw.like(StringUtils.isNotBlank(bo.getDictType()), SysDictType::getDictType, bo.getDictType());
+        lqw.between(params.get("beginTime") != null && params.get("endTime") != null,
+                SysDictType::getCreateTime, params.get("beginTime"), params.get("endTime"));
+        lqw.orderByAsc(SysDictType::getDictId);
+        return lqw;
+    }
+
+    /**
+     * 根据所有字典类型
+     *
+     * @return 字典类型集合信息
+     */
+    @Override
+    public List<SysDictTypeVo> selectDictTypeAll() {
+        return baseMapper.selectVoList();
+    }
+
+    /**
+     * 根据字典类型查询字典数据
+     *
+     * @param dictType 字典类型
+     * @return 字典数据集合信息
+     */
+    @Cacheable(cacheNames = CacheNames.SYS_DICT, key = "#dictType")
+    @Override
+    public List<SysDictDataVo> selectDictDataByType(String dictType) {
+        List<SysDictDataVo> dictDatas = dictDataMapper.selectDictDataByType(dictType);
+        return CollUtil.isNotEmpty(dictDatas) ? dictDatas : null;
+    }
+
+    /**
+     * 根据字典类型ID查询信息
+     *
+     * @param dictId 字典类型ID
+     * @return 字典类型
+     */
+    @Override
+    public SysDictTypeVo selectDictTypeById(Long dictId) {
+        return baseMapper.selectVoById(dictId);
+    }
+
+    /**
+     * 根据字典类型查询信息
+     *
+     * @param dictType 字典类型
+     * @return 字典类型
+     */
+    @Cacheable(cacheNames = CacheNames.SYS_DICT_TYPE, key = "#dictType")
+    @Override
+    public SysDictTypeVo selectDictTypeByType(String dictType) {
+        return baseMapper.selectVoOne(new LambdaQueryWrapper<SysDictType>().eq(SysDictType::getDictType, dictType));
+    }
+
+    /**
+     * 批量删除字典类型信息
+     *
+     * @param dictIds 需要删除的字典ID
+     */
+    @Override
+    public void deleteDictTypeByIds(List<Long> dictIds) {
+        List<SysDictType> list = baseMapper.selectByIds(dictIds);
+        list.forEach(x -> {
+            boolean assigned = dictDataMapper.exists(new LambdaQueryWrapper<SysDictData>()
+                    .eq(SysDictData::getDictType, x.getDictType()));
+            if (assigned) {
+                throw new ServiceException(String.format("%1$s已分配,不能删除", x.getDictName()));
+            }
+        });
+        baseMapper.deleteByIds(dictIds);
+        list.forEach(x -> {
+            CacheUtils.evict(CacheNames.SYS_DICT, x.getDictType());
+            CacheUtils.evict(CacheNames.SYS_DICT_TYPE, x.getDictType());
+        });
+    }
+
+    /**
+     * 重置字典缓存数据
+     */
+    @Override
+    public void resetDictCache() {
+        CacheUtils.clear(CacheNames.SYS_DICT);
+        CacheUtils.clear(CacheNames.SYS_DICT_TYPE);
+    }
+
+    /**
+     * 新增保存字典类型信息
+     *
+     * @param bo 字典类型信息
+     * @return 结果
+     */
+    @CachePut(cacheNames = CacheNames.SYS_DICT, key = "#bo.dictType")
+    @Override
+    public List<SysDictDataVo> insertDictType(SysDictTypeBo bo) {
+        SysDictType dict = MapstructUtils.convert(bo, SysDictType.class);
+        int row = baseMapper.insert(dict);
+        if (row > 0) {
+            // 新增 type 下无 data 数据 返回空防止缓存穿透
+            return new ArrayList<>();
+        }
+        throw new ServiceException("操作失败");
+    }
+
+    /**
+     * 修改保存字典类型信息
+     *
+     * @param bo 字典类型信息
+     * @return 结果
+     */
+    @CachePut(cacheNames = CacheNames.SYS_DICT, key = "#bo.dictType")
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public List<SysDictDataVo> updateDictType(SysDictTypeBo bo) {
+        SysDictType dict = MapstructUtils.convert(bo, SysDictType.class);
+        SysDictType oldDict = baseMapper.selectById(dict.getDictId());
+        dictDataMapper.update(null, new LambdaUpdateWrapper<SysDictData>()
+                .set(SysDictData::getDictType, dict.getDictType())
+                .eq(SysDictData::getDictType, oldDict.getDictType()));
+        int row = baseMapper.updateById(dict);
+        if (row > 0) {
+            CacheUtils.evict(CacheNames.SYS_DICT, oldDict.getDictType());
+            CacheUtils.evict(CacheNames.SYS_DICT_TYPE, oldDict.getDictType());
+            return dictDataMapper.selectDictDataByType(dict.getDictType());
+        }
+        throw new ServiceException("操作失败");
+    }
+
+    /**
+     * 校验字典类型称是否唯一
+     *
+     * @param dictType 字典类型
+     * @return 结果
+     */
+    @Override
+    public boolean checkDictTypeUnique(SysDictTypeBo dictType) {
+        boolean exist = baseMapper.exists(new LambdaQueryWrapper<SysDictType>()
+                .eq(SysDictType::getDictType, dictType.getDictType())
+                .ne(ObjectUtil.isNotNull(dictType.getDictId()), SysDictType::getDictId, dictType.getDictId()));
+        return !exist;
+    }
+
+    /**
+     * 根据字典类型和字典值获取字典标签
+     *
+     * @param dictType  字典类型
+     * @param dictValue 字典值
+     * @param separator 分隔符
+     * @return 字典标签
+     */
+    @Override
+    public String getDictLabel(String dictType, String dictValue, String separator) {
+        List<SysDictDataVo> datas = SpringUtils.getAopProxy(this).selectDictDataByType(dictType);
+        Map<String, String> map = StreamUtils.toMap(datas, SysDictDataVo::getDictValue, SysDictDataVo::getDictLabel);
+        if (StringUtils.containsAny(dictValue, separator)) {
+            return Arrays.stream(dictValue.split(separator))
+                    .map(v -> map.getOrDefault(v, StringUtils.EMPTY))
+                    .collect(Collectors.joining(separator));
+        } else {
+            return map.getOrDefault(dictValue, StringUtils.EMPTY);
+        }
+    }
+
+    /**
+     * 根据字典类型和字典标签获取字典值
+     *
+     * @param dictType  字典类型
+     * @param dictLabel 字典标签
+     * @param separator 分隔符
+     * @return 字典值
+     */
+    @Override
+    public String getDictValue(String dictType, String dictLabel, String separator) {
+        List<SysDictDataVo> datas = SpringUtils.getAopProxy(this).selectDictDataByType(dictType);
+        Map<String, String> map = StreamUtils.toMap(datas, SysDictDataVo::getDictLabel, SysDictDataVo::getDictValue);
+        if (StringUtils.containsAny(dictLabel, separator)) {
+            return Arrays.stream(dictLabel.split(separator))
+                    .map(l -> map.getOrDefault(l, StringUtils.EMPTY))
+                    .collect(Collectors.joining(separator));
+        } else {
+            return map.getOrDefault(dictLabel, StringUtils.EMPTY);
+        }
+    }
+
+    /**
+     * 获取字典下所有的字典值与标签
+     *
+     * @param dictType 字典类型
+     * @return dictValue为key，dictLabel为值组成的Map
+     */
+    @Override
+    public Map<String, String> getAllDictByDictType(String dictType) {
+        List<SysDictDataVo> list = SpringUtils.getAopProxy(this).selectDictDataByType(dictType);
+        // 保证顺序
+        LinkedHashMap<String, String> map = new LinkedHashMap<>();
+        for (SysDictDataVo vo : list) {
+            map.put(vo.getDictValue(), vo.getDictLabel());
+        }
+        return map;
+    }
+
+    /**
+     * 根据字典类型查询详细信息
+     *
+     * @param dictType 字典类型
+     * @return 字典类型详细信息
+     */
+    @Override
+    public DictTypeDTO getDictType(String dictType) {
+        SysDictTypeVo vo = SpringUtils.getAopProxy(this).selectDictTypeByType(dictType);
+        return BeanUtil.toBean(vo, DictTypeDTO.class);
+    }
+
+    /**
+     * 根据字典类型查询字典数据列表
+     *
+     * @param dictType 字典类型
+     * @return 字典数据列表
+     */
+    @Override
+    public List<DictDataDTO> getDictData(String dictType) {
+        List<SysDictDataVo> list = SpringUtils.getAopProxy(this).selectDictDataByType(dictType);
+        return BeanUtil.copyToList(list, DictDataDTO.class);
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysLogininforServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysLogininforServiceImpl.java
new file mode 100644
index 0000000..9322a6d
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysLogininforServiceImpl.java
@@ -0,0 +1,169 @@
+package org.dromara.system.service.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.http.useragent.UserAgent;
+import cn.hutool.http.useragent.UserAgentUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import jakarta.servlet.http.HttpServletRequest;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.constant.Constants;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.ServletUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.core.utils.ip.AddressUtils;
+import org.dromara.common.log.event.LogininforEvent;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.system.domain.SysLogininfor;
+import org.dromara.system.domain.bo.SysLogininforBo;
+import org.dromara.system.domain.vo.SysClientVo;
+import org.dromara.system.domain.vo.SysLogininforVo;
+import org.dromara.system.mapper.SysLogininforMapper;
+import org.dromara.system.service.SysClientService;
+import org.dromara.system.service.SysLogininforService;
+import org.springframework.context.event.EventListener;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Service;
+
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 系统访问日志情况信息 服务层处理
+ *
+ * @author pengles
+ */
+@RequiredArgsConstructor
+@Service
+public class SysLogininforServiceImpl implements SysLogininforService {
+
+    private final SysLogininforMapper baseMapper;
+    private final SysClientService clientService;
+
+    /**
+     * 记录登录信息
+     *
+     * @param logininforEvent 登录事件
+     */
+    @Async
+    @EventListener
+    public void recordLogininfor(LogininforEvent logininforEvent) {
+        HttpServletRequest request = logininforEvent.getRequest();
+        final UserAgent userAgent = UserAgentUtil.parse(request.getHeader("User-Agent"));
+        final String ip = ServletUtils.getClientIP(request);
+        // 客户端信息
+        String clientId = request.getHeader(LoginHelper.CLIENT_KEY);
+        SysClientVo client = null;
+        if (StringUtils.isNotBlank(clientId)) {
+            client = clientService.queryByClientId(clientId);
+        }
+
+        String address = AddressUtils.getRealAddressByIP(ip);
+        StringBuilder s = new StringBuilder();
+        s.append(getBlock(ip));
+        s.append(address);
+        s.append(getBlock(logininforEvent.getUsername()));
+        s.append(getBlock(logininforEvent.getStatus()));
+        s.append(getBlock(logininforEvent.getMessage()));
+        // 获取客户端操作系统
+        String os = userAgent.getOs().getName();
+        // 获取客户端浏览器
+        String browser = userAgent.getBrowser().getName();
+        // 封装对象
+        SysLogininforBo logininfor = new SysLogininforBo();
+        logininfor.setUserName(logininforEvent.getUsername());
+        if (ObjectUtil.isNotNull(client)) {
+            logininfor.setClientKey(client.getClientKey());
+            logininfor.setDeviceType(client.getDeviceType());
+        }
+        logininfor.setIpaddr(ip);
+        logininfor.setLoginLocation(address);
+        logininfor.setBrowser(browser);
+        logininfor.setOs(os);
+        logininfor.setMsg(logininforEvent.getMessage());
+        // 日志状态
+        if (StringUtils.equalsAny(logininforEvent.getStatus(), Constants.LOGIN_SUCCESS, Constants.LOGOUT, Constants.REGISTER)) {
+            logininfor.setStatus(Constants.SUCCESS);
+        } else if (Constants.LOGIN_FAIL.equals(logininforEvent.getStatus())) {
+            logininfor.setStatus(Constants.FAIL);
+        }
+        // 插入数据
+        insertLogininfor(logininfor);
+    }
+
+    private String getBlock(Object msg) {
+        if (msg == null) {
+            msg = "";
+        }
+        return "[" + msg.toString() + "]";
+    }
+
+    @Override
+    public TableDataInfo<SysLogininforVo> selectPageLogininforList(SysLogininforBo logininfor, PageQuery pageQuery) {
+        Map<String, Object> params = logininfor.getParams();
+        LambdaQueryWrapper<SysLogininfor> lqw = new LambdaQueryWrapper<SysLogininfor>()
+                .like(StringUtils.isNotBlank(logininfor.getIpaddr()), SysLogininfor::getIpaddr, logininfor.getIpaddr())
+                .eq(StringUtils.isNotBlank(logininfor.getStatus()), SysLogininfor::getStatus, logininfor.getStatus())
+                .like(StringUtils.isNotBlank(logininfor.getUserName()), SysLogininfor::getUserName, logininfor.getUserName())
+                .between(params.get("beginTime") != null && params.get("endTime") != null,
+                        SysLogininfor::getLoginTime, params.get("beginTime"), params.get("endTime"));
+        if (StringUtils.isBlank(pageQuery.getOrderByColumn())) {
+            lqw.orderByDesc(SysLogininfor::getInfoId);
+        }
+        Page<SysLogininforVo> page = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(page);
+    }
+
+    /**
+     * 新增系统登录日志
+     *
+     * @param bo 访问日志对象
+     */
+    @Override
+    public void insertLogininfor(SysLogininforBo bo) {
+        SysLogininfor logininfor = MapstructUtils.convert(bo, SysLogininfor.class);
+        logininfor.setLoginTime(new Date());
+        baseMapper.insert(logininfor);
+    }
+
+    /**
+     * 查询系统登录日志集合
+     *
+     * @param logininfor 访问日志对象
+     * @return 登录记录集合
+     */
+    @Override
+    public List<SysLogininforVo> selectLogininforList(SysLogininforBo logininfor) {
+        Map<String, Object> params = logininfor.getParams();
+        return baseMapper.selectVoList(new LambdaQueryWrapper<SysLogininfor>()
+                .like(StringUtils.isNotBlank(logininfor.getIpaddr()), SysLogininfor::getIpaddr, logininfor.getIpaddr())
+                .eq(StringUtils.isNotBlank(logininfor.getStatus()), SysLogininfor::getStatus, logininfor.getStatus())
+                .like(StringUtils.isNotBlank(logininfor.getUserName()), SysLogininfor::getUserName, logininfor.getUserName())
+                .between(params.get("beginTime") != null && params.get("endTime") != null,
+                        SysLogininfor::getLoginTime, params.get("beginTime"), params.get("endTime"))
+                .orderByDesc(SysLogininfor::getInfoId));
+    }
+
+    /**
+     * 批量删除系统登录日志
+     *
+     * @param infoIds 需要删除的登录日志ID
+     * @return 结果
+     */
+    @Override
+    public int deleteLogininforByIds(Long[] infoIds) {
+        return baseMapper.deleteByIds(Arrays.asList(infoIds));
+    }
+
+    /**
+     * 清空系统登录日志
+     */
+    @Override
+    public void cleanLogininfor() {
+        baseMapper.delete(new LambdaQueryWrapper<>());
+    }
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysMenuServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysMenuServiceImpl.java
new file mode 100644
index 0000000..1b4d34d
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysMenuServiceImpl.java
@@ -0,0 +1,374 @@
+package org.dromara.system.service.impl;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.lang.tree.Tree;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.constant.Constants;
+import org.dromara.common.core.constant.SystemConstants;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StreamUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.core.utils.TreeBuildUtils;
+import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.system.domain.SysMenu;
+import org.dromara.system.domain.SysRole;
+import org.dromara.system.domain.SysRoleMenu;
+import org.dromara.system.domain.bo.SysMenuBo;
+import org.dromara.system.domain.vo.MetaVo;
+import org.dromara.system.domain.vo.RouterVo;
+import org.dromara.system.domain.vo.SysMenuVo;
+import org.dromara.system.mapper.SysMenuMapper;
+import org.dromara.system.mapper.SysRoleMapper;
+import org.dromara.system.mapper.SysRoleMenuMapper;
+import org.dromara.system.service.SysMenuService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.*;
+
+/**
+ * 菜单 业务层处理
+ *
+ * @author pengles
+ */
+@RequiredArgsConstructor
+@Service
+public class SysMenuServiceImpl implements SysMenuService {
+
+    private final SysMenuMapper baseMapper;
+    private final SysRoleMapper roleMapper;
+    private final SysRoleMenuMapper roleMenuMapper;
+
+    /**
+     * 根据用户查询系统菜单列表
+     *
+     * @param userId 用户ID
+     * @return 菜单列表
+     */
+    @Override
+    public List<SysMenuVo> selectMenuList(Long userId) {
+        return selectMenuList(new SysMenuBo(), userId);
+    }
+
+    /**
+     * 查询系统菜单列表
+     *
+     * @param menu 菜单信息
+     * @return 菜单列表
+     */
+    @Override
+    public List<SysMenuVo> selectMenuList(SysMenuBo menu, Long userId) {
+        List<SysMenuVo> menuList;
+        // 管理员显示所有菜单信息
+        if (LoginHelper.isSuperAdmin(userId)) {
+            menuList = baseMapper.selectVoList(new LambdaQueryWrapper<SysMenu>()
+                    .like(StringUtils.isNotBlank(menu.getMenuName()), SysMenu::getMenuName, menu.getMenuName())
+                    .eq(StringUtils.isNotBlank(menu.getVisible()), SysMenu::getVisible, menu.getVisible())
+                    .eq(StringUtils.isNotBlank(menu.getStatus()), SysMenu::getStatus, menu.getStatus())
+                    .eq(StringUtils.isNotBlank(menu.getMenuType()), SysMenu::getMenuType, menu.getMenuType())
+                    .eq(ObjectUtil.isNotNull(menu.getParentId()), SysMenu::getParentId, menu.getParentId())
+                    .orderByAsc(SysMenu::getParentId)
+                    .orderByAsc(SysMenu::getOrderNum));
+        } else {
+            QueryWrapper<SysMenu> wrapper = Wrappers.query();
+            wrapper.inSql("r.role_id", "select role_id from sys_user_role where user_id = " + userId)
+                    .like(StringUtils.isNotBlank(menu.getMenuName()), "m.menu_name", menu.getMenuName())
+                    .eq(StringUtils.isNotBlank(menu.getVisible()), "m.visible", menu.getVisible())
+                    .eq(StringUtils.isNotBlank(menu.getStatus()), "m.status", menu.getStatus())
+                    .eq(StringUtils.isNotBlank(menu.getMenuType()), "m.menu_type", menu.getMenuType())
+                    .eq(ObjectUtil.isNotNull(menu.getParentId()), "m.parent_id", menu.getParentId())
+                    .orderByAsc("m.parent_id")
+                    .orderByAsc("m.order_num");
+            List<SysMenu> list = baseMapper.selectMenuListByUserId(wrapper);
+            menuList = MapstructUtils.convert(list, SysMenuVo.class);
+        }
+        return menuList;
+    }
+
+    /**
+     * 根据用户ID查询权限
+     *
+     * @param userId 用户ID
+     * @return 权限列表
+     */
+    @Override
+    public Set<String> selectMenuPermsByUserId(Long userId) {
+        List<String> perms = baseMapper.selectMenuPermsByUserId(userId);
+        Set<String> permsSet = new HashSet<>();
+        for (String perm : perms) {
+            if (StringUtils.isNotEmpty(perm)) {
+                permsSet.addAll(StringUtils.splitList(perm.trim()));
+            }
+        }
+        return permsSet;
+    }
+
+    /**
+     * 根据角色ID查询权限
+     *
+     * @param roleId 角色ID
+     * @return 权限列表
+     */
+    @Override
+    public Set<String> selectMenuPermsByRoleId(Long roleId) {
+        List<String> perms = baseMapper.selectMenuPermsByRoleId(roleId);
+        Set<String> permsSet = new HashSet<>();
+        for (String perm : perms) {
+            if (StringUtils.isNotEmpty(perm)) {
+                permsSet.addAll(StringUtils.splitList(perm.trim()));
+            }
+        }
+        return permsSet;
+    }
+
+    /**
+     * 根据用户ID查询菜单
+     *
+     * @param userId 用户名称
+     * @return 菜单列表
+     */
+    @Override
+    public List<SysMenu> selectMenuTreeByUserId(Long userId) {
+        List<SysMenu> menus;
+        if (LoginHelper.isSuperAdmin(userId)) {
+            menus = baseMapper.selectMenuTreeAll();
+        } else {
+            menus = baseMapper.selectMenuTreeByUserId(userId);
+        }
+        return getChildPerms(menus, Constants.TOP_PARENT_ID);
+    }
+
+    /**
+     * 根据角色ID查询菜单树信息
+     *
+     * @param roleId 角色ID
+     * @return 选中菜单列表
+     */
+    @Override
+    public List<Long> selectMenuListByRoleId(Long roleId) {
+        SysRole role = roleMapper.selectById(roleId);
+        return baseMapper.selectMenuListByRoleId(roleId, role.getMenuCheckStrictly());
+    }
+
+    /**
+     * 构建前端路由所需要的菜单
+     * 路由name命名规则 path首字母转大写 + id
+     *
+     * @param menus 菜单列表
+     * @return 路由列表
+     */
+    @Override
+    public List<RouterVo> buildMenus(List<SysMenu> menus) {
+        List<RouterVo> routers = new LinkedList<>();
+        for (SysMenu menu : menus) {
+            String name = menu.getRouteName() + menu.getMenuId();
+            RouterVo router = new RouterVo();
+            router.setHidden("1".equals(menu.getVisible()));
+            router.setName(name);
+            router.setPath(menu.getRouterPath());
+            router.setComponent(menu.getComponentInfo());
+            router.setQuery(menu.getQueryParam());
+            router.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon(), StringUtils.equals("1", menu.getIsCache()), menu.getPath()));
+            List<SysMenu> cMenus = menu.getChildren();
+            if (CollUtil.isNotEmpty(cMenus) && SystemConstants.TYPE_DIR.equals(menu.getMenuType())) {
+                router.setAlwaysShow(true);
+                router.setRedirect("noRedirect");
+                router.setChildren(buildMenus(cMenus));
+            } else if (menu.isMenuFrame()) {
+                String frameName = StringUtils.capitalize(menu.getPath()) + menu.getMenuId();
+                router.setMeta(null);
+                List<RouterVo> childrenList = new ArrayList<>();
+                RouterVo children = new RouterVo();
+                children.setPath(menu.getPath());
+                children.setComponent(menu.getComponent());
+                children.setName(frameName);
+                children.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon(), StringUtils.equals("1", menu.getIsCache()), menu.getPath()));
+                children.setQuery(menu.getQueryParam());
+                childrenList.add(children);
+                router.setChildren(childrenList);
+            } else if (menu.getParentId().equals(Constants.TOP_PARENT_ID) && menu.isInnerLink()) {
+                router.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon()));
+                router.setPath("/");
+                List<RouterVo> childrenList = new ArrayList<>();
+                RouterVo children = new RouterVo();
+                String routerPath = SysMenu.innerLinkReplaceEach(menu.getPath());
+                String innerLinkName = StringUtils.capitalize(routerPath) + menu.getMenuId();
+                children.setPath(routerPath);
+                children.setComponent(SystemConstants.INNER_LINK);
+                children.setName(innerLinkName);
+                children.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon(), menu.getPath()));
+                childrenList.add(children);
+                router.setChildren(childrenList);
+            }
+            routers.add(router);
+        }
+        return routers;
+    }
+
+    /**
+     * 构建前端所需要下拉树结构
+     *
+     * @param menus 菜单列表
+     * @return 下拉树结构列表
+     */
+    @Override
+    public List<Tree<Long>> buildMenuTreeSelect(List<SysMenuVo> menus) {
+        if (CollUtil.isEmpty(menus)) {
+            return CollUtil.newArrayList();
+        }
+        return TreeBuildUtils.build(menus, (menu, tree) -> {
+            Tree<Long> menuTree = tree.setId(menu.getMenuId())
+                    .setParentId(menu.getParentId())
+                    .setName(menu.getMenuName())
+                    .setWeight(menu.getOrderNum());
+            menuTree.put("menuType", menu.getMenuType());
+            menuTree.put("icon", menu.getIcon());
+        });
+    }
+
+    /**
+     * 根据菜单ID查询信息
+     *
+     * @param menuId 菜单ID
+     * @return 菜单信息
+     */
+    @Override
+    public SysMenuVo selectMenuById(Long menuId) {
+        return baseMapper.selectVoById(menuId);
+    }
+
+    /**
+     * 是否存在菜单子节点
+     *
+     * @param menuId 菜单ID
+     * @return 结果
+     */
+    @Override
+    public boolean hasChildByMenuId(Long menuId) {
+        return baseMapper.exists(new LambdaQueryWrapper<SysMenu>().eq(SysMenu::getParentId, menuId));
+    }
+
+    /**
+     * 是否存在菜单子节点
+     *
+     * @param menuIds 菜单ID串
+     * @return 结果
+     */
+    @Override
+    public boolean hasChildByMenuId(List<Long> menuIds) {
+        return baseMapper.exists(new LambdaQueryWrapper<SysMenu>().in(SysMenu::getParentId, menuIds).notIn(SysMenu::getMenuId, menuIds));
+    }
+
+    /**
+     * 查询菜单使用数量
+     *
+     * @param menuId 菜单ID
+     * @return 结果
+     */
+    @Override
+    public boolean checkMenuExistRole(Long menuId) {
+        return roleMenuMapper.exists(new LambdaQueryWrapper<SysRoleMenu>().eq(SysRoleMenu::getMenuId, menuId));
+    }
+
+    /**
+     * 新增保存菜单信息
+     *
+     * @param bo 菜单信息
+     * @return 结果
+     */
+    @Override
+    public int insertMenu(SysMenuBo bo) {
+        SysMenu menu = MapstructUtils.convert(bo, SysMenu.class);
+        return baseMapper.insert(menu);
+    }
+
+    /**
+     * 修改保存菜单信息
+     *
+     * @param bo 菜单信息
+     * @return 结果
+     */
+    @Override
+    public int updateMenu(SysMenuBo bo) {
+        SysMenu menu = MapstructUtils.convert(bo, SysMenu.class);
+        return baseMapper.updateById(menu);
+    }
+
+    /**
+     * 删除菜单管理信息
+     *
+     * @param menuId 菜单ID
+     * @return 结果
+     */
+    @Override
+    public int deleteMenuById(Long menuId) {
+        return baseMapper.deleteById(menuId);
+    }
+
+    /**
+     * 批量删除菜单管理信息
+     *
+     * @param menuIds 菜单ID串
+     * @return 结果
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void deleteMenuById(List<Long> menuIds) {
+        baseMapper.deleteByIds(menuIds);
+        roleMenuMapper.deleteByMenuIds(menuIds);
+    }
+
+    /**
+     * 校验菜单名称是否唯一
+     *
+     * @param menu 菜单信息
+     * @return 结果
+     */
+    @Override
+    public boolean checkMenuNameUnique(SysMenuBo menu) {
+        boolean exist = baseMapper.exists(new LambdaQueryWrapper<SysMenu>()
+                .eq(SysMenu::getMenuName, menu.getMenuName())
+                .eq(SysMenu::getParentId, menu.getParentId())
+                .ne(ObjectUtil.isNotNull(menu.getMenuId()), SysMenu::getMenuId, menu.getMenuId()));
+        return !exist;
+    }
+
+    /**
+     * 根据父节点的ID获取所有子节点
+     *
+     * @param list     分类表
+     * @param parentId 传入的父节点ID
+     * @return String
+     */
+    private List<SysMenu> getChildPerms(List<SysMenu> list, Long parentId) {
+        List<SysMenu> returnList = new ArrayList<>();
+        for (SysMenu t : list) {
+            // 一、根据传入的某个父节点ID,遍历该父节点的所有子节点
+            if (t.getParentId().equals(parentId)) {
+                recursionFn(list, t);
+                returnList.add(t);
+            }
+        }
+        return returnList;
+    }
+
+    /**
+     * 递归列表
+     */
+    private void recursionFn(List<SysMenu> list, SysMenu t) {
+        // 得到子节点列表
+        List<SysMenu> childList = StreamUtils.filter(list, n -> n.getParentId().equals(t.getMenuId()));
+        t.setChildren(childList);
+        for (SysMenu tChild : childList) {
+            // 判断是否有子节点
+            if (list.stream().anyMatch(n -> n.getParentId().equals(tChild.getMenuId()))) {
+                recursionFn(list, tChild);
+            }
+        }
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysNoticeServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysNoticeServiceImpl.java
new file mode 100644
index 0000000..a18a8ab
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysNoticeServiceImpl.java
@@ -0,0 +1,124 @@
+package org.dromara.system.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.ObjectUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.system.domain.SysNotice;
+import org.dromara.system.domain.SysUser;
+import org.dromara.system.domain.bo.SysNoticeBo;
+import org.dromara.system.domain.vo.SysNoticeVo;
+import org.dromara.system.domain.vo.SysUserVo;
+import org.dromara.system.mapper.SysNoticeMapper;
+import org.dromara.system.mapper.SysUserMapper;
+import org.dromara.system.service.SysNoticeService;
+import org.springframework.stereotype.Service;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 公告 服务层实现
+ *
+ * @author pengles
+ */
+@RequiredArgsConstructor
+@Service
+public class SysNoticeServiceImpl implements SysNoticeService {
+
+    private final SysNoticeMapper baseMapper;
+    private final SysUserMapper userMapper;
+
+    @Override
+    public TableDataInfo<SysNoticeVo> selectPageNoticeList(SysNoticeBo notice, PageQuery pageQuery) {
+        LambdaQueryWrapper<SysNotice> lqw = buildQueryWrapper(notice);
+        Page<SysNoticeVo> page = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(page);
+    }
+
+    /**
+     * 查询公告信息
+     *
+     * @param noticeId 公告ID
+     * @return 公告信息
+     */
+    @Override
+    public SysNoticeVo selectNoticeById(Long noticeId) {
+        return baseMapper.selectVoById(noticeId);
+    }
+
+    /**
+     * 查询公告列表
+     *
+     * @param notice 公告信息
+     * @return 公告集合
+     */
+    @Override
+    public List<SysNoticeVo> selectNoticeList(SysNoticeBo notice) {
+        LambdaQueryWrapper<SysNotice> lqw = buildQueryWrapper(notice);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<SysNotice> buildQueryWrapper(SysNoticeBo bo) {
+        LambdaQueryWrapper<SysNotice> lqw = Wrappers.lambdaQuery();
+        lqw.like(StringUtils.isNotBlank(bo.getNoticeTitle()), SysNotice::getNoticeTitle, bo.getNoticeTitle());
+        lqw.eq(StringUtils.isNotBlank(bo.getNoticeType()), SysNotice::getNoticeType, bo.getNoticeType());
+        if (StringUtils.isNotBlank(bo.getCreateByName())) {
+            SysUserVo sysUser = userMapper.selectVoOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getUserName, bo.getCreateByName()));
+            lqw.eq(SysNotice::getCreateBy, ObjectUtils.notNullGetter(sysUser, SysUserVo::getUserId));
+        }
+        lqw.orderByAsc(SysNotice::getNoticeId);
+        return lqw;
+    }
+
+    /**
+     * 新增公告
+     *
+     * @param bo 公告信息
+     * @return 结果
+     */
+    @Override
+    public int insertNotice(SysNoticeBo bo) {
+        SysNotice notice = MapstructUtils.convert(bo, SysNotice.class);
+        return baseMapper.insert(notice);
+    }
+
+    /**
+     * 修改公告
+     *
+     * @param bo 公告信息
+     * @return 结果
+     */
+    @Override
+    public int updateNotice(SysNoticeBo bo) {
+        SysNotice notice = MapstructUtils.convert(bo, SysNotice.class);
+        return baseMapper.updateById(notice);
+    }
+
+    /**
+     * 删除公告对象
+     *
+     * @param noticeId 公告ID
+     * @return 结果
+     */
+    @Override
+    public int deleteNoticeById(Long noticeId) {
+        return baseMapper.deleteById(noticeId);
+    }
+
+    /**
+     * 批量删除公告信息
+     *
+     * @param noticeIds 需要删除的公告ID
+     * @return 结果
+     */
+    @Override
+    public int deleteNoticeByIds(Long[] noticeIds) {
+        return baseMapper.deleteByIds(Arrays.asList(noticeIds));
+    }
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOperLogServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOperLogServiceImpl.java
new file mode 100644
index 0000000..1694d09
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOperLogServiceImpl.java
@@ -0,0 +1,136 @@
+package org.dromara.system.service.impl;
+
+import cn.hutool.core.util.ArrayUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.core.utils.ip.AddressUtils;
+import org.dromara.common.log.event.OperLogEvent;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.system.domain.SysOperLog;
+import org.dromara.system.domain.bo.SysOperLogBo;
+import org.dromara.system.domain.vo.SysOperLogVo;
+import org.dromara.system.mapper.SysOperLogMapper;
+import org.dromara.system.service.SysOperLogService;
+import org.springframework.beans.BeanUtils;
+import org.springframework.context.event.EventListener;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Service;
+
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 操作日志 服务层处理
+ *
+ * @author pengles
+ */
+@RequiredArgsConstructor
+@Service
+public class SysOperLogServiceImpl implements SysOperLogService {
+
+    private final SysOperLogMapper baseMapper;
+
+    /**
+     * 操作日志记录
+     *
+     * @param operLogEvent 操作日志事件
+     */
+    @Async
+    @EventListener
+    public void recordOper(OperLogEvent operLogEvent) {
+        SysOperLogBo operLog = new SysOperLogBo();
+        BeanUtils.copyProperties(operLogEvent, operLog);
+        // 远程查询操作地点
+        operLog.setOperLocation(AddressUtils.getRealAddressByIP(operLog.getOperIp()));
+        insertOperlog(operLog);
+    }
+
+    @Override
+    public TableDataInfo<SysOperLogVo> selectPageOperLogList(SysOperLogBo operLog, PageQuery pageQuery) {
+        LambdaQueryWrapper<SysOperLog> lqw = buildQueryWrapper(operLog);
+        if (StringUtils.isBlank(pageQuery.getOrderByColumn())) {
+            lqw.orderByDesc(SysOperLog::getOperId);
+        }
+        Page<SysOperLogVo> page = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(page);
+    }
+
+    private LambdaQueryWrapper<SysOperLog> buildQueryWrapper(SysOperLogBo operLog) {
+        Map<String, Object> params = operLog.getParams();
+        return new LambdaQueryWrapper<SysOperLog>()
+                .like(StringUtils.isNotBlank(operLog.getOperIp()), SysOperLog::getOperIp, operLog.getOperIp())
+                .like(StringUtils.isNotBlank(operLog.getTitle()), SysOperLog::getTitle, operLog.getTitle())
+                .eq(operLog.getBusinessType() != null && operLog.getBusinessType() > 0,
+                        SysOperLog::getBusinessType, operLog.getBusinessType())
+                .func(f -> {
+                    if (ArrayUtil.isNotEmpty(operLog.getBusinessTypes())) {
+                        f.in(SysOperLog::getBusinessType, Arrays.asList(operLog.getBusinessTypes()));
+                    }
+                })
+                .eq(operLog.getStatus() != null,
+                        SysOperLog::getStatus, operLog.getStatus())
+                .like(StringUtils.isNotBlank(operLog.getOperName()), SysOperLog::getOperName, operLog.getOperName())
+                .between(params.get("beginTime") != null && params.get("endTime") != null,
+                        SysOperLog::getOperTime, params.get("beginTime"), params.get("endTime"));
+    }
+
+    /**
+     * 新增操作日志
+     *
+     * @param bo 操作日志对象
+     */
+    @Override
+    public void insertOperlog(SysOperLogBo bo) {
+        SysOperLog operLog = MapstructUtils.convert(bo, SysOperLog.class);
+        operLog.setOperTime(new Date());
+        baseMapper.insert(operLog);
+    }
+
+    /**
+     * 查询系统操作日志集合
+     *
+     * @param operLog 操作日志对象
+     * @return 操作日志集合
+     */
+    @Override
+    public List<SysOperLogVo> selectOperLogList(SysOperLogBo operLog) {
+        LambdaQueryWrapper<SysOperLog> lqw = buildQueryWrapper(operLog);
+        return baseMapper.selectVoList(lqw.orderByDesc(SysOperLog::getOperId));
+    }
+
+    /**
+     * 批量删除系统操作日志
+     *
+     * @param operIds 需要删除的操作日志ID
+     * @return 结果
+     */
+    @Override
+    public int deleteOperLogByIds(Long[] operIds) {
+        return baseMapper.deleteByIds(Arrays.asList(operIds));
+    }
+
+    /**
+     * 查询操作日志详细
+     *
+     * @param operId 操作ID
+     * @return 操作日志对象
+     */
+    @Override
+    public SysOperLogVo selectOperLogById(Long operId) {
+        return baseMapper.selectVoById(operId);
+    }
+
+    /**
+     * 清空操作日志
+     */
+    @Override
+    public void cleanOperLog() {
+        baseMapper.delete(new LambdaQueryWrapper<>());
+    }
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssConfigServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssConfigServiceImpl.java
new file mode 100644
index 0000000..a2cce4c
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssConfigServiceImpl.java
@@ -0,0 +1,175 @@
+package org.dromara.system.service.impl;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.constant.CacheNames;
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.ObjectUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.json.utils.JsonUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.oss.constant.OssConstant;
+import org.dromara.common.redis.utils.CacheUtils;
+import org.dromara.common.redis.utils.RedisUtils;
+import org.dromara.system.domain.SysOssConfig;
+import org.dromara.system.domain.bo.SysOssConfigBo;
+import org.dromara.system.domain.vo.SysOssConfigVo;
+import org.dromara.system.mapper.SysOssConfigMapper;
+import org.dromara.system.service.SysOssConfigService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 对象存储配置Service业务层处理
+ *
+ * @author pengles
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class SysOssConfigServiceImpl implements SysOssConfigService {
+
+    private final SysOssConfigMapper baseMapper;
+
+    /**
+     * 项目启动时，初始化参数到缓存，加载配置类
+     */
+    @Override
+    public void init() {
+        List<SysOssConfig> list = baseMapper.selectList();
+        // 加载OSS初始化配置
+        for (SysOssConfig config : list) {
+            String configKey = config.getConfigKey();
+            if ("0".equals(config.getStatus())) {
+                RedisUtils.setCacheObject(OssConstant.DEFAULT_CONFIG_KEY, configKey);
+            }
+            CacheUtils.put(CacheNames.SYS_OSS_CONFIG, config.getConfigKey(), JsonUtils.toJsonString(config));
+        }
+    }
+
+    @Override
+    public SysOssConfigVo queryById(Long ossConfigId) {
+        return baseMapper.selectVoById(ossConfigId);
+    }
+
+    @Override
+    public TableDataInfo<SysOssConfigVo> queryPageList(SysOssConfigBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<SysOssConfig> lqw = buildQueryWrapper(bo);
+        Page<SysOssConfigVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+
+    private LambdaQueryWrapper<SysOssConfig> buildQueryWrapper(SysOssConfigBo bo) {
+        LambdaQueryWrapper<SysOssConfig> lqw = Wrappers.lambdaQuery();
+        lqw.eq(StringUtils.isNotBlank(bo.getConfigKey()), SysOssConfig::getConfigKey, bo.getConfigKey());
+        lqw.like(StringUtils.isNotBlank(bo.getBucketName()), SysOssConfig::getBucketName, bo.getBucketName());
+        lqw.eq(StringUtils.isNotBlank(bo.getStatus()), SysOssConfig::getStatus, bo.getStatus());
+        lqw.orderByAsc(SysOssConfig::getOssConfigId);
+        return lqw;
+    }
+
+    @Override
+    public Boolean insertByBo(SysOssConfigBo bo) {
+        SysOssConfig config = MapstructUtils.convert(bo, SysOssConfig.class);
+        validEntityBeforeSave(config);
+        boolean flag = baseMapper.insert(config) > 0;
+        if (flag) {
+            // 从数据库查询完整的数据做缓存
+            config = baseMapper.selectById(config.getOssConfigId());
+            CacheUtils.put(CacheNames.SYS_OSS_CONFIG, config.getConfigKey(), JsonUtils.toJsonString(config));
+        }
+        return flag;
+    }
+
+    @Override
+    public Boolean updateByBo(SysOssConfigBo bo) {
+        SysOssConfig config = MapstructUtils.convert(bo, SysOssConfig.class);
+        validEntityBeforeSave(config);
+        LambdaUpdateWrapper<SysOssConfig> luw = new LambdaUpdateWrapper<>();
+        luw.set(ObjectUtil.isNull(config.getPrefix()), SysOssConfig::getPrefix, "");
+        luw.set(ObjectUtil.isNull(config.getRegion()), SysOssConfig::getRegion, "");
+        luw.set(ObjectUtil.isNull(config.getExt1()), SysOssConfig::getExt1, "");
+        luw.set(ObjectUtil.isNull(config.getRemark()), SysOssConfig::getRemark, "");
+        luw.eq(SysOssConfig::getOssConfigId, config.getOssConfigId());
+        boolean flag = baseMapper.update(config, luw) > 0;
+        if (flag) {
+            // 从数据库查询完整的数据做缓存
+            config = baseMapper.selectById(config.getOssConfigId());
+            CacheUtils.put(CacheNames.SYS_OSS_CONFIG, config.getConfigKey(), JsonUtils.toJsonString(config));
+        }
+        return flag;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(SysOssConfig entity) {
+        if (StringUtils.isNotEmpty(entity.getConfigKey())
+                && !checkConfigKeyUnique(entity)) {
+            throw new ServiceException("操作配置'" + entity.getConfigKey() + "'失败, 配置key已存在!");
+        }
+    }
+
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if (isValid) {
+            if (CollUtil.containsAny(ids, OssConstant.SYSTEM_DATA_IDS)) {
+                throw new ServiceException("系统内置, 不可删除!");
+            }
+        }
+        List<SysOssConfig> list = CollUtil.newArrayList();
+        for (Long configId : ids) {
+            SysOssConfig config = baseMapper.selectById(configId);
+            list.add(config);
+        }
+        boolean flag = baseMapper.deleteByIds(ids) > 0;
+        if (flag) {
+            list.forEach(sysOssConfig ->
+                    CacheUtils.evict(CacheNames.SYS_OSS_CONFIG, sysOssConfig.getConfigKey()));
+        }
+        return flag;
+    }
+
+    /**
+     * 判断configKey是否唯一
+     */
+    private boolean checkConfigKeyUnique(SysOssConfig sysOssConfig) {
+        long ossConfigId = ObjectUtils.notNull(sysOssConfig.getOssConfigId(), -1L);
+        SysOssConfig info = baseMapper.selectOne(new LambdaQueryWrapper<SysOssConfig>()
+                .select(SysOssConfig::getOssConfigId, SysOssConfig::getConfigKey)
+                .eq(SysOssConfig::getConfigKey, sysOssConfig.getConfigKey()));
+        if (ObjectUtil.isNotNull(info) && info.getOssConfigId() != ossConfigId) {
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * 启用禁用状态
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int updateOssConfigStatus(SysOssConfigBo bo) {
+        SysOssConfig sysOssConfig = MapstructUtils.convert(bo, SysOssConfig.class);
+        int row = baseMapper.update(null, new LambdaUpdateWrapper<SysOssConfig>()
+                .set(SysOssConfig::getStatus, "1"));
+        row += baseMapper.updateById(sysOssConfig);
+        if (row > 0) {
+            RedisUtils.setCacheObject(OssConstant.DEFAULT_CONFIG_KEY, sysOssConfig.getConfigKey());
+        }
+        return row;
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java
new file mode 100644
index 0000000..8c12879
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java
@@ -0,0 +1,269 @@
+package org.dromara.system.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.convert.Convert;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.constant.CacheNames;
+import org.dromara.common.core.domain.dto.OssDTO;
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.service.OssService;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.SpringUtils;
+import org.dromara.common.core.utils.StreamUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.core.utils.file.FileUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.oss.core.OssClient;
+import org.dromara.common.oss.entity.UploadResult;
+import org.dromara.common.oss.enums.AccessPolicyType;
+import org.dromara.common.oss.factory.OssFactory;
+import org.dromara.system.domain.SysOss;
+import org.dromara.system.domain.bo.SysOssBo;
+import org.dromara.system.domain.vo.SysOssVo;
+import org.dromara.system.mapper.SysOssMapper;
+import org.dromara.system.service.SysOssService;
+import org.jetbrains.annotations.NotNull;
+import org.springframework.cache.annotation.Cacheable;
+import org.springframework.http.MediaType;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.File;
+import java.io.IOException;
+import java.time.Duration;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 文件上传 服务层实现
+ *
+ * @author pengles
+ */
+@RequiredArgsConstructor
+@Service
+public class SysOssServiceImpl implements SysOssService, OssService {
+
+    private final SysOssMapper baseMapper;
+
+    /**
+     * 查询OSS对象存储列表
+     *
+     * @param bo        OSS对象存储分页查询对象
+     * @param pageQuery 分页查询实体类
+     * @return 结果
+     */
+    @Override
+    public TableDataInfo<SysOssVo> queryPageList(SysOssBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<SysOss> lqw = buildQueryWrapper(bo);
+        Page<SysOssVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        List<SysOssVo> filterResult = StreamUtils.toList(result.getRecords(), this::matchingUrl);
+        result.setRecords(filterResult);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 根据一组 ossIds 获取对应的 SysOssVo 列表
+     *
+     * @param ossIds 一组文件在数据库中的唯一标识集合
+     * @return 包含 SysOssVo 对象的列表
+     */
+    @Override
+    public List<SysOssVo> listByIds(Collection<Long> ossIds) {
+        List<SysOssVo> list = new ArrayList<>();
+        SysOssServiceImpl ossService = SpringUtils.getAopProxy(this);
+        for (Long id : ossIds) {
+            SysOssVo vo = ossService.getById(id);
+            if (ObjectUtil.isNotNull(vo)) {
+                try {
+                    list.add(this.matchingUrl(vo));
+                } catch (Exception ignored) {
+                    // 如果oss异常无法连接则将数据直接返回
+                    list.add(vo);
+                }
+            }
+        }
+        return list;
+    }
+
+    /**
+     * 根据一组 ossIds 获取对应文件的 URL 列表
+     *
+     * @param ossIds 以逗号分隔的 ossId 字符串
+     * @return 以逗号分隔的文件 URL 字符串
+     */
+    @Override
+    public String selectUrlByIds(String ossIds) {
+        List<String> list = new ArrayList<>();
+        SysOssServiceImpl ossService = SpringUtils.getAopProxy(this);
+        for (Long id : StringUtils.splitTo(ossIds, Convert::toLong)) {
+            SysOssVo vo = ossService.getById(id);
+            if (ObjectUtil.isNotNull(vo)) {
+                try {
+                    list.add(this.matchingUrl(vo).getUrl());
+                } catch (Exception ignored) {
+                    // 如果oss异常无法连接则将数据直接返回
+                    list.add(vo.getUrl());
+                }
+            }
+        }
+        return String.join(StringUtils.SEPARATOR, list);
+    }
+
+    @Override
+    public List<OssDTO> selectByIds(String ossIds) {
+        List<OssDTO> list = new ArrayList<>();
+        for (Long id : StringUtils.splitTo(ossIds, Convert::toLong)) {
+            SysOssVo vo = SpringUtils.getAopProxy(this).getById(id);
+            if (ObjectUtil.isNotNull(vo)) {
+                try {
+                    vo.setUrl(this.matchingUrl(vo).getUrl());
+                    list.add(BeanUtil.toBean(vo, OssDTO.class));
+                } catch (Exception ignored) {
+                    // 如果oss异常无法连接则将数据直接返回
+                    list.add(BeanUtil.toBean(vo, OssDTO.class));
+                }
+            }
+        }
+        return list;
+    }
+
+    private LambdaQueryWrapper<SysOss> buildQueryWrapper(SysOssBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<SysOss> lqw = Wrappers.lambdaQuery();
+        lqw.like(StringUtils.isNotBlank(bo.getFileName()), SysOss::getFileName, bo.getFileName());
+        lqw.like(StringUtils.isNotBlank(bo.getOriginalName()), SysOss::getOriginalName, bo.getOriginalName());
+        lqw.eq(StringUtils.isNotBlank(bo.getFileSuffix()), SysOss::getFileSuffix, bo.getFileSuffix());
+        lqw.eq(StringUtils.isNotBlank(bo.getUrl()), SysOss::getUrl, bo.getUrl());
+        lqw.between(params.get("beginCreateTime") != null && params.get("endCreateTime") != null,
+                SysOss::getCreateTime, params.get("beginCreateTime"), params.get("endCreateTime"));
+        lqw.eq(ObjectUtil.isNotNull(bo.getCreateBy()), SysOss::getCreateBy, bo.getCreateBy());
+        lqw.eq(StringUtils.isNotBlank(bo.getService()), SysOss::getService, bo.getService());
+        lqw.orderByAsc(SysOss::getOssId);
+        return lqw;
+    }
+
+    /**
+     * 根据 ossId 从缓存或数据库中获取 SysOssVo 对象
+     *
+     * @param ossId 文件在数据库中的唯一标识
+     * @return SysOssVo 对象，包含文件信息
+     */
+    @Cacheable(cacheNames = CacheNames.SYS_OSS, key = "#ossId")
+    @Override
+    public SysOssVo getById(Long ossId) {
+        return baseMapper.selectVoById(ossId);
+    }
+
+
+    /**
+     * 文件下载方法，支持一次性下载完整文件
+     *
+     * @param ossId    OSS对象ID
+     * @param response HttpServletResponse对象，用于设置响应头和向客户端发送文件内容
+     */
+    @Override
+    public void download(Long ossId, HttpServletResponse response) throws IOException {
+        SysOssVo sysOss = SpringUtils.getAopProxy(this).getById(ossId);
+        if (ObjectUtil.isNull(sysOss)) {
+            throw new ServiceException("文件数据不存在!");
+        }
+        FileUtils.setAttachmentResponseHeader(response, sysOss.getOriginalName());
+        response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE + "; charset=UTF-8");
+        OssClient storage = OssFactory.instance(sysOss.getService());
+        storage.download(sysOss.getFileName(), response.getOutputStream(), response::setContentLengthLong);
+    }
+
+    /**
+     * 上传 MultipartFile 到对象存储服务，并保存文件信息到数据库
+     *
+     * @param file 要上传的 MultipartFile 对象
+     * @return 上传成功后的 SysOssVo 对象，包含文件信息
+     * @throws ServiceException 如果上传过程中发生异常，则抛出 ServiceException 异常
+     */
+    @Override
+    public SysOssVo upload(MultipartFile file) {
+        String originalfileName = file.getOriginalFilename();
+        String suffix = StringUtils.substring(originalfileName, originalfileName.lastIndexOf("."), originalfileName.length());
+        OssClient storage = OssFactory.instance();
+        UploadResult uploadResult;
+        try {
+            uploadResult = storage.uploadSuffix(file.getBytes(), suffix, file.getContentType());
+        } catch (IOException e) {
+            throw new ServiceException(e.getMessage());
+        }
+        // 保存文件信息
+        return buildResultEntity(originalfileName, suffix, storage.getConfigKey(), uploadResult);
+    }
+
+    /**
+     * 上传文件到对象存储服务，并保存文件信息到数据库
+     *
+     * @param file 要上传的文件对象
+     * @return 上传成功后的 SysOssVo 对象，包含文件信息
+     */
+    @Override
+    public SysOssVo upload(File file) {
+        String originalfileName = file.getName();
+        String suffix = StringUtils.substring(originalfileName, originalfileName.lastIndexOf("."), originalfileName.length());
+        OssClient storage = OssFactory.instance();
+        UploadResult uploadResult = storage.uploadSuffix(file, suffix);
+        // 保存文件信息
+        return buildResultEntity(originalfileName, suffix, storage.getConfigKey(), uploadResult);
+    }
+
+    @NotNull
+    private SysOssVo buildResultEntity(String originalfileName, String suffix, String configKey, UploadResult uploadResult) {
+        SysOss oss = new SysOss();
+        oss.setUrl(uploadResult.getUrl());
+        oss.setFileSuffix(suffix);
+        oss.setFileName(uploadResult.getFilename());
+        oss.setOriginalName(originalfileName);
+        oss.setService(configKey);
+        baseMapper.insert(oss);
+        SysOssVo sysOssVo = MapstructUtils.convert(oss, SysOssVo.class);
+        return this.matchingUrl(sysOssVo);
+    }
+
+    /**
+     * 删除OSS对象存储
+     *
+     * @param ids     OSS对象ID串
+     * @param isValid 判断是否需要校验
+     * @return 结果
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if (isValid) {
+            // 做一些业务上的校验,判断是否需要校验
+        }
+        List<SysOss> list = baseMapper.selectByIds(ids);
+        for (SysOss sysOss : list) {
+            OssClient storage = OssFactory.instance(sysOss.getService());
+            storage.delete(sysOss.getUrl());
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+
+    /**
+     * 桶类型为 private 的URL 修改为临时URL时长为120s
+     *
+     * @param oss OSS对象
+     * @return oss 匹配Url的OSS对象
+     */
+    private SysOssVo matchingUrl(SysOssVo oss) {
+        OssClient storage = OssFactory.instance(oss.getService());
+        // 仅修改桶类型为 private 的URL，临时URL时长为120s
+        if (AccessPolicyType.PRIVATE == storage.getAccessPolicy()) {
+            oss.setUrl(storage.getPrivateUrl(oss.getFileName(), Duration.ofSeconds(120)));
+        }
+        return oss;
+    }
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPermissionServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPermissionServiceImpl.java
new file mode 100644
index 0000000..68d4301
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPermissionServiceImpl.java
@@ -0,0 +1,62 @@
+package org.dromara.system.service.impl;
+
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.constant.SystemConstants;
+import org.dromara.common.core.service.PermissionService;
+import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.system.service.SysMenuService;
+import org.dromara.system.service.SysPermissionService;
+import org.dromara.system.service.SysRoleService;
+import org.springframework.stereotype.Service;
+
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * 用户权限处理
+ *
+ * @author pengles
+ */
+@RequiredArgsConstructor
+@Service
+public class SysPermissionServiceImpl implements SysPermissionService, PermissionService {
+
+    private final SysRoleService roleService;
+    private final SysMenuService menuService;
+
+    /**
+     * 获取角色数据权限
+     *
+     * @param userId 用户id
+     * @return 角色权限信息
+     */
+    @Override
+    public Set<String> getRolePermission(Long userId) {
+        Set<String> roles = new HashSet<>();
+        // 管理员拥有所有权限
+        if (LoginHelper.isSuperAdmin(userId)) {
+            roles.add(SystemConstants.SUPER_ADMIN_ROLE_KEY);
+        } else {
+            roles.addAll(roleService.selectRolePermissionByUserId(userId));
+        }
+        return roles;
+    }
+
+    /**
+     * 获取菜单数据权限
+     *
+     * @param userId 用户id
+     * @return 菜单权限信息
+     */
+    @Override
+    public Set<String> getMenuPermission(Long userId) {
+        Set<String> perms = new HashSet<>();
+        // 管理员拥有所有权限
+        if (LoginHelper.isSuperAdmin(userId)) {
+            perms.add("*:*:*");
+        } else {
+            perms.addAll(menuService.selectMenuPermsByUserId(userId));
+        }
+        return perms;
+    }
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPostServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPostServiceImpl.java
new file mode 100644
index 0000000..140d577
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPostServiceImpl.java
@@ -0,0 +1,254 @@
+package org.dromara.system.service.impl;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.constant.SystemConstants;
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.service.PostService;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StreamUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.system.domain.SysDept;
+import org.dromara.system.domain.SysPost;
+import org.dromara.system.domain.SysUserPost;
+import org.dromara.system.domain.bo.SysPostBo;
+import org.dromara.system.domain.vo.SysPostVo;
+import org.dromara.system.mapper.SysDeptMapper;
+import org.dromara.system.mapper.SysPostMapper;
+import org.dromara.system.mapper.SysUserPostMapper;
+import org.dromara.system.service.SysPostService;
+import org.springframework.stereotype.Service;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 岗位信息 服务层处理
+ *
+ * @author pengles
+ */
+@RequiredArgsConstructor
+@Service
+public class SysPostServiceImpl implements SysPostService, PostService {
+
+    private final SysPostMapper baseMapper;
+    private final SysDeptMapper deptMapper;
+    private final SysUserPostMapper userPostMapper;
+
+    @Override
+    public TableDataInfo<SysPostVo> selectPagePostList(SysPostBo post, PageQuery pageQuery) {
+        Page<SysPostVo> page = baseMapper.selectPagePostList(pageQuery.build(), buildQueryWrapper(post));
+        return TableDataInfo.build(page);
+    }
+
+    /**
+     * 查询岗位信息集合
+     *
+     * @param post 岗位信息
+     * @return 岗位信息集合
+     */
+    @Override
+    public List<SysPostVo> selectPostList(SysPostBo post) {
+        return baseMapper.selectVoList(buildQueryWrapper(post));
+    }
+
+    /**
+     * 查询用户所属岗位组
+     *
+     * @param userId 用户ID
+     * @return 岗位ID
+     */
+    @Override
+    public List<SysPostVo> selectPostsByUserId(Long userId) {
+        return baseMapper.selectPostsByUserId(userId);
+    }
+
+    /**
+     * 根据查询条件构建查询包装器
+     *
+     * @param bo 查询条件对象
+     * @return 构建好的查询包装器
+     */
+    private LambdaQueryWrapper<SysPost> buildQueryWrapper(SysPostBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<SysPost> wrapper = new LambdaQueryWrapper<>();
+        wrapper.like(StringUtils.isNotBlank(bo.getPostCode()), SysPost::getPostCode, bo.getPostCode())
+                .like(StringUtils.isNotBlank(bo.getPostCategory()), SysPost::getPostCategory, bo.getPostCategory())
+                .like(StringUtils.isNotBlank(bo.getPostName()), SysPost::getPostName, bo.getPostName())
+                .eq(StringUtils.isNotBlank(bo.getStatus()), SysPost::getStatus, bo.getStatus())
+                .between(params.get("beginTime") != null && params.get("endTime") != null,
+                        SysPost::getCreateTime, params.get("beginTime"), params.get("endTime"))
+                .orderByAsc(SysPost::getPostSort);
+        if (ObjectUtil.isNotNull(bo.getDeptId())) {
+            //优先单部门搜索
+            wrapper.eq(SysPost::getDeptId, bo.getDeptId());
+        } else if (ObjectUtil.isNotNull(bo.getBelongDeptId())) {
+            //部门树搜索
+            wrapper.and(x -> {
+                List<SysDept> deptList = deptMapper.selectListByParentId(bo.getBelongDeptId());
+                List<Long> deptIds = StreamUtils.toList(deptList, SysDept::getDeptId);
+                deptIds.add(bo.getBelongDeptId());
+                x.in(SysPost::getDeptId, deptIds);
+            });
+        }
+        return wrapper;
+    }
+
+    /**
+     * 查询所有岗位
+     *
+     * @return 岗位列表
+     */
+    @Override
+    public List<SysPostVo> selectPostAll() {
+        return baseMapper.selectVoList(new QueryWrapper<>());
+    }
+
+    /**
+     * 通过岗位ID查询岗位信息
+     *
+     * @param postId 岗位ID
+     * @return 角色对象信息
+     */
+    @Override
+    public SysPostVo selectPostById(Long postId) {
+        return baseMapper.selectVoById(postId);
+    }
+
+    /**
+     * 根据用户ID获取岗位选择框列表
+     *
+     * @param userId 用户ID
+     * @return 选中岗位ID列表
+     */
+    @Override
+    public List<Long> selectPostListByUserId(Long userId) {
+        List<SysPostVo> list = baseMapper.selectPostsByUserId(userId);
+        return StreamUtils.toList(list, SysPostVo::getPostId);
+    }
+
+    /**
+     * 通过岗位ID串查询岗位
+     *
+     * @param postIds 岗位id串
+     * @return 岗位列表信息
+     */
+    @Override
+    public List<SysPostVo> selectPostByIds(List<Long> postIds) {
+        return baseMapper.selectVoList(new LambdaQueryWrapper<SysPost>()
+                .select(SysPost::getPostId, SysPost::getPostName, SysPost::getPostCode)
+                .eq(SysPost::getStatus, SystemConstants.NORMAL)
+                .in(CollUtil.isNotEmpty(postIds), SysPost::getPostId, postIds));
+    }
+
+    /**
+     * 校验岗位名称是否唯一
+     *
+     * @param post 岗位信息
+     * @return 结果
+     */
+    @Override
+    public boolean checkPostNameUnique(SysPostBo post) {
+        boolean exist = baseMapper.exists(new LambdaQueryWrapper<SysPost>()
+                .eq(SysPost::getPostName, post.getPostName())
+                .eq(SysPost::getDeptId, post.getDeptId())
+                .ne(ObjectUtil.isNotNull(post.getPostId()), SysPost::getPostId, post.getPostId()));
+        return !exist;
+    }
+
+    /**
+     * 校验岗位编码是否唯一
+     *
+     * @param post 岗位信息
+     * @return 结果
+     */
+    @Override
+    public boolean checkPostCodeUnique(SysPostBo post) {
+        boolean exist = baseMapper.exists(new LambdaQueryWrapper<SysPost>()
+                .eq(SysPost::getPostCode, post.getPostCode())
+                .ne(ObjectUtil.isNotNull(post.getPostId()), SysPost::getPostId, post.getPostId()));
+        return !exist;
+    }
+
+    /**
+     * 通过岗位ID查询岗位使用数量
+     *
+     * @param postId 岗位ID
+     * @return 结果
+     */
+    @Override
+    public long countUserPostById(Long postId) {
+        return userPostMapper.selectCount(new LambdaQueryWrapper<SysUserPost>().eq(SysUserPost::getPostId, postId));
+    }
+
+    /**
+     * 通过部门ID查询岗位使用数量
+     *
+     * @param deptId 部门id
+     * @return 结果
+     */
+    @Override
+    public long countPostByDeptId(Long deptId) {
+        return baseMapper.selectCount(new LambdaQueryWrapper<SysPost>().eq(SysPost::getDeptId, deptId));
+    }
+
+    /**
+     * 删除岗位信息
+     *
+     * @param postId 岗位ID
+     * @return 结果
+     */
+    @Override
+    public int deletePostById(Long postId) {
+        return baseMapper.deleteById(postId);
+    }
+
+    /**
+     * 批量删除岗位信息
+     *
+     * @param postIds 需要删除的岗位ID
+     * @return 结果
+     */
+    @Override
+    public int deletePostByIds(Long[] postIds) {
+        for (Long postId : postIds) {
+            SysPost post = baseMapper.selectById(postId);
+            if (countUserPostById(postId) > 0) {
+                throw new ServiceException(String.format("%1$s已分配，不能删除!", post.getPostName()));
+            }
+        }
+        return baseMapper.deleteByIds(Arrays.asList(postIds));
+    }
+
+    /**
+     * 新增保存岗位信息
+     *
+     * @param bo 岗位信息
+     * @return 结果
+     */
+    @Override
+    public int insertPost(SysPostBo bo) {
+        SysPost post = MapstructUtils.convert(bo, SysPost.class);
+        return baseMapper.insert(post);
+    }
+
+    /**
+     * 修改保存岗位信息
+     *
+     * @param bo 岗位信息
+     * @return 结果
+     */
+    @Override
+    public int updatePost(SysPostBo bo) {
+        SysPost post = MapstructUtils.convert(bo, SysPost.class);
+        return baseMapper.updateById(post);
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysRoleServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysRoleServiceImpl.java
new file mode 100644
index 0000000..8a7fb88
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysRoleServiceImpl.java
@@ -0,0 +1,551 @@
+package org.dromara.system.service.impl;
+
+import cn.dev33.satoken.exception.NotLoginException;
+import cn.dev33.satoken.stp.StpUtil;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.constant.CacheNames;
+import org.dromara.common.core.constant.SystemConstants;
+import org.dromara.common.core.domain.model.LoginUser;
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.service.RoleService;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StreamUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.system.domain.SysRole;
+import org.dromara.system.domain.SysRoleDept;
+import org.dromara.system.domain.SysRoleMenu;
+import org.dromara.system.domain.SysUserRole;
+import org.dromara.system.domain.bo.SysRoleBo;
+import org.dromara.system.domain.vo.SysRoleVo;
+import org.dromara.system.mapper.SysRoleDeptMapper;
+import org.dromara.system.mapper.SysRoleMapper;
+import org.dromara.system.mapper.SysRoleMenuMapper;
+import org.dromara.system.mapper.SysUserRoleMapper;
+import org.dromara.system.service.SysRoleService;
+import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.*;
+
+/**
+ * 角色 业务层处理
+ *
+ * @author pengles
+ */
+@RequiredArgsConstructor
+@Service
+public class SysRoleServiceImpl implements SysRoleService, RoleService {
+
+    private final SysRoleMapper baseMapper;
+    private final SysRoleMenuMapper roleMenuMapper;
+    private final SysUserRoleMapper userRoleMapper;
+    private final SysRoleDeptMapper roleDeptMapper;
+
+    @Override
+    public TableDataInfo<SysRoleVo> selectPageRoleList(SysRoleBo role, PageQuery pageQuery) {
+        Page<SysRoleVo> page = baseMapper.selectPageRoleList(pageQuery.build(), this.buildQueryWrapper(role));
+        return TableDataInfo.build(page);
+    }
+
+    /**
+     * 根据条件分页查询角色数据
+     *
+     * @param role 角色信息
+     * @return 角色数据集合信息
+     */
+    @Override
+    public List<SysRoleVo> selectRoleList(SysRoleBo role) {
+        return baseMapper.selectRoleList(this.buildQueryWrapper(role));
+    }
+
+    private Wrapper<SysRole> buildQueryWrapper(SysRoleBo bo) {
+        Map<String, Object> params = bo.getParams();
+        QueryWrapper<SysRole> wrapper = Wrappers.query();
+        wrapper.eq("r.del_flag", SystemConstants.NORMAL)
+                .eq(ObjectUtil.isNotNull(bo.getRoleId()), "r.role_id", bo.getRoleId())
+                .like(StringUtils.isNotBlank(bo.getRoleName()), "r.role_name", bo.getRoleName())
+                .eq(StringUtils.isNotBlank(bo.getStatus()), "r.status", bo.getStatus())
+                .like(StringUtils.isNotBlank(bo.getRoleKey()), "r.role_key", bo.getRoleKey())
+                .between(params.get("beginTime") != null && params.get("endTime") != null,
+                        "r.create_time", params.get("beginTime"), params.get("endTime"))
+                .orderByAsc("r.role_sort").orderByAsc("r.create_time");
+        return wrapper;
+    }
+
+    /**
+     * 根据用户ID查询角色
+     *
+     * @param userId 用户ID
+     * @return 角色列表
+     */
+    @Override
+    public List<SysRoleVo> selectRolesByUserId(Long userId) {
+        return baseMapper.selectRolesByUserId(userId);
+    }
+
+    /**
+     * 根据用户ID查询角色列表(包含被授权状态)
+     *
+     * @param userId 用户ID
+     * @return 角色列表
+     */
+    @Override
+    public List<SysRoleVo> selectRolesAuthByUserId(Long userId) {
+        List<SysRoleVo> userRoles = baseMapper.selectRolesByUserId(userId);
+        List<SysRoleVo> roles = selectRoleAll();
+        // 使用HashSet提高查找效率
+        Set<Long> userRoleIds = StreamUtils.toSet(userRoles, SysRoleVo::getRoleId);
+        for (SysRoleVo role : roles) {
+            if (userRoleIds.contains(role.getRoleId())) {
+                role.setFlag(true);
+            }
+        }
+        return roles;
+    }
+
+    /**
+     * 根据用户ID查询权限
+     *
+     * @param userId 用户ID
+     * @return 权限列表
+     */
+    @Override
+    public Set<String> selectRolePermissionByUserId(Long userId) {
+        List<SysRoleVo> perms = baseMapper.selectRolesByUserId(userId);
+        Set<String> permsSet = new HashSet<>();
+        for (SysRoleVo perm : perms) {
+            if (ObjectUtil.isNotNull(perm)) {
+                permsSet.addAll(StringUtils.splitList(perm.getRoleKey().trim()));
+            }
+        }
+        return permsSet;
+    }
+
+    /**
+     * 查询所有角色
+     *
+     * @return 角色列表
+     */
+    @Override
+    public List<SysRoleVo> selectRoleAll() {
+        return this.selectRoleList(new SysRoleBo());
+    }
+
+    /**
+     * 根据用户ID获取角色选择框列表
+     *
+     * @param userId 用户ID
+     * @return 选中角色ID列表
+     */
+    @Override
+    public List<Long> selectRoleListByUserId(Long userId) {
+        List<SysRoleVo> list = baseMapper.selectRolesByUserId(userId);
+        return StreamUtils.toList(list, SysRoleVo::getRoleId);
+    }
+
+    /**
+     * 通过角色ID查询角色
+     *
+     * @param roleId 角色ID
+     * @return 角色对象信息
+     */
+    @Override
+    public SysRoleVo selectRoleById(Long roleId) {
+        return baseMapper.selectRoleById(roleId);
+    }
+
+    /**
+     * 通过角色ID串查询角色
+     *
+     * @param roleIds 角色ID串
+     * @return 角色列表信息
+     */
+    @Override
+    public List<SysRoleVo> selectRoleByIds(List<Long> roleIds) {
+        return baseMapper.selectRoleList(new QueryWrapper<SysRole>()
+                .eq("r.status", SystemConstants.NORMAL)
+                .in(CollUtil.isNotEmpty(roleIds), "r.role_id", roleIds));
+    }
+
+    /**
+     * 校验角色名称是否唯一
+     *
+     * @param role 角色信息
+     * @return 结果
+     */
+    @Override
+    public boolean checkRoleNameUnique(SysRoleBo role) {
+        boolean exist = baseMapper.exists(new LambdaQueryWrapper<SysRole>()
+                .eq(SysRole::getRoleName, role.getRoleName())
+                .ne(ObjectUtil.isNotNull(role.getRoleId()), SysRole::getRoleId, role.getRoleId()));
+        return !exist;
+    }
+
+    /**
+     * 校验角色权限是否唯一
+     *
+     * @param role 角色信息
+     * @return 结果
+     */
+    @Override
+    public boolean checkRoleKeyUnique(SysRoleBo role) {
+        boolean exist = baseMapper.exists(new LambdaQueryWrapper<SysRole>()
+                .eq(SysRole::getRoleKey, role.getRoleKey())
+                .ne(ObjectUtil.isNotNull(role.getRoleId()), SysRole::getRoleId, role.getRoleId()));
+        return !exist;
+    }
+
+    /**
+     * 校验角色是否允许操作
+     *
+     * @param role 角色信息
+     */
+    @Override
+    public void checkRoleAllowed(SysRoleBo role) {
+        if (ObjectUtil.isNotNull(role.getRoleId()) && LoginHelper.isSuperAdmin(role.getRoleId())) {
+            throw new ServiceException("不允许操作超级管理员角色");
+        }
+        String[] keys = new String[]{SystemConstants.SUPER_ADMIN_ROLE_KEY, SystemConstants.ADMIN_ROLE_KEY};
+        // 新增不允许使用 管理员标识符
+        if (ObjectUtil.isNull(role.getRoleId())
+                && StringUtils.equalsAny(role.getRoleKey(), keys)) {
+            throw new ServiceException("不允许使用系统内置管理员角色标识符!");
+        }
+        // 修改不允许修改 管理员标识符
+        if (ObjectUtil.isNotNull(role.getRoleId())) {
+            SysRole sysRole = baseMapper.selectById(role.getRoleId());
+            // 如果标识符不相等 判断为修改了管理员标识符
+            if (!StringUtils.equals(sysRole.getRoleKey(), role.getRoleKey())) {
+                if (StringUtils.equalsAny(sysRole.getRoleKey(), keys)) {
+                    throw new ServiceException("不允许修改系统内置管理员角色标识符!");
+                } else if (StringUtils.equalsAny(role.getRoleKey(), keys)) {
+                    throw new ServiceException("不允许使用系统内置管理员角色标识符!");
+                }
+            }
+        }
+    }
+
+    /**
+     * 校验角色是否有数据权限
+     *
+     * @param roleId 角色id
+     */
+    @Override
+    public void checkRoleDataScope(Long roleId) {
+        if (ObjectUtil.isNull(roleId)) {
+            return;
+        }
+        if (LoginHelper.isSuperAdmin()) {
+            return;
+        }
+        List<SysRoleVo> roles = this.selectRoleList(new SysRoleBo(roleId));
+        if (CollUtil.isEmpty(roles)) {
+            throw new ServiceException("没有权限访问角色数据！");
+        }
+
+    }
+
+    /**
+     * 通过角色ID查询角色使用数量
+     *
+     * @param roleId 角色ID
+     * @return 结果
+     */
+    @Override
+    public long countUserRoleByRoleId(Long roleId) {
+        return userRoleMapper.selectCount(new LambdaQueryWrapper<SysUserRole>().eq(SysUserRole::getRoleId, roleId));
+    }
+
+    /**
+     * 新增保存角色信息
+     *
+     * @param bo 角色信息
+     * @return 结果
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int insertRole(SysRoleBo bo) {
+        SysRole role = MapstructUtils.convert(bo, SysRole.class);
+        // 新增角色信息
+        baseMapper.insert(role);
+        bo.setRoleId(role.getRoleId());
+        return insertRoleMenu(bo);
+    }
+
+    /**
+     * 修改保存角色信息
+     *
+     * @param bo 角色信息
+     * @return 结果
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int updateRole(SysRoleBo bo) {
+        SysRole role = MapstructUtils.convert(bo, SysRole.class);
+
+        if (SystemConstants.DISABLE.equals(role.getStatus()) && this.countUserRoleByRoleId(role.getRoleId()) > 0) {
+            throw new ServiceException("角色已分配，不能禁用!");
+        }
+        // 修改角色信息
+        baseMapper.updateById(role);
+        // 删除角色与菜单关联
+        roleMenuMapper.delete(new LambdaQueryWrapper<SysRoleMenu>().eq(SysRoleMenu::getRoleId, role.getRoleId()));
+        return insertRoleMenu(bo);
+    }
+
+    /**
+     * 修改角色状态
+     *
+     * @param roleId 角色ID
+     * @param status 角色状态
+     * @return 结果
+     */
+    @Override
+    public int updateRoleStatus(Long roleId, String status) {
+        if (SystemConstants.DISABLE.equals(status) && this.countUserRoleByRoleId(roleId) > 0) {
+            throw new ServiceException("角色已分配，不能禁用!");
+        }
+        return baseMapper.update(null,
+                new LambdaUpdateWrapper<SysRole>()
+                        .set(SysRole::getStatus, status)
+                        .eq(SysRole::getRoleId, roleId));
+    }
+
+    /**
+     * 修改数据权限信息
+     *
+     * @param bo 角色信息
+     * @return 结果
+     */
+    @CacheEvict(cacheNames = CacheNames.SYS_ROLE_CUSTOM, key = "#bo.roleId")
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int authDataScope(SysRoleBo bo) {
+        SysRole role = MapstructUtils.convert(bo, SysRole.class);
+        // 修改角色信息
+        baseMapper.updateById(role);
+        // 删除角色与部门关联
+        roleDeptMapper.delete(new LambdaQueryWrapper<SysRoleDept>().eq(SysRoleDept::getRoleId, role.getRoleId()));
+        // 新增角色和部门信息（数据权限）
+        return insertRoleDept(bo);
+    }
+
+    /**
+     * 新增角色菜单信息
+     *
+     * @param role 角色对象
+     */
+    private int insertRoleMenu(SysRoleBo role) {
+        int rows = 1;
+        // 新增用户与角色管理
+        List<SysRoleMenu> list = new ArrayList<>();
+        for (Long menuId : role.getMenuIds()) {
+            SysRoleMenu rm = new SysRoleMenu();
+            rm.setRoleId(role.getRoleId());
+            rm.setMenuId(menuId);
+            list.add(rm);
+        }
+        if (list.size() > 0) {
+            rows = roleMenuMapper.insertBatch(list) ? list.size() : 0;
+        }
+        return rows;
+    }
+
+    /**
+     * 新增角色部门信息(数据权限)
+     *
+     * @param role 角色对象
+     */
+    private int insertRoleDept(SysRoleBo role) {
+        int rows = 1;
+        // 新增角色与部门（数据权限）管理
+        List<SysRoleDept> list = new ArrayList<>();
+        for (Long deptId : role.getDeptIds()) {
+            SysRoleDept rd = new SysRoleDept();
+            rd.setRoleId(role.getRoleId());
+            rd.setDeptId(deptId);
+            list.add(rd);
+        }
+        if (list.size() > 0) {
+            rows = roleDeptMapper.insertBatch(list) ? list.size() : 0;
+        }
+        return rows;
+    }
+
+    /**
+     * 通过角色ID删除角色
+     *
+     * @param roleId 角色ID
+     * @return 结果
+     */
+    @CacheEvict(cacheNames = CacheNames.SYS_ROLE_CUSTOM, key = "#roleId")
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int deleteRoleById(Long roleId) {
+        // 删除角色与菜单关联
+        roleMenuMapper.delete(new LambdaQueryWrapper<SysRoleMenu>().eq(SysRoleMenu::getRoleId, roleId));
+        // 删除角色与部门关联
+        roleDeptMapper.delete(new LambdaQueryWrapper<SysRoleDept>().eq(SysRoleDept::getRoleId, roleId));
+        return baseMapper.deleteById(roleId);
+    }
+
+    /**
+     * 批量删除角色信息
+     *
+     * @param roleIds 需要删除的角色ID
+     * @return 结果
+     */
+    @CacheEvict(cacheNames = CacheNames.SYS_ROLE_CUSTOM, allEntries = true)
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int deleteRoleByIds(Long[] roleIds) {
+        for (Long roleId : roleIds) {
+            SysRole role = baseMapper.selectById(roleId);
+            checkRoleAllowed(BeanUtil.toBean(role, SysRoleBo.class));
+            checkRoleDataScope(roleId);
+            if (countUserRoleByRoleId(roleId) > 0) {
+                throw new ServiceException(String.format("%1$s已分配，不能删除!", role.getRoleName()));
+            }
+        }
+        List<Long> ids = Arrays.asList(roleIds);
+        // 删除角色与菜单关联
+        roleMenuMapper.delete(new LambdaQueryWrapper<SysRoleMenu>().in(SysRoleMenu::getRoleId, ids));
+        // 删除角色与部门关联
+        roleDeptMapper.delete(new LambdaQueryWrapper<SysRoleDept>().in(SysRoleDept::getRoleId, ids));
+        return baseMapper.deleteByIds(ids);
+    }
+
+    /**
+     * 取消授权用户角色
+     *
+     * @param userRole 用户和角色关联信息
+     * @return 结果
+     */
+    @Override
+    public int deleteAuthUser(SysUserRole userRole) {
+        int rows = userRoleMapper.delete(new LambdaQueryWrapper<SysUserRole>()
+                .eq(SysUserRole::getRoleId, userRole.getRoleId())
+                .eq(SysUserRole::getUserId, userRole.getUserId()));
+        if (rows > 0) {
+            cleanOnlineUser(List.of(userRole.getUserId()));
+        }
+        return rows;
+    }
+
+    /**
+     * 批量取消授权用户角色
+     *
+     * @param roleId  角色ID
+     * @param userIds 需要取消授权的用户数据ID
+     * @return 结果
+     */
+    @Override
+    public int deleteAuthUsers(Long roleId, Long[] userIds) {
+        List<Long> ids = List.of(userIds);
+        int rows = userRoleMapper.delete(new LambdaQueryWrapper<SysUserRole>()
+                .eq(SysUserRole::getRoleId, roleId)
+                .in(SysUserRole::getUserId, ids));
+        if (rows > 0) {
+            cleanOnlineUser(ids);
+        }
+        return rows;
+    }
+
+    /**
+     * 批量选择授权用户角色
+     *
+     * @param roleId  角色ID
+     * @param userIds 需要授权的用户数据ID
+     * @return 结果
+     */
+    @Override
+    public int insertAuthUsers(Long roleId, Long[] userIds) {
+        // 新增用户与角色管理
+        int rows = 1;
+        List<Long> ids = List.of(userIds);
+        List<SysUserRole> list = StreamUtils.toList(ids, userId -> {
+            SysUserRole ur = new SysUserRole();
+            ur.setUserId(userId);
+            ur.setRoleId(roleId);
+            return ur;
+        });
+        if (CollUtil.isNotEmpty(list)) {
+            rows = userRoleMapper.insertBatch(list) ? list.size() : 0;
+        }
+        if (rows > 0) {
+            cleanOnlineUser(ids);
+        }
+        return rows;
+    }
+
+    @Override
+    public void cleanOnlineUserByRole(Long roleId) {
+        // 如果角色未绑定用户 直接返回
+        Long num = userRoleMapper.selectCount(new LambdaQueryWrapper<SysUserRole>().eq(SysUserRole::getRoleId, roleId));
+        if (num == 0) {
+            return;
+        }
+        List<String> keys = StpUtil.searchTokenValue("", 0, -1, false);
+        if (CollUtil.isEmpty(keys)) {
+            return;
+        }
+        // 角色关联的在线用户量过大会导致redis阻塞卡顿 谨慎操作
+        keys.parallelStream().forEach(key -> {
+            String token = StringUtils.substringAfterLast(key, ":");
+            // 如果已经过期则跳过
+            if (StpUtil.stpLogic.getTokenActiveTimeoutByToken(token) < -1) {
+                return;
+            }
+            LoginUser loginUser = LoginHelper.getLoginUser(token);
+            if (ObjectUtil.isNull(loginUser) || CollUtil.isEmpty(loginUser.getRoles())) {
+                return;
+            }
+            if (loginUser.getRoles().stream().anyMatch(r -> r.getRoleId().equals(roleId))) {
+                try {
+                    StpUtil.logoutByTokenValue(token);
+                } catch (NotLoginException ignored) {
+                }
+            }
+        });
+    }
+
+    @Override
+    public void cleanOnlineUser(List<Long> userIds) {
+        List<String> keys = StpUtil.searchTokenValue("", 0, -1, false);
+        if (CollUtil.isEmpty(keys)) {
+            return;
+        }
+        // 角色关联的在线用户量过大会导致redis阻塞卡顿 谨慎操作
+        keys.parallelStream().forEach(key -> {
+            String token = StringUtils.substringAfterLast(key, ":");
+            // 如果已经过期则跳过
+            if (StpUtil.stpLogic.getTokenActiveTimeoutByToken(token) < -1) {
+                return;
+            }
+            LoginUser loginUser = LoginHelper.getLoginUser(token);
+            if (ObjectUtil.isNull(loginUser)) {
+                return;
+            }
+            if (userIds.contains(loginUser.getUserId())) {
+                try {
+                    StpUtil.logoutByTokenValue(token);
+                } catch (NotLoginException ignored) {
+                }
+            }
+        });
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysSensitiveServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysSensitiveServiceImpl.java
new file mode 100644
index 0000000..d938657
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysSensitiveServiceImpl.java
@@ -0,0 +1,42 @@
+package org.dromara.system.service.impl;
+
+import cn.dev33.satoken.stp.StpUtil;
+import cn.hutool.core.util.ArrayUtil;
+import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.common.sensitive.core.SensitiveService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 脱敏服务
+ * 默认管理员不过滤
+ * 需自行根据业务重写实现
+ *
+ * @author pengles
+ * @version 3.6.0
+ */
+@Service
+public class SysSensitiveServiceImpl implements SensitiveService {
+
+    /**
+     * 是否脱敏
+     */
+    @Override
+    public boolean isSensitive(String[] roleKey, String[] perms) {
+        if (!LoginHelper.isLogin()) {
+            return true;
+        }
+        boolean roleExist = ArrayUtil.isNotEmpty(roleKey);
+        boolean permsExist = ArrayUtil.isNotEmpty(perms);
+        if (roleExist && permsExist) {
+            if (StpUtil.hasRoleOr(roleKey) && StpUtil.hasPermissionOr(perms)) {
+                return false;
+            }
+        } else if (roleExist && StpUtil.hasRoleOr(roleKey)) {
+            return false;
+        } else if (permsExist && StpUtil.hasPermissionOr(perms)) {
+            return false;
+        }
+        return !LoginHelper.isSuperAdmin();
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysSocialServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysSocialServiceImpl.java
new file mode 100644
index 0000000..69f3dbb
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysSocialServiceImpl.java
@@ -0,0 +1,112 @@
+package org.dromara.system.service.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.system.domain.SysSocial;
+import org.dromara.system.domain.bo.SysSocialBo;
+import org.dromara.system.domain.vo.SysSocialVo;
+import org.dromara.system.mapper.SysSocialMapper;
+import org.dromara.system.service.SysSocialService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 社会化关系Service业务层处理
+ *
+ * @author thiszhc
+ * @date 2023-06-12
+ */
+@RequiredArgsConstructor
+@Service
+public class SysSocialServiceImpl implements SysSocialService {
+
+    private final SysSocialMapper baseMapper;
+
+
+    /**
+     * 查询社会化关系
+     */
+    @Override
+    public SysSocialVo queryById(String id) {
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 授权列表
+     */
+    @Override
+    public List<SysSocialVo> queryList(SysSocialBo bo) {
+        LambdaQueryWrapper<SysSocial> lqw = new LambdaQueryWrapper<SysSocial>()
+                .eq(ObjectUtil.isNotNull(bo.getUserId()), SysSocial::getUserId, bo.getUserId())
+                .eq(StringUtils.isNotBlank(bo.getAuthId()), SysSocial::getAuthId, bo.getAuthId())
+                .eq(StringUtils.isNotBlank(bo.getSource()), SysSocial::getSource, bo.getSource());
+        return baseMapper.selectVoList(lqw);
+    }
+
+    @Override
+    public List<SysSocialVo> queryListByUserId(Long userId) {
+        return baseMapper.selectVoList(new LambdaQueryWrapper<SysSocial>().eq(SysSocial::getUserId, userId));
+    }
+
+
+    /**
+     * 新增社会化关系
+     */
+    @Override
+    public Boolean insertByBo(SysSocialBo bo) {
+        SysSocial add = MapstructUtils.convert(bo, SysSocial.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            if (add != null) {
+                bo.setId(add.getId());
+            } else {
+                return false;
+            }
+        }
+        return flag;
+    }
+
+    /**
+     * 更新社会化关系
+     */
+    @Override
+    public Boolean updateByBo(SysSocialBo bo) {
+        SysSocial update = MapstructUtils.convert(bo, SysSocial.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(SysSocial entity) {
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+
+    /**
+     * 删除社会化关系
+     */
+    @Override
+    public Boolean deleteWithValidById(Long id) {
+        return baseMapper.deleteById(id) > 0;
+    }
+
+
+    /**
+     * 根据 authId 查询用户信息
+     *
+     * @param authId 认证id
+     * @return 授权信息
+     */
+    @Override
+    public List<SysSocialVo> selectByAuthId(String authId) {
+        return baseMapper.selectVoList(new LambdaQueryWrapper<SysSocial>().eq(SysSocial::getAuthId, authId));
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTaskAssigneeServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTaskAssigneeServiceImpl.java
new file mode 100644
index 0000000..585d19b
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTaskAssigneeServiceImpl.java
@@ -0,0 +1,138 @@
+package org.dromara.system.service.impl;
+
+import cn.hutool.core.convert.Convert;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.constant.SystemConstants;
+import org.dromara.common.core.domain.dto.TaskAssigneeDTO;
+import org.dromara.common.core.domain.model.TaskAssigneeBody;
+import org.dromara.common.core.service.TaskAssigneeService;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.system.domain.bo.SysDeptBo;
+import org.dromara.system.domain.bo.SysPostBo;
+import org.dromara.system.domain.bo.SysRoleBo;
+import org.dromara.system.domain.bo.SysUserBo;
+import org.dromara.system.domain.vo.SysDeptVo;
+import org.dromara.system.domain.vo.SysPostVo;
+import org.dromara.system.domain.vo.SysRoleVo;
+import org.dromara.system.domain.vo.SysUserVo;
+import org.dromara.system.service.SysDeptService;
+import org.dromara.system.service.SysPostService;
+import org.dromara.system.service.SysRoleService;
+import org.dromara.system.service.SysUserService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 工作流设计器获取任务执行人
+ *
+ * @author pengles
+ */
+@RequiredArgsConstructor
+@Service
+public class SysTaskAssigneeServiceImpl implements TaskAssigneeService {
+
+    // 上级Service注入下级Service 其他Service永远不可能注入当前类 避免循环注入
+    private final SysPostService postService;
+    private final SysDeptService deptService;
+    private final SysUserService userService;
+    private final SysRoleService roleService;
+
+    /**
+     * 查询角色并返回任务指派的列表，支持分页
+     *
+     * @param taskQuery 查询条件
+     * @return 办理人
+     */
+    @Override
+    public TaskAssigneeDTO selectRolesByTaskAssigneeList(TaskAssigneeBody taskQuery) {
+        PageQuery pageQuery = new PageQuery(taskQuery.getPageSize(), taskQuery.getPageNum());
+        SysRoleBo bo = new SysRoleBo();
+        bo.setRoleKey(taskQuery.getHandlerCode());
+        bo.setRoleName(taskQuery.getHandlerName());
+        bo.setStatus(SystemConstants.NORMAL);
+        Map<String, Object> params = bo.getParams();
+        params.put("beginTime", taskQuery.getBeginTime());
+        params.put("endTime", taskQuery.getEndTime());
+        TableDataInfo<SysRoleVo> page = roleService.selectPageRoleList(bo, pageQuery);
+        // 使用封装的字段映射方法进行转换
+        List<TaskAssigneeDTO.TaskHandler> handlers = TaskAssigneeDTO.convertToHandlerList(page.getRows(),
+                SysRoleVo::getRoleId, SysRoleVo::getRoleKey, SysRoleVo::getRoleName, null, SysRoleVo::getCreateTime);
+        return new TaskAssigneeDTO(page.getTotal(), handlers);
+    }
+
+    /**
+     * 查询岗位并返回任务指派的列表，支持分页
+     *
+     * @param taskQuery 查询条件
+     * @return 办理人
+     */
+    @Override
+    public TaskAssigneeDTO selectPostsByTaskAssigneeList(TaskAssigneeBody taskQuery) {
+        PageQuery pageQuery = new PageQuery(taskQuery.getPageSize(), taskQuery.getPageNum());
+        SysPostBo bo = new SysPostBo();
+        bo.setPostCategory(taskQuery.getHandlerCode());
+        bo.setPostName(taskQuery.getHandlerName());
+        bo.setStatus(SystemConstants.NORMAL);
+        Map<String, Object> params = bo.getParams();
+        params.put("beginTime", taskQuery.getBeginTime());
+        params.put("endTime", taskQuery.getEndTime());
+        bo.setBelongDeptId(Convert.toLong(taskQuery.getGroupId()));
+        TableDataInfo<SysPostVo> page = postService.selectPagePostList(bo, pageQuery);
+        // 使用封装的字段映射方法进行转换
+        List<TaskAssigneeDTO.TaskHandler> handlers = TaskAssigneeDTO.convertToHandlerList(page.getRows(),
+                SysPostVo::getPostId, SysPostVo::getPostCategory, SysPostVo::getPostName, SysPostVo::getDeptId, SysPostVo::getCreateTime);
+        return new TaskAssigneeDTO(page.getTotal(), handlers);
+    }
+
+    /**
+     * 查询部门并返回任务指派的列表，支持分页
+     *
+     * @param taskQuery 查询条件
+     * @return 办理人
+     */
+    @Override
+    public TaskAssigneeDTO selectDeptsByTaskAssigneeList(TaskAssigneeBody taskQuery) {
+        PageQuery pageQuery = new PageQuery(taskQuery.getPageSize(), taskQuery.getPageNum());
+        SysDeptBo bo = new SysDeptBo();
+        bo.setDeptCategory(taskQuery.getHandlerCode());
+        bo.setDeptName(taskQuery.getHandlerName());
+        bo.setStatus(SystemConstants.NORMAL);
+        Map<String, Object> params = bo.getParams();
+        params.put("beginTime", taskQuery.getBeginTime());
+        params.put("endTime", taskQuery.getEndTime());
+        bo.setBelongDeptId(Convert.toLong(taskQuery.getGroupId()));
+        TableDataInfo<SysDeptVo> page = deptService.selectPageDeptList(bo, pageQuery);
+        // 使用封装的字段映射方法进行转换
+        List<TaskAssigneeDTO.TaskHandler> handlers = TaskAssigneeDTO.convertToHandlerList(page.getRows(),
+                SysDeptVo::getDeptId, SysDeptVo::getDeptCategory, SysDeptVo::getDeptName, SysDeptVo::getParentId, SysDeptVo::getCreateTime);
+        return new TaskAssigneeDTO(page.getTotal(), handlers);
+    }
+
+    /**
+     * 查询用户并返回任务指派的列表，支持分页
+     *
+     * @param taskQuery 查询条件
+     * @return 办理人
+     */
+    @Override
+    public TaskAssigneeDTO selectUsersByTaskAssigneeList(TaskAssigneeBody taskQuery) {
+        PageQuery pageQuery = new PageQuery(taskQuery.getPageSize(), taskQuery.getPageNum());
+        SysUserBo bo = new SysUserBo();
+        bo.setUserName(taskQuery.getHandlerCode());
+        bo.setNickName(taskQuery.getHandlerName());
+        bo.setStatus(SystemConstants.NORMAL);
+        Map<String, Object> params = bo.getParams();
+        params.put("beginTime", taskQuery.getBeginTime());
+        params.put("endTime", taskQuery.getEndTime());
+        bo.setDeptId(Convert.toLong(taskQuery.getGroupId()));
+        TableDataInfo<SysUserVo> page = userService.selectPageUserList(bo, pageQuery);
+        // 使用封装的字段映射方法进行转换
+        List<TaskAssigneeDTO.TaskHandler> handlers = TaskAssigneeDTO.convertToHandlerList(page.getRows(),
+                SysUserVo::getUserId, SysUserVo::getUserName, SysUserVo::getNickName, SysUserVo::getDeptId, SysUserVo::getCreateTime);
+        return new TaskAssigneeDTO(page.getTotal(), handlers);
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java
new file mode 100644
index 0000000..442bad0
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java
@@ -0,0 +1,840 @@
+package org.dromara.system.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.convert.Convert;
+import cn.hutool.core.util.ArrayUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.constant.CacheNames;
+import org.dromara.common.core.constant.SystemConstants;
+import org.dromara.common.core.domain.dto.UserDTO;
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.service.UserService;
+import org.dromara.common.core.utils.*;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.system.domain.*;
+import org.dromara.system.domain.bo.SysUserBo;
+import org.dromara.system.domain.vo.SysPostVo;
+import org.dromara.system.domain.vo.SysRoleVo;
+import org.dromara.system.domain.vo.SysUserExportVo;
+import org.dromara.system.domain.vo.SysUserVo;
+import org.dromara.system.mapper.*;
+import org.dromara.system.service.SysUserService;
+import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.cache.annotation.Cacheable;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * 用户 业务层处理
+ *
+ * @author pengles
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class SysUserServiceImpl implements SysUserService, UserService {
+
+    private final SysUserMapper baseMapper;
+    private final SysDeptMapper deptMapper;
+    private final SysRoleMapper roleMapper;
+    private final SysPostMapper postMapper;
+    private final SysUserRoleMapper userRoleMapper;
+    private final SysUserPostMapper userPostMapper;
+
+    @Override
+    public TableDataInfo<SysUserVo> selectPageUserList(SysUserBo user, PageQuery pageQuery) {
+        Page<SysUserVo> page = baseMapper.selectPageUserList(pageQuery.build(), this.buildQueryWrapper(user));
+        return TableDataInfo.build(page);
+    }
+
+    /**
+     * 根据条件分页查询用户列表
+     *
+     * @param user 用户信息
+     * @return 用户信息集合信息
+     */
+    @Override
+    public List<SysUserExportVo> selectUserExportList(SysUserBo user) {
+        Map<String, Object> params = user.getParams();
+        QueryWrapper<SysUser> wrapper = Wrappers.query();
+        wrapper.eq("u.del_flag", SystemConstants.NORMAL)
+                .like(StringUtils.isNotBlank(user.getUserName()), "u.user_name", user.getUserName())
+                .like(StringUtils.isNotBlank(user.getNickName()), "u.nick_name", user.getNickName())
+                .eq(StringUtils.isNotBlank(user.getStatus()), "u.status", user.getStatus())
+                .like(StringUtils.isNotBlank(user.getPhonenumber()), "u.phonenumber", user.getPhonenumber())
+                .between(params.get("beginTime") != null && params.get("endTime") != null,
+                        "u.create_time", params.get("beginTime"), params.get("endTime"))
+                .and(ObjectUtil.isNotNull(user.getDeptId()), w -> {
+                    List<SysDept> deptList = deptMapper.selectListByParentId(user.getDeptId());
+                    List<Long> ids = StreamUtils.toList(deptList, SysDept::getDeptId);
+                    ids.add(user.getDeptId());
+                    w.in("u.dept_id", ids);
+                }).orderByAsc("u.user_id");
+        return baseMapper.selectUserExportList(wrapper);
+    }
+
+    private Wrapper<SysUser> buildQueryWrapper(SysUserBo user) {
+        Map<String, Object> params = user.getParams();
+        LambdaQueryWrapper<SysUser> wrapper = Wrappers.lambdaQuery();
+        wrapper.eq(SysUser::getDelFlag, SystemConstants.NORMAL)
+                .eq(ObjectUtil.isNotNull(user.getUserId()), SysUser::getUserId, user.getUserId())
+                .in(StringUtils.isNotBlank(user.getUserIds()), SysUser::getUserId, StringUtils.splitTo(user.getUserIds(), Convert::toLong))
+                .like(StringUtils.isNotBlank(user.getUserName()), SysUser::getUserName, user.getUserName())
+                .like(StringUtils.isNotBlank(user.getNickName()), SysUser::getNickName, user.getNickName())
+                .eq(StringUtils.isNotBlank(user.getStatus()), SysUser::getStatus, user.getStatus())
+                .like(StringUtils.isNotBlank(user.getPhonenumber()), SysUser::getPhonenumber, user.getPhonenumber())
+                .between(params.get("beginTime") != null && params.get("endTime") != null,
+                        SysUser::getCreateTime, params.get("beginTime"), params.get("endTime"))
+                .and(ObjectUtil.isNotNull(user.getDeptId()), w -> {
+                    List<SysDept> deptList = deptMapper.selectListByParentId(user.getDeptId());
+                    List<Long> ids = StreamUtils.toList(deptList, SysDept::getDeptId);
+                    ids.add(user.getDeptId());
+                    w.in(SysUser::getDeptId, ids);
+                }).orderByAsc(SysUser::getUserId);
+        if (StringUtils.isNotBlank(user.getExcludeUserIds())) {
+            wrapper.notIn(SysUser::getUserId, StringUtils.splitList(user.getExcludeUserIds()));
+        }
+        return wrapper;
+    }
+
+    /**
+     * 根据条件分页查询已分配用户角色列表
+     *
+     * @param user 用户信息
+     * @return 用户信息集合信息
+     */
+    @Override
+    public TableDataInfo<SysUserVo> selectAllocatedList(SysUserBo user, PageQuery pageQuery) {
+        QueryWrapper<SysUser> wrapper = Wrappers.query();
+        wrapper.eq("u.del_flag", SystemConstants.NORMAL)
+                .eq(ObjectUtil.isNotNull(user.getRoleId()), "r.role_id", user.getRoleId())
+                .like(StringUtils.isNotBlank(user.getUserName()), "u.user_name", user.getUserName())
+                .eq(StringUtils.isNotBlank(user.getStatus()), "u.status", user.getStatus())
+                .like(StringUtils.isNotBlank(user.getPhonenumber()), "u.phonenumber", user.getPhonenumber())
+                .orderByAsc("u.user_id");
+        Page<SysUserVo> page = baseMapper.selectAllocatedList(pageQuery.build(), wrapper);
+        return TableDataInfo.build(page);
+    }
+
+    /**
+     * 根据条件分页查询未分配用户角色列表
+     *
+     * @param user 用户信息
+     * @return 用户信息集合信息
+     */
+    @Override
+    public TableDataInfo<SysUserVo> selectUnallocatedList(SysUserBo user, PageQuery pageQuery) {
+        List<Long> userIds = userRoleMapper.selectUserIdsByRoleId(user.getRoleId());
+        QueryWrapper<SysUser> wrapper = Wrappers.query();
+        wrapper.eq("u.del_flag", SystemConstants.NORMAL)
+                .and(w -> w.ne("r.role_id", user.getRoleId()).or().isNull("r.role_id"))
+                .notIn(CollUtil.isNotEmpty(userIds), "u.user_id", userIds)
+                .like(StringUtils.isNotBlank(user.getUserName()), "u.user_name", user.getUserName())
+                .like(StringUtils.isNotBlank(user.getPhonenumber()), "u.phonenumber", user.getPhonenumber())
+                .orderByAsc("u.user_id");
+        Page<SysUserVo> page = baseMapper.selectUnallocatedList(pageQuery.build(), wrapper);
+        return TableDataInfo.build(page);
+    }
+
+    /**
+     * 通过用户名查询用户
+     *
+     * @param userName 用户名
+     * @return 用户对象信息
+     */
+    @Override
+    public SysUserVo selectUserByUserName(String userName) {
+        return baseMapper.selectVoOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getUserName, userName));
+    }
+
+    /**
+     * 通过手机号查询用户
+     *
+     * @param phonenumber 手机号
+     * @return 用户对象信息
+     */
+    @Override
+    public SysUserVo selectUserByPhonenumber(String phonenumber) {
+        return baseMapper.selectVoOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getPhonenumber, phonenumber));
+    }
+
+    /**
+     * 通过邮箱查询用户
+     *
+     * @param email 邮箱
+     * @return 用户对象信息
+     */
+    @Override
+    public SysUserVo selectUserByEmail(String email) {
+        return baseMapper.selectVoOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getEmail, email));
+    }
+
+    /**
+     * 更新用户登录信息
+     *
+     * @param userId 用户ID
+     * @param ip     登录IP
+     */
+    @Override
+    public void updateLoginInfo(Long userId, String ip) {
+        baseMapper.update(null, new LambdaUpdateWrapper<SysUser>()
+                .set(SysUser::getLoginIp, ip)
+                .set(SysUser::getLoginDate, new Date())
+                .eq(SysUser::getUserId, userId));
+    }
+
+    /**
+     * 通过用户ID查询用户
+     *
+     * @param userId 用户ID
+     * @return 用户对象信息
+     */
+    @Override
+    public SysUserVo selectUserById(Long userId) {
+        SysUserVo user = baseMapper.selectVoById(userId);
+        if (ObjectUtil.isNull(user)) {
+            return user;
+        }
+        user.setRoles(roleMapper.selectRolesByUserId(user.getUserId()));
+        return user;
+    }
+
+    /**
+     * 通过用户ID串查询用户
+     *
+     * @param userIds 用户ID串
+     * @param deptId  部门id
+     * @return 用户列表信息
+     */
+    @Override
+    public List<SysUserVo> selectUserByIds(List<Long> userIds, Long deptId) {
+        return baseMapper.selectUserList(new LambdaQueryWrapper<SysUser>()
+                .select(SysUser::getUserId, SysUser::getUserName, SysUser::getNickName)
+                .eq(SysUser::getStatus, SystemConstants.NORMAL)
+                .eq(ObjectUtil.isNotNull(deptId), SysUser::getDeptId, deptId)
+                .in(CollUtil.isNotEmpty(userIds), SysUser::getUserId, userIds));
+    }
+
+    /**
+     * 查询用户所属角色组
+     *
+     * @param userId 用户ID
+     * @return 结果
+     */
+    @Override
+    public String selectUserRoleGroup(Long userId) {
+        List<SysRoleVo> list = roleMapper.selectRolesByUserId(userId);
+        if (CollUtil.isEmpty(list)) {
+            return StringUtils.EMPTY;
+        }
+        return StreamUtils.join(list, SysRoleVo::getRoleName);
+    }
+
+    /**
+     * 查询用户所属岗位组
+     *
+     * @param userId 用户ID
+     * @return 结果
+     */
+    @Override
+    public String selectUserPostGroup(Long userId) {
+        List<SysPostVo> list = postMapper.selectPostsByUserId(userId);
+        if (CollUtil.isEmpty(list)) {
+            return StringUtils.EMPTY;
+        }
+        return StreamUtils.join(list, SysPostVo::getPostName);
+    }
+
+    /**
+     * 校验用户名称是否唯一
+     *
+     * @param user 用户信息
+     * @return 结果
+     */
+    @Override
+    public boolean checkUserNameUnique(SysUserBo user) {
+        boolean exist = baseMapper.exists(new LambdaQueryWrapper<SysUser>()
+                .eq(SysUser::getUserName, user.getUserName())
+                .ne(ObjectUtil.isNotNull(user.getUserId()), SysUser::getUserId, user.getUserId()));
+        return !exist;
+    }
+
+    /**
+     * 校验手机号码是否唯一
+     *
+     * @param user 用户信息
+     */
+    @Override
+    public boolean checkPhoneUnique(SysUserBo user) {
+        boolean exist = baseMapper.exists(new LambdaQueryWrapper<SysUser>()
+                .eq(SysUser::getPhonenumber, user.getPhonenumber())
+                .ne(ObjectUtil.isNotNull(user.getUserId()), SysUser::getUserId, user.getUserId()));
+        return !exist;
+    }
+
+    /**
+     * 校验email是否唯一
+     *
+     * @param user 用户信息
+     */
+    @Override
+    public boolean checkEmailUnique(SysUserBo user) {
+        boolean exist = baseMapper.exists(new LambdaQueryWrapper<SysUser>()
+                .eq(SysUser::getEmail, user.getEmail())
+                .ne(ObjectUtil.isNotNull(user.getUserId()), SysUser::getUserId, user.getUserId()));
+        return !exist;
+    }
+
+    /**
+     * 校验用户是否允许操作
+     *
+     * @param userId 用户ID
+     */
+    @Override
+    public void checkUserAllowed(Long userId) {
+        if (ObjectUtil.isNotNull(userId) && LoginHelper.isSuperAdmin(userId)) {
+            throw new ServiceException("不允许操作超级管理员用户");
+        }
+    }
+
+    /**
+     * 校验用户是否有数据权限
+     *
+     * @param userId 用户id
+     */
+    @Override
+    public void checkUserDataScope(Long userId) {
+        if (ObjectUtil.isNull(userId)) {
+            return;
+        }
+        if (LoginHelper.isSuperAdmin()) {
+            return;
+        }
+        if (baseMapper.countUserById(userId) == 0) {
+            throw new ServiceException("没有权限访问用户数据！");
+        }
+    }
+
+    /**
+     * 新增保存用户信息
+     *
+     * @param user 用户信息
+     * @return 结果
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int insertUser(SysUserBo user) {
+        SysUser sysUser = MapstructUtils.convert(user, SysUser.class);
+        // 新增用户信息
+        int rows = baseMapper.insert(sysUser);
+        user.setUserId(sysUser.getUserId());
+        // 新增用户岗位关联
+        insertUserPost(user, false);
+        // 新增用户与角色管理
+        insertUserRole(user, false);
+        return rows;
+    }
+
+    /**
+     * 注册用户信息
+     *
+     * @param user 用户信息
+     * @return 结果
+     */
+    @Override
+    public boolean registerUser(SysUserBo user) {
+        user.setCreateBy(0L);
+        user.setUpdateBy(0L);
+        SysUser sysUser = MapstructUtils.convert(user, SysUser.class);
+        return baseMapper.insert(sysUser) > 0;
+    }
+
+    /**
+     * 修改保存用户信息
+     *
+     * @param user 用户信息
+     * @return 结果
+     */
+    @Override
+    @CacheEvict(cacheNames = CacheNames.SYS_NICKNAME, key = "#user.userId")
+    @Transactional(rollbackFor = Exception.class)
+    public int updateUser(SysUserBo user) {
+        // 新增用户与角色管理
+        insertUserRole(user, true);
+        // 新增用户与岗位管理
+        insertUserPost(user, true);
+        SysUser sysUser = MapstructUtils.convert(user, SysUser.class);
+        // 防止错误更新后导致的数据误删除
+        int flag = baseMapper.updateById(sysUser);
+        if (flag < 1) {
+            throw new ServiceException("修改用户" + user.getUserName() + "信息失败");
+        }
+        return flag;
+    }
+
+    /**
+     * 用户授权角色
+     *
+     * @param userId  用户ID
+     * @param roleIds 角色组
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void insertUserAuth(Long userId, Long[] roleIds) {
+        insertUserRole(userId, roleIds, true);
+    }
+
+    /**
+     * 修改用户状态
+     *
+     * @param userId 用户ID
+     * @param status 帐号状态
+     * @return 结果
+     */
+    @Override
+    public int updateUserStatus(Long userId, String status) {
+        return baseMapper.update(null,
+                new LambdaUpdateWrapper<SysUser>()
+                        .set(SysUser::getStatus, status)
+                        .eq(SysUser::getUserId, userId));
+    }
+
+    /**
+     * 修改用户基本信息
+     *
+     * @param user 用户信息
+     * @return 结果
+     */
+    @CacheEvict(cacheNames = CacheNames.SYS_NICKNAME, key = "#user.userId")
+    @Override
+    public int updateUserProfile(SysUserBo user) {
+        return baseMapper.update(null,
+                new LambdaUpdateWrapper<SysUser>()
+                        .set(ObjectUtil.isNotNull(user.getNickName()), SysUser::getNickName, user.getNickName())
+                        .set(SysUser::getPhonenumber, user.getPhonenumber())
+                        .set(SysUser::getEmail, user.getEmail())
+                        .set(SysUser::getSex, user.getSex())
+                        .eq(SysUser::getUserId, user.getUserId()));
+    }
+
+    /**
+     * 修改用户头像
+     *
+     * @param userId 用户ID
+     * @param avatar 头像地址
+     * @return 结果
+     */
+    @Override
+    public boolean updateUserAvatar(Long userId, Long avatar) {
+        return baseMapper.update(null,
+                new LambdaUpdateWrapper<SysUser>()
+                        .set(SysUser::getAvatar, avatar)
+                        .eq(SysUser::getUserId, userId)) > 0;
+    }
+
+    /**
+     * 重置用户密码
+     *
+     * @param userId   用户ID
+     * @param password 密码
+     * @return 结果
+     */
+    @Override
+    public int resetUserPwd(Long userId, String password) {
+        return baseMapper.update(null,
+                new LambdaUpdateWrapper<SysUser>()
+                        .set(SysUser::getPassword, password)
+                        .eq(SysUser::getUserId, userId));
+    }
+
+    /**
+     * 新增用户角色信息
+     *
+     * @param user  用户对象
+     * @param clear 清除已存在的关联数据
+     */
+    private void insertUserRole(SysUserBo user, boolean clear) {
+        this.insertUserRole(user.getUserId(), user.getRoleIds(), clear);
+    }
+
+    /**
+     * 新增用户岗位信息
+     *
+     * @param user  用户对象
+     * @param clear 清除已存在的关联数据
+     */
+    private void insertUserPost(SysUserBo user, boolean clear) {
+        Long[] posts = user.getPostIds();
+        if (ArrayUtil.isNotEmpty(posts)) {
+            if (clear) {
+                // 删除用户与岗位关联
+                userPostMapper.delete(new LambdaQueryWrapper<SysUserPost>().eq(SysUserPost::getUserId, user.getUserId()));
+            }
+            // 新增用户与岗位管理
+            List<SysUserPost> list = StreamUtils.toList(List.of(posts), postId -> {
+                SysUserPost up = new SysUserPost();
+                up.setUserId(user.getUserId());
+                up.setPostId(postId);
+                return up;
+            });
+            userPostMapper.insertBatch(list);
+        }
+    }
+
+    /**
+     * 新增用户角色信息
+     *
+     * @param userId  用户ID
+     * @param roleIds 角色组
+     * @param clear   清除已存在的关联数据
+     */
+    private void insertUserRole(Long userId, Long[] roleIds, boolean clear) {
+        if (ArrayUtil.isNotEmpty(roleIds)) {
+            List<Long> roleList = new ArrayList<>(List.of(roleIds));
+            if (!LoginHelper.isSuperAdmin(userId)) {
+                roleList.remove(SystemConstants.SUPER_ADMIN_ID);
+            }
+            // 判断是否具有此角色的操作权限
+            List<SysRoleVo> roles = roleMapper.selectRoleList(
+                    new QueryWrapper<SysRole>().in("r.role_id", roleList));
+            if (CollUtil.isEmpty(roles)) {
+                throw new ServiceException("没有权限访问角色的数据");
+            }
+            if (clear) {
+                // 删除用户与角色关联
+                userRoleMapper.delete(new LambdaQueryWrapper<SysUserRole>().eq(SysUserRole::getUserId, userId));
+            }
+            // 新增用户与角色管理
+            List<SysUserRole> list = StreamUtils.toList(roleList, roleId -> {
+                SysUserRole ur = new SysUserRole();
+                ur.setUserId(userId);
+                ur.setRoleId(roleId);
+                return ur;
+            });
+            userRoleMapper.insertBatch(list);
+        }
+    }
+
+    /**
+     * 通过用户ID删除用户
+     *
+     * @param userId 用户ID
+     * @return 结果
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int deleteUserById(Long userId) {
+        // 删除用户与角色关联
+        userRoleMapper.delete(new LambdaQueryWrapper<SysUserRole>().eq(SysUserRole::getUserId, userId));
+        // 删除用户与岗位表
+        userPostMapper.delete(new LambdaQueryWrapper<SysUserPost>().eq(SysUserPost::getUserId, userId));
+        // 防止更新失败导致的数据删除
+        int flag = baseMapper.deleteById(userId);
+        if (flag < 1) {
+            throw new ServiceException("删除用户失败!");
+        }
+        return flag;
+    }
+
+    /**
+     * 批量删除用户信息
+     *
+     * @param userIds 需要删除的用户ID
+     * @return 结果
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int deleteUserByIds(Long[] userIds) {
+        for (Long userId : userIds) {
+            checkUserAllowed(userId);
+            checkUserDataScope(userId);
+        }
+        List<Long> ids = List.of(userIds);
+        // 删除用户与角色关联
+        userRoleMapper.delete(new LambdaQueryWrapper<SysUserRole>().in(SysUserRole::getUserId, ids));
+        // 删除用户与岗位表
+        userPostMapper.delete(new LambdaQueryWrapper<SysUserPost>().in(SysUserPost::getUserId, ids));
+        // 防止更新失败导致的数据删除
+        int flag = baseMapper.deleteByIds(ids);
+        if (flag < 1) {
+            throw new ServiceException("删除用户失败!");
+        }
+        return flag;
+    }
+
+    /**
+     * 通过部门id查询当前部门所有用户
+     *
+     * @param deptId 部门ID
+     * @return 用户信息集合信息
+     */
+    @Override
+    public List<SysUserVo> selectUserListByDept(Long deptId) {
+        LambdaQueryWrapper<SysUser> lqw = Wrappers.lambdaQuery();
+        lqw.eq(SysUser::getDeptId, deptId);
+        lqw.orderByAsc(SysUser::getUserId);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    /**
+     * 通过用户ID查询用户账户
+     *
+     * @param userId 用户ID
+     * @return 用户账户
+     */
+    @Cacheable(cacheNames = CacheNames.SYS_USER_NAME, key = "#userId")
+    @Override
+    public String selectUserNameById(Long userId) {
+        SysUser sysUser = baseMapper.selectOne(new LambdaQueryWrapper<SysUser>()
+                .select(SysUser::getUserName).eq(SysUser::getUserId, userId));
+        return ObjectUtils.notNullGetter(sysUser, SysUser::getUserName);
+    }
+
+    /**
+     * 通过用户ID查询用户账户
+     *
+     * @param userId 用户ID
+     * @return 用户账户
+     */
+    @Override
+    @Cacheable(cacheNames = CacheNames.SYS_NICKNAME, key = "#userId")
+    public String selectNicknameById(Long userId) {
+        SysUser sysUser = baseMapper.selectOne(new LambdaQueryWrapper<SysUser>()
+                .select(SysUser::getNickName).eq(SysUser::getUserId, userId));
+        return ObjectUtils.notNullGetter(sysUser, SysUser::getNickName);
+    }
+
+    /**
+     * 通过用户ID查询用户账户
+     *
+     * @param userIds 用户ID 多个用逗号隔开
+     * @return 用户账户
+     */
+    @Override
+    public String selectNicknameByIds(String userIds) {
+        List<String> list = new ArrayList<>();
+        for (Long id : StringUtils.splitTo(userIds, Convert::toLong)) {
+            String nickname = SpringUtils.getAopProxy(this).selectNicknameById(id);
+            if (StringUtils.isNotBlank(nickname)) {
+                list.add(nickname);
+            }
+        }
+        return String.join(StringUtils.SEPARATOR, list);
+    }
+
+    /**
+     * 通过用户ID查询用户手机号
+     *
+     * @param userId 用户id
+     * @return 用户手机号
+     */
+    @Override
+    public String selectPhonenumberById(Long userId) {
+        SysUser sysUser = baseMapper.selectOne(new LambdaQueryWrapper<SysUser>()
+                .select(SysUser::getPhonenumber).eq(SysUser::getUserId, userId));
+        return ObjectUtils.notNullGetter(sysUser, SysUser::getPhonenumber);
+    }
+
+    /**
+     * 通过用户ID查询用户邮箱
+     *
+     * @param userId 用户id
+     * @return 用户邮箱
+     */
+    @Override
+    public String selectEmailById(Long userId) {
+        SysUser sysUser = baseMapper.selectOne(new LambdaQueryWrapper<SysUser>()
+                .select(SysUser::getEmail).eq(SysUser::getUserId, userId));
+        return ObjectUtils.notNullGetter(sysUser, SysUser::getEmail);
+    }
+
+    /**
+     * 通过用户ID查询用户列表
+     *
+     * @param userIds 用户ids
+     * @return 用户列表
+     */
+    @Override
+    public List<UserDTO> selectListByIds(List<Long> userIds) {
+        if (CollUtil.isEmpty(userIds)) {
+            return List.of();
+        }
+        List<SysUserVo> list = baseMapper.selectVoList(new LambdaQueryWrapper<SysUser>()
+                .select(SysUser::getUserId, SysUser::getDeptId, SysUser::getUserName,
+                        SysUser::getNickName, SysUser::getUserType, SysUser::getEmail,
+                        SysUser::getPhonenumber, SysUser::getSex, SysUser::getStatus,
+                        SysUser::getCreateTime)
+                .eq(SysUser::getStatus, SystemConstants.NORMAL)
+                .in(SysUser::getUserId, userIds));
+        return BeanUtil.copyToList(list, UserDTO.class);
+    }
+
+    /**
+     * 通过角色ID查询用户ID
+     *
+     * @param roleIds 角色ids
+     * @return 用户ids
+     */
+    @Override
+    public List<Long> selectUserIdsByRoleIds(List<Long> roleIds) {
+        if (CollUtil.isEmpty(roleIds)) {
+            return List.of();
+        }
+        List<SysUserRole> userRoles = userRoleMapper.selectList(
+                new LambdaQueryWrapper<SysUserRole>().in(SysUserRole::getRoleId, roleIds));
+        return StreamUtils.toList(userRoles, SysUserRole::getUserId);
+    }
+
+    /**
+     * 通过角色ID查询用户
+     *
+     * @param roleIds 角色ids
+     * @return 用户
+     */
+    @Override
+    public List<UserDTO> selectUsersByRoleIds(List<Long> roleIds) {
+        if (CollUtil.isEmpty(roleIds)) {
+            return List.of();
+        }
+
+        // 通过角色ID获取用户角色信息
+        List<SysUserRole> userRoles = userRoleMapper.selectList(
+                new LambdaQueryWrapper<SysUserRole>().in(SysUserRole::getRoleId, roleIds));
+
+        // 获取用户ID列表
+        Set<Long> userIds = StreamUtils.toSet(userRoles, SysUserRole::getUserId);
+
+        return this.selectListByIds(new ArrayList<>(userIds));
+    }
+
+    /**
+     * 通过部门ID查询用户
+     *
+     * @param deptIds 部门ids
+     * @return 用户
+     */
+    @Override
+    public List<UserDTO> selectUsersByDeptIds(List<Long> deptIds) {
+        if (CollUtil.isEmpty(deptIds)) {
+            return List.of();
+        }
+        List<SysUserVo> list = baseMapper.selectVoList(new LambdaQueryWrapper<SysUser>()
+                .select(SysUser::getUserId, SysUser::getUserName, SysUser::getNickName, SysUser::getEmail, SysUser::getPhonenumber)
+                .eq(SysUser::getStatus, SystemConstants.NORMAL)
+                .in(SysUser::getDeptId, deptIds));
+        return BeanUtil.copyToList(list, UserDTO.class);
+    }
+
+    /**
+     * 通过岗位ID查询用户
+     *
+     * @param postIds 岗位ids
+     * @return 用户
+     */
+    @Override
+    public List<UserDTO> selectUsersByPostIds(List<Long> postIds) {
+        if (CollUtil.isEmpty(postIds)) {
+            return List.of();
+        }
+
+        // 通过岗位ID获取用户岗位信息
+        List<SysUserPost> userPosts = userPostMapper.selectList(
+                new LambdaQueryWrapper<SysUserPost>().in(SysUserPost::getPostId, postIds));
+
+        // 获取用户ID列表
+        Set<Long> userIds = StreamUtils.toSet(userPosts, SysUserPost::getUserId);
+
+        return this.selectListByIds(new ArrayList<>(userIds));
+    }
+
+    /**
+     * 根据用户 ID 列表查询用户名称映射关系
+     *
+     * @param userIds 用户 ID 列表
+     * @return Map，其中 key 为用户 ID，value 为对应的用户名称
+     */
+    @Override
+    public Map<Long, String> selectUserNamesByIds(List<Long> userIds) {
+        if (CollUtil.isEmpty(userIds)) {
+            return Collections.emptyMap();
+        }
+        return baseMapper.selectList(
+                        new LambdaQueryWrapper<SysUser>()
+                                .select(SysUser::getUserId, SysUser::getNickName)
+                                .in(SysUser::getUserId, userIds)
+                ).stream()
+                .collect(Collectors.toMap(SysUser::getUserId, SysUser::getNickName));
+    }
+
+    /**
+     * 根据角色 ID 列表查询角色名称映射关系
+     *
+     * @param roleIds 角色 ID 列表
+     * @return Map，其中 key 为角色 ID，value 为对应的角色名称
+     */
+    @Override
+    public Map<Long, String> selectRoleNamesByIds(List<Long> roleIds) {
+        if (CollUtil.isEmpty(roleIds)) {
+            return Collections.emptyMap();
+        }
+        return roleMapper.selectList(
+                        new LambdaQueryWrapper<SysRole>()
+                                .select(SysRole::getRoleId, SysRole::getRoleName)
+                                .in(SysRole::getRoleId, roleIds)
+                ).stream()
+                .collect(Collectors.toMap(SysRole::getRoleId, SysRole::getRoleName));
+    }
+
+    /**
+     * 根据部门 ID 列表查询部门名称映射关系
+     *
+     * @param deptIds 部门 ID 列表
+     * @return Map，其中 key 为部门 ID，value 为对应的部门名称
+     */
+    @Override
+    public Map<Long, String> selectDeptNamesByIds(List<Long> deptIds) {
+        if (CollUtil.isEmpty(deptIds)) {
+            return Collections.emptyMap();
+        }
+        return deptMapper.selectList(
+                        new LambdaQueryWrapper<SysDept>()
+                                .select(SysDept::getDeptId, SysDept::getDeptName)
+                                .in(SysDept::getDeptId, deptIds)
+                ).stream()
+                .collect(Collectors.toMap(SysDept::getDeptId, SysDept::getDeptName));
+    }
+
+    /**
+     * 根据岗位 ID 列表查询岗位名称映射关系
+     *
+     * @param postIds 岗位 ID 列表
+     * @return Map，其中 key 为岗位 ID，value 为对应的岗位名称
+     */
+    @Override
+    public Map<Long, String> selectPostNamesByIds(List<Long> postIds) {
+        if (CollUtil.isEmpty(postIds)) {
+            return Collections.emptyMap();
+        }
+        return postMapper.selectList(
+                        new LambdaQueryWrapper<SysPost>()
+                                .select(SysPost::getPostId, SysPost::getPostName)
+                                .in(SysPost::getPostId, postIds)
+                ).stream()
+                .collect(Collectors.toMap(SysPost::getPostId, SysPost::getPostName));
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/package-info.md b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/package-info.md
new file mode 100644
index 0000000..c938b1e
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/package-info.md
@@ -0,0 +1,3 @@
+java包使用 `.` 分割 resource 目录使用 `/` 分割
+<br>
+此文件目的 防止文件夹粘连找不到 `xml` 文件
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysClientMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysClientMapper.xml
new file mode 100644
index 0000000..5016995
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysClientMapper.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.system.mapper.SysClientMapper">
+
+</mapper>
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml
new file mode 100644
index 0000000..e542a10
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.system.mapper.SysConfigMapper">
+
+</mapper>
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
new file mode 100644
index 0000000..b9326aa
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.system.mapper.SysDeptMapper">
+
+    <resultMap type="org.dromara.system.domain.vo.SysDeptVo" id="SysDeptResult">
+    </resultMap>
+
+    <select id="selectDeptListByRoleId" resultType="Long">
+        select d.dept_id
+        from sys_dept d
+        left join sys_role_dept rd on d.dept_id = rd.dept_id
+        where rd.role_id = #{roleId}
+        <if test="deptCheckStrictly">
+            and d.dept_id not in (select d.parent_id from sys_dept d inner join sys_role_dept rd on d.dept_id =
+            rd.dept_id and rd.role_id = #{roleId})
+        </if>
+        order by d.parent_id, d.order_num
+    </select>
+
+</mapper>
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml
new file mode 100644
index 0000000..6bcce51
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.system.mapper.SysDictDataMapper">
+
+</mapper>
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml
new file mode 100644
index 0000000..6975da4
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.system.mapper.SysDictTypeMapper">
+
+</mapper>
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml
new file mode 100644
index 0000000..c64b551
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.system.mapper.SysLogininforMapper">
+
+</mapper>
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
new file mode 100644
index 0000000..ff654ca
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.system.mapper.SysMenuMapper">
+
+    <resultMap type="org.dromara.system.domain.SysMenu" id="SysMenuResult">
+    </resultMap>
+
+    <select id="selectMenuListByUserId" resultMap="SysMenuResult">
+        select distinct m.menu_id,
+                        m.parent_id,
+                        m.menu_name,
+                        m.path,
+                        m.component,
+                        m.query_param,
+                        m.visible,
+                        m.status,
+                        m.perms,
+                        m.is_frame,
+                        m.is_cache,
+                        m.menu_type,
+                        m.icon,
+                        m.order_num,
+                        m.create_time
+        from sys_menu m
+                 left join sys_role_menu rm on m.menu_id = rm.menu_id
+                 left join sys_role r on rm.role_id = r.role_id
+            ${ew.getCustomSqlSegment}
+    </select>
+
+    <select id="selectMenuTreeByUserId" parameterType="Long" resultMap="SysMenuResult">
+        select distinct m.menu_id,
+                        m.parent_id,
+                        m.menu_name,
+                        m.path,
+                        m.component,
+                        m.query_param,
+                        m.visible,
+                        m.status,
+                        m.perms,
+                        m.is_frame,
+                        m.is_cache,
+                        m.menu_type,
+                        m.icon,
+                        m.order_num,
+                        m.create_time
+        from sys_menu m
+                 left join sys_role_menu rm on m.menu_id = rm.menu_id and m.status = '0'
+                 left join sys_role r on rm.role_id = r.role_id and r.status = '0'
+        where m.menu_type in ('M', 'C')
+          and r.role_id in (select role_id from sys_user_role where user_id = #{userId})
+        order by m.parent_id, m.order_num
+    </select>
+
+    <select id="selectMenuListByRoleId" resultType="Long">
+        select m.menu_id
+        from sys_menu m
+        left join sys_role_menu rm on m.menu_id = rm.menu_id
+        where rm.role_id = #{roleId}
+        <if test="menuCheckStrictly">
+            and m.menu_id not in (select m.parent_id from sys_menu m inner join sys_role_menu rm on m.menu_id =
+            rm.menu_id and rm.role_id = #{roleId})
+        </if>
+        order by m.parent_id, m.order_num
+    </select>
+
+    <select id="selectMenuPermsByUserId" parameterType="Long" resultType="String">
+        select distinct m.perms
+        from sys_menu m
+                 left join sys_role_menu rm on m.menu_id = rm.menu_id and m.status = '0'
+                 left join sys_role r on r.role_id = rm.role_id and r.status = '0'
+        where r.role_id in (select role_id from sys_user_role where user_id = #{userId})
+    </select>
+
+    <select id="selectMenuPermsByRoleId" parameterType="Long" resultType="String">
+        select distinct m.perms
+        from sys_menu m
+                 left join sys_role_menu rm on m.menu_id = rm.menu_id
+        where m.status = '0'
+          and rm.role_id = #{roleId}
+    </select>
+
+</mapper>
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml
new file mode 100644
index 0000000..43f494d
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.system.mapper.SysNoticeMapper">
+
+</mapper>
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml
new file mode 100644
index 0000000..5ef14ee
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.system.mapper.SysOperLogMapper">
+
+</mapper>
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOssConfigMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOssConfigMapper.xml
new file mode 100644
index 0000000..38b0e6a
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOssConfigMapper.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.system.mapper.SysOssConfigMapper">
+
+</mapper>
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOssMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOssMapper.xml
new file mode 100644
index 0000000..d9b25bd
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOssMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.system.mapper.SysOssMapper">
+
+</mapper>
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml
new file mode 100644
index 0000000..3c79918
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.system.mapper.SysPostMapper">
+
+    <resultMap type="org.dromara.system.domain.vo.SysPostVo" id="SysPostResult">
+    </resultMap>
+
+    <select id="selectPostsByUserId" parameterType="Long" resultMap="SysPostResult">
+        select p.post_id, p.dept_id, p.post_name, p.post_code, p.post_category
+        from sys_post p
+                 left join sys_user_post up on up.post_id = p.post_id
+                 left join sys_user u on u.user_id = up.user_id
+        where u.user_id = #{userId}
+    </select>
+
+</mapper>
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml
new file mode 100644
index 0000000..1705bb2
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.system.mapper.SysRoleDeptMapper">
+
+</mapper>
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
new file mode 100644
index 0000000..b0755ea
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.system.mapper.SysRoleMapper">
+
+    <resultMap type="org.dromara.system.domain.vo.SysRoleVo" id="SysRoleResult">
+    </resultMap>
+
+    <sql id="selectRoleVo">
+        select distinct r.role_id,
+                        r.role_name,
+                        r.role_key,
+                        r.role_sort,
+                        r.data_scope,
+                        r.menu_check_strictly,
+                        r.dept_check_strictly,
+                        r.status,
+                        r.del_flag,
+                        r.create_time,
+                        r.remark
+        from sys_role r
+                 left join sys_user_role sur on sur.role_id = r.role_id
+                 left join sys_user u on u.user_id = sur.user_id
+                 left join sys_dept d on u.dept_id = d.dept_id
+    </sql>
+
+    <select id="selectPageRoleList" resultMap="SysRoleResult">
+        <include refid="selectRoleVo"/>
+        ${ew.getCustomSqlSegment}
+    </select>
+
+    <select id="selectRoleList" resultMap="SysRoleResult">
+        <include refid="selectRoleVo"/>
+        ${ew.getCustomSqlSegment}
+    </select>
+
+    <select id="selectRolePermissionByUserId" parameterType="Long" resultMap="SysRoleResult">
+        <include refid="selectRoleVo"/>
+        WHERE r.del_flag = '0' and sur.user_id = #{userId}
+    </select>
+
+    <select id="selectRolesByUserId" parameterType="Long" resultMap="SysRoleResult">
+        select r.role_id,
+               r.role_name,
+               r.role_key,
+               r.role_sort,
+               r.data_scope,
+               r.status
+        from sys_role r
+        WHERE r.del_flag = '0'
+          and r.role_id in (select role_id from sys_user_role where user_id = #{userId})
+    </select>
+
+    <select id="selectRoleById" resultMap="SysRoleResult">
+        <include refid="selectRoleVo"/>
+        WHERE r.del_flag = '0' and r.role_id = #{roleId}
+    </select>
+
+</mapper>
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml
new file mode 100644
index 0000000..f01dc5e
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.system.mapper.SysRoleMenuMapper">
+
+</mapper>
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysSocialMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysSocialMapper.xml
new file mode 100644
index 0000000..ec87c3a
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysSocialMapper.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.system.mapper.SysSocialMapper">
+
+</mapper>
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
new file mode 100644
index 0000000..a602e0d
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.system.mapper.SysUserMapper">
+
+    <resultMap type="org.dromara.system.domain.vo.SysUserVo" id="SysUserResult">
+        <id property="userId" column="user_id"/>
+    </resultMap>
+    <resultMap type="org.dromara.system.domain.vo.SysUserExportVo" id="SysUserExportResult">
+        <id property="userId" column="user_id"/>
+    </resultMap>
+
+    <select id="selectUserExportList" resultMap="SysUserExportResult">
+        select u.user_id,
+               u.dept_id,
+               u.nick_name,
+               u.user_name,
+               u.email,
+               u.avatar,
+               u.phonenumber,
+               u.sex,
+               u.status,
+               u.del_flag,
+               u.login_ip,
+               u.login_date,
+               u.create_by,
+               u.create_time,
+               u.remark,
+               d.dept_name,
+               d.leader,
+               u1.user_name as leaderName
+        from sys_user u
+                 left join sys_dept d on u.dept_id = d.dept_id
+                 left join sys_user u1 on u1.user_id = d.leader
+            ${ew.getCustomSqlSegment}
+    </select>
+
+    <select id="selectAllocatedList" resultMap="SysUserResult">
+        select distinct u.user_id,
+                        u.dept_id,
+                        u.user_name,
+                        u.nick_name,
+                        u.email,
+                        u.phonenumber,
+                        u.status,
+                        u.create_time
+        from sys_user u
+                 left join sys_dept d on u.dept_id = d.dept_id
+                 left join sys_user_role sur on u.user_id = sur.user_id
+                 left join sys_role r on r.role_id = sur.role_id
+            ${ew.getCustomSqlSegment}
+    </select>
+
+    <select id="selectUnallocatedList" resultMap="SysUserResult">
+        select distinct u.user_id,
+                        u.dept_id,
+                        u.user_name,
+                        u.nick_name,
+                        u.email,
+                        u.phonenumber,
+                        u.status,
+                        u.create_time
+        from sys_user u
+                 left join sys_dept d on u.dept_id = d.dept_id
+                 left join sys_user_role sur on u.user_id = sur.user_id
+                 left join sys_role r on r.role_id = sur.role_id
+            ${ew.getCustomSqlSegment}
+    </select>
+
+</mapper>
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml
new file mode 100644
index 0000000..e9f2496
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.system.mapper.SysUserPostMapper">
+
+</mapper>
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml
new file mode 100644
index 0000000..af8c151
--- /dev/null
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.system.mapper.SysUserRoleMapper">
+
+    <select id="selectUserIdsByRoleId" resultType="Long">
+        select u.user_id
+        from sys_user u
+                 inner join sys_user_role sur
+                            on u.user_id = sur.user_id and sur.role_id = #{roleId}
+    </select>
+
+</mapper>
diff --git a/ruoyi-modules/ruoyi-workflow/pom.xml b/ruoyi-modules/ruoyi-workflow/pom.xml
new file mode 100644
index 0000000..951ffb7
--- /dev/null
+++ b/ruoyi-modules/ruoyi-workflow/pom.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>org.dromara</groupId>
+        <artifactId>ruoyi-modules</artifactId>
+        <version>${revision}</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <packaging>jar</packaging>
+    <artifactId>ruoyi-workflow</artifactId>
+
+    <description>
+        工作流模块
+    </description>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-sse</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-doc</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-mail</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-sms</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-mybatis</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-log</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-idempotent</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-excel</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-translation</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-security</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.dromara.warm</groupId>
+            <artifactId>warm-flow-mybatis-plus-sb3-starter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.dromara.warm</groupId>
+            <artifactId>warm-flow-plugin-ui-sb-web</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>
+
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/ConditionalOnEnable.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/ConditionalOnEnable.java
new file mode 100644
index 0000000..6440c29
--- /dev/null
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/ConditionalOnEnable.java
@@ -0,0 +1,29 @@
+package org.dromara.workflow.common;
+
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * 自定义条件注解，用于基于配置启用或禁用特定功能
+ * <p>
+ * 该注解只会在配置文件中 `warm-flow.enabled=true` 时，标注了此注解的类或方法才会被 Spring 容器加载
+ * <p>
+ * 示例配置：
+ * <pre>
+ * warm-flow:
+ *   enabled: true  # 设置为 true 时，启用工作流功能
+ * </pre>
+ * <p>
+ * 使用此注解时，可以动态控制工作流功能是否启用，而不需要修改代码逻辑
+ *
+ * @author pengles
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.TYPE, ElementType.METHOD})
+@ConditionalOnProperty(value = "warm-flow.enabled", havingValue = "true")
+public @interface ConditionalOnEnable {
+}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/constant/FlowConstant.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/constant/FlowConstant.java
new file mode 100644
index 0000000..610d345
--- /dev/null
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/constant/FlowConstant.java
@@ -0,0 +1,81 @@
+package org.dromara.workflow.common.constant;
+
+
+/**
+ * 工作流常量
+ *
+ * @author may
+ */
+public interface FlowConstant {
+
+    /**
+     * 流程发起人
+     */
+    String INITIATOR = "initiator";
+
+    /**
+     * 业务id
+     */
+    String BUSINESS_ID = "businessId";
+
+    /**
+     * 委托
+     */
+    String DELEGATE_TASK = "delegateTask";
+
+    /**
+     * 转办
+     */
+    String TRANSFER_TASK = "transferTask";
+
+    /**
+     * 加签
+     */
+    String ADD_SIGNATURE = "addSignature";
+
+    /**
+     * 减签
+     */
+    String REDUCTION_SIGNATURE = "reductionSignature";
+
+    /**
+     * 流程分类Id转名称
+     */
+    String CATEGORY_ID_TO_NAME = "category_id_to_name";
+
+    /**
+     * 流程分类名称
+     */
+    String FLOW_CATEGORY_NAME = "flow_category_name#30d";
+
+    /**
+     * 默认OA申请分类id
+     */
+    Long FLOW_CATEGORY_ID = 100L;
+
+    /**
+     * 是否为申请人提交常量
+     */
+    String SUBMIT = "submit";
+
+    /**
+     * 抄送常量
+     */
+    String FLOW_COPY_LIST = "flowCopyList";
+
+    /**
+     * 消息类型常量
+     */
+    String MESSAGE_TYPE = "messageType";
+
+    /**
+     * 消息通知常量
+     */
+    String MESSAGE_NOTICE = "messageNotice";
+
+    /**
+     * 任务状态
+     */
+    String WF_TASK_STATUS = "wf_task_status";
+
+}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/ButtonPermissionEnum.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/ButtonPermissionEnum.java
new file mode 100644
index 0000000..598cd05
--- /dev/null
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/ButtonPermissionEnum.java
@@ -0,0 +1,65 @@
+package org.dromara.workflow.common.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 按钮权限枚举
+ *
+ * @author AprilWind
+ */
+@Getter
+@AllArgsConstructor
+public enum ButtonPermissionEnum implements NodeExtEnum {
+
+    /**
+     * 是否弹窗选人
+     */
+    POP("是否弹窗选人", "pop", false),
+
+    /**
+     * 是否能委托
+     */
+    TRUST("是否能委托", "trust", false),
+
+    /**
+     * 是否能转办
+     */
+    TRANSFER("是否能转办", "transfer", false),
+
+    /**
+     * 是否能抄送
+     */
+    COPY("是否能抄送", "copy", false),
+
+    /**
+     * 是否显示退回
+     */
+    BACK("是否显示退回", "back", true),
+
+    /**
+     * 是否能加签
+     */
+    ADD_SIGN("是否能加签", "addSign", false),
+
+    /**
+     * 是否能减签
+     */
+    SUB_SIGN("是否能减签", "subSign", false),
+
+    /**
+     * 是否能终止
+     */
+    TERMINATION("是否能终止", "termination", true),
+
+    /**
+     * 是否能上传附件
+     */
+    FILE("是否能上传附件", "file", true);
+
+    private final String label;
+    private final String value;
+    private final boolean selected;
+
+}
+
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/MessageTypeEnum.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/MessageTypeEnum.java
new file mode 100644
index 0000000..6d59f81
--- /dev/null
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/MessageTypeEnum.java
@@ -0,0 +1,51 @@
+package org.dromara.workflow.common.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+/**
+ * 消息类型枚举
+ *
+ * @author may
+ */
+@Getter
+@AllArgsConstructor
+public enum MessageTypeEnum {
+
+    /**
+     * 站内信
+     */
+    SYSTEM_MESSAGE("1", "站内信"),
+
+    /**
+     * 邮箱
+     */
+    EMAIL_MESSAGE("2", "邮箱"),
+
+    /**
+     * 短信
+     */
+    SMS_MESSAGE("3", "短信");
+
+    private static final Map<String, MessageTypeEnum> MESSAGE_TYPE_ENUM_MAP = Arrays.stream(values())
+            .collect(Collectors.toConcurrentMap(MessageTypeEnum::getCode, Function.identity()));
+    private final String code;
+    private final String desc;
+
+    /**
+     * 根据消息类型 code 获取 MessageTypeEnum
+     *
+     * @param code 消息类型code
+     * @return MessageTypeEnum
+     */
+    public static MessageTypeEnum getByCode(String code) {
+        return MESSAGE_TYPE_ENUM_MAP.getOrDefault(code, null);
+    }
+
+}
+
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/NodeExtEnum.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/NodeExtEnum.java
new file mode 100644
index 0000000..9926a8e
--- /dev/null
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/NodeExtEnum.java
@@ -0,0 +1,32 @@
+package org.dromara.workflow.common.enums;
+
+/**
+ * 节点扩展属性枚举
+ *
+ * @author AprilWind
+ */
+public interface NodeExtEnum {
+
+    /**
+     * 选项label
+     *
+     * @return 选项label
+     */
+    String getLabel();
+
+    /**
+     * 选项值
+     *
+     * @return 选项值
+     */
+    String getValue();
+
+    /**
+     * 是否默认选中
+     *
+     * @return 是否默认选中
+     */
+    boolean isSelected();
+
+}
+
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/TaskAssigneeEnum.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/TaskAssigneeEnum.java
new file mode 100644
index 0000000..438c8f3
--- /dev/null
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/TaskAssigneeEnum.java
@@ -0,0 +1,109 @@
+package org.dromara.workflow.common.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import org.dromara.common.core.exception.ServiceException;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 任务分配人枚举
+ *
+ * @author AprilWind
+ */
+@Getter
+@AllArgsConstructor
+public enum TaskAssigneeEnum {
+
+    /**
+     * 用户
+     */
+    USER("用户", ""),
+
+    /**
+     * 角色
+     */
+    ROLE("角色", "role:"),
+
+    /**
+     * 部门
+     */
+    DEPT("部门", "dept:"),
+
+    /**
+     * 岗位
+     */
+    POST("岗位", "post:");
+
+    private final String desc;
+    private final String code;
+
+    /**
+     * 根据描述获取对应的枚举类型
+     * <p>
+     * 通过传入描述，查找并返回匹配的枚举项。如果未找到匹配项，会抛出 {@link ServiceException}。
+     * </p>
+     *
+     * @param desc 描述，用于匹配对应的枚举项
+     * @return TaskAssigneeEnum 返回对应的枚举类型
+     * @throws ServiceException 如果未找到匹配的枚举项
+     */
+    public static TaskAssigneeEnum fromDesc(String desc) {
+        for (TaskAssigneeEnum type : values()) {
+            if (type.getDesc().equals(desc)) {
+                return type;
+            }
+        }
+        throw new ServiceException("未知的办理人类型: " + desc);
+    }
+
+    /**
+     * 根据代码获取对应的枚举类型
+     * <p>
+     * 通过传入代码，查找并返回匹配的枚举项。如果未找到匹配项，会抛出 {@link ServiceException}。
+     * </p>
+     *
+     * @param code 代码，用于匹配对应的枚举项
+     * @return TaskAssigneeEnum 返回对应的枚举类型
+     * @throws IllegalArgumentException 如果未找到匹配的枚举项
+     */
+    public static TaskAssigneeEnum fromCode(String code) {
+        for (TaskAssigneeEnum type : values()) {
+            if (type.getCode().equals(code)) {
+                return type;
+            }
+        }
+        throw new ServiceException("未知的办理人类型代码: " + code);
+    }
+
+    /**
+     * 获取所有办理人类型的描述列表
+     * <p>
+     * 获取当前枚举类所有项的描述字段列表，通常用于展示选择项。
+     * </p>
+     *
+     * @return List<String> 返回所有办理人类型的描述列表
+     */
+    public static List<String> getAssigneeTypeList() {
+        return Arrays.stream(values())
+                .map(TaskAssigneeEnum::getDesc)
+                .collect(Collectors.toList());
+    }
+
+    /**
+     * 获取所有办理人类型的代码列表
+     * <p>
+     * 获取当前枚举类所有项的代码字段列表，通常用于程序内部逻辑的判断。
+     * </p>
+     *
+     * @return List<String> 返回所有办理人类型的代码列表
+     */
+    public static List<String> getAssigneeCodeList() {
+        return Arrays.stream(values())
+                .map(TaskAssigneeEnum::getCode)
+                .collect(Collectors.toList());
+    }
+}
+
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/TaskAssigneeType.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/TaskAssigneeType.java
new file mode 100644
index 0000000..eed1b91
--- /dev/null
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/TaskAssigneeType.java
@@ -0,0 +1,49 @@
+package org.dromara.workflow.common.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 人员类型
+ *
+ * @author AprilWind
+ */
+@Getter
+@AllArgsConstructor
+public enum TaskAssigneeType {
+
+    /**
+     * 待办任务的审批人权限
+     * <p>该权限表示用户是待办任务的审批人，负责审核任务的执行情况。</p>
+     */
+    APPROVER("1", "待办任务的审批人权限"),
+
+    /**
+     * 待办任务的转办人权限
+     * <p>该权限表示用户是待办任务的转办人，负责将任务分配给其他人员。</p>
+     */
+    TRANSFER("2", "待办任务的转办人权限"),
+
+    /**
+     * 待办任务的委托人权限
+     * <p>该权限表示用户是待办任务的委托人，能够委托其他人代为处理任务。</p>
+     */
+    DELEGATE("3", "待办任务的委托人权限"),
+
+    /**
+     * 待办任务的抄送人权限
+     * <p>该权限表示用户是待办任务的抄送人，仅接收任务信息的通知，不参与任务的审批或处理。</p>
+     */
+    COPY("4", "待办任务的抄送人权限");
+
+    /**
+     * 类型
+     */
+    private final String code;
+
+    /**
+     * 描述
+     */
+    private final String description;
+
+}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/TaskStatusEnum.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/TaskStatusEnum.java
new file mode 100644
index 0000000..ebc93da
--- /dev/null
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/TaskStatusEnum.java
@@ -0,0 +1,102 @@
+package org.dromara.workflow.common.enums;
+
+import cn.hutool.core.util.StrUtil;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * 任务状态枚举
+ *
+ * @author may
+ */
+@Getter
+@AllArgsConstructor
+public enum TaskStatusEnum {
+
+    /**
+     * 撤销
+     */
+    CANCEL("cancel", "撤销"),
+
+    /**
+     * 通过
+     */
+    PASS("pass", "通过"),
+
+    /**
+     * 待审核
+     */
+    WAITING("waiting", "待审核"),
+
+    /**
+     * 作废
+     */
+    INVALID("invalid", "作废"),
+
+    /**
+     * 退回
+     */
+    BACK("back", "退回"),
+
+    /**
+     * 终止
+     */
+    TERMINATION("termination", "终止"),
+
+    /**
+     * 转办
+     */
+    TRANSFER("transfer", "转办"),
+
+    /**
+     * 委托
+     */
+    DEPUTE("depute", "委托"),
+
+    /**
+     * 抄送
+     */
+    COPY("copy", "抄送"),
+
+    /**
+     * 加签
+     */
+    SIGN("sign", "加签"),
+
+    /**
+     * 减签
+     */
+    SIGN_OFF("sign_off", "减签"),
+
+    /**
+     * 超时
+     */
+    TIMEOUT("timeout", "超时");
+
+    private static final Map<String, String> STATUS_DESC_MAP = Arrays.stream(values())
+            .collect(Collectors.toConcurrentMap(TaskStatusEnum::getStatus, TaskStatusEnum::getDesc));
+    /**
+     * 状态
+     */
+    private final String status;
+    /**
+     * 描述
+     */
+    private final String desc;
+
+    /**
+     * 任务业务状态
+     *
+     * @param status 状态
+     */
+    public static String findByStatus(String status) {
+        // 从缓存中直接获取描述
+        return STATUS_DESC_MAP.getOrDefault(status, StrUtil.EMPTY);
+    }
+
+}
+
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/config/WarmFlowConfig.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/config/WarmFlowConfig.java
new file mode 100644
index 0000000..08f1808
--- /dev/null
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/config/WarmFlowConfig.java
@@ -0,0 +1,16 @@
+package org.dromara.workflow.config;
+
+import org.dromara.workflow.common.ConditionalOnEnable;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * warmFlow配置
+ *
+ * @author may
+ */
+@ConditionalOnEnable
+@Configuration
+public class WarmFlowConfig {
+
+}
+
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwCategoryController.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwCategoryController.java
new file mode 100644
index 0000000..3018b08
--- /dev/null
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwCategoryController.java
@@ -0,0 +1,136 @@
+package org.dromara.workflow.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.hutool.core.lang.tree.Tree;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.workflow.common.ConditionalOnEnable;
+import org.dromara.workflow.common.constant.FlowConstant;
+import org.dromara.workflow.domain.bo.FlowCategoryBo;
+import org.dromara.workflow.domain.vo.FlowCategoryVo;
+import org.dromara.workflow.service.IFlwCategoryService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 流程分类
+ *
+ * @author may
+ */
+@ConditionalOnEnable
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/workflow/category")
+public class FlwCategoryController extends BaseController {
+
+    private final IFlwCategoryService flwCategoryService;
+
+    /**
+     * 查询流程分类列表
+     */
+    @SaCheckPermission("workflow:category:list")
+    @GetMapping("/list")
+    public R<List<FlowCategoryVo>> list(FlowCategoryBo bo) {
+        List<FlowCategoryVo> list = flwCategoryService.queryList(bo);
+        return R.ok(list);
+    }
+
+    /**
+     * 导出流程分类列表
+     */
+    @SaCheckPermission("workflow:category:export")
+    @Log(title = "流程分类", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(FlowCategoryBo bo, HttpServletResponse response) {
+        List<FlowCategoryVo> list = flwCategoryService.queryList(bo);
+        ExcelUtil.exportExcel(list, "流程分类", FlowCategoryVo.class, response);
+    }
+
+    /**
+     * 获取流程分类详细信息
+     *
+     * @param categoryId 主键
+     */
+    @SaCheckPermission("workflow:category:query")
+    @GetMapping("/{categoryId}")
+    public R<FlowCategoryVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long categoryId) {
+        flwCategoryService.checkCategoryDataScope(categoryId);
+        return R.ok(flwCategoryService.queryById(categoryId));
+    }
+
+    /**
+     * 新增流程分类
+     */
+    @SaCheckPermission("workflow:category:add")
+    @Log(title = "流程分类", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody FlowCategoryBo category) {
+        if (!flwCategoryService.checkCategoryNameUnique(category)) {
+            return R.fail("新增流程分类'" + category.getCategoryName() + "'失败，流程分类名称已存在");
+        }
+        return toAjax(flwCategoryService.insertByBo(category));
+    }
+
+    /**
+     * 修改流程分类
+     */
+    @SaCheckPermission("workflow:category:edit")
+    @Log(title = "流程分类", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody FlowCategoryBo category) {
+        Long categoryId = category.getCategoryId();
+        flwCategoryService.checkCategoryDataScope(categoryId);
+        if (!flwCategoryService.checkCategoryNameUnique(category)) {
+            return R.fail("修改流程分类'" + category.getCategoryName() + "'失败，流程分类名称已存在");
+        } else if (category.getParentId().equals(categoryId)) {
+            return R.fail("修改流程分类'" + category.getCategoryName() + "'失败，上级流程分类不能是自己");
+        }
+        return toAjax(flwCategoryService.updateByBo(category));
+    }
+
+    /**
+     * 删除流程分类
+     *
+     * @param categoryId 主键
+     */
+    @SaCheckPermission("workflow:category:remove")
+    @Log(title = "流程分类", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{categoryId}")
+    public R<Void> remove(@PathVariable Long categoryId) {
+        if (FlowConstant.FLOW_CATEGORY_ID.equals(categoryId)) {
+            return R.warn("默认流程分类,不允许删除");
+        }
+        if (flwCategoryService.hasChildByCategoryId(categoryId)) {
+            return R.warn("存在下级流程分类,不允许删除");
+        }
+        if (flwCategoryService.checkCategoryExistDefinition(categoryId)) {
+            return R.warn("流程分类存在流程定义,不允许删除");
+        }
+        return toAjax(flwCategoryService.deleteWithValidById(categoryId));
+    }
+
+    /**
+     * 获取流程分类树列表
+     *
+     * @param categoryBo 流程分类
+     */
+    @GetMapping("/categoryTree")
+    public R<List<Tree<String>>> categoryTree(FlowCategoryBo categoryBo) {
+        return R.ok(flwCategoryService.selectCategoryTreeList(categoryBo));
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwDefinitionController.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwDefinitionController.java
new file mode 100644
index 0000000..10d9de8
--- /dev/null
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwDefinitionController.java
@@ -0,0 +1,194 @@
+package org.dromara.workflow.controller;
+
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.warm.flow.core.entity.Definition;
+import org.dromara.warm.flow.core.service.DefService;
+import org.dromara.warm.flow.orm.entity.FlowDefinition;
+import org.dromara.workflow.common.ConditionalOnEnable;
+import org.dromara.workflow.domain.vo.FlowDefinitionVo;
+import org.dromara.workflow.service.IFlwDefinitionService;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * 流程定义管理 控制层
+ *
+ * @author may
+ */
+@ConditionalOnEnable
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/workflow/definition")
+public class FlwDefinitionController extends BaseController {
+
+    private final DefService defService;
+    private final IFlwDefinitionService flwDefinitionService;
+
+    /**
+     * 查询流程定义列表
+     *
+     * @param flowDefinition 参数
+     * @param pageQuery      分页
+     */
+    @GetMapping("/list")
+    public TableDataInfo<FlowDefinitionVo> list(FlowDefinition flowDefinition, PageQuery pageQuery) {
+        return flwDefinitionService.queryList(flowDefinition, pageQuery);
+    }
+
+    /**
+     * 查询未发布的流程定义列表
+     *
+     * @param flowDefinition 参数
+     * @param pageQuery      分页
+     */
+    @GetMapping("/unPublishList")
+    public TableDataInfo<FlowDefinitionVo> unPublishList(FlowDefinition flowDefinition, PageQuery pageQuery) {
+        return flwDefinitionService.unPublishList(flowDefinition, pageQuery);
+    }
+
+    /**
+     * 获取流程定义详细信息
+     *
+     * @param id 流程定义id
+     */
+    @GetMapping(value = "/{id}")
+    public R<Definition> getInfo(@PathVariable Long id) {
+        return R.ok(defService.getById(id));
+    }
+
+    /**
+     * 新增流程定义
+     *
+     * @param flowDefinition 参数
+     */
+    @Log(title = "流程定义", businessType = BusinessType.INSERT)
+    @PostMapping
+    @RepeatSubmit()
+    @Transactional(rollbackFor = Exception.class)
+    public R<Boolean> add(@RequestBody FlowDefinition flowDefinition) {
+        return R.ok(defService.checkAndSave(flowDefinition));
+    }
+
+    /**
+     * 修改流程定义
+     *
+     * @param flowDefinition 参数
+     */
+    @Log(title = "流程定义", businessType = BusinessType.UPDATE)
+    @PutMapping
+    @RepeatSubmit()
+    @Transactional(rollbackFor = Exception.class)
+    public R<Boolean> edit(@RequestBody FlowDefinition flowDefinition) {
+        return R.ok(defService.updateById(flowDefinition));
+    }
+
+    /**
+     * 发布流程定义
+     *
+     * @param id 流程定义id
+     */
+    @Log(title = "流程定义", businessType = BusinessType.INSERT)
+    @PutMapping("/publish/{id}")
+    @RepeatSubmit()
+    public R<Boolean> publish(@PathVariable Long id) {
+        return R.ok(flwDefinitionService.publish(id));
+    }
+
+    /**
+     * 取消发布流程定义
+     *
+     * @param id 流程定义id
+     */
+    @Log(title = "流程定义", businessType = BusinessType.INSERT)
+    @PutMapping("/unPublish/{id}")
+    @RepeatSubmit()
+    @Transactional(rollbackFor = Exception.class)
+    public R<Boolean> unPublish(@PathVariable Long id) {
+        return R.ok(defService.unPublish(id));
+    }
+
+    /**
+     * 删除流程定义
+     */
+    @Log(title = "流程定义", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@PathVariable List<Long> ids) {
+        return toAjax(flwDefinitionService.removeDef(ids));
+    }
+
+    /**
+     * 复制流程定义
+     *
+     * @param id 流程定义id
+     */
+    @Log(title = "流程定义", businessType = BusinessType.INSERT)
+    @PostMapping("/copy/{id}")
+    @RepeatSubmit()
+    @Transactional(rollbackFor = Exception.class)
+    public R<Boolean> copy(@PathVariable Long id) {
+        return R.ok(defService.copyDef(id));
+    }
+
+    /**
+     * 导入流程定义
+     *
+     * @param file     文件
+     * @param category 分类
+     */
+    @Log(title = "流程定义", businessType = BusinessType.IMPORT)
+    @PostMapping("/importDef")
+    public R<Boolean> importDef(MultipartFile file, String category) {
+        return R.ok(flwDefinitionService.importJson(file, category));
+    }
+
+    /**
+     * 导出流程定义
+     *
+     * @param id       流程定义id
+     * @param response 响应
+     * @throws IOException 异常
+     */
+    @Log(title = "流程定义", businessType = BusinessType.EXPORT)
+    @PostMapping("/exportDef/{id}")
+    public void exportDef(@PathVariable Long id, HttpServletResponse response) throws IOException {
+        flwDefinitionService.exportDef(id, response);
+    }
+
+    /**
+     * 获取流程定义JSON字符串
+     *
+     * @param id 流程定义id
+     */
+    @GetMapping("/xmlString/{id}")
+    public R<String> xmlString(@PathVariable Long id) {
+        return R.ok("操作成功", defService.exportJson(id));
+    }
+
+    /**
+     * 激活/挂起流程定义
+     *
+     * @param id     流程定义id
+     * @param active 激活/挂起
+     */
+    @RepeatSubmit()
+    @PutMapping("/active/{id}")
+    @Transactional(rollbackFor = Exception.class)
+    public R<Boolean> active(@PathVariable Long id, @RequestParam boolean active) {
+        return R.ok(active ? defService.active(id) : defService.unActive(id));
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwInstanceController.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwInstanceController.java
new file mode 100644
index 0000000..e7ea5e4
--- /dev/null
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwInstanceController.java
@@ -0,0 +1,157 @@
+package org.dromara.workflow.controller;
+
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.warm.flow.core.service.InsService;
+import org.dromara.workflow.common.ConditionalOnEnable;
+import org.dromara.workflow.domain.bo.FlowCancelBo;
+import org.dromara.workflow.domain.bo.FlowInstanceBo;
+import org.dromara.workflow.domain.bo.FlowInvalidBo;
+import org.dromara.workflow.domain.vo.FlowInstanceVo;
+import org.dromara.workflow.service.IFlwInstanceService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 流程实例管理 控制层
+ *
+ * @author may
+ */
+@ConditionalOnEnable
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/workflow/instance")
+public class FlwInstanceController extends BaseController {
+
+    private final InsService insService;
+    private final IFlwInstanceService flwInstanceService;
+
+    /**
+     * 查询正在运行的流程实例列表
+     *
+     * @param flowInstanceBo 流程实例
+     * @param pageQuery      分页
+     */
+    @GetMapping("/pageByRunning")
+    public TableDataInfo<FlowInstanceVo> selectRunningInstanceList(FlowInstanceBo flowInstanceBo, PageQuery pageQuery) {
+        return flwInstanceService.selectRunningInstanceList(flowInstanceBo, pageQuery);
+    }
+
+    /**
+     * 查询已结束的流程实例列表
+     *
+     * @param flowInstanceBo 流程实例
+     * @param pageQuery      分页
+     */
+    @GetMapping("/pageByFinish")
+    public TableDataInfo<FlowInstanceVo> selectFinishInstanceList(FlowInstanceBo flowInstanceBo, PageQuery pageQuery) {
+        return flwInstanceService.selectFinishInstanceList(flowInstanceBo, pageQuery);
+    }
+
+    /**
+     * 根据业务id查询流程实例详细信息
+     *
+     * @param businessId 业务id
+     */
+    @GetMapping("/getInfo/{businessId}")
+    public R<FlowInstanceVo> getInfo(@PathVariable Long businessId) {
+        return R.ok(flwInstanceService.queryByBusinessId(businessId));
+    }
+
+    /**
+     * 按照业务id删除流程实例
+     *
+     * @param businessIds 业务id
+     */
+    @DeleteMapping("/deleteByBusinessIds/{businessIds}")
+    public R<Void> deleteByBusinessIds(@PathVariable List<Long> businessIds) {
+        return toAjax(flwInstanceService.deleteByBusinessIds(businessIds));
+    }
+
+    /**
+     * 按照实例id删除流程实例
+     *
+     * @param instanceIds 实例id
+     */
+    @DeleteMapping("/deleteByInstanceIds/{instanceIds}")
+    public R<Void> deleteByInstanceIds(@PathVariable List<Long> instanceIds) {
+        return toAjax(flwInstanceService.deleteByInstanceIds(instanceIds));
+    }
+
+    /**
+     * 撤销流程
+     *
+     * @param bo 参数
+     */
+    @RepeatSubmit()
+    @PutMapping("/cancelProcessApply")
+    public R<Void> cancelProcessApply(@RequestBody FlowCancelBo bo) {
+        return toAjax(flwInstanceService.cancelProcessApply(bo));
+    }
+
+    /**
+     * 激活/挂起流程实例
+     *
+     * @param id     流程实例id
+     * @param active 激活/挂起
+     */
+    @RepeatSubmit()
+    @PutMapping("/active/{id}")
+    public R<Boolean> active(@PathVariable Long id, @RequestParam boolean active) {
+        return R.ok(active ? insService.active(id) : insService.unActive(id));
+    }
+
+    /**
+     * 获取当前登陆人发起的流程实例
+     *
+     * @param flowInstanceBo 参数
+     * @param pageQuery      分页
+     */
+    @GetMapping("/pageByCurrent")
+    public TableDataInfo<FlowInstanceVo> selectCurrentInstanceList(FlowInstanceBo flowInstanceBo, PageQuery pageQuery) {
+        return flwInstanceService.selectCurrentInstanceList(flowInstanceBo, pageQuery);
+    }
+
+    /**
+     * 获取流程图，流程记录
+     *
+     * @param businessId 业务id
+     */
+    @GetMapping("/flowHisTaskList/{businessId}")
+    public R<Map<String, Object>> flowHisTaskList(@PathVariable String businessId) {
+        return R.ok(flwInstanceService.flowHisTaskList(businessId));
+    }
+
+    /**
+     * 获取流程变量
+     *
+     * @param instanceId 流程实例id
+     */
+    @GetMapping("/instanceVariable/{instanceId}")
+    public R<Map<String, Object>> instanceVariable(@PathVariable Long instanceId) {
+        return R.ok(flwInstanceService.instanceVariable(instanceId));
+    }
+
+    /**
+     * 作废流程
+     *
+     * @param bo 参数
+     */
+    @Log(title = "流程实例管理", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping("/invalid")
+    public R<Boolean> invalid(@Validated @RequestBody FlowInvalidBo bo) {
+        return R.ok(flwInstanceService.processInvalid(bo));
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwTaskController.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwTaskController.java
new file mode 100644
index 0000000..5534b67
--- /dev/null
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwTaskController.java
@@ -0,0 +1,212 @@
+package org.dromara.workflow.controller;
+
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.domain.dto.StartProcessReturnDTO;
+import org.dromara.common.core.domain.dto.UserDTO;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.warm.flow.core.entity.Node;
+import org.dromara.warm.flow.orm.entity.FlowNode;
+import org.dromara.workflow.common.ConditionalOnEnable;
+import org.dromara.workflow.domain.bo.*;
+import org.dromara.workflow.domain.vo.FlowHisTaskVo;
+import org.dromara.workflow.domain.vo.FlowTaskVo;
+import org.dromara.workflow.service.IFlwTaskService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 任务管理 控制层
+ *
+ * @author may
+ */
+@ConditionalOnEnable
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/workflow/task")
+public class FlwTaskController extends BaseController {
+
+    private final IFlwTaskService flwTaskService;
+
+    /**
+     * 启动任务
+     *
+     * @param startProcessBo 启动流程参数
+     */
+    @Log(title = "任务管理", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping("/startWorkFlow")
+    public R<StartProcessReturnDTO> startWorkFlow(@Validated(AddGroup.class) @RequestBody StartProcessBo startProcessBo) {
+        StartProcessReturnDTO startProcessReturn = flwTaskService.startWorkFlow(startProcessBo);
+        return R.ok("提交成功", startProcessReturn);
+    }
+
+    /**
+     * 办理任务
+     *
+     * @param completeTaskBo 办理任务参数
+     */
+    @Log(title = "任务管理", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping("/completeTask")
+    public R<Void> completeTask(@Validated(AddGroup.class) @RequestBody CompleteTaskBo completeTaskBo) {
+        return toAjax(flwTaskService.completeTask(completeTaskBo));
+    }
+
+    /**
+     * 查询当前用户的待办任务
+     *
+     * @param flowTaskBo 参数
+     * @param pageQuery  分页
+     */
+    @GetMapping("/pageByTaskWait")
+    public TableDataInfo<FlowTaskVo> pageByTaskWait(FlowTaskBo flowTaskBo, PageQuery pageQuery) {
+        return flwTaskService.pageByTaskWait(flowTaskBo, pageQuery);
+    }
+
+    /**
+     * 查询当前用户的已办任务
+     *
+     * @param flowTaskBo 参数
+     * @param pageQuery  分页
+     */
+
+    @GetMapping("/pageByTaskFinish")
+    public TableDataInfo<FlowHisTaskVo> pageByTaskFinish(FlowTaskBo flowTaskBo, PageQuery pageQuery) {
+        return flwTaskService.pageByTaskFinish(flowTaskBo, pageQuery);
+    }
+
+    /**
+     * 查询待办任务
+     *
+     * @param flowTaskBo 参数
+     * @param pageQuery  分页
+     */
+    @GetMapping("/pageByAllTaskWait")
+    public TableDataInfo<FlowTaskVo> pageByAllTaskWait(FlowTaskBo flowTaskBo, PageQuery pageQuery) {
+        return flwTaskService.pageByAllTaskWait(flowTaskBo, pageQuery);
+    }
+
+    /**
+     * 查询已办任务
+     *
+     * @param flowTaskBo 参数
+     * @param pageQuery  分页
+     */
+    @GetMapping("/pageByAllTaskFinish")
+    public TableDataInfo<FlowHisTaskVo> pageByAllTaskFinish(FlowTaskBo flowTaskBo, PageQuery pageQuery) {
+        return flwTaskService.pageByAllTaskFinish(flowTaskBo, pageQuery);
+    }
+
+    /**
+     * 查询当前用户的抄送
+     *
+     * @param flowTaskBo 参数
+     * @param pageQuery  分页
+     */
+    @GetMapping("/pageByTaskCopy")
+    public TableDataInfo<FlowTaskVo> pageByTaskCopy(FlowTaskBo flowTaskBo, PageQuery pageQuery) {
+        return flwTaskService.pageByTaskCopy(flowTaskBo, pageQuery);
+    }
+
+    /**
+     * 根据taskId查询代表任务
+     *
+     * @param taskId 任务id
+     */
+    @GetMapping("/getTask/{taskId}")
+    public R<FlowTaskVo> getTask(@PathVariable Long taskId) {
+        return R.ok(flwTaskService.selectById(taskId));
+    }
+
+    /**
+     * 获取下一节点信息
+     *
+     * @param bo 参数
+     */
+    @PostMapping("/getNextNodeList")
+    public R<List<FlowNode>> getNextNodeList(@RequestBody FlowNextNodeBo bo) {
+        return R.ok(flwTaskService.getNextNodeList(bo));
+    }
+
+    /**
+     * 终止任务
+     *
+     * @param bo 参数
+     */
+    @Log(title = "任务管理", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping("/terminationTask")
+    public R<Boolean> terminationTask(@RequestBody FlowTerminationBo bo) {
+        return R.ok(flwTaskService.terminationTask(bo));
+    }
+
+    /**
+     * 任务操作
+     *
+     * @param bo            参数
+     * @param taskOperation 操作类型，委派 delegateTask、转办 transferTask、加签 addSignature、减签 reductionSignature
+     */
+    @Log(title = "任务管理", businessType = BusinessType.UPDATE)
+    @RepeatSubmit
+    @PostMapping("/taskOperation/{taskOperation}")
+    public R<Void> taskOperation(@Validated @RequestBody TaskOperationBo bo, @PathVariable String taskOperation) {
+        return toAjax(flwTaskService.taskOperation(bo, taskOperation));
+    }
+
+    /**
+     * 修改任务办理人
+     *
+     * @param taskIdList 任务id
+     * @param userId     办理人id
+     */
+    @Log(title = "任务管理", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping("/updateAssignee/{userId}")
+    public R<Void> updateAssignee(@RequestBody List<Long> taskIdList, @PathVariable String userId) {
+        return toAjax(flwTaskService.updateAssignee(taskIdList, userId));
+    }
+
+    /**
+     * 驳回审批
+     *
+     * @param bo 参数
+     */
+    @Log(title = "任务管理", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping("/backProcess")
+    public R<Void> backProcess(@Validated({AddGroup.class}) @RequestBody BackProcessBo bo) {
+        return toAjax(flwTaskService.backProcess(bo));
+    }
+
+    /**
+     * 获取可驳回的前置节点
+     *
+     * @param definitionId 流程定义id
+     * @param nowNodeCode  当前节点
+     */
+    @GetMapping("/getBackTaskNode/{definitionId}/{nowNodeCode}")
+    public R<List<Node>> getBackTaskNode(@PathVariable Long definitionId, @PathVariable String nowNodeCode) {
+        return R.ok(flwTaskService.getBackTaskNode(definitionId, nowNodeCode));
+    }
+
+    /**
+     * 获取当前任务的所有办理人
+     *
+     * @param taskId 任务id
+     */
+    @GetMapping("/currentTaskAllUser/{taskId}")
+    public R<List<UserDTO>> currentTaskAllUser(@PathVariable Long taskId) {
+        return R.ok(flwTaskService.currentTaskAllUser(taskId));
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/TestLeaveController.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/TestLeaveController.java
new file mode 100644
index 0000000..98825d9
--- /dev/null
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/TestLeaveController.java
@@ -0,0 +1,108 @@
+package org.dromara.workflow.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.workflow.common.ConditionalOnEnable;
+import org.dromara.workflow.domain.bo.TestLeaveBo;
+import org.dromara.workflow.domain.vo.TestLeaveVo;
+import org.dromara.workflow.service.ITestLeaveService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 请假
+ *
+ * @author may
+ * @date 2023-07-21
+ */
+@ConditionalOnEnable
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/workflow/leave")
+public class TestLeaveController extends BaseController {
+
+    private final ITestLeaveService testLeaveService;
+
+    /**
+     * 查询请假列表
+     */
+    @SaCheckPermission("workflow:leave:list")
+    @GetMapping("/list")
+    public TableDataInfo<TestLeaveVo> list(TestLeaveBo bo, PageQuery pageQuery) {
+        return testLeaveService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出请假列表
+     */
+    @SaCheckPermission("workflow:leave:export")
+    @Log(title = "请假", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(TestLeaveBo bo, HttpServletResponse response) {
+        List<TestLeaveVo> list = testLeaveService.queryList(bo);
+        ExcelUtil.exportExcel(list, "请假", TestLeaveVo.class, response);
+    }
+
+    /**
+     * 获取请假详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("workflow:leave:query")
+    @GetMapping("/{id}")
+    public R<TestLeaveVo> getInfo(@NotNull(message = "主键不能为空")
+                                  @PathVariable Long id) {
+        return R.ok(testLeaveService.queryById(id));
+    }
+
+    /**
+     * 新增请假
+     */
+    @SaCheckPermission("workflow:leave:add")
+    @Log(title = "请假", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<TestLeaveVo> add(@Validated(AddGroup.class) @RequestBody TestLeaveBo bo) {
+        return R.ok(testLeaveService.insertByBo(bo));
+    }
+
+    /**
+     * 修改请假
+     */
+    @SaCheckPermission("workflow:leave:edit")
+    @Log(title = "请假", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<TestLeaveVo> edit(@Validated(EditGroup.class) @RequestBody TestLeaveBo bo) {
+        return R.ok(testLeaveService.updateByBo(bo));
+    }
+
+    /**
+     * 删除请假
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("workflow:leave:remove")
+    @Log(title = "请假", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(testLeaveService.deleteWithValidByIds(List.of(ids)));
+    }
+}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/FlowCategory.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/FlowCategory.java
new file mode 100644
index 0000000..5247efe
--- /dev/null
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/FlowCategory.java
@@ -0,0 +1,67 @@
+package org.dromara.workflow.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+
+import java.io.Serial;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 流程分类对象 wf_category
+ *
+ * @author may
+ * @date 2023-06-27
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("flow_category")
+public class FlowCategory extends BaseEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 流程分类ID
+     */
+    @TableId(value = "category_id")
+    private Long categoryId;
+
+    /**
+     * 父流程分类id
+     */
+    private Long parentId;
+
+    /**
+     * 祖级列表
+     */
+    private String ancestors;
+
+    /**
+     * 流程分类名称
+     */
+    private String categoryName;
+
+    /**
+     * 显示顺序
+     */
+    private Long orderNum;
+
+    /**
+     * 删除标志（0代表存在 1代表删除）
+     */
+    @TableLogic
+    private String delFlag;
+
+    /**
+     * 子菜单
+     */
+    @TableField(exist = false)
+    private List<FlowCategory> children = new ArrayList<>();
+
+}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/TestLeave.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/TestLeave.java
new file mode 100644
index 0000000..7d42a9b
--- /dev/null
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/TestLeave.java
@@ -0,0 +1,63 @@
+package org.dromara.workflow.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+
+import java.io.Serial;
+import java.util.Date;
+
+/**
+ * 请假对象 test_leave
+ *
+ * @author may
+ * @date 2023-07-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("test_leave")
+public class TestLeave extends BaseEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 请假类型
+     */
+    private String leaveType;
+
+    /**
+     * 开始时间
+     */
+    private Date startDate;
+
+    /**
+     * 结束时间
+     */
+    private Date endDate;
+
+    /**
+     * 请假天数
+     */
+    private Integer leaveDays;
+
+    /**
+     * 请假原因
+     */
+    private String remark;
+
+    /**
+     * 状态
+     */
+    private String status;
+
+
+}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/BackProcessBo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/BackProcessBo.java
new file mode 100644
index 0000000..a67a1f7
--- /dev/null
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/BackProcessBo.java
@@ -0,0 +1,69 @@
+package org.dromara.workflow.domain.bo;
+
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+import org.dromara.common.core.validate.AddGroup;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+
+/**
+ * 驳回参数请求
+ *
+ * @author may
+ */
+@Data
+public class BackProcessBo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 任务ID
+     */
+    @NotNull(message = "任务ID不能为空", groups = AddGroup.class)
+    private Long taskId;
+
+    /**
+     * 附件id
+     */
+    private String fileId;
+
+    /**
+     * 消息类型
+     */
+    private List<String> messageType;
+
+    /**
+     * 驳回的节点id(目前未使用，直接驳回到申请人)
+     */
+    private String nodeCode;
+
+    /**
+     * 办理意见
+     */
+    private String message;
+
+    /**
+     * 通知
+     */
+    private String notice;
+
+    /**
+     * 流程变量
+     */
+    private Map<String, Object> variables;
+
+    public Map<String, Object> getVariables() {
+        if (variables == null) {
+            return new HashMap<>(16);
+        }
+        variables.entrySet().removeIf(entry -> Objects.isNull(entry.getValue()));
+        return variables;
+    }
+}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/CompleteTaskBo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/CompleteTaskBo.java
new file mode 100644
index 0000000..360fc3b
--- /dev/null
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/CompleteTaskBo.java
@@ -0,0 +1,80 @@
+package org.dromara.workflow.domain.bo;
+
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+import org.dromara.common.core.validate.AddGroup;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * 办理任务请求对象
+ *
+ * @author may
+ */
+@Data
+public class CompleteTaskBo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 任务id
+     */
+    @NotNull(message = "任务id不能为空", groups = {AddGroup.class})
+    private Long taskId;
+
+    /**
+     * 附件id
+     */
+    private String fileId;
+
+    /**
+     * 抄送人员
+     */
+    private List<FlowCopyBo> flowCopyList;
+
+    /**
+     * 消息类型
+     */
+    private List<String> messageType;
+
+    /**
+     * 办理意见
+     */
+    private String message;
+
+    /**
+     * 消息通知
+     */
+    private String notice;
+
+    /**
+     * 流程变量
+     */
+    private Map<String, Object> variables;
+
+    /**
+     * 弹窗选择的办理人
+     */
+    private Map<String, Object> assigneeMap;
+
+    /**
+     * 扩展变量(此处为逗号分隔的ossId)
+     */
+    private String ext;
+
+    public Map<String, Object> getVariables() {
+        if (variables == null) {
+            variables = new HashMap<>(16);
+            return variables;
+        }
+        variables.entrySet().removeIf(entry -> Objects.isNull(entry.getValue()));
+        return variables;
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowCancelBo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowCancelBo.java
new file mode 100644
index 0000000..31742ea
--- /dev/null
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowCancelBo.java
@@ -0,0 +1,31 @@
+package org.dromara.workflow.domain.bo;
+
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+import org.dromara.common.core.validate.AddGroup;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 撤销任务请求对象
+ *
+ * @author may
+ */
+@Data
+public class FlowCancelBo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 任务ID
+     */
+    @NotBlank(message = "业务ID不能为空", groups = AddGroup.class)
+    private String businessId;
+
+    /**
+     * 办理意见
+     */
+    private String message;
+}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowCategoryBo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowCategoryBo.java
new file mode 100644
index 0000000..514c660
--- /dev/null
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowCategoryBo.java
@@ -0,0 +1,46 @@
+package org.dromara.workflow.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.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.workflow.domain.FlowCategory;
+
+/**
+ * 流程分类业务对象 wf_category
+ *
+ * @author ruoyu
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = FlowCategory.class, reverseConvertGenerate = false)
+public class FlowCategoryBo extends BaseEntity {
+
+    /**
+     * 流程分类ID
+     */
+    @NotNull(message = "流程分类ID不能为空", groups = {EditGroup.class})
+    private Long categoryId;
+
+    /**
+     * 父流程分类id
+     */
+    @NotNull(message = "父流程分类id不能为空", groups = {AddGroup.class, EditGroup.class})
+    private Long parentId;
+
+    /**
+     * 流程分类名称
+     */
+    @NotBlank(message = "流程分类名称不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String categoryName;
+
+    /**
+     * 显示顺序
+     */
+    private Long orderNum;
+
+}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowCopyBo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowCopyBo.java
new file mode 100644
index 0000000..a45e521
--- /dev/null
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowCopyBo.java
@@ -0,0 +1,30 @@
+package org.dromara.workflow.domain.bo;
+
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+
+/**
+ * 抄送
+ *
+ * @author may
+ */
+@Data
+public class FlowCopyBo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 用户id
+     */
+    private Long userId;
+
+    /**
+     * 用户名称
+     */
+    private String userName;
+
+}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowInstanceBo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowInstanceBo.java
new file mode 100644
index 0000000..fb1fe61
--- /dev/null
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowInstanceBo.java
@@ -0,0 +1,55 @@
+package org.dromara.workflow.domain.bo;
+
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 流程实例请求对象
+ *
+ * @author may
+ */
+@Data
+public class FlowInstanceBo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 流程定义名称
+     */
+    private String flowName;
+
+    /**
+     * 流程定义编码
+     */
+    private String flowCode;
+
+    /**
+     * 任务发起人
+     */
+    private String startUserId;
+
+    /**
+     * 业务id
+     */
+    private String businessId;
+
+    /**
+     * 流程分类id
+     */
+    private String category;
+
+    /**
+     * 任务名称
+     */
+    private String nodeName;
+
+    /**
+     * 申请人Ids
+     */
+    private List<Long> createByIds;
+
+}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowInvalidBo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowInvalidBo.java
new file mode 100644
index 0000000..297bd00
--- /dev/null
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowInvalidBo.java
@@ -0,0 +1,31 @@
+package org.dromara.workflow.domain.bo;
+
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+import org.dromara.common.core.validate.AddGroup;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 作废请求对象
+ *
+ * @author may
+ */
+@Data
+public class FlowInvalidBo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 流程实例id
+     */
+    @NotNull(message = "流程实例id为空", groups = AddGroup.class)
+    private Long id;
+
+    /**
+     * 审批意见
+     */
+    private String comment;
+}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowNextNodeBo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowNextNodeBo.java
new file mode 100644
index 0000000..12f0653
--- /dev/null
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowNextNodeBo.java
@@ -0,0 +1,38 @@
+package org.dromara.workflow.domain.bo;
+
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * 下一节点信息
+ *
+ * @author may
+ */
+@Data
+public class FlowNextNodeBo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+    /**
+     * 任务id
+     */
+    private Long taskId;
+
+    /**
+     * 流程变量
+     */
+    private Map<String, Object> variables;
+
+    public Map<String, Object> getVariables() {
+        if (variables == null) {
+            return new HashMap<>(16);
+        }
+        variables.entrySet().removeIf(entry -> Objects.isNull(entry.getValue()));
+        return variables;
+    }
+}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowTaskBo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowTaskBo.java
new file mode 100644
index 0000000..64dd082
--- /dev/null
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowTaskBo.java
@@ -0,0 +1,55 @@
+package org.dromara.workflow.domain.bo;
+
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 任务请求对象
+ *
+ * @author may
+ */
+@Data
+public class FlowTaskBo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 任务名称
+     */
+    private String nodeName;
+
+    /**
+     * 流程定义名称
+     */
+    private String flowName;
+
+    /**
+     * 流程定义编码
+     */
+    private String flowCode;
+
+    /**
+     * 流程分类id
+     */
+    private String category;
+
+    /**
+     * 流程实例id
+     */
+    private Long instanceId;
+
+    /**
+     * 权限列表
+     */
+    private List<String> permissionList;
+
+    /**
+     * 申请人Ids
+     */
+    private List<Long> createByIds;
+
+}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowTerminationBo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowTerminationBo.java
new file mode 100644
index 0000000..897fc21
--- /dev/null
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/FlowTerminationBo.java
@@ -0,0 +1,31 @@
+package org.dromara.workflow.domain.bo;
+
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+import org.dromara.common.core.validate.AddGroup;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 终止任务请求对象
+ *
+ * @author may
+ */
+@Data
+public class FlowTerminationBo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 任务id
+     */
+    @NotNull(message = "任务id为空", groups = AddGroup.class)
+    private Long taskId;
+
+    /**
+     * 审批意见
+     */
+    private String comment;
+}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/StartProcessBo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/StartProcessBo.java
new file mode 100644
index 0000000..ea21a81
--- /dev/null
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/StartProcessBo.java
@@ -0,0 +1,49 @@
+package org.dromara.workflow.domain.bo;
+
+
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+import org.dromara.common.core.validate.AddGroup;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * 启动流程对象
+ *
+ * @author may
+ */
+@Data
+public class StartProcessBo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 业务唯一值id
+     */
+    @NotBlank(message = "业务ID不能为空", groups = {AddGroup.class})
+    private String businessId;
+
+    /**
+     * 流程定义编码
+     */
+    @NotBlank(message = "流程定义编码不能为空", groups = {AddGroup.class})
+    private String flowCode;
+
+    /**
+     * 流程变量，前端会提交一个元素{'entity': {业务详情数据对象}}
+     */
+    private Map<String, Object> variables;
+
+    public Map<String, Object> getVariables() {
+        if (variables == null) {
+            return new HashMap<>(16);
+        }
+        variables.entrySet().removeIf(entry -> Objects.isNull(entry.getValue()));
+        return variables;
+    }
+}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TaskOperationBo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TaskOperationBo.java
new file mode 100644
index 0000000..4348e31
--- /dev/null
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TaskOperationBo.java
@@ -0,0 +1,48 @@
+package org.dromara.workflow.domain.bo;
+
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.List;
+
+
+/**
+ * 任务操作业务对象，用于描述任务委派、转办、加签等操作的必要参数
+ * 包含了用户ID、任务ID、任务相关的消息、以及加签/减签的用户ID
+ *
+ * @author AprilWind
+ */
+@Data
+public class TaskOperationBo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 委派/转办人的用户ID（必填，准对委派/转办人操作）
+     */
+    @NotNull(message = "委派/转办人id不能为空", groups = {AddGroup.class})
+    private String userId;
+
+    /**
+     * 加签/减签人的用户ID列表（必填，针对加签/减签操作）
+     */
+    @NotNull(message = "加签/减签id不能为空", groups = {EditGroup.class})
+    private List<String> userIds;
+
+    /**
+     * 任务ID（必填）
+     */
+    @NotNull(message = "任务id不能为空")
+    private Long taskId;
+
+    /**
+     * 意见或备注信息（可选）
+     */
+    private String message;
+
+}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TestLeaveBo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TestLeaveBo.java
new file mode 100644
index 0000000..395f71d
--- /dev/null
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TestLeaveBo.java
@@ -0,0 +1,82 @@
+package org.dromara.workflow.domain.bo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.workflow.domain.TestLeave;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * 请假业务对象 test_leave
+ *
+ * @author may
+ * @date 2023-07-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = TestLeave.class, reverseConvertGenerate = false)
+public class TestLeaveBo extends BaseEntity {
+
+    /**
+     * 主键
+     */
+    @NotNull(message = "主键不能为空", groups = {EditGroup.class})
+    private Long id;
+
+    /**
+     * 请假类型
+     */
+    @NotBlank(message = "请假类型不能为空", groups = {AddGroup.class, EditGroup.class})
+    private String leaveType;
+
+    /**
+     * 开始时间
+     */
+    @NotNull(message = "开始时间不能为空", groups = {AddGroup.class, EditGroup.class})
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date startDate;
+
+    /**
+     * 结束时间
+     */
+    @NotNull(message = "结束时间不能为空", groups = {AddGroup.class, EditGroup.class})
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date endDate;
+
+    /**
+     * 请假天数
+     */
+    private Integer leaveDays;
+
+    /**
+     * 开始时间
+     */
+    private Integer startLeaveDays;
+
+    /**
+     * 结束时间
+     */
+    private Integer endLeaveDays;
+
+    /**
+     * 请假原因
+     */
+    private String remark;
+
+    /**
+     * 状态
+     */
+    private String status;
+
+
+}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/ButtonPermissionVo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/ButtonPermissionVo.java
new file mode 100644
index 0000000..7175e5e
--- /dev/null
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/ButtonPermissionVo.java
@@ -0,0 +1,43 @@
+package org.dromara.workflow.domain.vo;
+
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 按钮权限
+ *
+ * @author may
+ * @date 2025-02-28
+ */
+@Data
+public class ButtonPermissionVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 唯一编码
+     */
+    private String code;
+
+    /**
+     * 选项值
+     */
+    private String value;
+
+    /**
+     * 是否显示
+     */
+    private Boolean show;
+
+    public ButtonPermissionVo() {
+    }
+
+    public ButtonPermissionVo(String code, Boolean show) {
+        this.code = code;
+        this.show = show;
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowCategoryVo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowCategoryVo.java
new file mode 100644
index 0000000..c5427a5
--- /dev/null
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowCategoryVo.java
@@ -0,0 +1,69 @@
+package org.dromara.workflow.domain.vo;
+
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.common.translation.annotation.Translation;
+import org.dromara.workflow.common.constant.FlowConstant;
+import org.dromara.workflow.domain.FlowCategory;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 流程分类视图对象 wf_category
+ *
+ * @author may
+ * @date 2023-06-27
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = FlowCategory.class)
+public class FlowCategoryVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 流程分类ID
+     */
+    @ExcelProperty(value = "流程分类ID")
+    private Long categoryId;
+
+    /**
+     * 父级分类id
+     */
+    private Long parentId;
+
+    /**
+     * 父级分类名称
+     */
+    @Translation(type = FlowConstant.CATEGORY_ID_TO_NAME, mapper = "parentId")
+    private String parentName;
+
+    /**
+     * 祖级列表
+     */
+    private String ancestors;
+
+    /**
+     * 流程分类名称
+     */
+    @ExcelProperty(value = "流程分类名称")
+    private String categoryName;
+
+    /**
+     * 显示顺序
+     */
+    @ExcelProperty(value = "显示顺序")
+    private Long orderNum;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "创建时间")
+    private Date createTime;
+
+}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowDefinitionVo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowDefinitionVo.java
new file mode 100644
index 0000000..210f1de
--- /dev/null
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowDefinitionVo.java
@@ -0,0 +1,99 @@
+package org.dromara.workflow.domain.vo;
+
+import lombok.Data;
+import org.dromara.common.translation.annotation.Translation;
+import org.dromara.workflow.common.constant.FlowConstant;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 流程定义视图
+ *
+ * @author may
+ */
+@Data
+public class FlowDefinitionVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    private Long id;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     * 删除标记
+     */
+    private String delFlag;
+
+    /**
+     * 流程定义编码
+     */
+    private String flowCode;
+
+    /**
+     * 流程定义名称
+     */
+    private String flowName;
+
+    /**
+     * 流程分类id
+     */
+    private String category;
+
+    /**
+     * 流程分类名称
+     */
+    @Translation(type = FlowConstant.CATEGORY_ID_TO_NAME, mapper = "category")
+    private String categoryName;
+
+    /**
+     * 流程版本
+     */
+    private String version;
+
+    /**
+     * 是否发布（0未发布 1已发布 9失效）
+     */
+    private Integer isPublish;
+
+    /**
+     * 审批表单是否自定义（Y是 N否）
+     */
+    private String formCustom;
+
+    /**
+     * 审批表单路径
+     */
+    private String formPath;
+
+    /**
+     * 流程激活状态（0挂起 1激活）
+     */
+    private Integer activityStatus;
+
+    /**
+     * 监听器类型
+     */
+    private String listenerType;
+
+    /**
+     * 监听器路径
+     */
+    private String listenerPath;
+
+    /**
+     * 扩展字段，预留给业务系统使用
+     */
+    private String ext;
+}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowHisTaskVo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowHisTaskVo.java
new file mode 100644
index 0000000..8776a76
--- /dev/null
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowHisTaskVo.java
@@ -0,0 +1,244 @@
+package org.dromara.workflow.domain.vo;
+
+import lombok.Data;
+import org.dromara.common.core.utils.DateUtils;
+import org.dromara.common.translation.annotation.Translation;
+import org.dromara.common.translation.constant.TransConstant;
+import org.dromara.warm.flow.core.enums.CooperateType;
+import org.dromara.workflow.common.constant.FlowConstant;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 历史任务视图
+ *
+ * @author may
+ */
+@Data
+public class FlowHisTaskVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    private Long id;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     * 租户ID
+     */
+    private String tenantId;
+
+    /**
+     * 删除标记
+     */
+    private String delFlag;
+
+    /**
+     * 对应flow_definition表的id
+     */
+    private Long definitionId;
+
+    /**
+     * 流程定义名称
+     */
+    private String flowName;
+
+    /**
+     * 流程实例表id
+     */
+    private Long instanceId;
+
+    /**
+     * 任务表id
+     */
+    private Long taskId;
+
+    /**
+     * 协作方式(1审批 2转办 3委派 4会签 5票签 6加签 7减签)
+     */
+    private Integer cooperateType;
+
+    /**
+     * 协作方式(1审批 2转办 3委派 4会签 5票签 6加签 7减签)
+     */
+    private String cooperateTypeName;
+
+    /**
+     * 业务id
+     */
+    private String businessId;
+
+    /**
+     * 开始节点编码
+     */
+    private String nodeCode;
+
+    /**
+     * 开始节点名称
+     */
+    private String nodeName;
+
+    /**
+     * 开始节点类型（0开始节点 1中间节点 2结束节点 3互斥网关 4并行网关）
+     */
+    private Integer nodeType;
+
+    /**
+     * 目标节点编码
+     */
+    private String targetNodeCode;
+
+    /**
+     * 结束节点名称
+     */
+    private String targetNodeName;
+
+    /**
+     * 审批者
+     */
+    private String approver;
+
+    /**
+     * 审批者
+     */
+    @Translation(type = TransConstant.USER_ID_TO_NICKNAME, mapper = "approver")
+    private String approveName;
+
+    /**
+     * 协作人(只有转办、会签、票签、委派)
+     */
+    private String collaborator;
+
+    /**
+     * 权限标识 permissionFlag的list形式
+     */
+    private List<String> permissionList;
+
+    /**
+     * 跳转类型（PASS通过 REJECT退回 NONE无动作）
+     */
+    private String skipType;
+
+    /**
+     * 流程状态
+     */
+    private String flowStatus;
+
+    /**
+     * 任务状态
+     */
+    private String flowTaskStatus;
+
+    /**
+     * 流程状态
+     */
+    private String flowStatusName;
+
+    /**
+     * 审批意见
+     */
+    private String message;
+
+    /**
+     * 业务详情 存业务类的json
+     */
+    private String ext;
+
+    /**
+     * 创建者
+     */
+    private String createBy;
+
+    /**
+     * 申请人
+     */
+    @Translation(type = TransConstant.USER_ID_TO_NICKNAME, mapper = "createBy")
+    private String createByName;
+
+    /**
+     * 流程分类id
+     */
+    private String category;
+
+    /**
+     * 流程分类名称
+     */
+    @Translation(type = FlowConstant.CATEGORY_ID_TO_NAME, mapper = "category")
+    private String categoryName;
+
+    /**
+     * 审批表单是否自定义（Y是 N否）
+     */
+    private String formCustom;
+
+    /**
+     * 审批表单路径
+     */
+    private String formPath;
+
+    /**
+     * 流程定义编码
+     */
+    private String flowCode;
+
+    /**
+     * 流程版本号
+     */
+    private String version;
+
+    /**
+     * 运行时长
+     */
+    private String runDuration;
+
+    /**
+     * 设置创建时间并计算任务运行时长
+     *
+     * @param createTime 创建时间
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+        updateRunDuration();
+    }
+
+    /**
+     * 设置更新时间并计算任务运行时长
+     *
+     * @param updateTime 更新时间
+     */
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+        updateRunDuration();
+    }
+
+    /**
+     * 更新运行时长
+     */
+    private void updateRunDuration() {
+        // 如果创建时间和更新时间均不为空，计算它们之间的时长
+        if (this.updateTime != null && this.createTime != null) {
+            this.runDuration = DateUtils.getTimeDifference(this.updateTime, this.createTime);
+        }
+    }
+
+    /**
+     * 设置协作方式，并通过协作方式获取名称
+     */
+    public void setCooperateType(Integer cooperateType) {
+        this.cooperateType = cooperateType;
+        this.cooperateTypeName = CooperateType.getValueByKey(cooperateType);
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowInstanceVo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowInstanceVo.java
new file mode 100644
index 0000000..75543f4
--- /dev/null
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowInstanceVo.java
@@ -0,0 +1,137 @@
+package org.dromara.workflow.domain.vo;
+
+import lombok.Data;
+import org.dromara.common.translation.annotation.Translation;
+import org.dromara.common.translation.constant.TransConstant;
+import org.dromara.workflow.common.constant.FlowConstant;
+
+import java.util.Date;
+
+/**
+ * 流程实例视图
+ *
+ * @author may
+ */
+@Data
+public class FlowInstanceVo {
+
+    private Long id;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     * 租户ID
+     */
+    private String tenantId;
+
+    /**
+     * 删除标记
+     */
+    private String delFlag;
+
+    /**
+     * 对应flow_definition表的id
+     */
+    private Long definitionId;
+
+    /**
+     * 流程定义名称
+     */
+    private String flowName;
+
+    /**
+     * 流程定义编码
+     */
+    private String flowCode;
+
+    /**
+     * 业务id
+     */
+    private String businessId;
+
+    /**
+     * 节点类型（0开始节点 1中间节点 2结束节点 3互斥网关 4并行网关）
+     */
+    private Integer nodeType;
+
+    /**
+     * 流程节点编码   每个流程的nodeCode是唯一的,即definitionId+nodeCode唯一,在数据库层面做了控制
+     */
+    private String nodeCode;
+
+    /**
+     * 流程节点名称
+     */
+    private String nodeName;
+
+    /**
+     * 流程变量
+     */
+    private String variable;
+
+    /**
+     * 流程状态（0待提交 1审批中 2 审批通过 3自动通过 8已完成 9已退回 10失效）
+     */
+    private String flowStatus;
+
+    /**
+     * 流程状态
+     */
+    private String flowStatusName;
+
+    /**
+     * 流程激活状态（0挂起 1激活）
+     */
+    private Integer activityStatus;
+
+    /**
+     * 审批表单是否自定义（Y是 N否）
+     */
+    private String formCustom;
+
+    /**
+     * 审批表单路径
+     */
+    private String formPath;
+
+    /**
+     * 扩展字段，预留给业务系统使用
+     */
+    private String ext;
+
+    /**
+     * 流程定义版本
+     */
+    private String version;
+
+    /**
+     * 创建者
+     */
+    private String createBy;
+
+    /**
+     * 申请人
+     */
+    @Translation(type = TransConstant.USER_ID_TO_NICKNAME, mapper = "createBy")
+    private String createByName;
+
+    /**
+     * 流程分类id
+     */
+    private String category;
+
+    /**
+     * 流程分类名称
+     */
+    @Translation(type = FlowConstant.CATEGORY_ID_TO_NAME, mapper = "category")
+    private String categoryName;
+
+}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowTaskVo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowTaskVo.java
new file mode 100644
index 0000000..1b1191e
--- /dev/null
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/FlowTaskVo.java
@@ -0,0 +1,182 @@
+package org.dromara.workflow.domain.vo;
+
+import lombok.Data;
+import org.dromara.common.translation.annotation.Translation;
+import org.dromara.common.translation.constant.TransConstant;
+import org.dromara.warm.flow.core.entity.User;
+import org.dromara.workflow.common.constant.FlowConstant;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 任务视图
+ *
+ * @author may
+ */
+@Data
+public class FlowTaskVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    private Long id;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     * 删除标记
+     */
+    private String delFlag;
+
+    /**
+     * 对应flow_definition表的id
+     */
+    private Long definitionId;
+
+    /**
+     * 流程实例表id
+     */
+    private Long instanceId;
+
+    /**
+     * 流程定义名称
+     */
+    private String flowName;
+
+    /**
+     * 业务id
+     */
+    private String businessId;
+
+    /**
+     * 节点编码
+     */
+    private String nodeCode;
+
+    /**
+     * 节点名称
+     */
+    private String nodeName;
+
+    /**
+     * 节点类型（0开始节点 1中间节点 2结束节点 3互斥网关 4并行网关）
+     */
+    private Integer nodeType;
+
+    /**
+     * 权限标识 permissionFlag的list形式
+     */
+    private List<String> permissionList;
+
+    /**
+     * 流程用户列表
+     */
+    private List<User> userList;
+
+    /**
+     * 审批表单是否自定义（Y是 N否）
+     */
+    private String formCustom;
+
+    /**
+     * 审批表单
+     */
+    private String formPath;
+
+    /**
+     * 流程定义编码
+     */
+    private String flowCode;
+
+    /**
+     * 流程版本号
+     */
+    private String version;
+
+    /**
+     * 流程状态
+     */
+    private String flowStatus;
+
+    /**
+     * 流程分类id
+     */
+    private String category;
+
+    /**
+     * 流程分类名称
+     */
+    @Translation(type = FlowConstant.CATEGORY_ID_TO_NAME, mapper = "category")
+    private String categoryName;
+
+    /**
+     * 流程状态
+     */
+    @Translation(type = TransConstant.DICT_TYPE_TO_LABEL, mapper = "flowStatus", other = "wf_business_status")
+    private String flowStatusName;
+
+    /**
+     * 办理人类型
+     */
+    private String type;
+
+    /**
+     * 办理人ids
+     */
+    private String assigneeIds;
+
+    /**
+     * 办理人名称
+     */
+    private String assigneeNames;
+
+    /**
+     * 抄送人id
+     */
+    private String processedBy;
+
+    /**
+     * 抄送人名称
+     */
+    @Translation(type = TransConstant.USER_ID_TO_NICKNAME, mapper = "processedBy")
+    private String processedByName;
+
+    /**
+     * 流程签署比例值 大于0为票签，会签
+     */
+    private BigDecimal nodeRatio;
+
+    /**
+     * 申请人id
+     */
+    private String createBy;
+
+    /**
+     * 申请人名称
+     */
+    @Translation(type = TransConstant.USER_ID_TO_NICKNAME, mapper = "createBy")
+    private String createByName;
+
+    /**
+     * 是否为申请人节点
+     */
+    private Boolean applyNode;
+
+    /**
+     * 按钮权限
+     */
+    private List<ButtonPermissionVo> buttonList;
+
+}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/TestLeaveVo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/TestLeaveVo.java
new file mode 100644
index 0000000..741949f
--- /dev/null
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/TestLeaveVo.java
@@ -0,0 +1,70 @@
+package org.dromara.workflow.domain.vo;
+
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.workflow.domain.TestLeave;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 请假视图对象 test_leave
+ *
+ * @author may
+ * @date 2023-07-21
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = TestLeave.class)
+public class TestLeaveVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @ExcelProperty(value = "主键")
+    private Long id;
+
+    /**
+     * 请假类型
+     */
+    @ExcelProperty(value = "请假类型")
+    private String leaveType;
+
+    /**
+     * 开始时间
+     */
+    @ExcelProperty(value = "开始时间")
+    private Date startDate;
+
+    /**
+     * 结束时间
+     */
+    @ExcelProperty(value = "结束时间")
+    private Date endDate;
+
+    /**
+     * 请假天数
+     */
+    @ExcelProperty(value = "请假天数")
+    private Integer leaveDays;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "请假原因")
+    private String remark;
+
+    /**
+     * 状态
+     */
+    @ExcelProperty(value = "状态")
+    private String status;
+
+}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/handler/FlowProcessEventHandler.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/handler/FlowProcessEventHandler.java
new file mode 100644
index 0000000..fc7bfcb
--- /dev/null
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/handler/FlowProcessEventHandler.java
@@ -0,0 +1,84 @@
+package org.dromara.workflow.handler;
+
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.domain.event.ProcessDeleteEvent;
+import org.dromara.common.core.domain.event.ProcessEvent;
+import org.dromara.common.core.domain.event.ProcessTaskEvent;
+import org.dromara.common.core.utils.SpringUtils;
+import org.dromara.warm.flow.core.entity.Instance;
+import org.dromara.workflow.common.ConditionalOnEnable;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+/**
+ * 流程监听服务
+ *
+ * @author may
+ * @date 2024-06-02
+ */
+@ConditionalOnEnable
+@Slf4j
+@Component
+public class FlowProcessEventHandler {
+
+    /**
+     * 总体流程监听(例如: 草稿，撤销，退回，作废，终止，已完成，单任务完成等)
+     *
+     * @param flowCode 流程定义编码
+     * @param instance 实例数据
+     * @param status   流程状态
+     * @param params   办理参数
+     * @param submit   当为true时为申请人节点办理
+     */
+    public void processHandler(String flowCode, Instance instance, String status, Map<String, Object> params, boolean submit) {
+        log.info("【流程事件发布】流程编码: {}, 业务ID: {}, 流程状态: {}, 节点类型: {}, 节点编码: {}, 节点名称: {}, 是否申请人节点: {}, 参数: {}",
+                flowCode, instance.getBusinessId(), status, instance.getNodeType(), instance.getNodeCode(), instance.getNodeName(), submit, params);
+        ProcessEvent processEvent = new ProcessEvent();
+        processEvent.setFlowCode(flowCode);
+        processEvent.setBusinessId(instance.getBusinessId());
+        processEvent.setNodeType(instance.getNodeType());
+        processEvent.setNodeCode(instance.getNodeCode());
+        processEvent.setNodeName(instance.getNodeName());
+        processEvent.setStatus(status);
+        processEvent.setParams(params);
+        processEvent.setSubmit(submit);
+        SpringUtils.context().publishEvent(processEvent);
+    }
+
+    /**
+     * 执行创建任务监听
+     *
+     * @param flowCode 流程定义编码
+     * @param instance 实例数据
+     * @param taskId   任务id
+     */
+    public void processTaskHandler(String flowCode, Instance instance, Long taskId) {
+        log.info("【流程任务事件发布】流程编码: {}, 业务ID: {}, 节点类型: {}, 节点编码: {}, 节点名称: {}, 任务ID: {}",
+                flowCode, instance.getBusinessId(), instance.getNodeType(), instance.getNodeCode(), instance.getNodeName(), taskId);
+        ProcessTaskEvent processTaskEvent = new ProcessTaskEvent();
+        processTaskEvent.setFlowCode(flowCode);
+        processTaskEvent.setBusinessId(instance.getBusinessId());
+        processTaskEvent.setNodeType(instance.getNodeType());
+        processTaskEvent.setNodeCode(instance.getNodeCode());
+        processTaskEvent.setNodeName(instance.getNodeName());
+        processTaskEvent.setTaskId(taskId);
+        processTaskEvent.setStatus(instance.getFlowStatus());
+        SpringUtils.context().publishEvent(processTaskEvent);
+    }
+
+    /**
+     * 删除流程监听
+     *
+     * @param flowCode   流程定义编码
+     * @param businessId 业务ID
+     */
+    public void processDeleteHandler(String flowCode, String businessId) {
+        log.info("【流程删除事件发布】, 流程编码: {}, 业务ID: {}", flowCode, businessId);
+        ProcessDeleteEvent processDeleteEvent = new ProcessDeleteEvent();
+        processDeleteEvent.setFlowCode(flowCode);
+        processDeleteEvent.setBusinessId(businessId);
+        SpringUtils.context().publishEvent(processDeleteEvent);
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/handler/WorkflowPermissionHandler.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/handler/WorkflowPermissionHandler.java
new file mode 100644
index 0000000..f9ede15
--- /dev/null
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/handler/WorkflowPermissionHandler.java
@@ -0,0 +1,59 @@
+package org.dromara.workflow.handler;
+
+import cn.hutool.core.collection.CollUtil;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.warm.flow.core.dto.FlowParams;
+import org.dromara.warm.flow.core.handler.PermissionHandler;
+import org.dromara.workflow.common.ConditionalOnEnable;
+import org.dromara.workflow.service.IFlwCommonService;
+import org.springframework.stereotype.Component;
+
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * 办理人权限处理器
+ *
+ * @author AprilWind
+ */
+@ConditionalOnEnable
+@RequiredArgsConstructor
+@Component
+@Slf4j
+public class WorkflowPermissionHandler implements PermissionHandler {
+
+    private final IFlwCommonService flwCommonService;
+
+    /**
+     * 办理人权限标识，比如用户，角色，部门等，用于校验是否有权限办理任务
+     * 后续在{@link FlowParams#getPermissionFlag}  中获取
+     * 返回当前用户权限集合
+     */
+    @Override
+    public List<String> permissions() {
+        return Collections.singletonList(LoginHelper.getUserIdStr());
+    }
+
+    /**
+     * 获取当前办理人
+     *
+     * @return 当前办理人
+     */
+    @Override
+    public String getHandler() {
+        return LoginHelper.getUserIdStr();
+    }
+
+    /**
+     * 转换办理人，比如设计器中预设了能办理的人，如果其中包含角色或者部门id等，可以通过此接口进行转换成用户id
+     */
+    @Override
+    public List<String> convertPermissions(List<String> permissions) {
+        if (CollUtil.isNotEmpty(permissions)) {
+            permissions = flwCommonService.buildUser(permissions);
+        }
+        return permissions;
+    }
+}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/listener/WorkflowGlobalListener.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/listener/WorkflowGlobalListener.java
new file mode 100644
index 0000000..6214a86
--- /dev/null
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/listener/WorkflowGlobalListener.java
@@ -0,0 +1,193 @@
+package org.dromara.workflow.listener;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.map.MapUtil;
+import cn.hutool.core.util.ObjectUtil;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.enums.BusinessStatusEnum;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.warm.flow.core.FlowEngine;
+import org.dromara.warm.flow.core.dto.FlowParams;
+import org.dromara.warm.flow.core.entity.Definition;
+import org.dromara.warm.flow.core.entity.Instance;
+import org.dromara.warm.flow.core.entity.Task;
+import org.dromara.warm.flow.core.listener.GlobalListener;
+import org.dromara.warm.flow.core.listener.ListenerVariable;
+import org.dromara.warm.flow.core.service.InsService;
+import org.dromara.warm.flow.orm.entity.FlowInstance;
+import org.dromara.warm.flow.orm.entity.FlowTask;
+import org.dromara.workflow.common.ConditionalOnEnable;
+import org.dromara.workflow.common.constant.FlowConstant;
+import org.dromara.workflow.common.enums.TaskStatusEnum;
+import org.dromara.workflow.domain.bo.FlowCopyBo;
+import org.dromara.workflow.handler.FlowProcessEventHandler;
+import org.dromara.workflow.service.IFlwCommonService;
+import org.dromara.workflow.service.IFlwInstanceService;
+import org.dromara.workflow.service.IFlwTaskService;
+import org.springframework.stereotype.Component;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 全局任务办理监听
+ *
+ * @author may
+ */
+@ConditionalOnEnable
+@Component
+@Slf4j
+@RequiredArgsConstructor
+public class WorkflowGlobalListener implements GlobalListener {
+
+    private final IFlwTaskService flwTaskService;
+    private final IFlwInstanceService instanceService;
+    private final FlowProcessEventHandler flowProcessEventHandler;
+    private final IFlwCommonService flwCommonService;
+    private final InsService insService;
+
+    /**
+     * 创建监听器，任务创建时执行
+     *
+     * @param listenerVariable 监听器变量
+     */
+    @Override
+    public void create(ListenerVariable listenerVariable) {
+
+    }
+
+    /**
+     * 开始监听器，任务开始办理时执行
+     *
+     * @param listenerVariable 监听器变量
+     */
+    @Override
+    public void start(ListenerVariable listenerVariable) {
+    }
+
+    /**
+     * 分派监听器，动态修改代办任务信息
+     *
+     * @param listenerVariable 监听器变量
+     */
+    @Override
+    public void assignment(ListenerVariable listenerVariable) {
+        Map<String, Object> variable = listenerVariable.getVariable();
+        List<Task> nextTasks = listenerVariable.getNextTasks();
+        FlowParams flowParams = listenerVariable.getFlowParams();
+        Definition definition = listenerVariable.getDefinition();
+        Instance instance = listenerVariable.getInstance();
+        String applyNodeCode = flwCommonService.applyNodeCode(definition.getId());
+        for (Task flowTask : nextTasks) {
+            // 如果办理或者退回并行存在需要指定办理人，则直接覆盖办理人
+            if (variable.containsKey(flowTask.getNodeCode()) && (TaskStatusEnum.PASS.getStatus().equals(flowParams.getHisStatus())
+                    || TaskStatusEnum.BACK.getStatus().equals(flowParams.getHisStatus()))) {
+                String userIds = variable.get(flowTask.getNodeCode()).toString();
+                flowTask.setPermissionList(List.of(userIds.split(StringUtils.SEPARATOR)));
+                variable.remove(flowTask.getNodeCode());
+            }
+            // 如果是申请节点，则把启动人添加到办理人
+            if (flowTask.getNodeCode().equals(applyNodeCode)) {
+                flowTask.setPermissionList(List.of(instance.getCreateBy()));
+            }
+        }
+    }
+
+    /**
+     * 完成监听器，当前任务完成后执行
+     *
+     * @param listenerVariable 监听器变量
+     */
+    @Override
+    public void finish(ListenerVariable listenerVariable) {
+        Instance instance = listenerVariable.getInstance();
+        Definition definition = listenerVariable.getDefinition();
+        Task task = listenerVariable.getTask();
+        Map<String, Object> params = new HashMap<>();
+        FlowParams flowParams = listenerVariable.getFlowParams();
+        Map<String, Object> variable = new HashMap<>();
+        if (ObjectUtil.isNotNull(flowParams)) {
+            // 历史任务扩展(通常为附件)
+            params.put("hisTaskExt", flowParams.getHisTaskExt());
+            // 办理人
+            params.put("handler", flowParams.getHandler());
+            // 办理意见
+            params.put("message", flowParams.getMessage());
+            variable = flowParams.getVariable();
+        }
+        //申请人提交事件
+        Boolean submit = MapUtil.getBool(variable, FlowConstant.SUBMIT);
+        if (submit != null && submit) {
+            flowProcessEventHandler.processHandler(definition.getFlowCode(), instance, instance.getFlowStatus(), variable, true);
+        } else {
+            // 判断流程状态（发布：撤销，退回，作废，终止，已完成事件）
+            String status = determineFlowStatus(instance);
+            if (StringUtils.isNotBlank(status)) {
+                flowProcessEventHandler.processHandler(definition.getFlowCode(), instance, status, params, false);
+            }
+        }
+        //发布任务事件
+        if (task != null) {
+            flowProcessEventHandler.processTaskHandler(definition.getFlowCode(), instance, task.getId());
+        }
+        if (ObjectUtil.isNull(flowParams)) {
+            return;
+        }
+        // 只有办理或者退回的时候才执行消息通知和抄送
+        if (TaskStatusEnum.PASS.getStatus().equals(flowParams.getHisStatus())
+                || TaskStatusEnum.BACK.getStatus().equals(flowParams.getHisStatus())) {
+            if (variable != null) {
+                if (variable.containsKey(FlowConstant.FLOW_COPY_LIST)) {
+                    List<FlowCopyBo> flowCopyList = (List<FlowCopyBo>) variable.get(FlowConstant.FLOW_COPY_LIST);
+                    // 添加抄送人
+                    flwTaskService.setCopy(task, flowCopyList);
+                }
+                if (variable.containsKey(FlowConstant.MESSAGE_TYPE)) {
+                    List<String> messageType = (List<String>) variable.get(FlowConstant.MESSAGE_TYPE);
+                    String notice = (String) variable.get(FlowConstant.MESSAGE_NOTICE);
+                    // 消息通知
+                    if (CollUtil.isNotEmpty(messageType)) {
+                        flwCommonService.sendMessage(definition.getFlowName(), instance.getId(), messageType, notice);
+                    }
+                }
+                FlowInstance ins = new FlowInstance();
+                Map<String, Object> variableMap = instance.getVariableMap();
+                variableMap.remove(FlowConstant.FLOW_COPY_LIST);
+                variableMap.remove(FlowConstant.MESSAGE_TYPE);
+                variableMap.remove(FlowConstant.MESSAGE_NOTICE);
+                variableMap.remove(FlowConstant.SUBMIT);
+                ins.setId(instance.getId());
+                ins.setVariable(FlowEngine.jsonConvert.objToStr(variableMap));
+                insService.updateById(ins);
+            }
+        }
+    }
+
+    /**
+     * 根据流程实例确定最终状态
+     *
+     * @param instance 流程实例
+     * @return 流程最终状态
+     */
+    private String determineFlowStatus(Instance instance) {
+        String flowStatus = instance.getFlowStatus();
+        if (StringUtils.isNotBlank(flowStatus) && BusinessStatusEnum.initialState(flowStatus)) {
+            log.info("流程实例当前状态: {}", flowStatus);
+            return flowStatus;
+        } else {
+            Long instanceId = instance.getId();
+            List<FlowTask> flowTasks = flwTaskService.selectByInstId(instanceId);
+            if (CollUtil.isEmpty(flowTasks)) {
+                String status = BusinessStatusEnum.FINISH.getStatus();
+                // 更新流程状态为已完成
+                instanceService.updateStatus(instanceId, status);
+                log.info("流程已结束，状态更新为: {}", status);
+                return status;
+            }
+            return null;
+        }
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwCategoryMapper.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwCategoryMapper.java
new file mode 100644
index 0000000..c572788
--- /dev/null
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwCategoryMapper.java
@@ -0,0 +1,62 @@
+package org.dromara.workflow.mapper;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import org.dromara.common.mybatis.annotation.DataColumn;
+import org.dromara.common.mybatis.annotation.DataPermission;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.common.mybatis.helper.DataBaseHelper;
+import org.dromara.workflow.domain.FlowCategory;
+import org.dromara.workflow.domain.vo.FlowCategoryVo;
+
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+/**
+ * 流程分类Mapper接口
+ *
+ * @author may
+ * @date 2023-06-27
+ */
+public interface FlwCategoryMapper extends BaseMapperPlus<FlowCategory, FlowCategoryVo> {
+
+    /**
+     * 统计指定流程分类ID的分类数量
+     *
+     * @param categoryId 流程分类ID
+     * @return 该流程分类ID的分类数量
+     */
+    @DataPermission({
+            @DataColumn(key = "deptName", value = "createDept")
+    })
+    default long countCategoryById(Long categoryId) {
+        return this.selectCount(new LambdaQueryWrapper<FlowCategory>().eq(FlowCategory::getCategoryId, categoryId));
+    }
+
+    /**
+     * 根据父流程分类ID查询其所有子流程分类的列表
+     *
+     * @param parentId 父流程分类ID
+     * @return 包含子流程分类的列表
+     */
+    default List<FlowCategory> selectListByParentId(Long parentId) {
+        return this.selectList(new LambdaQueryWrapper<FlowCategory>()
+                .select(FlowCategory::getCategoryId)
+                .apply(DataBaseHelper.findInSet(parentId, "ancestors")));
+    }
+
+    /**
+     * 根据父流程分类ID查询包括父ID及其所有子流程分类ID的列表
+     *
+     * @param parentId 父流程分类ID
+     * @return 包含父ID和子流程分类ID的列表
+     */
+    default List<Long> selectCategoryIdsByParentId(Long parentId) {
+        return Stream.concat(
+                this.selectListByParentId(parentId).stream()
+                        .map(FlowCategory::getCategoryId),
+                Stream.of(parentId)
+        ).collect(Collectors.toList());
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwInstanceMapper.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwInstanceMapper.java
new file mode 100644
index 0000000..92809c8
--- /dev/null
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwInstanceMapper.java
@@ -0,0 +1,27 @@
+package org.dromara.workflow.mapper;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
+import org.dromara.workflow.domain.bo.FlowInstanceBo;
+import org.dromara.workflow.domain.vo.FlowInstanceVo;
+
+/**
+ * 实例信息Mapper接口
+ *
+ * @author may
+ * @date 2024-03-02
+ */
+public interface FlwInstanceMapper {
+
+    /**
+     * 流程实例信息
+     *
+     * @param page         分页
+     * @param queryWrapper 条件
+     * @return 结果
+     */
+    Page<FlowInstanceVo> selectInstanceList(@Param("page") Page<FlowInstanceVo> page, @Param(Constants.WRAPPER) Wrapper<FlowInstanceBo> queryWrapper);
+
+}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwTaskMapper.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwTaskMapper.java
new file mode 100644
index 0000000..fd86c82
--- /dev/null
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/FlwTaskMapper.java
@@ -0,0 +1,57 @@
+package org.dromara.workflow.mapper;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
+import org.dromara.workflow.domain.bo.FlowTaskBo;
+import org.dromara.workflow.domain.vo.FlowHisTaskVo;
+import org.dromara.workflow.domain.vo.FlowTaskVo;
+
+import java.util.List;
+
+
+/**
+ * 任务信息Mapper接口
+ *
+ * @author may
+ * @date 2024-03-02
+ */
+public interface FlwTaskMapper {
+
+    /**
+     * 获取待办信息
+     *
+     * @param page         分页
+     * @param queryWrapper 条件
+     * @return 结果
+     */
+    Page<FlowTaskVo> getListRunTask(@Param("page") Page<FlowTaskVo> page, @Param(Constants.WRAPPER) Wrapper<FlowTaskBo> queryWrapper);
+
+    /**
+     * 获取待办信息
+     *
+     * @param queryWrapper 条件
+     * @return 结果
+     */
+    List<FlowTaskVo> getListRunTask(@Param(Constants.WRAPPER) Wrapper<FlowTaskBo> queryWrapper);
+
+    /**
+     * 获取已办
+     *
+     * @param page         分页
+     * @param queryWrapper 条件
+     * @return 结果
+     */
+    Page<FlowHisTaskVo> getListFinishTask(@Param("page") Page<FlowTaskVo> page, @Param(Constants.WRAPPER) Wrapper<FlowTaskBo> queryWrapper);
+
+    /**
+     * 查询当前用户的抄送
+     *
+     * @param page         分页
+     * @param queryWrapper 条件
+     * @return 结果
+     */
+    Page<FlowTaskVo> getTaskCopyByPage(@Param("page") Page<FlowTaskVo> page, @Param(Constants.WRAPPER) QueryWrapper<FlowTaskBo> queryWrapper);
+}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/TestLeaveMapper.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/TestLeaveMapper.java
new file mode 100644
index 0000000..cd1edba
--- /dev/null
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/TestLeaveMapper.java
@@ -0,0 +1,15 @@
+package org.dromara.workflow.mapper;
+
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.workflow.domain.TestLeave;
+import org.dromara.workflow.domain.vo.TestLeaveVo;
+
+/**
+ * 请假Mapper接口
+ *
+ * @author may
+ * @date 2023-07-21
+ */
+public interface TestLeaveMapper extends BaseMapperPlus<TestLeave, TestLeaveVo> {
+
+}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwCategoryService.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwCategoryService.java
new file mode 100644
index 0000000..91f173d
--- /dev/null
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwCategoryService.java
@@ -0,0 +1,102 @@
+package org.dromara.workflow.service;
+
+import cn.hutool.core.lang.tree.Tree;
+import org.dromara.workflow.domain.bo.FlowCategoryBo;
+import org.dromara.workflow.domain.vo.FlowCategoryVo;
+
+import java.util.List;
+
+/**
+ * 流程分类Service接口
+ *
+ * @author may
+ */
+public interface IFlwCategoryService {
+
+    /**
+     * 查询流程分类
+     *
+     * @param categoryId 主键
+     * @return 流程分类
+     */
+    FlowCategoryVo queryById(Long categoryId);
+
+    /**
+     * 根据流程分类ID查询流程分类名称
+     *
+     * @param categoryId 流程分类ID
+     * @return 流程分类名称
+     */
+    String selectCategoryNameById(Long categoryId);
+
+    /**
+     * 查询符合条件的流程分类列表
+     *
+     * @param bo 查询条件
+     * @return 流程分类列表
+     */
+    List<FlowCategoryVo> queryList(FlowCategoryBo bo);
+
+    /**
+     * 查询流程分类树结构信息
+     *
+     * @param category 流程分类信息
+     * @return 流程分类树信息集合
+     */
+    List<Tree<String>> selectCategoryTreeList(FlowCategoryBo category);
+
+    /**
+     * 校验流程分类是否有数据权限
+     *
+     * @param categoryId 流程分类ID
+     */
+    void checkCategoryDataScope(Long categoryId);
+
+    /**
+     * 校验流程分类名称是否唯一
+     *
+     * @param category 流程分类信息
+     * @return 结果
+     */
+    boolean checkCategoryNameUnique(FlowCategoryBo category);
+
+    /**
+     * 查询流程分类是否存在流程定义
+     *
+     * @param categoryId 流程分类ID
+     * @return 结果 true 存在 false 不存在
+     */
+    boolean checkCategoryExistDefinition(Long categoryId);
+
+    /**
+     * 是否存在流程分类子节点
+     *
+     * @param categoryId 流程分类ID
+     * @return 结果
+     */
+    boolean hasChildByCategoryId(Long categoryId);
+
+    /**
+     * 新增流程分类
+     *
+     * @param bo 流程分类
+     * @return 是否新增成功
+     */
+    int insertByBo(FlowCategoryBo bo);
+
+    /**
+     * 修改流程分类
+     *
+     * @param bo 流程分类
+     * @return 是否修改成功
+     */
+    int updateByBo(FlowCategoryBo bo);
+
+    /**
+     * 删除流程分类信息
+     *
+     * @param categoryId 主键
+     * @return 是否删除成功
+     */
+    int deleteWithValidById(Long categoryId);
+}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwCommonService.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwCommonService.java
new file mode 100644
index 0000000..662d599
--- /dev/null
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwCommonService.java
@@ -0,0 +1,37 @@
+package org.dromara.workflow.service;
+
+import java.util.List;
+
+/**
+ * 通用 工作流服务
+ *
+ * @author LionLi
+ */
+public interface IFlwCommonService {
+
+    /**
+     * 构建工作流用户
+     *
+     * @param permissionList 办理用户
+     * @return 用户
+     */
+    List<String> buildUser(List<String> permissionList);
+
+    /**
+     * 发送消息
+     *
+     * @param flowName    流程定义名称
+     * @param instId      实例id
+     * @param messageType 消息类型
+     * @param message     消息内容，为空则发送默认配置的消息内容
+     */
+    void sendMessage(String flowName, Long instId, List<String> messageType, String message);
+
+    /**
+     * 申请人节点编码
+     *
+     * @param definitionId 流程定义id
+     * @return 申请人节点编码
+     */
+    String applyNodeCode(Long definitionId);
+}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwDefinitionService.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwDefinitionService.java
new file mode 100644
index 0000000..a2d6110
--- /dev/null
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwDefinitionService.java
@@ -0,0 +1,72 @@
+package org.dromara.workflow.service;
+
+import jakarta.servlet.http.HttpServletResponse;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.warm.flow.orm.entity.FlowDefinition;
+import org.dromara.workflow.domain.vo.FlowDefinitionVo;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * 流程定义 服务层
+ *
+ * @author may
+ */
+public interface IFlwDefinitionService {
+
+    /**
+     * 查询流程定义列表
+     *
+     * @param flowDefinition 参数
+     * @param pageQuery      分页
+     * @return 返回分页列表
+     */
+    TableDataInfo<FlowDefinitionVo> queryList(FlowDefinition flowDefinition, PageQuery pageQuery);
+
+    /**
+     * 查询未发布的流程定义列表
+     *
+     * @param flowDefinition 参数
+     * @param pageQuery      分页
+     * @return 返回分页列表
+     */
+    TableDataInfo<FlowDefinitionVo> unPublishList(FlowDefinition flowDefinition, PageQuery pageQuery);
+
+    /**
+     * 发布流程定义
+     *
+     * @param id 流程定义id
+     * @return 结果
+     */
+    boolean publish(Long id);
+
+    /**
+     * 导出流程定义
+     *
+     * @param id       流程定义id
+     * @param response 响应
+     * @throws IOException 异常
+     */
+    void exportDef(Long id, HttpServletResponse response) throws IOException;
+
+    /**
+     * 导入流程定义
+     *
+     * @param file     文件
+     * @param category 分类
+     * @return 结果
+     */
+    boolean importJson(MultipartFile file, String category);
+
+    /**
+     * 删除流程定义
+     *
+     * @param ids 流程定义id
+     * @return 结果
+     */
+    boolean removeDef(List<Long> ids);
+
+}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwInstanceService.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwInstanceService.java
new file mode 100644
index 0000000..01e5124
--- /dev/null
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwInstanceService.java
@@ -0,0 +1,159 @@
+package org.dromara.workflow.service;
+
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.warm.flow.orm.entity.FlowInstance;
+import org.dromara.workflow.domain.bo.FlowCancelBo;
+import org.dromara.workflow.domain.bo.FlowInstanceBo;
+import org.dromara.workflow.domain.bo.FlowInvalidBo;
+import org.dromara.workflow.domain.vo.FlowInstanceVo;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 流程实例 服务层
+ *
+ * @author may
+ */
+public interface IFlwInstanceService {
+
+    /**
+     * 分页查询正在运行的流程实例
+     *
+     * @param flowInstanceBo 流程实例
+     * @param pageQuery      分页
+     * @return 结果
+     */
+    TableDataInfo<FlowInstanceVo> selectRunningInstanceList(FlowInstanceBo flowInstanceBo, PageQuery pageQuery);
+
+    /**
+     * 分页查询已结束的流程实例
+     *
+     * @param flowInstanceBo 流程实例
+     * @param pageQuery      分页
+     * @return 结果
+     */
+    TableDataInfo<FlowInstanceVo> selectFinishInstanceList(FlowInstanceBo flowInstanceBo, PageQuery pageQuery);
+
+    /**
+     * 根据业务id查询流程实例详细信息
+     *
+     * @param businessId 业务id
+     * @return 结果
+     */
+    FlowInstanceVo queryByBusinessId(Long businessId);
+
+    /**
+     * 按照业务id查询流程实例
+     *
+     * @param businessId 业务id
+     * @return 结果
+     */
+    FlowInstance selectInstByBusinessId(String businessId);
+
+    /**
+     * 按照实例id查询流程实例
+     *
+     * @param instanceId 实例id
+     * @return 结果
+     */
+    FlowInstance selectInstById(Long instanceId);
+
+    /**
+     * 按照实例id查询流程实例
+     *
+     * @param instanceIds 实例id
+     * @return 结果
+     */
+    List<FlowInstance> selectInstListByIdList(List<Long> instanceIds);
+
+    /**
+     * 按照业务id删除流程实例
+     *
+     * @param businessIds 业务id
+     * @return 结果
+     */
+    boolean deleteByBusinessIds(List<Long> businessIds);
+
+    /**
+     * 按照实例id删除流程实例
+     *
+     * @param instanceIds 实例id
+     * @return 结果
+     */
+    boolean deleteByInstanceIds(List<Long> instanceIds);
+
+    /**
+     * 撤销流程
+     *
+     * @param bo 参数
+     * @return 结果
+     */
+    boolean cancelProcessApply(FlowCancelBo bo);
+
+    /**
+     * 获取当前登陆人发起的流程实例
+     *
+     * @param instanceBo 流程实例
+     * @param pageQuery  分页
+     * @return 结果
+     */
+    TableDataInfo<FlowInstanceVo> selectCurrentInstanceList(FlowInstanceBo instanceBo, PageQuery pageQuery);
+
+    /**
+     * 获取流程图,流程记录
+     *
+     * @param businessId 业务id
+     * @return 结果
+     */
+    Map<String, Object> flowHisTaskList(String businessId);
+
+    /**
+     * 按照实例id更新状态
+     *
+     * @param instanceId 实例id
+     * @param status     状态
+     */
+    void updateStatus(Long instanceId, String status);
+
+    /**
+     * 获取流程变量
+     *
+     * @param instanceId 实例id
+     * @return 结果
+     */
+    Map<String, Object> instanceVariable(Long instanceId);
+
+    /**
+     * 设置流程变量
+     *
+     * @param instanceId 实例id
+     * @param variable   流程变量
+     */
+    void setVariable(Long instanceId, Map<String, Object> variable);
+
+    /**
+     * 按任务id查询实例
+     *
+     * @param taskId 任务id
+     * @return 结果
+     */
+    FlowInstance selectByTaskId(Long taskId);
+
+    /**
+     * 按任务id查询实例
+     *
+     * @param taskIdList 任务id
+     * @return 结果
+     */
+    List<FlowInstance> selectByTaskIdList(List<Long> taskIdList);
+
+    /**
+     * 作废流程
+     *
+     * @param bo 流程实例
+     * @return 结果
+     */
+    boolean processInvalid(FlowInvalidBo bo);
+}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwNodeExtService.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwNodeExtService.java
new file mode 100644
index 0000000..9595165
--- /dev/null
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwNodeExtService.java
@@ -0,0 +1,22 @@
+package org.dromara.workflow.service;
+
+import org.dromara.workflow.domain.vo.ButtonPermissionVo;
+
+import java.util.List;
+
+/**
+ * 流程节点扩展属性 服务层
+ *
+ * @author AprilWind
+ */
+public interface IFlwNodeExtService {
+
+    /**
+     * 从扩展属性构建按钮权限列表：根据 ext 中记录的权限值，标记每个按钮是否勾选
+     *
+     * @param ext 扩展属性 JSON 字符串
+     * @return 按钮权限 VO 列表
+     */
+    List<ButtonPermissionVo> buildButtonPermissionsFromExt(String ext);
+
+}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwTaskAssigneeService.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwTaskAssigneeService.java
new file mode 100644
index 0000000..830abaf
--- /dev/null
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwTaskAssigneeService.java
@@ -0,0 +1,24 @@
+package org.dromara.workflow.service;
+
+import org.dromara.common.core.domain.dto.UserDTO;
+
+import java.util.List;
+
+/**
+ * 流程设计器-获取办理人
+ *
+ * @author AprilWind
+ */
+public interface IFlwTaskAssigneeService {
+
+    /**
+     * 批量解析多个存储标识符（storageIds），按类型分类并合并查询用户列表
+     * 输入格式支持多个以逗号分隔的标识（如 "user:123,role:456,789"）
+     * 会自动去重返回结果，非法格式的标识将被忽略
+     *
+     * @param storageIds 多个存储标识符字符串（逗号分隔）
+     * @return 合并后的用户列表，去重后返回，非法格式的标识将被跳过
+     */
+    List<UserDTO> fetchUsersByStorageIds(String storageIds);
+
+}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwTaskService.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwTaskService.java
new file mode 100644
index 0000000..26dd7c9
--- /dev/null
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwTaskService.java
@@ -0,0 +1,218 @@
+package org.dromara.workflow.service;
+
+import org.dromara.common.core.domain.dto.StartProcessReturnDTO;
+import org.dromara.common.core.domain.dto.UserDTO;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.warm.flow.core.entity.Node;
+import org.dromara.warm.flow.core.entity.Task;
+import org.dromara.warm.flow.orm.entity.FlowHisTask;
+import org.dromara.warm.flow.orm.entity.FlowNode;
+import org.dromara.warm.flow.orm.entity.FlowTask;
+import org.dromara.workflow.domain.bo.*;
+import org.dromara.workflow.domain.vo.FlowHisTaskVo;
+import org.dromara.workflow.domain.vo.FlowTaskVo;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 任务 服务层
+ *
+ * @author may
+ */
+public interface IFlwTaskService {
+
+    /**
+     * 启动任务
+     *
+     * @param startProcessBo 启动流程参数
+     * @return 结果
+     */
+    StartProcessReturnDTO startWorkFlow(StartProcessBo startProcessBo);
+
+    /**
+     * 办理任务
+     *
+     * @param completeTaskBo 办理任务参数
+     * @return 结果
+     */
+    boolean completeTask(CompleteTaskBo completeTaskBo);
+
+    /**
+     * 添加抄送人
+     *
+     * @param task         任务信息
+     * @param flowCopyList 抄送人
+     */
+    void setCopy(Task task, List<FlowCopyBo> flowCopyList);
+
+    /**
+     * 查询当前用户的待办任务
+     *
+     * @param flowTaskBo 参数
+     * @param pageQuery  分页
+     * @return 结果
+     */
+    TableDataInfo<FlowTaskVo> pageByTaskWait(FlowTaskBo flowTaskBo, PageQuery pageQuery);
+
+    /**
+     * 查询所有待办任务
+     *
+     * @param flowTaskBo 参数
+     * @param pageQuery  分页
+     * @return 结果
+     */
+    TableDataInfo<FlowHisTaskVo> pageByTaskFinish(FlowTaskBo flowTaskBo, PageQuery pageQuery);
+
+    /**
+     * 查询待办任务
+     *
+     * @param flowTaskBo 参数
+     * @param pageQuery  分页
+     * @return 结果
+     */
+    TableDataInfo<FlowTaskVo> pageByAllTaskWait(FlowTaskBo flowTaskBo, PageQuery pageQuery);
+
+    /**
+     * 查询已办任务
+     *
+     * @param flowTaskBo 参数
+     * @param pageQuery  分页
+     * @return 结果
+     */
+    TableDataInfo<FlowHisTaskVo> pageByAllTaskFinish(FlowTaskBo flowTaskBo, PageQuery pageQuery);
+
+    /**
+     * 查询当前用户的抄送
+     *
+     * @param flowTaskBo 参数
+     * @param pageQuery  分页
+     * @return 结果
+     */
+    TableDataInfo<FlowTaskVo> pageByTaskCopy(FlowTaskBo flowTaskBo, PageQuery pageQuery);
+
+    /**
+     * 修改任务办理人
+     *
+     * @param taskIdList 任务id
+     * @param userId     用户id
+     * @return 结果
+     */
+    boolean updateAssignee(List<Long> taskIdList, String userId);
+
+    /**
+     * 驳回审批
+     *
+     * @param bo 参数
+     * @return 结果
+     */
+    boolean backProcess(BackProcessBo bo);
+
+    /**
+     * 获取可驳回的前置节点
+     *
+     * @param definitionId 流程定义id
+     * @param nowNodeCode  当前节点
+     * @return 结果
+     */
+    List<Node> getBackTaskNode(Long definitionId, String nowNodeCode);
+
+    /**
+     * 终止任务
+     *
+     * @param bo 参数
+     * @return 结果
+     */
+    boolean terminationTask(FlowTerminationBo bo);
+
+    /**
+     * 按照任务id查询任务
+     *
+     * @param taskIdList 任务id
+     * @return 结果
+     */
+    List<FlowTask> selectByIdList(List<Long> taskIdList);
+
+    /**
+     * 按照任务id查询任务
+     *
+     * @param taskId 任务id
+     * @return 结果
+     */
+    FlowTaskVo selectById(Long taskId);
+
+    /**
+     * 获取下一节点信息
+     *
+     * @param bo 参数
+     * @return 结果
+     */
+    List<FlowNode> getNextNodeList(FlowNextNodeBo bo);
+
+    /**
+     * 按照任务id查询任务
+     *
+     * @param taskIdList 任务id
+     * @return 结果
+     */
+    List<FlowHisTask> selectHisTaskByIdList(List<Long> taskIdList);
+
+    /**
+     * 按照任务id查询任务
+     *
+     * @param taskId 任务id
+     * @return 结果
+     */
+    FlowHisTask selectHisTaskById(Long taskId);
+
+    /**
+     * 按照实例id查询任务
+     *
+     * @param instanceIdList 流程实例id
+     * @return 结果
+     */
+    List<FlowTask> selectByInstIdList(List<Long> instanceIdList);
+
+    /**
+     * 按照实例id查询任务
+     *
+     * @param instanceId 流程实例id
+     * @return 结果
+     */
+    List<FlowTask> selectByInstId(Long instanceId);
+
+    /**
+     * 任务操作
+     *
+     * @param bo            参数
+     * @param taskOperation 操作类型，委派 delegateTask、转办 transferTask、加签 addSignature、减签 reductionSignature
+     * @return 结果
+     */
+    boolean taskOperation(TaskOperationBo bo, String taskOperation);
+
+    /**
+     * 获取任务所有办理人
+     *
+     * @param taskIdList 任务id
+     * @return 结果
+     */
+    Map<Long, List<UserDTO>> currentTaskAllUser(List<Long> taskIdList);
+
+    /**
+     * 获取当前任务的所有办理人
+     *
+     * @param taskId 任务id
+     * @return 结果
+     */
+    List<UserDTO> currentTaskAllUser(Long taskId);
+
+    /**
+     * 按照节点编码查询节点
+     *
+     * @param nodeCode     节点编码
+     * @param definitionId 流程定义id
+     * @return 节点
+     */
+    FlowNode getByNodeCode(String nodeCode, Long definitionId);
+}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/ITestLeaveService.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/ITestLeaveService.java
new file mode 100644
index 0000000..67b50ba
--- /dev/null
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/ITestLeaveService.java
@@ -0,0 +1,47 @@
+package org.dromara.workflow.service;
+
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.workflow.domain.bo.TestLeaveBo;
+import org.dromara.workflow.domain.vo.TestLeaveVo;
+
+import java.util.List;
+
+/**
+ * 请假Service接口
+ *
+ * @author may
+ * @date 2023-07-21
+ */
+public interface ITestLeaveService {
+
+    /**
+     * 查询请假
+     */
+    TestLeaveVo queryById(Long id);
+
+    /**
+     * 查询请假列表
+     */
+    TableDataInfo<TestLeaveVo> queryPageList(TestLeaveBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询请假列表
+     */
+    List<TestLeaveVo> queryList(TestLeaveBo bo);
+
+    /**
+     * 新增请假
+     */
+    TestLeaveVo insertByBo(TestLeaveBo bo);
+
+    /**
+     * 修改请假
+     */
+    TestLeaveVo updateByBo(TestLeaveBo bo);
+
+    /**
+     * 校验并批量删除请假信息
+     */
+    Boolean deleteWithValidByIds(List<Long> ids);
+}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/CategoryNameTranslationImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/CategoryNameTranslationImpl.java
new file mode 100644
index 0000000..883a967
--- /dev/null
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/CategoryNameTranslationImpl.java
@@ -0,0 +1,31 @@
+package org.dromara.workflow.service.impl;
+
+import cn.hutool.core.convert.Convert;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.translation.annotation.TranslationType;
+import org.dromara.common.translation.core.TranslationInterface;
+import org.dromara.workflow.common.ConditionalOnEnable;
+import org.dromara.workflow.common.constant.FlowConstant;
+import org.dromara.workflow.service.IFlwCategoryService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 流程分类名称翻译实现
+ *
+ * @author AprilWind
+ */
+@ConditionalOnEnable
+@Slf4j
+@RequiredArgsConstructor
+@Service
+@TranslationType(type = FlowConstant.CATEGORY_ID_TO_NAME)
+public class CategoryNameTranslationImpl implements TranslationInterface<String> {
+
+    private final IFlwCategoryService flwCategoryService;
+
+    @Override
+    public String translation(Object key, String other) {
+        return flwCategoryService.selectCategoryNameById(Convert.toLong(key));
+    }
+}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwCategoryServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwCategoryServiceImpl.java
new file mode 100644
index 0000000..cd29057
--- /dev/null
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwCategoryServiceImpl.java
@@ -0,0 +1,258 @@
+package org.dromara.workflow.service.impl;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.lang.tree.Tree;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.constant.SystemConstants;
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.ObjectUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.core.utils.TreeBuildUtils;
+import org.dromara.common.mybatis.helper.DataBaseHelper;
+import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.warm.flow.core.service.DefService;
+import org.dromara.warm.flow.orm.entity.FlowDefinition;
+import org.dromara.workflow.common.ConditionalOnEnable;
+import org.dromara.workflow.common.constant.FlowConstant;
+import org.dromara.workflow.domain.FlowCategory;
+import org.dromara.workflow.domain.bo.FlowCategoryBo;
+import org.dromara.workflow.domain.vo.FlowCategoryVo;
+import org.dromara.workflow.mapper.FlwCategoryMapper;
+import org.dromara.workflow.service.IFlwCategoryService;
+import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.cache.annotation.Cacheable;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 流程分类Service业务层处理
+ *
+ * @author may
+ */
+@ConditionalOnEnable
+@RequiredArgsConstructor
+@Service
+public class FlwCategoryServiceImpl implements IFlwCategoryService {
+
+    private final DefService defService;
+    private final FlwCategoryMapper baseMapper;
+
+    /**
+     * 查询流程分类
+     *
+     * @param categoryId 主键
+     * @return 流程分类
+     */
+    @Override
+    public FlowCategoryVo queryById(Long categoryId) {
+        return baseMapper.selectVoById(categoryId);
+    }
+
+    /**
+     * 根据流程分类ID查询流程分类名称
+     *
+     * @param categoryId 流程分类ID
+     * @return 流程分类名称
+     */
+    @Cacheable(cacheNames = FlowConstant.FLOW_CATEGORY_NAME, key = "#categoryId")
+    @Override
+    public String selectCategoryNameById(Long categoryId) {
+        if (ObjectUtil.isNull(categoryId)) {
+            return null;
+        }
+        FlowCategory category = baseMapper.selectOne(new LambdaQueryWrapper<FlowCategory>()
+                .select(FlowCategory::getCategoryName).eq(FlowCategory::getCategoryId, categoryId));
+        return ObjectUtils.notNullGetter(category, FlowCategory::getCategoryName);
+    }
+
+    /**
+     * 查询符合条件的流程分类列表
+     *
+     * @param bo 查询条件
+     * @return 流程分类列表
+     */
+    @Override
+    public List<FlowCategoryVo> queryList(FlowCategoryBo bo) {
+        LambdaQueryWrapper<FlowCategory> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    /**
+     * 查询流程分类树结构信息
+     *
+     * @param category 流程分类信息
+     * @return 流程分类树信息集合
+     */
+    @Override
+    public List<Tree<String>> selectCategoryTreeList(FlowCategoryBo category) {
+        List<FlowCategoryVo> categoryList = this.queryList(category);
+        if (CollUtil.isEmpty(categoryList)) {
+            return CollUtil.newArrayList();
+        }
+        return TreeBuildUtils.buildMultiRoot(
+                categoryList,
+                node -> String.valueOf(node.getCategoryId()),
+                node -> String.valueOf(node.getParentId()),
+                (node, treeNode) -> treeNode
+                        .setId(String.valueOf(node.getCategoryId()))
+                        .setParentId(String.valueOf(node.getParentId()))
+                        .setName(node.getCategoryName())
+                        .setWeight(node.getOrderNum())
+        );
+    }
+
+    /**
+     * 校验流程分类是否有数据权限
+     *
+     * @param categoryId 流程分类ID
+     */
+    @Override
+    public void checkCategoryDataScope(Long categoryId) {
+        if (ObjectUtil.isNull(categoryId)) {
+            return;
+        }
+        if (LoginHelper.isSuperAdmin()) {
+            return;
+        }
+        if (baseMapper.countCategoryById(categoryId) == 0) {
+            throw new ServiceException("没有权限访问流程分类数据！");
+        }
+    }
+
+    /**
+     * 校验流程分类名称是否唯一
+     *
+     * @param category 流程分类信息
+     * @return 结果
+     */
+    @Override
+    public boolean checkCategoryNameUnique(FlowCategoryBo category) {
+        boolean exist = baseMapper.exists(new LambdaQueryWrapper<FlowCategory>()
+                .eq(FlowCategory::getCategoryName, category.getCategoryName())
+                .eq(FlowCategory::getParentId, category.getParentId())
+                .ne(ObjectUtil.isNotNull(category.getCategoryId()), FlowCategory::getCategoryId, category.getCategoryId()));
+        return !exist;
+    }
+
+    /**
+     * 查询流程分类是否存在流程定义
+     *
+     * @param categoryId 流程分类ID
+     * @return 结果 true 存在 false 不存在
+     */
+    @Override
+    public boolean checkCategoryExistDefinition(Long categoryId) {
+        FlowDefinition definition = new FlowDefinition();
+        definition.setCategory(categoryId.toString());
+        return defService.exists(definition);
+    }
+
+    /**
+     * 是否存在流程分类子节点
+     *
+     * @param categoryId 流程分类ID
+     * @return 结果
+     */
+    @Override
+    public boolean hasChildByCategoryId(Long categoryId) {
+        return baseMapper.exists(new LambdaQueryWrapper<FlowCategory>()
+                .eq(FlowCategory::getParentId, categoryId));
+    }
+
+    private LambdaQueryWrapper<FlowCategory> buildQueryWrapper(FlowCategoryBo bo) {
+        LambdaQueryWrapper<FlowCategory> lqw = Wrappers.lambdaQuery();
+        lqw.eq(FlowCategory::getDelFlag, SystemConstants.NORMAL);
+        lqw.eq(ObjectUtil.isNotNull(bo.getCategoryId()), FlowCategory::getCategoryId, bo.getCategoryId());
+        lqw.eq(ObjectUtil.isNotNull(bo.getParentId()), FlowCategory::getParentId, bo.getParentId());
+        lqw.like(StringUtils.isNotBlank(bo.getCategoryName()), FlowCategory::getCategoryName, bo.getCategoryName());
+        lqw.orderByAsc(FlowCategory::getAncestors);
+        lqw.orderByAsc(FlowCategory::getParentId);
+        lqw.orderByAsc(FlowCategory::getOrderNum);
+        lqw.orderByAsc(FlowCategory::getCategoryId);
+        return lqw;
+    }
+
+    /**
+     * 新增流程分类
+     *
+     * @param bo 流程分类
+     * @return 是否新增成功
+     */
+    @Override
+    public int insertByBo(FlowCategoryBo bo) {
+        FlowCategory info = baseMapper.selectById(bo.getParentId());
+        FlowCategory category = MapstructUtils.convert(bo, FlowCategory.class);
+        category.setAncestors(info.getAncestors() + StringUtils.SEPARATOR + category.getParentId());
+        return baseMapper.insert(category);
+    }
+
+    /**
+     * 修改流程分类
+     *
+     * @param bo 流程分类
+     * @return 是否修改成功
+     */
+    @CacheEvict(cacheNames = FlowConstant.FLOW_CATEGORY_NAME, key = "#bo.categoryId")
+    @Override
+    public int updateByBo(FlowCategoryBo bo) {
+        FlowCategory category = MapstructUtils.convert(bo, FlowCategory.class);
+        FlowCategory oldCategory = baseMapper.selectById(category.getCategoryId());
+        if (ObjectUtil.isNull(oldCategory)) {
+            throw new ServiceException("流程分类不存在，无法修改");
+        }
+        if (!oldCategory.getParentId().equals(category.getParentId())) {
+            // 如果是新父流程分类 则校验是否具有新父流程分类权限 避免越权
+            this.checkCategoryDataScope(category.getParentId());
+            FlowCategory newParentCategory = baseMapper.selectById(category.getParentId());
+            if (ObjectUtil.isNotNull(newParentCategory)) {
+                String newAncestors = newParentCategory.getAncestors() + StringUtils.SEPARATOR + newParentCategory.getCategoryId();
+                String oldAncestors = oldCategory.getAncestors();
+                category.setAncestors(newAncestors);
+                updateCategoryChildren(category.getCategoryId(), newAncestors, oldAncestors);
+            }
+        } else {
+            category.setAncestors(oldCategory.getAncestors());
+        }
+        return baseMapper.updateById(category);
+    }
+
+    /**
+     * 修改子元素关系
+     *
+     * @param categoryId   被修改的流程分类ID
+     * @param newAncestors 新的父ID集合
+     * @param oldAncestors 旧的父ID集合
+     */
+    private void updateCategoryChildren(Long categoryId, String newAncestors, String oldAncestors) {
+        List<FlowCategory> children = baseMapper.selectList(new LambdaQueryWrapper<FlowCategory>()
+                .apply(DataBaseHelper.findInSet(categoryId, "ancestors")));
+        List<FlowCategory> list = new ArrayList<>();
+        for (FlowCategory child : children) {
+            FlowCategory category = new FlowCategory();
+            category.setCategoryId(child.getCategoryId());
+            category.setAncestors(child.getAncestors().replaceFirst(oldAncestors, newAncestors));
+            list.add(category);
+        }
+        if (CollUtil.isNotEmpty(list)) {
+            baseMapper.updateBatchById(list);
+        }
+    }
+
+    /**
+     * 删除流程分类信息
+     *
+     * @param categoryId 主键
+     * @return 是否删除成功
+     */
+    @CacheEvict(cacheNames = FlowConstant.FLOW_CATEGORY_NAME, key = "#categoryId")
+    @Override
+    public int deleteWithValidById(Long categoryId) {
+        return baseMapper.deleteById(categoryId);
+    }
+}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwChartExtServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwChartExtServiceImpl.java
new file mode 100644
index 0000000..b552bd9
--- /dev/null
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwChartExtServiceImpl.java
@@ -0,0 +1,247 @@
+package org.dromara.workflow.service.impl;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.convert.Convert;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.domain.dto.UserDTO;
+import org.dromara.common.core.service.DeptService;
+import org.dromara.common.core.service.DictService;
+import org.dromara.common.core.service.UserService;
+import org.dromara.common.core.utils.DateUtils;
+import org.dromara.common.core.utils.ServletUtils;
+import org.dromara.common.core.utils.StreamUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.warm.flow.core.dto.DefJson;
+import org.dromara.warm.flow.core.dto.NodeJson;
+import org.dromara.warm.flow.core.dto.PromptContent;
+import org.dromara.warm.flow.core.enums.NodeType;
+import org.dromara.warm.flow.core.utils.MapUtil;
+import org.dromara.warm.flow.orm.entity.FlowHisTask;
+import org.dromara.warm.flow.orm.mapper.FlowHisTaskMapper;
+import org.dromara.warm.flow.ui.service.ChartExtService;
+import org.dromara.workflow.common.ConditionalOnEnable;
+import org.dromara.workflow.common.constant.FlowConstant;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 流程图提示信息
+ *
+ * @author AprilWind
+ */
+@ConditionalOnEnable
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class FlwChartExtServiceImpl implements ChartExtService {
+
+    private final UserService userService;
+    private final DeptService deptService;
+    private final FlowHisTaskMapper flowHisTaskMapper;
+    private final DictService dictService;
+
+    /**
+     * 设置流程图提示信息
+     *
+     * @param defJson 流程定义json对象
+     */
+    @Override
+    public void execute(DefJson defJson) {
+        // 临时修复 后续版本将通过defjson获取流程实例ID
+        String[] parts = ServletUtils.getRequest().getRequestURI().split("/");
+        Long instanceId = Convert.toLong(parts[parts.length - 1]);
+
+        // 根据流程实例ID查询所有相关的历史任务列表
+        List<FlowHisTask> flowHisTasks = this.getHisTaskGroupedByNode(instanceId);
+        if (CollUtil.isEmpty(flowHisTasks)) {
+            return;
+        }
+
+        // 按节点编号（nodeCode）对历史任务进行分组
+        Map<String, List<FlowHisTask>> groupedByNode = StreamUtils.groupByKey(flowHisTasks, FlowHisTask::getNodeCode);
+
+        // 批量查询所有审批人的用户信息
+        List<UserDTO> userDTOList = userService.selectListByIds(StreamUtils.toList(flowHisTasks, e -> Convert.toLong(e.getApprover())));
+
+        // 将查询到的用户列表转换为以用户ID为key的映射
+        Map<Long, UserDTO> userMap = StreamUtils.toIdentityMap(userDTOList, UserDTO::getUserId);
+
+        Map<String, String> dictType = dictService.getAllDictByDictType(FlowConstant.WF_TASK_STATUS);
+
+        // 遍历流程定义中的每个节点，调用处理方法，将对应节点的任务列表及用户信息传入，生成扩展提示内容
+        for (NodeJson nodeJson : defJson.getNodeList()) {
+            // 获取当前节点对应的历史任务列表，如果没有则返回空列表避免空指针
+            List<FlowHisTask> taskList = groupedByNode.get(nodeJson.getNodeCode());
+            if (CollUtil.isEmpty(taskList)) {
+                continue;
+            }
+            // 处理当前节点的扩展信息，包括构建审批人提示内容等
+            this.processNodeExtInfo(nodeJson, taskList, userMap, dictType);
+        }
+    }
+
+    /**
+     * 初始化流程图提示信息
+     *
+     * @param defJson 流程定义json对象
+     */
+    @Override
+    public void initPromptContent(DefJson defJson) {
+        defJson.setTopText("流程名称: " + defJson.getFlowName());
+        defJson.getNodeList().forEach(nodeJson -> {
+            nodeJson.setPromptContent(
+                    new PromptContent()
+                            // 提示信息
+                            .setInfo(
+                                    CollUtil.newArrayList(
+                                            new PromptContent.InfoItem()
+                                                    .setPrefix("任务名称: ")
+                                                    .setContent(nodeJson.getNodeName())
+                                                    .setContentStyle(Map.of(
+                                                            "border", "1px solid #d1e9ff",
+                                                            "backgroundColor", "#e8f4ff",
+                                                            "padding", "4px 8px",
+                                                            "borderRadius", "4px"
+                                                    ))
+                                                    .setRowStyle(Map.of(
+                                                            "fontWeight", "bold",
+                                                            "margin", "0 0 6px 0",
+                                                            "padding", "0 0 8px 0",
+                                                            "borderBottom", "1px solid #ccc"
+                                                    ))
+                                    )
+                            )
+                            // 弹窗样式
+                            .setDialogStyle(MapUtil.mergeAll(
+                                    "position", "absolute",
+                                    "backgroundColor", "#fff",
+                                    "border", "1px solid #ccc",
+                                    "borderRadius", "4px",
+                                    "boxShadow", "0 2px 8px rgba(0, 0, 0, 0.15)",
+                                    "padding", "8px 12px",
+                                    "fontSize", "14px",
+                                    "zIndex", "1000",
+                                    "maxWidth", "500px",
+                                    "overflowY", "visible",
+                                    "overflowX", "hidden",
+                                    "color", "#333",
+                                    "pointerEvents", "auto",
+                                    "scrollbarWidth", "thin"
+                            ))
+            );
+        });
+    }
+
+    /**
+     * 处理节点的扩展信息，构建用于流程图悬浮提示的内容
+     *
+     * @param nodeJson 当前节点对象
+     * @param taskList 当前节点对应的历史审批任务列表
+     */
+    private void processNodeExtInfo(NodeJson nodeJson, List<FlowHisTask> taskList, Map<Long, UserDTO> userMap, Map<String, String> dictType) {
+
+        // 获取节点提示内容对象中的 info 列表，用于追加提示项
+        List<PromptContent.InfoItem> info = nodeJson.getPromptContent().getInfo();
+
+        // 遍历所有任务记录，构建提示内容
+        for (FlowHisTask task : taskList) {
+            UserDTO userDTO = userMap.get(Convert.toLong(task.getApprover()));
+            if (ObjectUtil.isEmpty(userDTO)) {
+                continue;
+            }
+
+            // 查询用户所属部门名称
+            String deptName = deptService.selectDeptNameByIds(Convert.toStr(userDTO.getDeptId()));
+
+            // 添加标题项，如：👤 张三（市场部）
+            info.add(new PromptContent.InfoItem()
+                    .setPrefix(StringUtils.format("👥 {}（{}）", userDTO.getNickName(), deptName))
+                    .setPrefixStyle(Map.of(
+                            "fontWeight", "bold",
+                            "fontSize", "15px",
+                            "color", "#333"
+                    ))
+                    .setRowStyle(Map.of(
+                            "margin", "8px 0",
+                            "borderBottom", "1px dashed #ccc"
+                    ))
+            );
+
+            // 添加具体信息项：账号、耗时、时间
+            info.add(buildInfoItem("用户账号", userDTO.getUserName()));
+            info.add(buildInfoItem("审批状态", dictType.get(task.getFlowStatus())));
+            info.add(buildInfoItem("审批耗时", DateUtils.getTimeDifference(task.getUpdateTime(), task.getCreateTime())));
+            info.add(buildInfoItem("办理时间", DateUtils.formatDateTime(task.getUpdateTime())));
+        }
+    }
+
+    /**
+     * 构建单条提示内容对象 InfoItem，用于悬浮窗显示（key: value）
+     *
+     * @param key   字段名（作为前缀）
+     * @param value 字段值
+     * @return 提示项对象
+     */
+    private PromptContent.InfoItem buildInfoItem(String key, String value) {
+        return new PromptContent.InfoItem()
+                // 前缀
+                .setPrefix(key + ": ")
+                // 前缀样式
+                .setPrefixStyle(Map.of(
+                        "textAlign", "right",
+                        "color", "#444",
+                        "userSelect", "none",
+                        "display", "inline-block",
+                        "width", "100px",
+                        "paddingRight", "8px",
+                        "fontWeight", "500",
+                        "fontSize", "14px",
+                        "lineHeight", "24px",
+                        "verticalAlign", "middle"
+                ))
+                // 内容
+                .setContent(value)
+                // 内容样式
+                .setContentStyle(Map.of(
+                        "backgroundColor", "#f7faff",
+                        "color", "#005cbf",
+                        "padding", "4px 8px",
+                        "fontSize", "14px",
+                        "borderRadius", "4px",
+                        "whiteSpace", "normal",
+                        "border", "1px solid #d0e5ff",
+                        "userSelect", "text",
+                        "lineHeight", "20px"
+                ))
+                // 行样式
+                .setRowStyle(Map.of(
+                        "color", "#222",
+                        "alignItems", "center",
+                        "display", "flex",
+                        "marginBottom", "6px",
+                        "fontWeight", "400",
+                        "fontSize", "14px"
+                ));
+    }
+
+    /**
+     * 根据流程实例ID获取历史任务列表
+     *
+     * @param instanceId 流程实例ID
+     * @return 历史任务列表
+     */
+    public List<FlowHisTask> getHisTaskGroupedByNode(Long instanceId) {
+        LambdaQueryWrapper<FlowHisTask> wrapper = Wrappers.lambdaQuery();
+        wrapper.eq(FlowHisTask::getInstanceId, instanceId)
+                .eq(FlowHisTask::getNodeType, NodeType.BETWEEN.getKey())
+                .orderByDesc(FlowHisTask::getCreateTime, FlowHisTask::getUpdateTime);
+        return flowHisTaskMapper.selectList(wrapper);
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwCommonServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwCommonServiceImpl.java
new file mode 100644
index 0000000..4c77a59
--- /dev/null
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwCommonServiceImpl.java
@@ -0,0 +1,122 @@
+package org.dromara.workflow.service.impl;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.domain.dto.UserDTO;
+import org.dromara.common.core.utils.SpringUtils;
+import org.dromara.common.core.utils.StreamUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mail.utils.MailUtils;
+import org.dromara.common.sse.dto.SseMessageDto;
+import org.dromara.common.sse.utils.SseMessageUtils;
+import org.dromara.warm.flow.core.entity.Node;
+import org.dromara.warm.flow.core.entity.Task;
+import org.dromara.warm.flow.core.enums.SkipType;
+import org.dromara.warm.flow.core.service.NodeService;
+import org.dromara.warm.flow.orm.entity.FlowTask;
+import org.dromara.workflow.common.ConditionalOnEnable;
+import org.dromara.workflow.common.enums.MessageTypeEnum;
+import org.dromara.workflow.service.IFlwCommonService;
+import org.dromara.workflow.service.IFlwTaskAssigneeService;
+import org.dromara.workflow.service.IFlwTaskService;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+
+/**
+ * 工作流工具
+ *
+ * @author LionLi
+ */
+@ConditionalOnEnable
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class FlwCommonServiceImpl implements IFlwCommonService {
+    private final NodeService nodeService;
+
+    /**
+     * 构建工作流用户
+     *
+     * @param permissionList 办理用户
+     * @return 用户
+     */
+    @Override
+    public List<String> buildUser(List<String> permissionList) {
+        if (CollUtil.isEmpty(permissionList)) {
+            return List.of();
+        }
+        IFlwTaskAssigneeService taskAssigneeService = SpringUtils.getBean(IFlwTaskAssigneeService.class);
+        String processedBys = CollUtil.join(permissionList, StringUtils.SEPARATOR);
+        // 根据 processedBy 前缀判断处理人类型，分别获取用户列表
+        List<UserDTO> users = taskAssigneeService.fetchUsersByStorageIds(processedBys);
+
+        return StreamUtils.toList(users, userDTO -> String.valueOf(userDTO.getUserId()));
+    }
+
+
+    /**
+     * 发送消息
+     *
+     * @param flowName    流程定义名称
+     * @param messageType 消息类型
+     * @param message     消息内容，为空则发送默认配置的消息内容
+     */
+    @Override
+    public void sendMessage(String flowName, Long instId, List<String> messageType, String message) {
+        IFlwTaskService flwTaskService = SpringUtils.getBean(IFlwTaskService.class);
+        List<UserDTO> userList = new ArrayList<>();
+        List<FlowTask> list = flwTaskService.selectByInstId(instId);
+        if (StringUtils.isBlank(message)) {
+            message = "有新的【" + flowName + "】单据已经提交至您，请您及时处理。";
+        }
+        for (Task task : list) {
+            List<UserDTO> users = flwTaskService.currentTaskAllUser(task.getId());
+            if (CollUtil.isNotEmpty(users)) {
+                userList.addAll(users);
+            }
+        }
+        if (CollUtil.isNotEmpty(userList)) {
+            for (String code : messageType) {
+                MessageTypeEnum messageTypeEnum = MessageTypeEnum.getByCode(code);
+                if (ObjectUtil.isNotEmpty(messageTypeEnum)) {
+                    switch (messageTypeEnum) {
+                        case SYSTEM_MESSAGE:
+                            SseMessageDto dto = new SseMessageDto();
+                            dto.setUserIds(StreamUtils.toList(userList, UserDTO::getUserId).stream().distinct().collect(Collectors.toList()));
+                            dto.setMessage(message);
+                            SseMessageUtils.publishMessage(dto);
+                            break;
+                        case EMAIL_MESSAGE:
+                            MailUtils.sendText(StreamUtils.join(userList, UserDTO::getEmail), "单据审批提醒", message);
+                            break;
+                        case SMS_MESSAGE:
+                            //todo 短信发送
+                            break;
+                        default:
+                            throw new IllegalStateException("Unexpected value: " + messageTypeEnum);
+                    }
+                }
+            }
+        }
+    }
+
+
+    /**
+     * 申请人节点编码
+     *
+     * @param definitionId 流程定义id
+     * @return 申请人节点编码
+     */
+    @Override
+    public String applyNodeCode(Long definitionId) {
+        Node startNode = nodeService.getStartNode(definitionId);
+        Node nextNode = nodeService.getNextNode(definitionId, startNode.getNodeCode(), null, SkipType.PASS.getKey());
+        return nextNode.getNodeCode();
+    }
+}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwDefinitionServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwDefinitionServiceImpl.java
new file mode 100644
index 0000000..a590345
--- /dev/null
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwDefinitionServiceImpl.java
@@ -0,0 +1,198 @@
+package org.dromara.workflow.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.convert.Convert;
+import cn.hutool.core.io.IoUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.utils.StreamUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.json.utils.JsonUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.warm.flow.core.dto.DefJson;
+import org.dromara.warm.flow.core.enums.NodeType;
+import org.dromara.warm.flow.core.enums.PublishStatus;
+import org.dromara.warm.flow.core.service.DefService;
+import org.dromara.warm.flow.orm.entity.FlowDefinition;
+import org.dromara.warm.flow.orm.entity.FlowHisTask;
+import org.dromara.warm.flow.orm.entity.FlowNode;
+import org.dromara.warm.flow.orm.mapper.FlowDefinitionMapper;
+import org.dromara.warm.flow.orm.mapper.FlowHisTaskMapper;
+import org.dromara.warm.flow.orm.mapper.FlowNodeMapper;
+import org.dromara.warm.flow.orm.mapper.FlowSkipMapper;
+import org.dromara.workflow.common.ConditionalOnEnable;
+import org.dromara.workflow.domain.vo.FlowDefinitionVo;
+import org.dromara.workflow.mapper.FlwCategoryMapper;
+import org.dromara.workflow.service.IFlwCommonService;
+import org.dromara.workflow.service.IFlwDefinitionService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 流程定义 服务层实现
+ *
+ * @author may
+ */
+@ConditionalOnEnable
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class FlwDefinitionServiceImpl implements IFlwDefinitionService {
+
+    private final DefService defService;
+    private final FlowDefinitionMapper flowDefinitionMapper;
+    private final FlowHisTaskMapper flowHisTaskMapper;
+    private final FlowNodeMapper flowNodeMapper;
+    private final FlowSkipMapper flowSkipMapper;
+    private final FlwCategoryMapper flwCategoryMapper;
+    private final IFlwCommonService flwCommonService;
+
+    /**
+     * 查询流程定义列表
+     *
+     * @param flowDefinition 流程定义信息
+     * @param pageQuery      分页
+     * @return 返回分页列表
+     */
+    @Override
+    public TableDataInfo<FlowDefinitionVo> queryList(FlowDefinition flowDefinition, PageQuery pageQuery) {
+        LambdaQueryWrapper<FlowDefinition> wrapper = buildQueryWrapper(flowDefinition);
+        wrapper.eq(FlowDefinition::getIsPublish, PublishStatus.PUBLISHED.getKey());
+        Page<FlowDefinition> page = flowDefinitionMapper.selectPage(pageQuery.build(), wrapper);
+        List<FlowDefinitionVo> list = BeanUtil.copyToList(page.getRecords(), FlowDefinitionVo.class);
+        return new TableDataInfo<>(list, page.getTotal());
+    }
+
+    /**
+     * 查询未发布的流程定义列表
+     *
+     * @param flowDefinition 流程定义信息
+     * @param pageQuery      分页
+     * @return 返回分页列表
+     */
+    @Override
+    public TableDataInfo<FlowDefinitionVo> unPublishList(FlowDefinition flowDefinition, PageQuery pageQuery) {
+        LambdaQueryWrapper<FlowDefinition> wrapper = buildQueryWrapper(flowDefinition);
+        wrapper.in(FlowDefinition::getIsPublish, Arrays.asList(PublishStatus.UNPUBLISHED.getKey(), PublishStatus.EXPIRED.getKey()));
+        Page<FlowDefinition> page = flowDefinitionMapper.selectPage(pageQuery.build(), wrapper);
+        List<FlowDefinitionVo> list = BeanUtil.copyToList(page.getRecords(), FlowDefinitionVo.class);
+        return new TableDataInfo<>(list, page.getTotal());
+    }
+
+    private LambdaQueryWrapper<FlowDefinition> buildQueryWrapper(FlowDefinition flowDefinition) {
+        LambdaQueryWrapper<FlowDefinition> wrapper = Wrappers.lambdaQuery();
+        wrapper.like(StringUtils.isNotBlank(flowDefinition.getFlowCode()), FlowDefinition::getFlowCode, flowDefinition.getFlowCode());
+        wrapper.like(StringUtils.isNotBlank(flowDefinition.getFlowName()), FlowDefinition::getFlowName, flowDefinition.getFlowName());
+        if (StringUtils.isNotBlank(flowDefinition.getCategory())) {
+            List<Long> categoryIds = flwCategoryMapper.selectCategoryIdsByParentId(Convert.toLong(flowDefinition.getCategory()));
+            wrapper.in(FlowDefinition::getCategory, StreamUtils.toList(categoryIds, Convert::toStr));
+        }
+        wrapper.orderByDesc(FlowDefinition::getCreateTime);
+        return wrapper;
+    }
+
+    /**
+     * 发布流程定义
+     *
+     * @param id 流程定义id
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public boolean publish(Long id) {
+        List<FlowNode> flowNodes = flowNodeMapper.selectList(new LambdaQueryWrapper<FlowNode>().eq(FlowNode::getDefinitionId, id));
+        List<String> errorMsg = new ArrayList<>();
+        if (CollUtil.isNotEmpty(flowNodes)) {
+            for (FlowNode flowNode : flowNodes) {
+                String applyNodeCode = flwCommonService.applyNodeCode(id);
+                if (StringUtils.isBlank(flowNode.getPermissionFlag()) && !applyNodeCode.equals(flowNode.getNodeCode()) && NodeType.BETWEEN.getKey().equals(flowNode.getNodeType())) {
+                    errorMsg.add(flowNode.getNodeName());
+                }
+            }
+            if (CollUtil.isNotEmpty(errorMsg)) {
+                throw new ServiceException("节点【" + StringUtils.join(errorMsg, ",") + "】未配置办理人!");
+            }
+        }
+        return defService.publish(id);
+    }
+
+    /**
+     * 导入流程定义
+     *
+     * @param file 文件
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public boolean importJson(MultipartFile file, String category) {
+        try {
+            DefJson defJson = JsonUtils.parseObject(file.getBytes(), DefJson.class);
+            defJson.setCategory(category);
+            defService.importDef(defJson);
+        } catch (IOException e) {
+            log.error("读取文件流错误: {}", e.getMessage(), e);
+            throw new IllegalStateException("文件读取失败，请检查文件内容", e);
+        }
+        return true;
+    }
+
+    /**
+     * 导出流程定义
+     *
+     * @param id       流程定义id
+     * @param response 响应
+     * @throws IOException 异常
+     */
+    @Override
+    public void exportDef(Long id, HttpServletResponse response) throws IOException {
+        byte[] data = defService.exportJson(id).getBytes(StandardCharsets.UTF_8);
+        // 设置响应头和内容类型
+        response.reset();
+        response.setCharacterEncoding(StandardCharsets.UTF_8.name());
+        response.setContentType("application/text");
+        response.setHeader("Content-Disposition", "attachment;");
+        response.addHeader("Content-Length", "" + data.length);
+        IoUtil.write(response.getOutputStream(), false, data);
+    }
+
+    /**
+     * 删除流程定义
+     *
+     * @param ids 流程定义id
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public boolean removeDef(List<Long> ids) {
+        LambdaQueryWrapper<FlowHisTask> wrapper = Wrappers.lambdaQuery();
+        wrapper.in(FlowHisTask::getDefinitionId, ids);
+        List<FlowHisTask> flowHisTasks = flowHisTaskMapper.selectList(wrapper);
+        if (CollUtil.isNotEmpty(flowHisTasks)) {
+            List<FlowDefinition> flowDefinitions = flowDefinitionMapper.selectByIds(StreamUtils.toList(flowHisTasks, FlowHisTask::getDefinitionId));
+            if (CollUtil.isNotEmpty(flowDefinitions)) {
+                String join = StreamUtils.join(flowDefinitions, FlowDefinition::getFlowCode);
+                log.info("流程定义【{}】已被使用不可被删除！", join);
+                throw new ServiceException("流程定义【" + join + "】已被使用不可被删除！");
+            }
+        }
+        try {
+            defService.removeDef(ids);
+        } catch (Exception e) {
+            log.error("Error removing flow definitions: {}", e.getMessage(), e);
+            throw new RuntimeException("Failed to remove flow definitions", e);
+        }
+        return true;
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java
new file mode 100644
index 0000000..f5d9549
--- /dev/null
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java
@@ -0,0 +1,430 @@
+package org.dromara.workflow.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.convert.Convert;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.domain.dto.UserDTO;
+import org.dromara.common.core.enums.BusinessStatusEnum;
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.utils.StreamUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.warm.flow.core.constant.ExceptionCons;
+import org.dromara.warm.flow.core.dto.FlowParams;
+import org.dromara.warm.flow.core.entity.Definition;
+import org.dromara.warm.flow.core.entity.Instance;
+import org.dromara.warm.flow.core.entity.Task;
+import org.dromara.warm.flow.core.enums.NodeType;
+import org.dromara.warm.flow.core.service.DefService;
+import org.dromara.warm.flow.core.service.InsService;
+import org.dromara.warm.flow.core.service.TaskService;
+import org.dromara.warm.flow.orm.entity.FlowHisTask;
+import org.dromara.warm.flow.orm.entity.FlowInstance;
+import org.dromara.warm.flow.orm.entity.FlowTask;
+import org.dromara.warm.flow.orm.mapper.FlowHisTaskMapper;
+import org.dromara.warm.flow.orm.mapper.FlowInstanceMapper;
+import org.dromara.workflow.common.ConditionalOnEnable;
+import org.dromara.workflow.common.enums.TaskStatusEnum;
+import org.dromara.workflow.domain.bo.FlowCancelBo;
+import org.dromara.workflow.domain.bo.FlowInstanceBo;
+import org.dromara.workflow.domain.bo.FlowInvalidBo;
+import org.dromara.workflow.domain.vo.FlowHisTaskVo;
+import org.dromara.workflow.domain.vo.FlowInstanceVo;
+import org.dromara.workflow.handler.FlowProcessEventHandler;
+import org.dromara.workflow.mapper.FlwCategoryMapper;
+import org.dromara.workflow.mapper.FlwInstanceMapper;
+import org.dromara.workflow.service.IFlwInstanceService;
+import org.dromara.workflow.service.IFlwTaskService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * 流程实例 服务层实现
+ *
+ * @author may
+ */
+@ConditionalOnEnable
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class FlwInstanceServiceImpl implements IFlwInstanceService {
+
+    private final InsService insService;
+    private final DefService defService;
+    private final TaskService taskService;
+    private final FlowHisTaskMapper flowHisTaskMapper;
+    private final FlowInstanceMapper flowInstanceMapper;
+    private final FlowProcessEventHandler flowProcessEventHandler;
+    private final IFlwTaskService flwTaskService;
+    private final FlwInstanceMapper flwInstanceMapper;
+    private final FlwCategoryMapper flwCategoryMapper;
+
+    /**
+     * 分页查询正在运行的流程实例
+     *
+     * @param flowInstanceBo 流程实例
+     * @param pageQuery      分页
+     */
+    @Override
+    public TableDataInfo<FlowInstanceVo> selectRunningInstanceList(FlowInstanceBo flowInstanceBo, PageQuery pageQuery) {
+        QueryWrapper<FlowInstanceBo> queryWrapper = buildQueryWrapper(flowInstanceBo);
+        queryWrapper.in("fi.flow_status", BusinessStatusEnum.runningStatus());
+        Page<FlowInstanceVo> page = flwInstanceMapper.selectInstanceList(pageQuery.build(), queryWrapper);
+        return TableDataInfo.build(page);
+    }
+
+    /**
+     * 分页查询已结束的流程实例
+     *
+     * @param flowInstanceBo 流程实例
+     * @param pageQuery      分页
+     */
+    @Override
+    public TableDataInfo<FlowInstanceVo> selectFinishInstanceList(FlowInstanceBo flowInstanceBo, PageQuery pageQuery) {
+        QueryWrapper<FlowInstanceBo> queryWrapper = buildQueryWrapper(flowInstanceBo);
+        queryWrapper.in("fi.flow_status", BusinessStatusEnum.finishStatus());
+        Page<FlowInstanceVo> page = flwInstanceMapper.selectInstanceList(pageQuery.build(), queryWrapper);
+        return TableDataInfo.build(page);
+    }
+
+    /**
+     * 根据业务id查询流程实例详细信息
+     *
+     * @param businessId 业务id
+     * @return 结果
+     */
+    @Override
+    public FlowInstanceVo queryByBusinessId(Long businessId) {
+        FlowInstance instance = this.selectInstByBusinessId(String.valueOf(businessId));
+        FlowInstanceVo instanceVo = BeanUtil.toBean(instance, FlowInstanceVo.class);
+        Definition definition = defService.getById(instanceVo.getDefinitionId());
+        instanceVo.setFlowName(definition.getFlowName());
+        instanceVo.setFlowCode(definition.getFlowCode());
+        instanceVo.setVersion(definition.getVersion());
+        instanceVo.setFormCustom(definition.getFormCustom());
+        instanceVo.setFormPath(definition.getFormPath());
+        instanceVo.setCategory(definition.getCategory());
+        return instanceVo;
+    }
+
+    /**
+     * 通用查询条件
+     *
+     * @param flowInstanceBo 查询条件
+     * @return 查询条件构造方法
+     */
+    private QueryWrapper<FlowInstanceBo> buildQueryWrapper(FlowInstanceBo flowInstanceBo) {
+        QueryWrapper<FlowInstanceBo> queryWrapper = Wrappers.query();
+        queryWrapper.like(StringUtils.isNotBlank(flowInstanceBo.getNodeName()), "fi.node_name", flowInstanceBo.getNodeName());
+        queryWrapper.like(StringUtils.isNotBlank(flowInstanceBo.getFlowName()), "fd.flow_name", flowInstanceBo.getFlowName());
+        queryWrapper.like(StringUtils.isNotBlank(flowInstanceBo.getFlowCode()), "fd.flow_code", flowInstanceBo.getFlowCode());
+        if (StringUtils.isNotBlank(flowInstanceBo.getCategory())) {
+            List<Long> categoryIds = flwCategoryMapper.selectCategoryIdsByParentId(Convert.toLong(flowInstanceBo.getCategory()));
+            queryWrapper.in("fd.category", StreamUtils.toList(categoryIds, Convert::toStr));
+        }
+        queryWrapper.eq(StringUtils.isNotBlank(flowInstanceBo.getBusinessId()), "fi.business_id", flowInstanceBo.getBusinessId());
+        queryWrapper.in(CollUtil.isNotEmpty(flowInstanceBo.getCreateByIds()), "fi.create_by", flowInstanceBo.getCreateByIds());
+        queryWrapper.eq("fi.del_flag", "0");
+        queryWrapper.orderByDesc("fi.create_time");
+        return queryWrapper;
+    }
+
+    /**
+     * 根据业务id查询流程实例
+     *
+     * @param businessId 业务id
+     */
+    @Override
+    public FlowInstance selectInstByBusinessId(String businessId) {
+        return flowInstanceMapper.selectOne(new LambdaQueryWrapper<FlowInstance>().eq(FlowInstance::getBusinessId, businessId));
+    }
+
+    /**
+     * 按照实例id查询流程实例
+     *
+     * @param instanceId 实例id
+     */
+    @Override
+    public FlowInstance selectInstById(Long instanceId) {
+        return flowInstanceMapper.selectById(instanceId);
+    }
+
+    /**
+     * 按照实例id查询流程实例
+     *
+     * @param instanceIds 实例id
+     */
+    @Override
+    public List<FlowInstance> selectInstListByIdList(List<Long> instanceIds) {
+        return flowInstanceMapper.selectByIds(instanceIds);
+    }
+
+    /**
+     * 按照业务id删除流程实例
+     *
+     * @param businessIds 业务id
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public boolean deleteByBusinessIds(List<Long> businessIds) {
+        List<FlowInstance> flowInstances = flowInstanceMapper.selectList(new LambdaQueryWrapper<FlowInstance>().in(FlowInstance::getBusinessId, StreamUtils.toList(businessIds, Convert::toStr)));
+        if (CollUtil.isEmpty(flowInstances)) {
+            log.warn("未找到对应的流程实例信息，无法执行删除操作。");
+            return false;
+        }
+        return insService.remove(StreamUtils.toList(flowInstances, FlowInstance::getId));
+    }
+
+    /**
+     * 按照实例id删除流程实例
+     *
+     * @param instanceIds 实例id
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public boolean deleteByInstanceIds(List<Long> instanceIds) {
+        // 获取实例信息
+        List<Instance> instances = insService.getByIds(instanceIds);
+        if (CollUtil.isEmpty(instances)) {
+            log.warn("未找到对应的流程实例信息，无法执行删除操作。");
+            return false;
+        }
+        // 获取定义信息
+        Map<Long, Definition> definitionMap = defService.getByIds(
+                StreamUtils.toList(instances, Instance::getDefinitionId)
+        ).stream().collect(Collectors.toMap(Definition::getId, definition -> definition));
+
+        // 逐一触发删除事件
+        instances.forEach(instance -> {
+            Definition definition = definitionMap.get(instance.getDefinitionId());
+            if (ObjectUtil.isNull(definition)) {
+                log.warn("实例 ID: {} 对应的流程定义信息未找到，跳过删除事件触发。", instance.getId());
+                return;
+            }
+            flowProcessEventHandler.processDeleteHandler(definition.getFlowCode(), instance.getBusinessId());
+        });
+
+        // 删除实例
+        return insService.remove(instanceIds);
+    }
+
+    /**
+     * 撤销流程
+     *
+     * @param bo 参数
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public boolean cancelProcessApply(FlowCancelBo bo) {
+        try {
+            Instance instance = selectInstByBusinessId(bo.getBusinessId());
+            if (instance == null) {
+                throw new ServiceException(ExceptionCons.NOT_FOUNT_INSTANCE);
+            }
+            Definition definition = defService.getById(instance.getDefinitionId());
+            if (definition == null) {
+                throw new ServiceException(ExceptionCons.NOT_FOUNT_DEF);
+            }
+            String message = bo.getMessage();
+            String userIdStr = LoginHelper.getUserIdStr();
+            BusinessStatusEnum.checkCancelStatus(instance.getFlowStatus());
+            FlowParams flowParams = FlowParams.build()
+                    .message(message)
+                    .flowStatus(BusinessStatusEnum.CANCEL.getStatus())
+                    .hisStatus(BusinessStatusEnum.CANCEL.getStatus())
+                    .handler(userIdStr)
+                    .ignore(true);
+            taskService.revoke(instance.getId(), flowParams);
+        } catch (Exception e) {
+            log.error("撤销失败: {}", e.getMessage(), e);
+            throw new ServiceException(e.getMessage());
+        }
+        return true;
+    }
+
+    /**
+     * 获取当前登陆人发起的流程实例
+     *
+     * @param instanceBo 流程实例
+     * @param pageQuery  分页
+     */
+    @Override
+    public TableDataInfo<FlowInstanceVo> selectCurrentInstanceList(FlowInstanceBo instanceBo, PageQuery pageQuery) {
+        QueryWrapper<FlowInstanceBo> queryWrapper = buildQueryWrapper(instanceBo);
+        queryWrapper.eq("fi.create_by", LoginHelper.getUserIdStr());
+        Page<FlowInstanceVo> page = flwInstanceMapper.selectInstanceList(pageQuery.build(), queryWrapper);
+        return TableDataInfo.build(page);
+    }
+
+    /**
+     * 获取流程图,流程记录
+     *
+     * @param businessId 业务id
+     */
+    @Override
+    public Map<String, Object> flowHisTaskList(String businessId) {
+        FlowInstance flowInstance = this.selectInstByBusinessId(businessId);
+        if (ObjectUtil.isNull(flowInstance)) {
+            throw new ServiceException(ExceptionCons.NOT_FOUNT_INSTANCE);
+        }
+        Long instanceId = flowInstance.getId();
+        //运行中的任务
+        List<FlowHisTaskVo> list = new ArrayList<>();
+        List<FlowTask> flowTaskList = flwTaskService.selectByInstId(instanceId);
+        if (CollUtil.isNotEmpty(flowTaskList)) {
+            List<FlowHisTaskVo> flowHisTaskVos = BeanUtil.copyToList(flowTaskList, FlowHisTaskVo.class);
+            for (FlowHisTaskVo flowHisTaskVo : flowHisTaskVos) {
+                flowHisTaskVo.setFlowStatus(TaskStatusEnum.WAITING.getStatus());
+                flowHisTaskVo.setUpdateTime(null);
+                flowHisTaskVo.setRunDuration(null);
+                List<UserDTO> allUser = flwTaskService.currentTaskAllUser(flowHisTaskVo.getId());
+                if (CollUtil.isNotEmpty(allUser)) {
+                    String join = StreamUtils.join(allUser, e -> String.valueOf(e.getUserId()));
+                    flowHisTaskVo.setApprover(join);
+                }
+                if (BusinessStatusEnum.isDraftOrCancelOrBack(flowInstance.getFlowStatus())) {
+                    flowHisTaskVo.setApprover(LoginHelper.getUserIdStr());
+                    flowHisTaskVo.setApproveName(LoginHelper.getLoginUser().getNickname());
+                }
+            }
+            list.addAll(flowHisTaskVos);
+        }
+        //历史任务
+        LambdaQueryWrapper<FlowHisTask> wrapper = Wrappers.lambdaQuery();
+        wrapper.eq(FlowHisTask::getInstanceId, instanceId)
+                .eq(FlowHisTask::getNodeType, NodeType.BETWEEN.getKey())
+                .orderByDesc(FlowHisTask::getCreateTime, FlowHisTask::getUpdateTime);
+        List<FlowHisTask> flowHisTasks = flowHisTaskMapper.selectList(wrapper);
+        if (CollUtil.isNotEmpty(flowHisTasks)) {
+            list.addAll(BeanUtil.copyToList(flowHisTasks, FlowHisTaskVo.class));
+        }
+        return Map.of("list", list, "instanceId", instanceId);
+    }
+
+    /**
+     * 按照实例id更新状态
+     *
+     * @param instanceId 实例id
+     * @param status     状态
+     */
+    @Override
+    public void updateStatus(Long instanceId, String status) {
+        LambdaUpdateWrapper<FlowInstance> wrapper = new LambdaUpdateWrapper<>();
+        wrapper.set(FlowInstance::getFlowStatus, status);
+        wrapper.eq(FlowInstance::getId, instanceId);
+        flowInstanceMapper.update(wrapper);
+    }
+
+    /**
+     * 获取流程变量
+     *
+     * @param instanceId 实例id
+     */
+    @Override
+    public Map<String, Object> instanceVariable(Long instanceId) {
+        FlowInstance flowInstance = flowInstanceMapper.selectById(instanceId);
+        Map<String, Object> variableMap = Optional.ofNullable(flowInstance.getVariableMap()).orElse(Collections.emptyMap());
+        List<Map<String, Object>> variableList = variableMap.entrySet().stream()
+                .map(entry -> Map.of("key", entry.getKey(), "value", entry.getValue()))
+                .toList();
+        return Map.of("variableList", variableList, "variable", flowInstance.getVariable());
+    }
+
+    /**
+     * 设置流程变量
+     *
+     * @param instanceId 实例id
+     * @param variable   流程变量
+     */
+    @Override
+    public void setVariable(Long instanceId, Map<String, Object> variable) {
+        Instance instance = insService.getById(instanceId);
+        if (instance != null) {
+            taskService.mergeVariable(instance, variable);
+            insService.updateById(instance);
+        }
+    }
+
+    /**
+     * 按任务id查询实例
+     *
+     * @param taskId 任务id
+     */
+    @Override
+    public FlowInstance selectByTaskId(Long taskId) {
+        Task task = taskService.getById(taskId);
+        if (task == null) {
+            FlowHisTask flowHisTask = flwTaskService.selectHisTaskById(taskId);
+            if (flowHisTask != null) {
+                return this.selectInstById(flowHisTask.getInstanceId());
+            }
+        } else {
+            return this.selectInstById(task.getInstanceId());
+        }
+        return null;
+    }
+
+    /**
+     * 按任务id查询实例
+     *
+     * @param taskIdList 任务id
+     */
+    @Override
+    public List<FlowInstance> selectByTaskIdList(List<Long> taskIdList) {
+        if (CollUtil.isEmpty(taskIdList)) {
+            return Collections.emptyList();
+        }
+        Set<Long> instanceIds = new HashSet<>();
+        List<FlowTask> flowTaskList = flwTaskService.selectByIdList(taskIdList);
+        for (FlowTask flowTask : flowTaskList) {
+            instanceIds.add(flowTask.getInstanceId());
+        }
+        List<FlowHisTask> flowHisTaskList = flwTaskService.selectHisTaskByIdList(taskIdList);
+        for (FlowHisTask flowHisTask : flowHisTaskList) {
+            instanceIds.add(flowHisTask.getInstanceId());
+        }
+        if (!instanceIds.isEmpty()) {
+            return this.selectInstListByIdList(new ArrayList<>(instanceIds));
+        }
+        return Collections.emptyList();
+    }
+
+    /**
+     * 作废流程
+     *
+     * @param bo 参数
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public boolean processInvalid(FlowInvalidBo bo) {
+        try {
+            Instance instance = insService.getById(bo.getId());
+            if (instance != null) {
+                BusinessStatusEnum.checkInvalidStatus(instance.getFlowStatus());
+            }
+            FlowParams flowParams = FlowParams.build()
+                    .message(bo.getComment())
+                    .flowStatus(BusinessStatusEnum.INVALID.getStatus())
+                    .hisStatus(TaskStatusEnum.INVALID.getStatus())
+                    .ignore(true);
+            taskService.terminationByInsId(bo.getId(), flowParams);
+            return true;
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            throw new ServiceException(e.getMessage());
+        }
+    }
+}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwNodeExtServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwNodeExtServiceImpl.java
new file mode 100644
index 0000000..8b33590
--- /dev/null
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwNodeExtServiceImpl.java
@@ -0,0 +1,243 @@
+package org.dromara.workflow.service.impl;
+
+import cn.hutool.core.convert.Convert;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.domain.dto.DictTypeDTO;
+import org.dromara.common.core.service.DictService;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.json.utils.JsonUtils;
+import org.dromara.warm.flow.ui.service.NodeExtService;
+import org.dromara.warm.flow.ui.vo.NodeExt;
+import org.dromara.workflow.common.ConditionalOnEnable;
+import org.dromara.workflow.common.enums.ButtonPermissionEnum;
+import org.dromara.workflow.common.enums.NodeExtEnum;
+import org.dromara.workflow.domain.vo.ButtonPermissionVo;
+import org.dromara.workflow.service.IFlwNodeExtService;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+/**
+ * 流程设计器-节点扩展属性
+ *
+ * @author AprilWind
+ */
+@ConditionalOnEnable
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class FlwNodeExtServiceImpl implements NodeExtService, IFlwNodeExtService {
+
+    /**
+     * 存储不同 dictType 对应的配置信息
+     */
+    private static final Map<String, ButtonPermission> CHILD_NODE_MAP = new HashMap<>();
+
+    static {
+        CHILD_NODE_MAP.put(ButtonPermissionEnum.class.getSimpleName(),
+                new ButtonPermission("权限按钮", 4, false, true));
+    }
+
+    private final DictService dictService;
+
+    /**
+     * 获取节点扩展属性
+     *
+     * @return 节点扩展属性列表
+     */
+    @Override
+    public List<NodeExt> getNodeExt() {
+        List<NodeExt> nodeExtList = new ArrayList<>();
+        // 构建按钮权限页面
+        nodeExtList.add(buildNodeExt("wf_button_tab", "权限", 2,
+                List.of(ButtonPermissionEnum.class)));
+        // 自定义构建 规则参考 NodeExt 与 warm-flow文档说明
+        // nodeExtList.add(buildNodeExt("xxx_xxx", "xxx", 1, List);
+        return nodeExtList;
+    }
+
+    /**
+     * 构建一个 `NodeExt` 对象
+     *
+     * @param code    唯一编码
+     * @param name    名称（新页签时，作为页签名称）
+     * @param type    节点类型（1: 基础设置，2: 新页签）
+     * @param sources 数据来源（枚举类或字典类型）
+     * @return 构建的 `NodeExt` 对象
+     */
+    @SuppressWarnings("unchecked cast")
+    private NodeExt buildNodeExt(String code, String name, int type, List<Object> sources) {
+        NodeExt nodeExt = new NodeExt();
+        nodeExt.setCode(code);
+        nodeExt.setType(type);
+        nodeExt.setName(name);
+        nodeExt.setChilds(sources.stream()
+                .map(source -> {
+                    if (source instanceof Class<?> clazz && NodeExtEnum.class.isAssignableFrom(clazz)) {
+                        return buildChildNode((Class<? extends NodeExtEnum>) clazz);
+                    } else if (source instanceof String dictType) {
+                        return buildChildNode(dictType);
+                    }
+                    return null;
+                })
+                .filter(ObjectUtil::isNotNull)
+                .toList()
+        );
+        return nodeExt;
+    }
+
+    /**
+     * 根据枚举类型构建一个 `ChildNode` 对象
+     *
+     * @param enumClass 枚举类，必须实现 `NodeExtEnum` 接口
+     * @return 构建的 `ChildNode` 对象
+     */
+    private NodeExt.ChildNode buildChildNode(Class<? extends NodeExtEnum> enumClass) {
+        if (!enumClass.isEnum()) {
+            return null;
+        }
+        String simpleName = enumClass.getSimpleName();
+        NodeExt.ChildNode childNode = buildChildNodeMap(simpleName);
+        // 编码，此json中唯
+        childNode.setCode(simpleName);
+        // 字典，下拉框和复选框时用到
+        childNode.setDict(Arrays.stream(enumClass.getEnumConstants())
+                .map(NodeExtEnum.class::cast)
+                .map(x ->
+                        new NodeExt.DictItem(x.getLabel(), x.getValue(), x.isSelected())
+                ).toList());
+        return childNode;
+    }
+
+    /**
+     * 根据字典类型构建 `ChildNode` 对象
+     *
+     * @param dictType 字典类型
+     * @return 构建的 `ChildNode` 对象
+     */
+    private NodeExt.ChildNode buildChildNode(String dictType) {
+        DictTypeDTO dictTypeDTO = dictService.getDictType(dictType);
+        if (ObjectUtil.isNull(dictTypeDTO)) {
+            return null;
+        }
+        NodeExt.ChildNode childNode = buildChildNodeMap(dictType);
+        // 编码，此json中唯一
+        childNode.setCode(dictType);
+        // label名称
+        childNode.setLabel(dictTypeDTO.getDictName());
+        // 描述
+        childNode.setDesc(dictTypeDTO.getRemark());
+        // 字典，下拉框和复选框时用到
+        childNode.setDict(dictService.getDictData(dictType)
+                .stream().map(x ->
+                        new NodeExt.DictItem(x.getDictLabel(), x.getDictValue(), Convert.toBool(x.getIsDefault(), false))
+                ).toList());
+        return childNode;
+    }
+
+    /**
+     * 根据 CHILD_NODE_MAP 中的配置信息，构建一个基本的 ChildNode 对象
+     * 该方法用于设置 ChildNode 的常规属性，例如 label、type、是否必填、是否多选等
+     *
+     * @param key CHILD_NODE_MAP 的 key
+     * @return 返回构建好的 ChildNode 对象
+     */
+    private NodeExt.ChildNode buildChildNodeMap(String key) {
+        NodeExt.ChildNode childNode = new NodeExt.ChildNode();
+        ButtonPermission bp = CHILD_NODE_MAP.get(key);
+        if (bp == null) {
+            childNode.setType(1);
+            childNode.setMust(false);
+            childNode.setMultiple(true);
+            return childNode;
+        }
+        // label名称
+        childNode.setLabel(bp.label());
+        // 1：输入框 2：输入框 3：下拉框 4：选择框
+        childNode.setType(bp.type());
+        // 是否必填
+        childNode.setMust(bp.must());
+        // 是否多选
+        childNode.setMultiple(bp.multiple());
+        return childNode;
+    }
+
+    /**
+     * 从扩展属性构建按钮权限列表：根据 ext 中记录的权限值，标记每个按钮是否勾选
+     *
+     * @param ext 扩展属性 JSON 字符串
+     * @return 按钮权限 VO 列表
+     */
+    @Override
+    public List<ButtonPermissionVo> buildButtonPermissionsFromExt(String ext) {
+        // 解析 ext 为 Map<code, Set<value>>，用于标记权限
+        Map<String, Set<String>> permissionMap = JsonUtils.parseArray(ext, ButtonPermissionVo.class)
+                .stream()
+                .collect(Collectors.toMap(
+                        ButtonPermissionVo::getCode,
+                        item -> StringUtils.splitList(item.getValue()).stream()
+                                .map(String::trim)
+                                .filter(StrUtil::isNotBlank)
+                                .collect(Collectors.toSet()),
+                        (a, b) -> b,
+                        HashMap::new
+                ));
+
+        // 构建按钮权限列表，标记哪些按钮在 permissionMap 中出现（表示已勾选）
+        return buildPermissionsFromSources(permissionMap, List.of(ButtonPermissionEnum.class));
+    }
+
+    /**
+     * 将权限映射与按钮权限来源（枚举类或字典类型）进行匹配，生成权限视图列表
+     * <p>
+     * 使用说明：
+     * - sources 支持传入多个来源类型，支持 NodeExtEnum 枚举类 或 字典类型字符串（dictType）
+     * - 若需要扩展更多按钮权限，只需在 sources 中新增对应的枚举类或字典类型
+     * <p>
+     * 示例：
+     * buildPermissionsFromSources(permissionMap, List.of(ButtonPermissionEnum.class, "custom_button_dict"));
+     *
+     * @param permissionMap 权限映射
+     * @param sources       枚举类或字典类型列表
+     * @return 按钮权限视图对象列表
+     */
+    @SuppressWarnings("unchecked cast")
+    private List<ButtonPermissionVo> buildPermissionsFromSources(Map<String, Set<String>> permissionMap, List<Object> sources) {
+        return sources.stream()
+                .flatMap(source -> {
+                    if (source instanceof Class<?> clazz && NodeExtEnum.class.isAssignableFrom(clazz)) {
+                        Set<String> selectedSet = permissionMap.getOrDefault(clazz.getSimpleName(), Collections.emptySet());
+                        return extractDictItems(this.buildChildNode((Class<? extends NodeExtEnum>) clazz), selectedSet).stream();
+                    } else if (source instanceof String dictType) {
+                        Set<String> selectedSet = permissionMap.getOrDefault(dictType, Collections.emptySet());
+                        return extractDictItems(this.buildChildNode(dictType), selectedSet).stream();
+                    }
+                    return Stream.empty();
+                }).toList();
+    }
+
+    /**
+     * 从节点子项中提取字典项，并构建按钮权限视图对象列表
+     *
+     * @param childNode   子节点
+     * @param selectedSet 已选中的值集
+     * @return 按钮权限视图对象列表
+     */
+    private List<ButtonPermissionVo> extractDictItems(NodeExt.ChildNode childNode, Set<String> selectedSet) {
+        return Optional.ofNullable(childNode)
+                .map(NodeExt.ChildNode::getDict)
+                .orElse(List.of())
+                .stream()
+                .map(dict -> new ButtonPermissionVo(dict.getValue(), selectedSet.contains(dict.getValue())))
+                .toList();
+    }
+
+    record ButtonPermission(String label, Integer type, Boolean must, Boolean multiple) {
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskAssigneeServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskAssigneeServiceImpl.java
new file mode 100644
index 0000000..85d1907
--- /dev/null
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskAssigneeServiceImpl.java
@@ -0,0 +1,254 @@
+package org.dromara.workflow.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.convert.Convert;
+import cn.hutool.core.lang.Pair;
+import cn.hutool.core.util.StrUtil;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.domain.dto.DeptDTO;
+import org.dromara.common.core.domain.dto.TaskAssigneeDTO;
+import org.dromara.common.core.domain.dto.UserDTO;
+import org.dromara.common.core.domain.model.TaskAssigneeBody;
+import org.dromara.common.core.enums.FormatsType;
+import org.dromara.common.core.service.DeptService;
+import org.dromara.common.core.service.TaskAssigneeService;
+import org.dromara.common.core.service.UserService;
+import org.dromara.common.core.utils.DateUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.warm.flow.ui.dto.HandlerFunDto;
+import org.dromara.warm.flow.ui.dto.HandlerQuery;
+import org.dromara.warm.flow.ui.dto.TreeFunDto;
+import org.dromara.warm.flow.ui.service.HandlerSelectService;
+import org.dromara.warm.flow.ui.vo.HandlerFeedBackVo;
+import org.dromara.warm.flow.ui.vo.HandlerSelectVo;
+import org.dromara.workflow.common.ConditionalOnEnable;
+import org.dromara.workflow.common.enums.TaskAssigneeEnum;
+import org.dromara.workflow.service.IFlwTaskAssigneeService;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+
+/**
+ * 流程设计器-获取办理人权限设置列表
+ *
+ * @author AprilWind
+ */
+@ConditionalOnEnable
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class FlwTaskAssigneeServiceImpl implements IFlwTaskAssigneeService, HandlerSelectService {
+
+    private static final String DEFAULT_GROUP_NAME = "默认分组";
+    private final TaskAssigneeService taskAssigneeService;
+    private final UserService userService;
+    private final DeptService deptService;
+
+    /**
+     * 获取办理人权限设置列表tabs页签
+     *
+     * @return tabs页签
+     */
+    @Override
+    public List<String> getHandlerType() {
+        return TaskAssigneeEnum.getAssigneeTypeList();
+    }
+
+    /**
+     * 获取办理列表, 同时构建左侧部门树状结构
+     *
+     * @param query 查询条件
+     * @return HandlerSelectVo
+     */
+    @Override
+    public HandlerSelectVo getHandlerSelect(HandlerQuery query) {
+        // 获取任务办理类型
+        TaskAssigneeEnum type = TaskAssigneeEnum.fromDesc(query.getHandlerType());
+        // 转换查询条件为 TaskAssigneeBody
+        TaskAssigneeBody taskQuery = BeanUtil.toBean(query, TaskAssigneeBody.class);
+
+        // 统一查询并构建业务数据
+        TaskAssigneeDTO dto = fetchTaskAssigneeData(type, taskQuery);
+        List<DeptDTO> depts = fetchDeptData(type);
+
+        return getHandlerSelectVo(buildHandlerData(dto, type), buildDeptTree(depts));
+    }
+
+    /**
+     * 办理人权限名称回显
+     *
+     * @param storageIds 入库主键集合
+     * @return 结果
+     */
+    @Override
+    public List<HandlerFeedBackVo> handlerFeedback(List<String> storageIds) {
+        if (CollUtil.isEmpty(storageIds)) {
+            return Collections.emptyList();
+        }
+        // 解析并归类 ID，同时记录原始顺序和对应解析结果
+        Map<TaskAssigneeEnum, List<Long>> typeIdMap = new EnumMap<>(TaskAssigneeEnum.class);
+        Map<String, Pair<TaskAssigneeEnum, Long>> parsedMap = new LinkedHashMap<>();
+        for (String storageId : storageIds) {
+            Pair<TaskAssigneeEnum, Long> parsed = this.parseStorageId(storageId);
+            parsedMap.put(storageId, parsed);
+            if (parsed != null) {
+                typeIdMap.computeIfAbsent(parsed.getKey(), k -> new ArrayList<>()).add(parsed.getValue());
+            }
+        }
+
+        // 查询所有类型对应的 ID 名称映射
+        Map<TaskAssigneeEnum, Map<Long, String>> nameMap = new EnumMap<>(TaskAssigneeEnum.class);
+        typeIdMap.forEach((type, ids) -> nameMap.put(type, this.getNamesByType(type, ids)));
+
+        // 组装返回结果，保持原始顺序
+        return parsedMap.entrySet().stream()
+                .map(entry -> {
+                    String storageId = entry.getKey();
+                    Pair<TaskAssigneeEnum, Long> parsed = entry.getValue();
+                    String handlerName = (parsed == null) ? null
+                            : nameMap.getOrDefault(parsed.getKey(), Collections.emptyMap())
+                            .get(parsed.getValue());
+                    return new HandlerFeedBackVo(storageId, handlerName);
+                }).toList();
+    }
+
+    /**
+     * 根据任务办理类型查询对应的数据
+     */
+    private TaskAssigneeDTO fetchTaskAssigneeData(TaskAssigneeEnum type, TaskAssigneeBody taskQuery) {
+        return switch (type) {
+            case USER -> taskAssigneeService.selectUsersByTaskAssigneeList(taskQuery);
+            case ROLE -> taskAssigneeService.selectRolesByTaskAssigneeList(taskQuery);
+            case DEPT -> taskAssigneeService.selectDeptsByTaskAssigneeList(taskQuery);
+            case POST -> taskAssigneeService.selectPostsByTaskAssigneeList(taskQuery);
+        };
+    }
+
+    /**
+     * 根据任务办理类型获取部门数据
+     */
+    private List<DeptDTO> fetchDeptData(TaskAssigneeEnum type) {
+        if (type == TaskAssigneeEnum.USER || type == TaskAssigneeEnum.DEPT || type == TaskAssigneeEnum.POST) {
+            return deptService.selectDeptsByList();
+        }
+        return new ArrayList<>();
+    }
+
+    /**
+     * 构建部门树状结构
+     */
+    private TreeFunDto<DeptDTO> buildDeptTree(List<DeptDTO> depts) {
+        return new TreeFunDto<>(depts)
+                .setId(dept -> String.valueOf(dept.getDeptId()))
+                .setName(DeptDTO::getDeptName)
+                .setParentId(dept -> String.valueOf(dept.getParentId()));
+    }
+
+    /**
+     * 构建任务办理人数据
+     */
+    private HandlerFunDto<TaskAssigneeDTO.TaskHandler> buildHandlerData(TaskAssigneeDTO dto, TaskAssigneeEnum type) {
+        return new HandlerFunDto<>(dto.getList(), dto.getTotal())
+                .setStorageId(assignee -> type.getCode() + assignee.getStorageId())
+                .setHandlerCode(assignee -> StringUtils.blankToDefault(assignee.getHandlerCode(), "无"))
+                .setHandlerName(assignee -> StringUtils.blankToDefault(assignee.getHandlerName(), "无"))
+                .setGroupName(assignee -> StringUtils.defaultIfBlank(
+                        Optional.ofNullable(assignee.getGroupName())
+                                .map(deptService::selectDeptNameByIds)
+                                .orElse(DEFAULT_GROUP_NAME), DEFAULT_GROUP_NAME))
+                .setCreateTime(assignee -> DateUtils.parseDateToStr(FormatsType.YYYY_MM_DD_HH_MM_SS, assignee.getCreateTime()));
+    }
+
+    /**
+     * 批量解析多个存储标识符（storageIds），按类型分类并合并查询用户列表
+     * 输入格式支持多个以逗号分隔的标识（如 "user:123,role:456,789"）
+     * 会自动去重返回结果，非法格式的标识将被忽略
+     *
+     * @param storageIds 多个存储标识符字符串（逗号分隔）
+     * @return 合并后的用户列表，去重后返回，非法格式的标识将被跳过
+     */
+    @Override
+    public List<UserDTO> fetchUsersByStorageIds(String storageIds) {
+        if (StringUtils.isEmpty(storageIds)) {
+            return List.of();
+        }
+        Map<TaskAssigneeEnum, List<Long>> typeIdMap = new EnumMap<>(TaskAssigneeEnum.class);
+        for (String storageId : storageIds.split(StringUtils.SEPARATOR)) {
+            Pair<TaskAssigneeEnum, Long> parsed = this.parseStorageId(storageId);
+            if (parsed != null) {
+                typeIdMap.computeIfAbsent(parsed.getKey(), k -> new ArrayList<>()).add(parsed.getValue());
+            }
+        }
+        return typeIdMap.entrySet().stream()
+                .flatMap(entry -> this.getUsersByType(entry.getKey(), entry.getValue()).stream())
+                .distinct()
+                .toList();
+    }
+
+    /**
+     * 根据指定的任务分配类型（TaskAssigneeEnum）和 ID 列表，获取对应的用户信息列表
+     *
+     * @param type 任务分配类型，表示用户、角色、部门或其他（TaskAssigneeEnum 枚举值）
+     * @param ids  与指定分配类型关联的 ID 列表（例如用户ID、角色ID、部门ID等）
+     * @return 返回包含用户信息的列表。如果类型为用户（USER），则通过用户ID列表查询；
+     * 如果类型为角色（ROLE），则通过角色ID列表查询；
+     * 如果类型为部门（DEPT），则通过部门ID列表查询；
+     * 如果类型为岗位（POST）或无法识别的类型，则返回空列表
+     */
+    private List<UserDTO> getUsersByType(TaskAssigneeEnum type, List<Long> ids) {
+        return switch (type) {
+            case USER -> userService.selectListByIds(ids);
+            case ROLE -> userService.selectUsersByRoleIds(ids);
+            case DEPT -> userService.selectUsersByDeptIds(ids);
+            case POST -> userService.selectUsersByPostIds(ids);
+        };
+    }
+
+    /**
+     * 根据任务分配类型和对应 ID 列表，批量查询名称映射关系
+     *
+     * @param type 分配类型（用户、角色、部门、岗位）
+     * @param ids  ID 列表（如用户ID、角色ID等）
+     * @return 返回 Map，其中 key 为 ID，value 为对应的名称
+     */
+    private Map<Long, String> getNamesByType(TaskAssigneeEnum type, List<Long> ids) {
+        return switch (type) {
+            case USER -> userService.selectUserNamesByIds(ids);
+            case ROLE -> userService.selectRoleNamesByIds(ids);
+            case DEPT -> userService.selectDeptNamesByIds(ids);
+            case POST -> userService.selectPostNamesByIds(ids);
+        };
+    }
+
+    /**
+     * 解析 storageId 字符串，返回类型和ID的组合
+     *
+     * @param storageId 例如 "user:123" 或 "456"
+     * @return Pair(TaskAssigneeEnum, Long)，如果格式非法返回 null
+     */
+    private Pair<TaskAssigneeEnum, Long> parseStorageId(String storageId) {
+        if (StringUtils.isBlank(storageId)) {
+            return null;
+        }
+        // 跳过以 $ 或 # 开头的字符串
+        if (StringUtils.startsWith(storageId, "$") || StringUtils.startsWith(storageId, "#")) {
+            log.debug("跳过 storageId 解析，检测到内置变量表达式：{}", storageId);
+            return null;
+        }
+        try {
+            String[] parts = storageId.split(StrUtil.COLON, 2);
+            if (parts.length < 2) {
+                return Pair.of(TaskAssigneeEnum.USER, Convert.toLong(parts[0]));
+            } else {
+                TaskAssigneeEnum type = TaskAssigneeEnum.fromCode(parts[0] + StrUtil.COLON);
+                return Pair.of(type, Convert.toLong(parts[1]));
+            }
+        } catch (Exception e) {
+            log.warn("解析 storageId 失败，格式非法：{}，错误信息：{}", storageId, e.getMessage());
+            return null;
+        }
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java
new file mode 100644
index 0000000..bfd34e6
--- /dev/null
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java
@@ -0,0 +1,755 @@
+package org.dromara.workflow.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.convert.Convert;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.incrementer.IdentifierGenerator;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.domain.dto.StartProcessReturnDTO;
+import org.dromara.common.core.domain.dto.UserDTO;
+import org.dromara.common.core.enums.BusinessStatusEnum;
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.service.UserService;
+import org.dromara.common.core.utils.StreamUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.core.utils.ValidatorUtils;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.warm.flow.core.FlowEngine;
+import org.dromara.warm.flow.core.dto.FlowParams;
+import org.dromara.warm.flow.core.entity.*;
+import org.dromara.warm.flow.core.enums.NodeType;
+import org.dromara.warm.flow.core.enums.SkipType;
+import org.dromara.warm.flow.core.service.*;
+import org.dromara.warm.flow.core.utils.ExpressionUtil;
+import org.dromara.warm.flow.core.utils.MapUtil;
+import org.dromara.warm.flow.orm.entity.*;
+import org.dromara.warm.flow.orm.mapper.FlowHisTaskMapper;
+import org.dromara.warm.flow.orm.mapper.FlowInstanceMapper;
+import org.dromara.warm.flow.orm.mapper.FlowNodeMapper;
+import org.dromara.warm.flow.orm.mapper.FlowTaskMapper;
+import org.dromara.workflow.common.ConditionalOnEnable;
+import org.dromara.workflow.common.constant.FlowConstant;
+import org.dromara.workflow.common.enums.TaskAssigneeType;
+import org.dromara.workflow.common.enums.TaskStatusEnum;
+import org.dromara.workflow.domain.bo.*;
+import org.dromara.workflow.domain.vo.FlowHisTaskVo;
+import org.dromara.workflow.domain.vo.FlowTaskVo;
+import org.dromara.workflow.mapper.FlwCategoryMapper;
+import org.dromara.workflow.mapper.FlwTaskMapper;
+import org.dromara.workflow.service.IFlwCommonService;
+import org.dromara.workflow.service.IFlwNodeExtService;
+import org.dromara.workflow.service.IFlwTaskAssigneeService;
+import org.dromara.workflow.service.IFlwTaskService;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.math.BigDecimal;
+import java.util.*;
+import java.util.stream.Collectors;
+
+import static org.dromara.workflow.common.constant.FlowConstant.*;
+
+/**
+ * 任务 服务层实现
+ *
+ * @author may
+ */
+@ConditionalOnEnable
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class FlwTaskServiceImpl implements IFlwTaskService {
+
+    private final TaskService taskService;
+    private final InsService insService;
+    private final DefService defService;
+    private final HisTaskService hisTaskService;
+    private final NodeService nodeService;
+    private final FlowInstanceMapper flowInstanceMapper;
+    private final FlowTaskMapper flowTaskMapper;
+    private final FlowHisTaskMapper flowHisTaskMapper;
+    private final IdentifierGenerator identifierGenerator;
+    private final UserService userService;
+    private final FlwTaskMapper flwTaskMapper;
+    private final FlwCategoryMapper flwCategoryMapper;
+    private final FlowNodeMapper flowNodeMapper;
+    private final IFlwTaskAssigneeService flwTaskAssigneeService;
+    private final IFlwCommonService flwCommonService;
+    private final IFlwNodeExtService flwNodeExtService;
+
+    /**
+     * 启动任务
+     *
+     * @param startProcessBo 启动流程参数
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public StartProcessReturnDTO startWorkFlow(StartProcessBo startProcessBo) {
+        String businessId = startProcessBo.getBusinessId();
+        if (StringUtils.isBlank(businessId)) {
+            throw new ServiceException("启动工作流时必须包含业务ID");
+        }
+        // 启动流程实例（提交申请）
+        Map<String, Object> variables = startProcessBo.getVariables();
+        // 流程发起人
+        variables.put(INITIATOR, LoginHelper.getUserIdStr());
+        // 业务id
+        variables.put(BUSINESS_ID, businessId);
+        FlowInstance flowInstance = flowInstanceMapper.selectOne(new LambdaQueryWrapper<>(FlowInstance.class)
+                .eq(FlowInstance::getBusinessId, businessId));
+        if (ObjectUtil.isNotNull(flowInstance)) {
+            BusinessStatusEnum.checkStartStatus(flowInstance.getFlowStatus());
+            List<Task> taskList = taskService.list(new FlowTask().setInstanceId(flowInstance.getId()));
+            taskService.mergeVariable(flowInstance, variables);
+            insService.updateById(flowInstance);
+            StartProcessReturnDTO dto = new StartProcessReturnDTO();
+            dto.setProcessInstanceId(taskList.get(0).getInstanceId());
+            dto.setTaskId(taskList.get(0).getId());
+            return dto;
+        }
+        FlowParams flowParams = FlowParams.build()
+                .flowCode(startProcessBo.getFlowCode())
+                .variable(startProcessBo.getVariables())
+                .flowStatus(BusinessStatusEnum.DRAFT.getStatus());
+        Instance instance;
+        try {
+            instance = insService.start(businessId, flowParams);
+        } catch (Exception e) {
+            throw new ServiceException(e.getMessage());
+        }
+        // 申请人执行流程
+        List<Task> taskList = taskService.list(new FlowTask().setInstanceId(instance.getId()));
+        if (taskList.size() > 1) {
+            throw new ServiceException("请检查流程第一个环节是否为申请人！");
+        }
+        StartProcessReturnDTO dto = new StartProcessReturnDTO();
+        dto.setProcessInstanceId(instance.getId());
+        dto.setTaskId(taskList.get(0).getId());
+        return dto;
+    }
+
+    /**
+     * 办理任务
+     *
+     * @param completeTaskBo 办理任务参数
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public boolean completeTask(CompleteTaskBo completeTaskBo) {
+        try {
+            // 获取任务ID并查询对应的流程任务和实例信息
+            Long taskId = completeTaskBo.getTaskId();
+            List<String> messageType = completeTaskBo.getMessageType();
+            String notice = completeTaskBo.getNotice();
+            // 获取抄送人
+            List<FlowCopyBo> flowCopyList = completeTaskBo.getFlowCopyList();
+            // 设置抄送人
+            completeTaskBo.getVariables().put(FlowConstant.FLOW_COPY_LIST, flowCopyList);
+            // 消息类型
+            completeTaskBo.getVariables().put(FlowConstant.MESSAGE_TYPE, messageType);
+            // 消息通知
+            completeTaskBo.getVariables().put(FlowConstant.MESSAGE_NOTICE, notice);
+
+
+            FlowTask flowTask = flowTaskMapper.selectById(taskId);
+            if (ObjectUtil.isNull(flowTask)) {
+                throw new ServiceException("流程任务不存在或任务已审批！");
+            }
+            Instance ins = insService.getById(flowTask.getInstanceId());
+            // 检查流程状态是否为草稿、已撤销或已退回状态，若是则执行流程提交监听
+            if (BusinessStatusEnum.isDraftOrCancelOrBack(ins.getFlowStatus())) {
+                completeTaskBo.getVariables().put(FlowConstant.SUBMIT, true);
+            }
+            // 设置弹窗处理人
+            Map<String, Object> assigneeMap = setPopAssigneeMap(completeTaskBo.getAssigneeMap(), ins.getVariableMap());
+            if (CollUtil.isNotEmpty(assigneeMap)) {
+                completeTaskBo.getVariables().putAll(assigneeMap);
+            }
+            // 构建流程参数，包括变量、跳转类型、消息、处理人、权限等信息
+            FlowParams flowParams = FlowParams.build()
+                    .variable(completeTaskBo.getVariables())
+                    .skipType(SkipType.PASS.getKey())
+                    .message(completeTaskBo.getMessage())
+                    .flowStatus(BusinessStatusEnum.WAITING.getStatus())
+                    .hisStatus(TaskStatusEnum.PASS.getStatus())
+                    .hisTaskExt(completeTaskBo.getFileId());
+            // 执行任务跳转，并根据返回的处理人设置下一步处理人
+            taskService.skip(taskId, flowParams);
+            return true;
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            throw new ServiceException(e.getMessage());
+        }
+    }
+
+    /**
+     * 设置弹窗处理人
+     *
+     * @param assigneeMap  处理人
+     * @param variablesMap 变量
+     */
+    private Map<String, Object> setPopAssigneeMap(Map<String, Object> assigneeMap, Map<String, Object> variablesMap) {
+        Map<String, Object> map = new HashMap<>();
+        if (CollUtil.isEmpty(assigneeMap)) {
+            return map;
+        }
+        for (Map.Entry<String, Object> entry : assigneeMap.entrySet()) {
+            if (variablesMap.containsKey(entry.getKey())) {
+                String userIds = variablesMap.get(entry.getKey()).toString();
+                if (StringUtils.isNotBlank(userIds)) {
+                    Set<String> hashSet = new HashSet<>();
+                    //弹窗传入的选人
+                    List<String> popUserIds = Arrays.asList(entry.getValue().toString().split(StringUtils.SEPARATOR));
+                    //已有的选人
+                    List<String> variableUserIds = Arrays.asList(userIds.split(StringUtils.SEPARATOR));
+                    hashSet.addAll(popUserIds);
+                    hashSet.addAll(variableUserIds);
+                    map.put(entry.getKey(), String.join(StringUtils.SEPARATOR, hashSet));
+                }
+            } else {
+                map.put(entry.getKey(), entry.getValue());
+            }
+        }
+        return map;
+    }
+
+    /**
+     * 添加抄送人
+     *
+     * @param task         任务信息
+     * @param flowCopyList 抄送人
+     */
+    @Override
+    public void setCopy(Task task, List<FlowCopyBo> flowCopyList) {
+        if (CollUtil.isEmpty(flowCopyList)) {
+            return;
+        }
+        // 添加抄送人记录
+        FlowHisTask flowHisTask = flowHisTaskMapper.selectList(new LambdaQueryWrapper<>(FlowHisTask.class).eq(FlowHisTask::getTaskId, task.getId())).get(0);
+        FlowNode flowNode = new FlowNode();
+        flowNode.setNodeCode(flowHisTask.getTargetNodeCode());
+        flowNode.setNodeName(flowHisTask.getTargetNodeName());
+        //生成新的任务id
+        long taskId = identifierGenerator.nextId(null).longValue();
+        task.setId(taskId);
+        task.setNodeName("【抄送】" + task.getNodeName());
+        Date updateTime = new Date(flowHisTask.getUpdateTime().getTime() - 1000);
+        FlowParams flowParams = FlowParams.build()
+                .skipType(SkipType.NONE.getKey())
+                .hisStatus(TaskStatusEnum.COPY.getStatus())
+                .message("【抄送给】" + StreamUtils.join(flowCopyList, FlowCopyBo::getUserName));
+        HisTask hisTask = hisTaskService.setSkipHisTask(task, flowNode, flowParams);
+        hisTask.setCreateTime(updateTime);
+        hisTask.setUpdateTime(updateTime);
+        hisTaskService.save(hisTask);
+        List<User> userList = flowCopyList.stream()
+                .map(flowCopy -> {
+                    FlowUser flowUser = new FlowUser();
+                    flowUser.setType(TaskAssigneeType.COPY.getCode());
+                    flowUser.setProcessedBy(String.valueOf(flowCopy.getUserId()));
+                    flowUser.setAssociated(taskId);
+                    return flowUser;
+                }).collect(Collectors.toList());
+        // 批量保存抄送人员
+        FlowEngine.userService().saveBatch(userList);
+    }
+
+    /**
+     * 查询当前用户的待办任务
+     *
+     * @param flowTaskBo 参数
+     * @param pageQuery  分页
+     */
+    @Override
+    public TableDataInfo<FlowTaskVo> pageByTaskWait(FlowTaskBo flowTaskBo, PageQuery pageQuery) {
+        QueryWrapper<FlowTaskBo> queryWrapper = buildQueryWrapper(flowTaskBo);
+        queryWrapper.eq("t.node_type", NodeType.BETWEEN.getKey());
+        queryWrapper.in("t.processed_by", LoginHelper.getUserIdStr());
+        queryWrapper.in("t.flow_status", BusinessStatusEnum.WAITING.getStatus());
+        Page<FlowTaskVo> page = this.getFlowTaskVoPage(pageQuery, queryWrapper);
+        return TableDataInfo.build(page);
+    }
+
+    /**
+     * 查询当前用户的已办任务
+     *
+     * @param flowTaskBo 参数
+     * @param pageQuery  分页
+     */
+    @Override
+    public TableDataInfo<FlowHisTaskVo> pageByTaskFinish(FlowTaskBo flowTaskBo, PageQuery pageQuery) {
+        QueryWrapper<FlowTaskBo> queryWrapper = buildQueryWrapper(flowTaskBo);
+        queryWrapper.eq("t.node_type", NodeType.BETWEEN.getKey());
+        queryWrapper.in("t.approver", LoginHelper.getUserIdStr());
+        queryWrapper.orderByDesc("t.create_time").orderByDesc("t.update_time");
+        Page<FlowHisTaskVo> page = flwTaskMapper.getListFinishTask(pageQuery.build(), queryWrapper);
+        return TableDataInfo.build(page);
+    }
+
+    /**
+     * 查询待办任务
+     *
+     * @param flowTaskBo 参数
+     * @param pageQuery  分页
+     */
+    @Override
+    public TableDataInfo<FlowTaskVo> pageByAllTaskWait(FlowTaskBo flowTaskBo, PageQuery pageQuery) {
+        QueryWrapper<FlowTaskBo> queryWrapper = buildQueryWrapper(flowTaskBo);
+        queryWrapper.eq("t.node_type", NodeType.BETWEEN.getKey());
+        Page<FlowTaskVo> page = getFlowTaskVoPage(pageQuery, queryWrapper);
+        return TableDataInfo.build(page);
+    }
+
+    private Page<FlowTaskVo> getFlowTaskVoPage(PageQuery pageQuery, QueryWrapper<FlowTaskBo> queryWrapper) {
+        Page<FlowTaskVo> page = flwTaskMapper.getListRunTask(pageQuery.build(), queryWrapper);
+        List<FlowTaskVo> records = page.getRecords();
+        if (CollUtil.isNotEmpty(records)) {
+            List<Long> taskIds = StreamUtils.toList(records, FlowTaskVo::getId);
+            Map<Long, List<UserDTO>> listMap = currentTaskAllUser(taskIds);
+            records.forEach(t -> {
+                List<UserDTO> userList = listMap.getOrDefault(t.getId(), Collections.emptyList());
+                if (CollUtil.isNotEmpty(userList)) {
+                    t.setAssigneeIds(StreamUtils.join(userList, e -> String.valueOf(e.getUserId())));
+                    t.setAssigneeNames(StreamUtils.join(userList, UserDTO::getNickName));
+                }
+            });
+        }
+        return page;
+    }
+
+    /**
+     * 查询已办任务
+     *
+     * @param flowTaskBo 参数
+     * @param pageQuery  分页
+     */
+    @Override
+    public TableDataInfo<FlowHisTaskVo> pageByAllTaskFinish(FlowTaskBo flowTaskBo, PageQuery pageQuery) {
+        QueryWrapper<FlowTaskBo> queryWrapper = buildQueryWrapper(flowTaskBo);
+        Page<FlowHisTaskVo> page = flwTaskMapper.getListFinishTask(pageQuery.build(), queryWrapper);
+        return TableDataInfo.build(page);
+    }
+
+    /**
+     * 查询当前用户的抄送
+     *
+     * @param flowTaskBo 参数
+     * @param pageQuery  分页
+     */
+    @Override
+    public TableDataInfo<FlowTaskVo> pageByTaskCopy(FlowTaskBo flowTaskBo, PageQuery pageQuery) {
+        QueryWrapper<FlowTaskBo> queryWrapper = buildQueryWrapper(flowTaskBo);
+        queryWrapper.in("t.processed_by", LoginHelper.getUserIdStr());
+        Page<FlowTaskVo> page = flwTaskMapper.getTaskCopyByPage(pageQuery.build(), queryWrapper);
+        return TableDataInfo.build(page);
+    }
+
+    private QueryWrapper<FlowTaskBo> buildQueryWrapper(FlowTaskBo flowTaskBo) {
+        QueryWrapper<FlowTaskBo> wrapper = Wrappers.query();
+        wrapper.like(StringUtils.isNotBlank(flowTaskBo.getNodeName()), "t.node_name", flowTaskBo.getNodeName());
+        wrapper.like(StringUtils.isNotBlank(flowTaskBo.getFlowName()), "t.flow_name", flowTaskBo.getFlowName());
+        wrapper.like(StringUtils.isNotBlank(flowTaskBo.getFlowCode()), "t.flow_code", flowTaskBo.getFlowCode());
+        wrapper.in(CollUtil.isNotEmpty(flowTaskBo.getCreateByIds()), "t.create_by", flowTaskBo.getCreateByIds());
+        if (StringUtils.isNotBlank(flowTaskBo.getCategory())) {
+            List<Long> categoryIds = flwCategoryMapper.selectCategoryIdsByParentId(Convert.toLong(flowTaskBo.getCategory()));
+            wrapper.in("t.category", StreamUtils.toList(categoryIds, Convert::toStr));
+        }
+        wrapper.orderByDesc("t.create_time");
+        return wrapper;
+    }
+
+    /**
+     * 驳回任务
+     *
+     * @param bo 参数
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public boolean backProcess(BackProcessBo bo) {
+        try {
+            Long taskId = bo.getTaskId();
+            String notice = bo.getNotice();
+            List<String> messageType = bo.getMessageType();
+            String message = bo.getMessage();
+            FlowTask task = flowTaskMapper.selectById(taskId);
+            if (ObjectUtil.isNull(task)) {
+                throw new ServiceException("任务不存在！");
+            }
+            Instance inst = insService.getById(task.getInstanceId());
+            BusinessStatusEnum.checkBackStatus(inst.getFlowStatus());
+            Long definitionId = task.getDefinitionId();
+            String applyNodeCode = flwCommonService.applyNodeCode(definitionId);
+
+            Map<String, Object> variable = new HashMap<>();
+            // 消息类型
+            variable.put("messageType", messageType);
+            // 消息通知
+            variable.put("notice", notice);
+
+            FlowParams flowParams = FlowParams.build()
+                    .nodeCode(bo.getNodeCode())
+                    .variable(variable)
+                    .message(message)
+                    .skipType(SkipType.REJECT.getKey())
+                    .flowStatus(applyNodeCode.equals(bo.getNodeCode()) ? TaskStatusEnum.BACK.getStatus() : TaskStatusEnum.WAITING.getStatus())
+                    .hisStatus(TaskStatusEnum.BACK.getStatus())
+                    .hisTaskExt(bo.getFileId());
+            taskService.skip(task.getId(), flowParams);
+            return true;
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            throw new ServiceException(e.getMessage());
+        }
+    }
+
+    /**
+     * 获取可驳回的前置节点
+     *
+     * @param definitionId 流程定义id
+     * @param nowNodeCode  当前节点
+     */
+    @Override
+    public List<Node> getBackTaskNode(Long definitionId, String nowNodeCode) {
+        List<Node> nodeCodes = nodeService.getByNodeCodes(Collections.singletonList(nowNodeCode), definitionId);
+        if (!CollUtil.isNotEmpty(nodeCodes)) {
+            return nodeCodes;
+        }
+        //判断是否配置了固定驳回节点
+        Node node = nodeCodes.get(0);
+        if (StringUtils.isNotBlank(node.getAnyNodeSkip())) {
+            return nodeService.getByNodeCodes(Collections.singletonList(node.getAnyNodeSkip()), definitionId);
+        }
+        //获取可驳回的前置节点
+        List<Node> nodes = nodeService.previousNodeList(definitionId, nowNodeCode);
+        if (CollUtil.isNotEmpty(nodes)) {
+            return StreamUtils.filter(nodes, e -> NodeType.BETWEEN.getKey().equals(e.getNodeType()));
+        }
+        return nodes;
+    }
+
+    /**
+     * 终止任务
+     *
+     * @param bo 参数
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public boolean terminationTask(FlowTerminationBo bo) {
+        try {
+            Long taskId = bo.getTaskId();
+            Task task = taskService.getById(taskId);
+            if (task == null) {
+                throw new ServiceException("任务不存在！");
+            }
+            Instance instance = insService.getById(task.getInstanceId());
+            if (ObjectUtil.isNotNull(instance)) {
+                BusinessStatusEnum.checkInvalidStatus(instance.getFlowStatus());
+            }
+            FlowParams flowParams = FlowParams.build()
+                    .message(bo.getComment())
+                    .flowStatus(BusinessStatusEnum.TERMINATION.getStatus())
+                    .hisStatus(TaskStatusEnum.TERMINATION.getStatus());
+            taskService.termination(taskId, flowParams);
+            return true;
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            throw new ServiceException(e.getMessage());
+        }
+    }
+
+    /**
+     * 按照任务id查询任务
+     *
+     * @param taskIdList 任务id
+     */
+    @Override
+    public List<FlowTask> selectByIdList(List<Long> taskIdList) {
+        return flowTaskMapper.selectList(new LambdaQueryWrapper<>(FlowTask.class)
+                .in(FlowTask::getId, taskIdList));
+    }
+
+    /**
+     * 按照任务id查询任务
+     *
+     * @param taskId 任务id
+     */
+    @Override
+    public FlowTaskVo selectById(Long taskId) {
+        Task task = taskService.getById(taskId);
+        if (ObjectUtil.isNull(task)) {
+            return null;
+        }
+        FlowTaskVo flowTaskVo = BeanUtil.toBean(task, FlowTaskVo.class);
+        Instance instance = insService.getById(task.getInstanceId());
+        Definition definition = defService.getById(task.getDefinitionId());
+        flowTaskVo.setFlowStatus(instance.getFlowStatus());
+        flowTaskVo.setVersion(definition.getVersion());
+        flowTaskVo.setFlowCode(definition.getFlowCode());
+        flowTaskVo.setFlowName(definition.getFlowName());
+        flowTaskVo.setBusinessId(instance.getBusinessId());
+        FlowNode flowNode = this.getByNodeCode(flowTaskVo.getNodeCode(), instance.getDefinitionId());
+        if (ObjectUtil.isNull(flowNode)) {
+            throw new NullPointerException("当前【" + flowTaskVo.getNodeCode() + "】节点编码不存在");
+        }
+        //设置按钮权限
+        flowTaskVo.setButtonList(flwNodeExtService.buildButtonPermissionsFromExt(flowNode.getExt()));
+        flowTaskVo.setNodeRatio(flowNode.getNodeRatio());
+        flowTaskVo.setApplyNode(flowNode.getNodeCode().equals(flwCommonService.applyNodeCode(task.getDefinitionId())));
+        return flowTaskVo;
+    }
+
+    /**
+     * 获取下一节点信息
+     *
+     * @param bo 参数
+     */
+    @Override
+    public List<FlowNode> getNextNodeList(FlowNextNodeBo bo) {
+        Long taskId = bo.getTaskId();
+        Map<String, Object> variables = bo.getVariables();
+        Task task = taskService.getById(taskId);
+        Instance instance = insService.getById(task.getInstanceId());
+        Definition definition = defService.getById(task.getDefinitionId());
+        Map<String, Object> mergeVariable = MapUtil.mergeAll(instance.getVariableMap(), variables);
+        // 获取下一节点列表
+        List<Node> nextNodeList = nodeService.getNextNodeList(task.getDefinitionId(), task.getNodeCode(), null, SkipType.PASS.getKey(), mergeVariable);
+        List<FlowNode> nextFlowNodes = BeanUtil.copyToList(nextNodeList, FlowNode.class);
+        // 只获取中间节点
+        nextFlowNodes = StreamUtils.filter(nextFlowNodes, node -> NodeType.BETWEEN.getKey().equals(node.getNodeType()));
+        if (CollUtil.isNotEmpty(nextNodeList)) {
+            // 构建以下节点数据
+            List<Task> buildNextTaskList = StreamUtils.toList(nextNodeList, node -> taskService.addTask(node, instance, definition, FlowParams.build()));
+            // 办理人变量替换
+            ExpressionUtil.evalVariable(buildNextTaskList,
+                    FlowParams.build()
+                            .variable(mergeVariable)
+            );
+            for (FlowNode flowNode : nextFlowNodes) {
+                buildNextTaskList.stream().filter(t -> t.getNodeCode().equals(flowNode.getNodeCode())).findFirst().ifPresent(t -> {
+                    if (CollUtil.isNotEmpty(t.getPermissionList())) {
+                        List<UserDTO> users = flwTaskAssigneeService.fetchUsersByStorageIds(String.join(StringUtils.SEPARATOR, t.getPermissionList()));
+                        if (CollUtil.isNotEmpty(users)) {
+                            flowNode.setPermissionFlag(StreamUtils.join(users, e -> String.valueOf(e.getUserId())));
+                        }
+                    }
+                });
+            }
+        }
+        return nextFlowNodes;
+    }
+
+    /**
+     * 按照任务id查询任务
+     *
+     * @param taskIdList 任务id
+     * @return 结果
+     */
+    @Override
+    public List<FlowHisTask> selectHisTaskByIdList(List<Long> taskIdList) {
+        return flowHisTaskMapper.selectList(new LambdaQueryWrapper<>(FlowHisTask.class)
+                .in(FlowHisTask::getId, taskIdList));
+    }
+
+    /**
+     * 按照任务id查询任务
+     *
+     * @param taskId 任务id
+     * @return 结果
+     */
+    @Override
+    public FlowHisTask selectHisTaskById(Long taskId) {
+        return flowHisTaskMapper.selectOne(new LambdaQueryWrapper<>(FlowHisTask.class)
+                .eq(FlowHisTask::getId, taskId));
+    }
+
+    /**
+     * 按照实例id查询任务
+     *
+     * @param instanceIdList 流程实例id
+     */
+    @Override
+    public List<FlowTask> selectByInstIdList(List<Long> instanceIdList) {
+        return flowTaskMapper.selectList(new LambdaQueryWrapper<>(FlowTask.class)
+                .in(FlowTask::getInstanceId, instanceIdList));
+    }
+
+    /**
+     * 按照实例id查询任务
+     *
+     * @param instanceId 流程实例id
+     */
+    @Override
+    public List<FlowTask> selectByInstId(Long instanceId) {
+        return flowTaskMapper.selectList(new LambdaQueryWrapper<>(FlowTask.class)
+                .eq(FlowTask::getInstanceId, instanceId));
+    }
+
+    /**
+     * 任务操作
+     *
+     * @param bo            参数
+     * @param taskOperation 操作类型，委派 delegateTask、转办 transferTask、加签 addSignature、减签 reductionSignature
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public boolean taskOperation(TaskOperationBo bo, String taskOperation) {
+        FlowParams flowParams = FlowParams.build()
+                .message(bo.getMessage());
+        if (LoginHelper.isSuperAdmin()) {
+            flowParams.ignore(true);
+        }
+
+        // 根据操作类型构建 FlowParams
+        switch (taskOperation) {
+            case DELEGATE_TASK, TRANSFER_TASK -> {
+                ValidatorUtils.validate(bo, AddGroup.class);
+                flowParams.addHandlers(Collections.singletonList(bo.getUserId()));
+            }
+            case ADD_SIGNATURE -> {
+                ValidatorUtils.validate(bo, EditGroup.class);
+                flowParams.addHandlers(bo.getUserIds());
+            }
+            case REDUCTION_SIGNATURE -> {
+                ValidatorUtils.validate(bo, EditGroup.class);
+                flowParams.reductionHandlers(bo.getUserIds());
+            }
+            default -> {
+                log.error("Invalid operation type:{} ", taskOperation);
+                throw new ServiceException("Invalid operation type " + taskOperation);
+            }
+        }
+
+        Long taskId = bo.getTaskId();
+        Task task = taskService.getById(taskId);
+        FlowNode flowNode = getByNodeCode(task.getNodeCode(), task.getDefinitionId());
+        if ("addSignature".equals(taskOperation) || "reductionSignature".equals(taskOperation)) {
+            if (flowNode.getNodeRatio().compareTo(BigDecimal.ZERO) == 0) {
+                throw new ServiceException(task.getNodeName() + "不是会签节点！");
+            }
+        }
+        // 设置任务状态并执行对应的任务操作
+        switch (taskOperation) {
+            //委派任务
+            case DELEGATE_TASK -> {
+                flowParams.hisStatus(TaskStatusEnum.DEPUTE.getStatus());
+                return taskService.depute(taskId, flowParams);
+            }
+            //转办任务
+            case TRANSFER_TASK -> {
+                flowParams.hisStatus(TaskStatusEnum.TRANSFER.getStatus());
+                return taskService.transfer(taskId, flowParams);
+            }
+            //加签，增加办理人
+            case ADD_SIGNATURE -> {
+                flowParams.hisStatus(TaskStatusEnum.SIGN.getStatus());
+                return taskService.addSignature(taskId, flowParams);
+            }
+            //减签，减少办理人
+            case REDUCTION_SIGNATURE -> {
+                flowParams.hisStatus(TaskStatusEnum.SIGN_OFF.getStatus());
+                return taskService.reductionSignature(taskId, flowParams);
+            }
+            default -> {
+                log.error("Invalid operation type:{} ", taskOperation);
+                throw new ServiceException("Invalid operation type " + taskOperation);
+            }
+        }
+    }
+
+    /**
+     * 修改任务办理人（此方法将会批量修改所有任务的办理人）
+     *
+     * @param taskIdList 任务id
+     * @param userId     用户id
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public boolean updateAssignee(List<Long> taskIdList, String userId) {
+        if (CollUtil.isEmpty(taskIdList)) {
+            return false;
+        }
+        try {
+            List<FlowTask> flowTasks = this.selectByIdList(taskIdList);
+            // 批量删除现有任务的办理人记录
+            if (CollUtil.isNotEmpty(flowTasks)) {
+                FlowEngine.userService().deleteByTaskIds(StreamUtils.toList(flowTasks, FlowTask::getId));
+                List<User> userList = flowTasks.stream()
+                        .map(flowTask -> {
+                            FlowUser flowUser = new FlowUser();
+                            flowUser.setType(TaskAssigneeType.APPROVER.getCode());
+                            flowUser.setProcessedBy(userId);
+                            flowUser.setAssociated(flowTask.getId());
+                            return flowUser;
+                        })
+                        .collect(Collectors.toList());
+                if (CollUtil.isNotEmpty(userList)) {
+                    FlowEngine.userService().saveBatch(userList);
+                }
+            }
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            throw new ServiceException(e.getMessage());
+        }
+        return true;
+    }
+
+    /**
+     * 获取任务所有办理人
+     *
+     * @param taskIdList 任务id
+     */
+    @Override
+    public Map<Long, List<UserDTO>> currentTaskAllUser(List<Long> taskIdList) {
+        Map<Long, List<UserDTO>> map = new HashMap<>();
+        // 获取与当前任务关联的用户列表
+        List<User> associatedUsers = FlowEngine.userService().getByAssociateds(taskIdList);
+        Map<Long, List<User>> listMap = StreamUtils.groupByKey(associatedUsers, User::getAssociated);
+        for (Map.Entry<Long, List<User>> entry : listMap.entrySet()) {
+            List<User> value = entry.getValue();
+            if (CollUtil.isNotEmpty(value)) {
+                List<UserDTO> userDtoList = userService.selectListByIds(StreamUtils.toList(value, e -> Convert.toLong(e.getProcessedBy())));
+                map.put(entry.getKey(), userDtoList);
+            }
+        }
+        return map;
+    }
+
+    /**
+     * 获取当前任务的所有办理人
+     *
+     * @param taskId 任务id
+     */
+    @Override
+    public List<UserDTO> currentTaskAllUser(Long taskId) {
+        // 获取与当前任务关联的用户列表
+        List<User> userList = FlowEngine.userService().getByAssociateds(Collections.singletonList(taskId));
+        if (CollUtil.isEmpty(userList)) {
+            return Collections.emptyList();
+        }
+        return userService.selectListByIds(StreamUtils.toList(userList, e -> Convert.toLong(e.getProcessedBy())));
+    }
+
+    /**
+     * 按照节点编码查询节点
+     *
+     * @param nodeCode     节点编码
+     * @param definitionId 流程定义id
+     */
+    @Override
+    public FlowNode getByNodeCode(String nodeCode, Long definitionId) {
+        return flowNodeMapper.selectOne(new LambdaQueryWrapper<FlowNode>()
+                .eq(FlowNode::getNodeCode, nodeCode)
+                .eq(FlowNode::getDefinitionId, definitionId));
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/TestLeaveServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/TestLeaveServiceImpl.java
new file mode 100644
index 0000000..1df697c
--- /dev/null
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/TestLeaveServiceImpl.java
@@ -0,0 +1,198 @@
+package org.dromara.workflow.service.impl;
+
+import cn.hutool.core.convert.Convert;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.map.MapUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.domain.event.ProcessDeleteEvent;
+import org.dromara.common.core.domain.event.ProcessEvent;
+import org.dromara.common.core.domain.event.ProcessTaskEvent;
+import org.dromara.common.core.enums.BusinessStatusEnum;
+import org.dromara.common.core.service.WorkflowService;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.workflow.common.ConditionalOnEnable;
+import org.dromara.workflow.domain.TestLeave;
+import org.dromara.workflow.domain.bo.TestLeaveBo;
+import org.dromara.workflow.domain.vo.TestLeaveVo;
+import org.dromara.workflow.mapper.TestLeaveMapper;
+import org.dromara.workflow.service.ITestLeaveService;
+import org.springframework.context.event.EventListener;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 请假Service业务层处理
+ *
+ * @author may
+ * @date 2023-07-21
+ */
+@ConditionalOnEnable
+@RequiredArgsConstructor
+@Service
+@Slf4j
+public class TestLeaveServiceImpl implements ITestLeaveService {
+
+    private final TestLeaveMapper baseMapper;
+    private final WorkflowService workflowService;
+
+    /**
+     * spel条件表达：判断小于2
+     *
+     * @param leaveDays 待判断的变量（可不传自行返回true或false）
+     * @return boolean
+     */
+    public boolean eval(Integer leaveDays) {
+        if (leaveDays <= 2) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * 查询请假
+     */
+    @Override
+    public TestLeaveVo queryById(Long id) {
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 查询请假列表
+     */
+    @Override
+    public TableDataInfo<TestLeaveVo> queryPageList(TestLeaveBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<TestLeave> lqw = buildQueryWrapper(bo);
+        Page<TestLeaveVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询请假列表
+     */
+    @Override
+    public List<TestLeaveVo> queryList(TestLeaveBo bo) {
+        LambdaQueryWrapper<TestLeave> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<TestLeave> buildQueryWrapper(TestLeaveBo bo) {
+        LambdaQueryWrapper<TestLeave> lqw = Wrappers.lambdaQuery();
+        lqw.eq(StringUtils.isNotBlank(bo.getLeaveType()), TestLeave::getLeaveType, bo.getLeaveType());
+        lqw.ge(bo.getStartLeaveDays() != null, TestLeave::getLeaveDays, bo.getStartLeaveDays());
+        lqw.le(bo.getEndLeaveDays() != null, TestLeave::getLeaveDays, bo.getEndLeaveDays());
+        lqw.orderByDesc(BaseEntity::getCreateTime);
+        return lqw;
+    }
+
+    /**
+     * 新增请假
+     */
+    @Override
+    public TestLeaveVo insertByBo(TestLeaveBo bo) {
+        long day = DateUtil.betweenDay(bo.getStartDate(), bo.getEndDate(), true);
+        // 截止日期也算一天
+        bo.setLeaveDays((int) day + 1);
+        TestLeave add = MapstructUtils.convert(bo, TestLeave.class);
+        if (StringUtils.isBlank(add.getStatus())) {
+            add.setStatus(BusinessStatusEnum.DRAFT.getStatus());
+        }
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return MapstructUtils.convert(add, TestLeaveVo.class);
+    }
+
+    /**
+     * 修改请假
+     */
+    @Override
+    public TestLeaveVo updateByBo(TestLeaveBo bo) {
+        TestLeave update = MapstructUtils.convert(bo, TestLeave.class);
+        baseMapper.updateById(update);
+        return MapstructUtils.convert(update, TestLeaveVo.class);
+    }
+
+    /**
+     * 批量删除请假
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean deleteWithValidByIds(List<Long> ids) {
+        workflowService.deleteInstance(ids);
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+
+    /**
+     * 总体流程监听(例如: 草稿，撤销，退回，作废，终止，已完成，单任务完成等)
+     * 正常使用只需#processEvent.flowCode=='leave1'
+     * 示例为了方便则使用startsWith匹配了全部示例key
+     *
+     * @param processEvent 参数
+     */
+    @EventListener(condition = "#processEvent.flowCode.startsWith('leave')")
+    public void processHandler(ProcessEvent processEvent) {
+        log.info("当前任务执行了{}", processEvent.toString());
+        TestLeave testLeave = baseMapper.selectById(Convert.toLong(processEvent.getBusinessId()));
+        testLeave.setStatus(processEvent.getStatus());
+        // 用于例如审批附件 审批意见等 存储到业务表内 自行根据业务实现存储流程
+        Map<String, Object> params = processEvent.getParams();
+        if (MapUtil.isNotEmpty(params)) {
+            // 历史任务扩展(通常为附件)
+            String hisTaskExt = Convert.toStr(params.get("hisTaskExt"));
+            // 办理人
+            String handler = Convert.toStr(params.get("handler"));
+            // 办理意见
+            String message = Convert.toStr(params.get("message"));
+        }
+        if (processEvent.getSubmit()) {
+            testLeave.setStatus(BusinessStatusEnum.WAITING.getStatus());
+        }
+        baseMapper.updateById(testLeave);
+    }
+
+    /**
+     * 执行任务创建监听
+     * 示例：也可通过  @EventListener(condition = "#processTaskEvent.flowCode=='leave1'")进行判断
+     * 在方法中判断流程节点key
+     * if ("xxx".equals(processTaskEvent.getNodeCode())) {
+     * //执行业务逻辑
+     * }
+     *
+     * @param processTaskEvent 参数
+     */
+    @EventListener(condition = "#processTaskEvent.flowCode.startsWith('leave')")
+    public void processTaskHandler(ProcessTaskEvent processTaskEvent) {
+        log.info("当前任务创建了{}", processTaskEvent.toString());
+    }
+
+    /**
+     * 监听删除流程事件
+     * 正常使用只需#processDeleteEvent.flowCode=='leave1'
+     * 示例为了方便则使用startsWith匹配了全部示例key
+     *
+     * @param processDeleteEvent 参数
+     */
+    @EventListener(condition = "#processDeleteEvent.flowCode.startsWith('leave')")
+    public void processDeleteHandler(ProcessDeleteEvent processDeleteEvent) {
+        log.info("监听删除流程事件，当前任务执行了{}", processDeleteEvent.toString());
+        TestLeave testLeave = baseMapper.selectById(Convert.toLong(processDeleteEvent.getBusinessId()));
+        if (ObjectUtil.isNull(testLeave)) {
+            return;
+        }
+        baseMapper.deleteById(testLeave.getId());
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WorkflowServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WorkflowServiceImpl.java
new file mode 100644
index 0000000..9c18380
--- /dev/null
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WorkflowServiceImpl.java
@@ -0,0 +1,141 @@
+package org.dromara.workflow.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.dto.CompleteTaskDTO;
+import org.dromara.common.core.domain.dto.StartProcessDTO;
+import org.dromara.common.core.domain.dto.StartProcessReturnDTO;
+import org.dromara.common.core.service.WorkflowService;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.warm.flow.orm.entity.FlowInstance;
+import org.dromara.workflow.common.ConditionalOnEnable;
+import org.dromara.workflow.domain.bo.CompleteTaskBo;
+import org.dromara.workflow.domain.bo.StartProcessBo;
+import org.dromara.workflow.service.IFlwDefinitionService;
+import org.dromara.workflow.service.IFlwInstanceService;
+import org.dromara.workflow.service.IFlwTaskService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 通用 工作流服务实现
+ *
+ * @author may
+ */
+@ConditionalOnEnable
+@RequiredArgsConstructor
+@Service
+public class WorkflowServiceImpl implements WorkflowService {
+
+    private final IFlwInstanceService flwInstanceService;
+    private final IFlwDefinitionService flwDefinitionService;
+    private final IFlwTaskService flwTaskService;
+
+    /**
+     * 删除流程实例
+     *
+     * @param businessIds 业务id
+     * @return 结果
+     */
+    @Override
+    public boolean deleteInstance(List<Long> businessIds) {
+        return flwInstanceService.deleteByBusinessIds(businessIds);
+    }
+
+    /**
+     * 获取当前流程状态
+     *
+     * @param taskId 任务id
+     */
+    @Override
+    public String getBusinessStatusByTaskId(Long taskId) {
+        FlowInstance flowInstance = flwInstanceService.selectByTaskId(taskId);
+        return ObjectUtil.isNotNull(flowInstance) ? flowInstance.getFlowStatus() : StringUtils.EMPTY;
+    }
+
+    /**
+     * 获取当前流程状态
+     *
+     * @param businessId 业务id
+     */
+    @Override
+    public String getBusinessStatus(String businessId) {
+        FlowInstance flowInstance = flwInstanceService.selectInstByBusinessId(businessId);
+        return ObjectUtil.isNotNull(flowInstance) ? flowInstance.getFlowStatus() : StringUtils.EMPTY;
+    }
+
+    /**
+     * 设置流程变量
+     *
+     * @param instanceId 流程实例id
+     * @param variables  流程变量
+     */
+    @Override
+    public void setVariable(Long instanceId, Map<String, Object> variables) {
+        flwInstanceService.setVariable(instanceId, variables);
+    }
+
+    /**
+     * 获取流程变量
+     *
+     * @param instanceId 流程实例id
+     */
+    @Override
+    public Map<String, Object> instanceVariable(Long instanceId) {
+        return flwInstanceService.instanceVariable(instanceId);
+    }
+
+    /**
+     * 按照业务id查询流程实例id
+     *
+     * @param businessId 业务id
+     * @return 结果
+     */
+    @Override
+    public Long getInstanceIdByBusinessId(String businessId) {
+        FlowInstance flowInstance = flwInstanceService.selectInstByBusinessId(businessId);
+        return ObjectUtil.isNotNull(flowInstance) ? flowInstance.getId() : null;
+    }
+
+    /**
+     * 启动流程
+     *
+     * @param startProcess 参数
+     */
+    @Override
+    public StartProcessReturnDTO startWorkFlow(StartProcessDTO startProcess) {
+        return flwTaskService.startWorkFlow(BeanUtil.toBean(startProcess, StartProcessBo.class));
+    }
+
+    /**
+     * 办理任务
+     * 系统后台发起审批 无用户信息 需要忽略权限
+     * completeTask.getVariables().put("ignore", true);
+     *
+     * @param completeTask 参数
+     */
+    @Override
+    public boolean completeTask(CompleteTaskDTO completeTask) {
+        return flwTaskService.completeTask(BeanUtil.toBean(completeTask, CompleteTaskBo.class));
+    }
+
+    /**
+     * 办理任务
+     *
+     * @param taskId  任务ID
+     * @param message 办理意见
+     */
+    @Override
+    public boolean completeTask(Long taskId, String message) {
+        CompleteTaskBo completeTask = new CompleteTaskBo();
+        completeTask.setTaskId(taskId);
+        completeTask.setMessage(message);
+        // 忽略权限(系统后台发起审批 无用户信息 需要忽略权限)
+        completeTask.getVariables().put("ignore", true);
+        return flwTaskService.completeTask(completeTask);
+    }
+
+}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/package-info.md b/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/package-info.md
new file mode 100644
index 0000000..c938b1e
--- /dev/null
+++ b/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/package-info.md
@@ -0,0 +1,3 @@
+java包使用 `.` 分割 resource 目录使用 `/` 分割
+<br>
+此文件目的 防止文件夹粘连找不到 `xml` 文件
\ No newline at end of file
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/FlwCategoryMapper.xml b/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/FlwCategoryMapper.xml
new file mode 100644
index 0000000..1433aa7
--- /dev/null
+++ b/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/FlwCategoryMapper.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.workflow.mapper.FlwCategoryMapper">
+
+</mapper>
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/FlwInstanceMapper.xml b/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/FlwInstanceMapper.xml
new file mode 100644
index 0000000..414f61b
--- /dev/null
+++ b/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/FlwInstanceMapper.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.workflow.mapper.FlwInstanceMapper">
+    <resultMap type="org.dromara.workflow.domain.vo.FlowInstanceVo" id="FlowInstanceResult">
+    </resultMap>
+
+    <select id="selectInstanceList" resultMap="FlowInstanceResult">
+        select fi.id,
+               fi.create_time,
+               fi.update_time,
+               fi.tenant_id,
+               fi.del_flag,
+               fi.definition_id,
+               fi.business_id,
+               fi.node_type,
+               fi.node_code,
+               fi.node_name,
+               fi.variable,
+               fi.flow_status,
+               fi.activity_status,
+               fi.create_by,
+               fi.ext,
+               fd.flow_name,
+               fd.flow_code,
+               fd.version,
+               fd.form_custom,
+               fd.form_path,
+               fd.category
+        from flow_instance fi
+                 left join flow_definition fd on fi.definition_id = fd.id
+            ${ew.getCustomSqlSegment}
+    </select>
+
+</mapper>
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/FlwTaskMapper.xml b/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/FlwTaskMapper.xml
new file mode 100644
index 0000000..4301dea
--- /dev/null
+++ b/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/FlwTaskMapper.xml
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.workflow.mapper.FlwTaskMapper">
+    <resultMap type="org.dromara.workflow.domain.vo.FlowTaskVo" id="FlowTaskResult">
+    </resultMap>
+    <resultMap type="org.dromara.workflow.domain.vo.FlowHisTaskVo" id="FlowHisTaskResult">
+    </resultMap>
+
+    <select id="getListRunTask" resultMap="FlowTaskResult">
+        select *
+        from (select distinct t.id,
+                              t.node_code,
+                              t.node_name,
+                              t.node_type,
+                              t.definition_id,
+                              t.instance_id,
+                              t.create_time,
+                              t.update_time,
+                              t.tenant_id,
+                              i.business_id,
+                              i.flow_status,
+                              i.create_by,
+                              d.flow_name,
+                              d.flow_code,
+                              d.form_custom,
+                              d.category,
+                              COALESCE(t.form_path, d.form_path) as form_path,
+                              d.version,
+                              uu.processed_by,
+                              uu.type
+              from flow_task t
+                       left join flow_user uu on uu.associated = t.id
+                       left join flow_definition d on t.definition_id = d.id
+                       left join flow_instance i on t.instance_id = i.id
+              where t.node_type = 1
+                and t.del_flag = '0'
+                and uu.del_flag = '0'
+                and uu.type in ('1', '2', '3')) t
+            ${ew.getCustomSqlSegment}
+    </select>
+
+    <select id="getListFinishTask" resultMap="FlowHisTaskResult">
+        select *
+        from (select a.id,
+                     a.node_code,
+                     a.node_name,
+                     a.cooperate_type,
+                     a.approver,
+                     a.collaborator,
+                     a.node_type,
+                     a.target_node_code,
+                     a.target_node_name,
+                     a.definition_id,
+                     a.instance_id,
+                     a.flow_status flow_task_status,
+                     a.message,
+                     a.ext,
+                     a.create_time,
+                     a.update_time,
+                     a.tenant_id,
+                     a.form_custom,
+                     a.form_path,
+                     b.flow_status,
+                     b.business_id,
+                     b.create_by,
+                     c.flow_name,
+                     c.flow_code,
+                     c.category,
+                     c.version
+              from flow_his_task a
+                       left join flow_instance b on a.instance_id = b.id
+                       left join flow_definition c on a.definition_id = c.id
+              where a.del_flag = '0'
+                and b.del_flag = '0'
+                and c.del_flag = '0'
+                and a.node_type in ('1', '3', '4')) t
+            ${ew.getCustomSqlSegment}
+    </select>
+
+    <select id="getTaskCopyByPage" resultMap="FlowTaskResult">
+        select *
+        from (select b.id,
+                     b.update_time,
+                     c.business_id,
+                     c.flow_status,
+                     c.create_by,
+                     a.processed_by,
+                     a.create_time,
+                     b.form_custom,
+                     b.form_path,
+                     b.node_name,
+                     b.node_code,
+                     d.flow_name,
+                     d.flow_code,
+                     d.category,
+                     d.version
+              from flow_user a
+                       left join flow_his_task b on a.associated = b.task_id
+                       left join flow_instance c on b.instance_id = c.id
+                       left join flow_definition d on c.definition_id = d.id
+              where a.type = '4'
+                and a.del_flag = '0'
+                and b.del_flag = '0'
+                and d.del_flag = '0') t
+            ${ew.getCustomSqlSegment}
+    </select>
+</mapper>
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/TestLeaveMapper.xml b/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/TestLeaveMapper.xml
new file mode 100644
index 0000000..235484a
--- /dev/null
+++ b/ruoyi-modules/ruoyi-workflow/src/main/resources/mapper/workflow/TestLeaveMapper.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.workflow.mapper.TestLeaveMapper">
+
+</mapper>
diff --git a/ruoyi-plugins/.DS_Store b/ruoyi-plugins/.DS_Store
new file mode 100644
index 0000000..7dc81b4
Binary files /dev/null and b/ruoyi-plugins/.DS_Store differ
diff --git a/ruoyi-server/Dockerfile b/ruoyi-server/Dockerfile
new file mode 100644
index 0000000..c713956
--- /dev/null
+++ b/ruoyi-server/Dockerfile
@@ -0,0 +1,30 @@
+# 贝尔实验室 Spring 官方推荐镜像 JDK下载地址 https://bell-sw.com/pages/downloads/
+FROM bellsoft/liberica-openjdk-rocky:17.0.15-cds
+#FROM bellsoft/liberica-openjdk-rocky:21.0.7-cds
+
+LABEL maintainer="Lion Li"
+
+RUN mkdir -p /ruoyi/server/logs \
+    /ruoyi/server/temp \
+    /ruoyi/skywalking/agent
+
+WORKDIR /ruoyi/server
+
+ENV SERVER_PORT=8080 SNAIL_PORT=28080 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS=""
+
+EXPOSE ${SERVER_PORT}
+# 暴露 snail job 客户端端口 用于定时任务调度中心通信
+EXPOSE ${SNAIL_PORT}
+
+ADD ./target/ruoyi-server.jar ./app.jar
+
+SHELL ["/bin/bash", "-c"]
+
+ENTRYPOINT java -Djava.security.egd=file:/dev/./urandom -Dserver.port=${SERVER_PORT} \
+           -Dsnail-job.port=${SNAIL_PORT} \
+           # 应用名称 如果想区分集群节点监控 改成不同的名称即可
+           #-Dskywalking.agent.service_name=ruoyi-server \
+           #-javaagent:/ruoyi/skywalking/agent/skywalking-agent.jar \
+           -XX:+HeapDumpOnOutOfMemoryError -XX:+UseZGC ${JAVA_OPTS} \
+           -jar app.jar
+
diff --git a/ruoyi-server/docs/LOGIN_COMPREHENSIVE_GUIDE.md b/ruoyi-server/docs/LOGIN_COMPREHENSIVE_GUIDE.md
new file mode 100644
index 0000000..927b51d
--- /dev/null
+++ b/ruoyi-server/docs/LOGIN_COMPREHENSIVE_GUIDE.md
@@ -0,0 +1,718 @@
+# 登录模块综合开发指南（LOGIN_COMPREHENSIVE_GUIDE）
+
+版本：v1.1.0（2025-12-27）  
+适用范围：Sys（后台管理端）、App（移动端）两套登录体系及微信公众号整合  
+最后更新：2025-12-27
+
+---
+
+## 目录
+1. 登录模块概述
+2. 详细开发指南
+3. 登录流程示意图
+4. 实现方案
+5. 模块规范
+6. App 会话管理 API
+7. Sys 在线用户管理 API
+8. Sys 登录日志管理 API
+9. 相关代码路径参考
+
+---
+
+## 1. 登录模块概述
+
+- 背景与目的  
+  - 系统同时支持 Sys 与 App 两套登录体系，分别面向管理员与 C 端用户，要求登录态、权限与数据完全隔离，同时提供统一的扩展与维护指引。  
+  - 采用策略模式（Strategy Pattern）实现登录方式的可插拔扩展，基于 Sa-Token 管理会话与权限，支持验证码、限流、并发与设备维度会话。  
+  - 集成微信公众号能力：App 用于授权登录与业务交互；Sys 用于管理员绑定与模板消息推送。
+
+- 目标  
+  - 统一规范开发流程与接口定义，保障多端、多方式登录的稳定性与可扩展性。  
+  - 为新增登录方式与微信能力提供清晰的落地步骤与测试方案。
+
+---
+
+## 2. 详细开发指南
+
+### 2.1 多用户体系与会话隔离
+- 物理隔离 + 逻辑统一：`sys_user` 与 `app_user` 两套用户体系；统一使用 Sa-Token 管理会话。  
+- LoginId 前缀隔离：  
+  - Sys：`sys_user:{id}`  
+  - App：`app:{id}`  
+- 会话校验（Sys 全局拦截）：参考 SecurityConfig 的 `StpUtil.checkLogin()` 与路由校验，确保 Token 与 clientid 一致。
+
+### 2.2 App 开发要点
+- 策略模式登录：`IAppAuthStrategy` 以 `grantType` 路由到具体策略（密码、短信、社交、微信等）。  
+- 验证码与密码重试：`captcha.enable=true` 可开关；错误次数与锁定时间通过配置项控制。  
+- 信息补全向导（过滤器）：登录后若用户资料未完善，仅放行“查询个人信息/绑定手机号”接口，其余拦截返回 403。
+
+### 2.3 Sys 开发要点
+- 安全加固：  
+  - 异地登录检测：比对最近一次登录 IP 归属地变化并告警（日志/邮件）。  
+  - 强制改密策略：登录后检查密码更新时间是否超期，超期在 Session 写入标记，拦截除改密外所有接口。  
+- 管理员微信绑定与消息推送：后台生成带参二维码，管理员扫码绑定 `openId/unionId`，用于模板消息推送。
+  
+（最小改动策略）  
+- 保留现有 Sys 登录与权限实现，不做核心代码改造。  
+- 新增或接入的仅为“管理员微信绑定二维码生成”“SCAN/SUBSCRIBE 回调绑定”“模板消息推送”三个能力点；其余增强（如异地登录与强制改密）可按需增量加入，不影响主流程。
+
+### 2.4 微信公众号整合（双端）
+- App：OAuth2 获取 `openId/unionId`，优先 `unionId` 进行跨应用账号识别；若未绑定则返回 401 并引导绑定手机号。  
+- Sys：生成 `scene_str=sys_user:{userId}` 的二维码，接收 `SCAN/SUBSCRIBE` 事件解析并绑定，后续通过模板消息进行系统通知与订单推送。
+
+---
+
+## 3. 登录流程示意图
+
+### 3.1 App 登录总体流程
+```mermaid
+sequenceDiagram
+  participant Client as 客户端
+  participant Controller as AppAuthController
+  participant Strategy as IAppAuthStrategy
+  participant Service as AppLoginService
+  participant Redis as Redis
+  Client->>Controller: POST /app/auth/login
+  Controller->>Strategy: authenticate(body, client, grantType)
+  Strategy->>Service: checkLogin(...)
+  Service->>Redis: PWD_ERR_CNT_KEY
+  Strategy->>Controller: LoginVo(token, expire)
+  Controller-->>Client: 返回结果
+```
+
+### 3.2 App 微信公众号授权登录
+```mermaid
+sequenceDiagram
+  participant H5 as 前端网页
+  participant Wx as 微信OAuth2
+  participant AppAPI as AppAuthController
+  participant MP as WxMpService
+  H5->>Wx: 跳转授权，获取code
+  H5->>AppAPI: grantType=wechat_mp, code
+  AppAPI->>MP: getAccessToken(code)
+  MP-->>AppAPI: openId, accessToken
+  AppAPI->>MP: userInfo(openId)
+  MP-->>AppAPI: unionId
+  AppAPI->>DB: 查询app_social_auth by unionId
+  alt 已绑定
+    AppAPI-->>H5: 登录成功
+  else 未绑定
+    AppAPI-->>H5: 401_BIND_REQUIRED + tempKey
+  end
+```
+
+### 3.3 Sys 管理员绑定与模板消息推送
+```mermaid
+flowchart LR
+  A[管理员点击绑定] --> B[生成带参二维码 scene_str=sys_user:{userId}]
+  B --> C[管理员扫码]
+  C --> D[WxMpPortal接收SCAN/SUBSCRIBE]
+  D --> E[解析EventKey与OpenId]
+  E --> F[查询UnionId]
+  F --> G[更新管理员绑定信息]
+  G --> H[SysMessageService发送模板消息]
+```
+
+---
+
+## 4. 实现方案
+
+### 4.1 架构与技术选型
+- Sa-Token：统一的会话与权限管理（Token 名称、并发、多设备）。  
+- 策略模式：按 `grantType` 定位不同登录策略，低耦合、易扩展。  
+- WxJava：`ruoyi-mp` 模块提供的公众号 OAuth2 与模板消息能力。  
+- 线程池与并发：按需启用全局线程池或在 JDK21 使用虚拟线程。
+
+### 4.2 关键实现细节
+- LoginId 前缀实现：`LoginUser.getLoginId()` 返回 `userType + ":" + userId`。  
+- App 密码策略：开启验证码校验时执行 `validateCaptcha()`；错误次数与锁定时间通过配置项 `user.password.maxRetryCount`、`user.password.lockTime` 控制。  
+- App 信息补全：过滤器中检查 `infoComplete`，仅放行指定白名单接口（配置项 `user.auth.whitelist`），其余拦截返回 403。  
+- App 微信授权：`getAccessToken(code) → userInfo(openId)`，优先使用 `unionId` 识别；未绑定返回 401 与临时 Key，引导绑定手机号。  
+- Sys 管理员绑定：二维码 `scene_str=sys_user:{userId}`；接收事件后解析 `EventKey` 与 `OpenId`，查询 `unionId` 并写入绑定信息；后续根据 `openId` 推送模板消息。  
+- 异地登录检测：在记录登录信息时调用 `LoginRiskService.checkRisk(userId, ip)`，比较归属地变化并告警。  
+- 强制改密：登录后检查密码更新时间是否超期，标记 Session 并在拦截器中只放行改密接口。
+
+### 4.4 配置项说明
+- **验证码配置**（`application.yml`）：
+  ```yaml
+  captcha:
+    enable: true              # 是否启用验证码校验
+    type: MATH                # 验证码类型（MATH数学计算 / CHAR字符验证）
+    category: CIRCLE          # 干扰类型（LINE线段 / CIRCLE圆圈 / SHEAR扭曲）
+    numberLength: 1           # 数字验证码位数
+    charLength: 4             # 字符验证码长度
+  ```
+- **用户密码策略配置**（`application.yml`）：
+  ```yaml
+  user:
+    password:
+      maxRetryCount: 5        # 密码最大错误次数
+      lockTime: 10            # 密码锁定时间（分钟）
+  ```
+- **App端验证码与白名单配置**（`application.yml`）：
+  ```yaml
+  user:
+    auth:
+      captcha:
+        enabled: false        # App端验证码开关
+        type: math            # 验证码类型
+      whitelist: /app/user/profile,/app/user/bind,/app/auth/logout  # 信息补全白名单
+  ```
+- **客户端配置**：在 `sys_client` 表中配置客户端信息，包括 `client_id`、`grant_type`（支持多个，逗号分隔）、`status`、`timeout`、`active_timeout` 等。
+
+### 4.3 OAuth 与 MP 职责划分
+- 第三方登录（OAuth）：使用 justauth
+  - 属性来源：`application*.yml` 中的 `justauth.type.*`
+  - 代码路径：属性绑定 [SocialProperties](file:///Users/lihaha/Documents/Projecte/PoJie/PoJie/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/config/properties/SocialProperties.java)，工厂方法 [SocialUtils.getAuthRequest](file:///Users/lihaha/Documents/Projecte/PoJie/PoJie/ruoyi-common/ruoyi-common-social/src/main/java/org/dromara/common/social/utils/SocialUtils.java#L35-L74)
+  - 使用位置：App 端策略 [AppWechatMpAuthStrategy](file:///Users/lihaha/Documents/Projecte/PoJie/PoJie/ruoyi-server/src/main/java/org/dromara/app/service/impl/AppWechatMpAuthStrategy.java)、[AppWechatOpenAuthStrategy](file:///Users/lihaha/Documents/Projecte/PoJie/PoJie/ruoyi-server/src/main/java/org/dromara/app/service/impl/AppWechatOpenAuthStrategy.java)、[AppWechatMiniprogramAuthStrategy](file:///Users/lihaha/Documents/Projecte/PoJie/PoJie/ruoyi-server/src/main/java/org/dromara/app/service/impl/AppWechatMiniprogramAuthStrategy.java)
+  - 说明：source 包含 `wechat_mp`、`wechat_open`、`wechat_miniprogram`、`github`、`gitee` 等，统一由 justauth 提供 OAuth 能力
+- 公众号服务端能力（MP）：使用 `wx.*`
+  - 属性来源：`application*.yml` 中的 `wx.mp.*`、`wx.miniapp.*`、`wx.pay.*`
+  - 代码路径：属性绑定 [WxMpProperties](file:///Users/lihaha/Documents/Projecte/PoJie/PoJie/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/config/WxMpProperties.java)，装配 [WxMpConfiguration](file:///Users/lihaha/Documents/Projecte/PoJie/PoJie/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/config/WxMpConfiguration.java)
+  - 使用位置：消息入口 [WxMpPortalController](file:///Users/lihaha/Documents/Projecte/PoJie/PoJie/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/controller/WxMpPortalController.java)、二维码接口 [WxMpQrCodeController](file:///Users/lihaha/Documents/Projecte/PoJie/PoJie/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/controller/WxMpQrCodeController.java)
+  - 说明：MP 提供消息接收、二维码、模板消息推送等服务端功能，不用于 OAuth 登录
+  
+---
+
+## 5. 模块规范
+
+### 5.1 接口定义与参数
+
+#### Sys 登录接口
+- **路径**：`/auth/login`  
+- **方法**：`POST`
+- **支持的grantType**：
+  - `password` - 密码登录（参数：`username`, `password`, 可选 `code/uuid`验证码）
+  - `sms` - 短信登录（参数：`phonenumber`, `smsCode`）
+  - `email` - 邮箱登录（参数：`email`, `emailCode`）
+  - `social` - 第三方登录（参数：`source`, `socialCode`, `socialState`）
+- **通用参数**：`clientId`（必填）
+- **返回**：`LoginVo`（包含 `accessToken`, `expireIn`, `clientId`）
+- **代码路径**：[AuthController.login](file:///Users/lihaha/Documents/Projecte/PoJie/PoJie/ruoyi-server/src/main/java/org/dromara/web/controller/AuthController.java#L75-L101)
+
+#### Sys 退出登录接口
+- **路径**：`/auth/logout`  
+- **方法**：`POST`
+- **权限**：需要登录态
+- **说明**：退出当前登录会话，清除Token
+- **代码路径**：[AuthController.logout](file:///Users/lihaha/Documents/Projecte/PoJie/PoJie/ruoyi-server/src/main/java/org/dromara/web/controller/AuthController.java#L164-L168)
+
+#### Sys 用户注册接口
+- **路径**：`/auth/register`  
+- **方法**：`POST`
+- **参数**：`username`, `password`, `userType`, 可选 `code/uuid`（验证码）
+- **说明**：系统用户注册，需系统开启注册功能
+- **代码路径**：[AuthController.register](file:///Users/lihaha/Documents/Projecte/PoJie/PoJie/ruoyi-server/src/main/java/org/dromara/web/controller/AuthController.java#L174-L181)
+
+#### Sys 第三方绑定接口
+- **获取绑定URL**：`GET /auth/binding/{source}?domain={domain}`
+  - 生成第三方授权跳转URL，用于绑定第三方账号
+- **回调绑定**：`POST /auth/social/callback`
+  - 前端回调后绑定第三方账号（需token）
+- **取消绑定**：`DELETE /auth/unlock/{socialId}`
+  - 取消已绑定的第三方账号（需token）
+- **代码路径**：[AuthController](file:///Users/lihaha/Documents/Projecte/PoJie/PoJie/ruoyi-server/src/main/java/org/dromara/web/controller/AuthController.java#L109-L158)
+
+#### App 登录接口
+- **路径**：`/app/auth/login`  
+- **方法**：`POST`
+- **支持的grantType**：
+  - `app_password` - 密码登录（参数：`username`, `password`）
+  - `sms` - 短信登录（参数：`phonenumber`, `smsCode`）
+  - `email` - 邮箱登录（参数：`email`, `emailCode`）
+  - `social` - 第三方登录（参数：`source`, `socialCode`, `socialState`）
+  - `wechat_mp` - 微信公众号登录（参数：`socialCode`, `socialState`）
+  - `wechat_open` - 微信开放平台登录（参数：`socialCode`, `socialState`）
+  - `wechat_miniprogram` - 微信小程序登录（参数：`socialCode`, `socialState`）
+- **通用参数**：`clientId`（必填）
+- **返回**：`LoginVo`（包含 `accessToken`, `expireIn`, `clientId`）
+- **代码路径**：[AppAuthController.login](file:///Users/lihaha/Documents/Projecte/PoJie/PoJie/ruoyi-server/src/main/java/org/dromara/app/controller/AppAuthController.java#L69-L93)
+
+#### App 退出登录接口
+- **路径**：`/app/auth/logout`  
+- **方法**：`POST`
+- **权限**：需要登录态
+- **说明**：退出当前登录会话，清除Token
+- **代码路径**：[AppAuthController.logout](file:///Users/lihaha/Documents/Projecte/PoJie/PoJie/ruoyi-server/src/main/java/org/dromara/app/controller/AppAuthController.java#L100-L104)
+
+#### App 用户注册接口
+- **路径**：`/app/auth/register`  
+- **方法**：`POST`
+- **参数**：`username`, `password`
+- **限流**：60秒内最多1次（按IP）
+- **说明**：App用户注册，需系统开启注册功能
+- **代码路径**：[AppAuthController.register](file:///Users/lihaha/Documents/Projecte/PoJie/PoJie/ruoyi-server/src/main/java/org/dromara/app/controller/AppAuthController.java#L115-L132)
+
+#### App 配置接口
+- **路径**：`/app/auth/config`  
+- **方法**：`GET`
+- **说明**：获取App端配置信息（如注册开关等）
+- **代码路径**：[AppAuthController.getConfig](file:///Users/lihaha/Documents/Projecte/PoJie/PoJie/ruoyi-server/src/main/java/org/dromara/app/controller/AppAuthController.java#L139-L145)
+
+#### 验证码接口
+- **图形验证码**：`GET /auth/code`
+  - 返回：`CaptchaVo`（包含 `uuid`, `img`（Base64图片）, `captchaEnabled`）
+  - 限流：60秒内最多10次（按IP）
+  - **代码路径**：[CaptchaController.getCode](file:///Users/lihaha/Documents/Projecte/PoJie/PoJie/ruoyi-server/src/main/java/org/dromara/web/controller/CaptchaController.java#L112-L121)
+- **短信验证码**：`GET /resource/sms/code?phonenumber={phonenumber}`
+  - 限流：60秒内最多1次（按手机号）
+  - **代码路径**：[CaptchaController.smsCode](file:///Users/lihaha/Documents/Projecte/PoJie/PoJie/ruoyi-server/src/main/java/org/dromara/web/controller/CaptchaController.java#L59-L76)
+- **邮箱验证码**：`GET /resource/email/code?email={email}`
+  - 限流：60秒内最多1次（按邮箱）
+  - **代码路径**：[CaptchaController.emailCode](file:///Users/lihaha/Documents/Projecte/PoJie/PoJie/ruoyi-server/src/main/java/org/dromara/web/controller/CaptchaController.java#L83-L90)
+
+#### 管理员绑定微信（建议）
+- **生成绑定二维码**：`POST /wx/mp/qrcode/{appid}/forever?sceneStr=sys_user:{userId}`
+  - 生成永久二维码，scene_str = sys_user:{userId}
+- **获取二维码URL**：`GET /wx/mp/qrcode/{appid}/url?ticket={ticket}`
+  - 根据ticket获取二维码图片URL
+- **事件回调**：`WxMpPortalController` 处理 `SCAN/SUBSCRIBE` 事件并完成绑定
+  - **代码路径**：[WxMpPortalController](file:///Users/lihaha/Documents/Projecte/PoJie/PoJie/ruoyi-modules/ruoyi-mp/src/main/java/org/dromara/mp/controller/WxMpPortalController.java)
+
+### 5.2 会话与权限规范
+- Token 名称：`Authorization`（统一）。  
+- 并发策略：`is-concurrent=true` 支持多设备，按需要设置 `deviceType`。  
+- 登录态隔离：Sys 与 App 使用不同 LoginId 前缀与独立会话空间。  
+- 鉴权方式：Sys 采用注解鉴权（`@SaCheckPermission` 等）；App 采用资源级鉴权（业务层校验 `userId` 所属资源）。
+
+### 5.3 错误码与处理
+- `401_BIND_REQUIRED`：微信授权成功但未绑定手机号，引导前端跳转绑定流程。  
+- `403_UPDATE_PWD`：Sys 账号密码超期未改，拦截除改密外所有接口。  
+- `403_INFO_INCOMPLETE`：App 用户信息未补全，仅放行资料完善接口。
+
+### 5.4 约束与约定
+- 不混用 Sys 与 App 的用户体系与权限模型。  
+- 微信授权优先使用 `unionId` 进行跨应用识别；若缺失则降级使用 `openId`。  
+- 新增登录方式遵循 `{grantType}AppAuthStrategy` 命名与策略路由约定。
+
+### 5.5 App 角色与关联关系
+- 表结构与关系：
+  - 用户表：`app_user`，参见 [ry_app.sql:app_user](file:///Users/lihaha/Documents/Projecte/PoJie/PoJie/script/sql/ry_app.sql#L6-L27)
+  - 角色表：`app_role`（角色键如 `app_user`、`app_vip`），参见 [ry_app.sql:app_role](file:///Users/lihaha/Documents/Projecte/PoJie/PoJie/script/sql/ry_app.sql#L35-L53)
+  - 关联表：`app_user_role`（多对多关联），参见 [ry_app.sql:app_user_role](file:///Users/lihaha/Documents/Projecte/PoJie/PoJie/script/sql/ry_app.sql#L56-L64)
+- 规范说明：
+  - App 端角色用于业务权益与标签管理（如普通用户、VIP），不等同于 Sys 端的 RBAC 功能权限。
+  - 业务层根据 `role_key`（如 `app_vip`）判断权益与展示（价格、特权、活动资格等），避免与后台菜单/按钮权限混用。
+  - 登录后构建的 `AppLoginUser` 可加载角色集合用于业务判定；权限校验仍以资源归属为主（基于 `userId`）。
+- 第三方授权表：
+  - `app_social_auth` 用于存储平台标识（`platform`/`platform_uid`）与微信 `open_id`/`union_id`，参见 [ry_app.sql:app_social_auth](file:///Users/lihaha/Documents/Projecte/PoJie/PoJie/script/sql/ry_app.sql#L67-L85)
+  - App 微信登录优先使用 `union_id` 进行账号打通；若缺失则降级使用 `open_id`。
+
+### 5.6 调用实例（curl）
+- Sys 密码登录（grantType=password）：
+```bash
+curl -sS -X POST "http://localhost:8080/auth/login" \
+  -H "Content-Type: application/json" \
+  -d '{
+    "clientId": "e5cd7e4891bf95d1d19206ce24a7b32e",
+    "grantType": "password",
+    "username": "admin",
+    "password": "admin123",
+    "code": "a1b2",
+    "uuid": "captcha-uuid"
+  }'
+```
+- Sys 短信登录（grantType=sms）：
+```bash
+curl -sS -X POST "http://localhost:8080/auth/login" \
+  -H "Content-Type: application/json" \
+  -d '{
+    "clientId": "e5cd7e4891bf95d1d19206ce24a7b32e",
+    "grantType": "sms",
+    "phonenumber": "13800000000",
+    "smsCode": "123456"
+  }'
+```
+- Sys 邮箱登录（grantType=email）：
+```bash
+curl -sS -X POST "http://localhost:8080/auth/login" \
+  -H "Content-Type: application/json" \
+  -d '{
+    "clientId": "e5cd7e4891bf95d1d19206ce24a7b32e",
+    "grantType": "email",
+    "email": "admin@example.com",
+    "emailCode": "654321"
+  }'
+```
+- Sys 第三方登录（grantType=social，source∈{github,gitee,wechat_open,wechat_mp…}）：
+```bash
+curl -sS -X POST "http://localhost:8080/auth/login" \
+  -H "Content-Type: application/json" \
+  -d '{
+    "clientId": "e5cd7e4891bf95d1d19206ce24a7b32e",
+    "grantType": "social",
+    "source": "github",
+    "socialCode": "oauth-code",
+    "socialState": "state-123"
+  }'
+```
+- App 密码登录（grantType=app_password）：
+```bash
+curl -sS -X POST "http://localhost:8080/app/auth/login" \
+  -H "Content-Type: application/json" \
+  -d '{
+    "clientId": "428a8310cd442757ae699df5d894f051",
+    "grantType": "app_password",
+    "username": "appuser",
+    "password": "admin123"
+  }'
+```
+- App 短信登录（grantType=sms）：
+```bash
+curl -sS -X POST "http://localhost:8080/app/auth/login" \
+  -H "Content-Type: application/json" \
+  -d '{
+    "clientId": "428a8310cd442757ae699df5d894f051",
+    "grantType": "sms",
+    "phonenumber": "13800000000",
+    "smsCode": "123456"
+  }'
+```
+- App 邮箱登录（grantType=email）：
+```bash
+curl -sS -X POST "http://localhost:8080/app/auth/login" \
+  -H "Content-Type: application/json" \
+  -d '{
+    "clientId": "428a8310cd442757ae699df5d894f051",
+    "grantType": "email",
+    "email": "user@example.com",
+    "emailCode": "654321"
+  }'
+```
+- App 第三方登录（grantType=social，source∈{github,gitee,wechat_open…}）：
+```bash
+curl -sS -X POST "http://localhost:8080/app/auth/login" \
+  -H "Content-Type: application/json" \
+  -d '{
+    "clientId": "428a8310cd442757ae699df5d894f051",
+    "grantType": "social",
+    "source": "gitee",
+    "socialCode": "oauth-code",
+    "socialState": "state-xyz"
+  }'
+```
+- App 微信公众号登录（grantType=wechat_mp，前端已拿到 code 与 state）：
+```bash
+curl -sS -X POST "http://localhost:8080/app/auth/login" \
+  -H "Content-Type: application/json" \
+  -d '{
+    "clientId": "428a8310cd442757ae699df5d894f051",
+    "grantType": "wechat_mp",
+    "socialCode": "wx-oauth-code",
+    "socialState": "state-123"
+  }'
+```
+- App 微信开放平台登录（grantType=wechat_open）：
+```bash
+curl -sS -X POST "http://localhost:8080/app/auth/login" \
+  -H "Content-Type: application/json" \
+  -d '{
+    "clientId": "428a8310cd442757ae699df5d894f051",
+    "grantType": "wechat_open",
+    "socialCode": "wx-open-code",
+    "socialState": "state-456"
+  }'
+```
+- App 微信小程序登录（grantType=wechat_miniprogram）：
+```bash
+curl -sS -X POST "http://localhost:8080/app/auth/login" \
+  -H "Content-Type: application/json" \
+  -d '{
+    "clientId": "428a8310cd442757ae699df5d894f051",
+    "grantType": "wechat_miniprogram",
+    "socialCode": "wx-mini-code",
+    "socialState": "state-789"
+  }'
+```
+- Sys 管理员绑定二维码（生成永久二维码 ticket 与 URL）：
+```bash
+# 生成永久二维码，scene_str = sys_user:{userId}
+curl -sS -X POST "http://localhost:8080/wx/mp/qrcode/{appid}/forever" \
+  -d "sceneStr=sys_user:1"
+
+# 根据 ticket 获取二维码 URL
+curl -sS -X GET "http://localhost:8080/wx/mp/qrcode/{appid}/url" \
+  --data-urlencode "ticket=YOUR_TICKET"
+```
+- 获取公众号配置：
+```bash
+curl -sS "http://localhost:8080/wx/mp/portal/{appid}/config"
+```
+- App 用户信息补全白名单接口示例（占位）：
+```bash
+# 获取个人信息
+curl -sS "http://localhost:8080/app/user/profile" -H "Authorization: Bearer YOUR_TOKEN"
+
+# 绑定手机号
+curl -sS -X POST "http://localhost:8080/app/user/bind" \
+  -H "Content-Type: application/json" \
+  -H "Authorization: Bearer YOUR_TOKEN" \
+  -d '{ "phone": "13800000000", "smsCode": "123456" }'
+```
+- Sys 退出登录：
+```bash
+curl -sS -X POST "http://localhost:8080/auth/logout" \
+  -H "Authorization: Bearer YOUR_TOKEN"
+```
+- App 退出登录：
+```bash
+curl -sS -X POST "http://localhost:8080/app/auth/logout" \
+  -H "Authorization: Bearer YOUR_TOKEN"
+```
+- Sys 用户注册：
+```bash
+curl -sS -X POST "http://localhost:8080/auth/register" \
+  -H "Content-Type: application/json" \
+  -d '{
+    "username": "newuser",
+    "password": "password123",
+    "userType": "sys_user",
+    "code": "a1b2",
+    "uuid": "captcha-uuid"
+  }'
+```
+- App 用户注册：
+```bash
+curl -sS -X POST "http://localhost:8080/app/auth/register" \
+  -H "Content-Type: application/json" \
+  -d '{
+    "username": "appuser",
+    "password": "password123"
+  }'
+```
+- 获取图形验证码：
+```bash
+curl -sS "http://localhost:8080/auth/code"
+# 返回: {"code":200,"data":{"uuid":"xxx","img":"data:image/png;base64,...","captchaEnabled":true}}
+```
+- 获取短信验证码：
+```bash
+curl -sS "http://localhost:8080/resource/sms/code?phonenumber=13800000000"
+```
+- 获取邮箱验证码：
+```bash
+curl -sS "http://localhost:8080/resource/email/code?email=user@example.com"
+```
+- 获取App配置：
+```bash
+curl -sS "http://localhost:8080/app/auth/config"
+# 返回: {"code":200,"data":{"registerEnabled":true}}
+```
+- Sys 获取第三方绑定URL：
+```bash
+curl -sS "http://localhost:8080/auth/binding/github?domain=http://localhost:8080"
+# 返回: {"code":200,"data":"https://github.com/login/oauth/authorize?..."}
+```
+- Sys 第三方绑定回调：
+```bash
+curl -sS -X POST "http://localhost:8080/auth/social/callback" \
+  -H "Content-Type: application/json" \
+  -H "Authorization: Bearer YOUR_TOKEN" \
+  -d '{
+    "source": "github",
+    "socialCode": "oauth-code",
+    "socialState": "state-123"
+  }'
+```
+- Sys 取消第三方绑定：
+```bash
+curl -sS -X DELETE "http://localhost:8080/auth/unlock/1" \
+  -H "Authorization: Bearer YOUR_TOKEN"
+```
+
+---
+
+## 6. App 会话管理 API
+
+- 基础路径：`/app/session`  
+- 鉴权：登录态（Sa-Token）
+
+### 6.1 接口列表
+- `GET /app/session/active` 获取当前用户活跃会话列表
+- `POST /app/session/terminate` 终止指定会话（参数：`sessionId`）
+- `POST /app/session/heartbeat` 会话续期（参数：`sessionId`，默认延长至 30 天）
+- `GET /app/session/sse` 订阅会话事件（SSE），事件名：`session`，数据格式：`<TYPE>:<SESSION_ID>`
+
+### 6.2 会话数据结构（AppSession）
+- `sessionId` 会话ID（token值）
+- `userId` 用户ID
+- `deviceType` 设备类型（Web/iOS/Android/Desktop）
+- `deviceId` 设备标识（`X-Device-Id` 或生成）
+- `userAgent` UA 字符串
+- `ip` 登录IP
+- `location` 地理位置（预留）
+- `loginAt` 登录时间戳（毫秒）
+- `expireAt` 过期时间戳（毫秒）
+- `active` 活跃状态
+- `token` 令牌原文
+
+### 6.3 存储键规范
+- 索引：`APP:SESS_INDEX:{userId}`
+- 会话：`APP:SESS:{userId}:{sessionId}`（TTL 与 token 同步）
+- 事件通道：`APP:SESS_EVT:{userId}`
+
+### 6.4 调用示例（curl）
+- 获取活跃会话：
+```bash
+curl -sS "http://localhost:8080/app/session/active" \
+  -H "Authorization: Bearer YOUR_TOKEN"
+```
+- 终止指定会话：
+```bash
+curl -sS -X POST "http://localhost:8080/app/session/terminate" \
+  -H "Content-Type: application/json" \
+  -H "Authorization: Bearer YOUR_TOKEN" \
+  -d '{ "sessionId": "TOKEN_VALUE_TO_TERMINATE" }'
+```
+- 会话续期（心跳）：
+```bash
+curl -sS -X POST "http://localhost:8080/app/session/heartbeat" \
+  -H "Content-Type: application/json" \
+  -H "Authorization: Bearer YOUR_TOKEN" \
+  -d '{ "sessionId": "CURRENT_TOKEN_VALUE" }'
+```
+- 订阅会话事件（SSE）：
+```bash
+curl -sS "http://localhost:8080/app/session/sse" \
+  -H "Authorization: Bearer YOUR_TOKEN"
+```
+
+### 6.5 优化建议
+- 统一设备标识头 `X-Device-Id`，策略层在登录时读取并写入会话，便于同账号多设备管理。
+- 事件命名与负载标准化：`<TYPE>:<SESSION_ID>`（TYPE ∈ {login, logout, heartbeat, terminate}）。
+- TTL 与 Sa-Token 同步：确保 `APP:SESS:{userId}:{sessionId}` 的过期时间与 Token 过期保持一致，避免“僵尸会话”。
+
+---
+
+## 7. Sys 在线用户管理 API
+
+- 基础路径：`/monitor/online`  
+- 鉴权：登录态（Sa-Token），需要权限 `monitor:online:*`
+
+### 7.1 接口列表
+- `GET /monitor/online/list` 获取在线用户监控列表（支持按IP、用户名筛选）
+- `GET /monitor/online` 获取当前用户登录的在线设备列表
+- `DELETE /monitor/online/{tokenId}` 强退指定用户（需要权限 `monitor:online:forceLogout`）
+- `DELETE /monitor/online/myself/{tokenId}` 强退当前用户的指定设备
+
+### 7.2 在线用户数据结构（SysUserOnline）
+- `tokenId` 会话编号（Token值）
+- `userName` 用户名称
+- `deptName` 部门名称
+- `clientKey` 客户端标识
+- `deviceType` 设备类型
+- `ipaddr` 登录IP地址
+- `loginLocation` 登录地点
+- `browser` 浏览器类型
+- `os` 操作系统
+- `loginTime` 登录时间（时间戳，毫秒）
+
+### 7.3 调用示例（curl）
+- 获取在线用户列表：
+```bash
+curl -sS "http://localhost:8080/monitor/online/list?ipaddr=127.0.0.1&userName=admin" \
+  -H "Authorization: Bearer YOUR_TOKEN"
+```
+- 获取当前用户在线设备：
+```bash
+curl -sS "http://localhost:8080/monitor/online" \
+  -H "Authorization: Bearer YOUR_TOKEN"
+```
+- 强退指定用户：
+```bash
+curl -sS -X DELETE "http://localhost:8080/monitor/online/TOKEN_VALUE" \
+  -H "Authorization: Bearer YOUR_TOKEN"
+```
+- 强退当前用户的指定设备：
+```bash
+curl -sS -X DELETE "http://localhost:8080/monitor/online/myself/TOKEN_VALUE" \
+  -H "Authorization: Bearer YOUR_TOKEN"
+```
+- **代码路径**：[SysUserOnlineController](file:///Users/lihaha/Documents/Projecte/PoJie/PoJie/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysUserOnlineController.java)
+
+---
+
+## 8. Sys 登录日志管理 API
+
+- 基础路径：`/monitor/logininfor`  
+- 鉴权：登录态（Sa-Token），需要权限 `monitor:logininfor:*`
+
+### 8.1 接口列表
+- `GET /monitor/logininfor/list` 获取系统访问记录列表（分页，支持按IP、状态、用户名、时间范围筛选）
+- `POST /monitor/logininfor/export` 导出系统访问记录列表（需要权限 `monitor:logininfor:export`）
+- `DELETE /monitor/logininfor/{infoIds}` 批量删除登录日志（需要权限 `monitor:logininfor:remove`）
+- `DELETE /monitor/logininfor/clean` 清理系统访问记录（需要权限 `monitor:logininfor:remove`）
+- `GET /monitor/logininfor/unlock/{userName}` 解锁指定用户的登录锁定（需要权限 `monitor:logininfor:unlock`）
+
+### 8.2 登录日志数据结构（SysLogininfor）
+- `infoId` 日志ID
+- `userName` 用户账号
+- `clientKey` 客户端标识
+- `deviceType` 设备类型
+- `status` 登录状态（0成功 1失败）
+- `ipaddr` 登录IP地址
+- `loginLocation` 登录地点
+- `browser` 浏览器类型
+- `os` 操作系统
+- `msg` 提示消息
+- `loginTime` 访问时间
+
+### 8.3 调用示例（curl）
+- 获取登录日志列表：
+```bash
+curl -sS "http://localhost:8080/monitor/logininfor/list?ipaddr=127.0.0.1&status=0&userName=admin&beginTime=2024-01-01&endTime=2024-12-31&pageNum=1&pageSize=10" \
+  -H "Authorization: Bearer YOUR_TOKEN"
+```
+- 导出登录日志：
+```bash
+curl -sS -X POST "http://localhost:8080/monitor/logininfor/export" \
+  -H "Authorization: Bearer YOUR_TOKEN" \
+  -o logininfor.xlsx
+```
+- 批量删除登录日志：
+```bash
+curl -sS -X DELETE "http://localhost:8080/monitor/logininfor/1,2,3" \
+  -H "Authorization: Bearer YOUR_TOKEN"
+```
+- 清理登录日志：
+```bash
+curl -sS -X DELETE "http://localhost:8080/monitor/logininfor/clean" \
+  -H "Authorization: Bearer YOUR_TOKEN"
+```
+- 解锁用户登录：
+```bash
+curl -sS "http://localhost:8080/monitor/logininfor/unlock/admin" \
+  -H "Authorization: Bearer YOUR_TOKEN"
+```
+- **代码路径**：[SysLogininforController](file:///Users/lihaha/Documents/Projecte/PoJie/PoJie/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysLogininforController.java)
+
+---
+
+## 9. 相关代码路径参考
+
+### 9.1 核心控制器
+- **Sys登录控制器**：[AuthController](file:///Users/lihaha/Documents/Projecte/PoJie/PoJie/ruoyi-server/src/main/java/org/dromara/web/controller/AuthController.java)
+- **App登录控制器**：[AppAuthController](file:///Users/lihaha/Documents/Projecte/PoJie/PoJie/ruoyi-server/src/main/java/org/dromara/app/controller/AppAuthController.java)
+- **验证码控制器**：[CaptchaController](file:///Users/lihaha/Documents/Projecte/PoJie/PoJie/ruoyi-server/src/main/java/org/dromara/web/controller/CaptchaController.java)
+
+### 9.2 核心服务
+- **Sys登录服务**：[SysLoginService](file:///Users/lihaha/Documents/Projecte/PoJie/PoJie/ruoyi-server/src/main/java/org/dromara/web/service/SysLoginService.java)
+- **App登录服务**：[AppLoginService](file:///Users/lihaha/Documents/Projecte/PoJie/PoJie/ruoyi-server/src/main/java/org/dromara/app/service/AppLoginService.java)
+- **Sys注册服务**：[SysRegisterService](file:///Users/lihaha/Documents/Projecte/PoJie/PoJie/ruoyi-server/src/main/java/org/dromara/web/service/SysRegisterService.java)
+
+### 9.3 登录策略
+- **Sys策略接口**：[IAuthStrategy](file:///Users/lihaha/Documents/Projecte/PoJie/PoJie/ruoyi-server/src/main/java/org/dromara/web/service/IAuthStrategy.java)
+- **App策略接口**：[IAppAuthStrategy](file:///Users/lihaha/Documents/Projecte/PoJie/PoJie/ruoyi-server/src/main/java/org/dromara/app/service/IAppAuthStrategy.java)
+- **密码策略**：[PasswordAuthStrategy](file:///Users/lihaha/Documents/Projecte/PoJie/PoJie/ruoyi-server/src/main/java/org/dromara/web/service/impl/PasswordAuthStrategy.java), [AppPasswordAuthStrategy](file:///Users/lihaha/Documents/Projecte/PoJie/PoJie/ruoyi-server/src/main/java/org/dromara/app/service/impl/AppPasswordAuthStrategy.java)
+- **短信策略**：[SmsAuthStrategy](file:///Users/lihaha/Documents/Projecte/PoJie/PoJie/ruoyi-server/src/main/java/org/dromara/web/service/impl/SmsAuthStrategy.java), [AppSmsAuthStrategy](file:///Users/lihaha/Documents/Projecte/PoJie/PoJie/ruoyi-server/src/main/java/org/dromara/app/service/impl/AppSmsAuthStrategy.java)
+- **邮箱策略**：[EmailAuthStrategy](file:///Users/lihaha/Documents/Projecte/PoJie/PoJie/ruoyi-server/src/main/java/org/dromara/web/service/impl/EmailAuthStrategy.java), [AppEmailAuthStrategy](file:///Users/lihaha/Documents/Projecte/PoJie/PoJie/ruoyi-server/src/main/java/org/dromara/app/service/impl/AppEmailAuthStrategy.java)
+- **第三方策略**：[SocialAuthStrategy](file:///Users/lihaha/Documents/Projecte/PoJie/PoJie/ruoyi-server/src/main/java/org/dromara/web/service/impl/SocialAuthStrategy.java), [AppSocialAuthStrategy](file:///Users/lihaha/Documents/Projecte/PoJie/PoJie/ruoyi-server/src/main/java/org/dromara/app/service/impl/AppSocialAuthStrategy.java)
+
+### 9.4 管理接口
+- **在线用户管理**：[SysUserOnlineController](file:///Users/lihaha/Documents/Projecte/PoJie/PoJie/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysUserOnlineController.java)
+- **登录日志管理**：[SysLogininforController](file:///Users/lihaha/Documents/Projecte/PoJie/PoJie/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysLogininforController.java)
+- **登录日志服务**：[SysLogininforService](file:///Users/lihaha/Documents/Projecte/PoJie/PoJie/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/SysLogininforService.java), [SysLogininforServiceImpl](file:///Users/lihaha/Documents/Projecte/PoJie/PoJie/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysLogininforServiceImpl.java)
+
+---
+
+所有代码与配置参考项目既有实现与路径，确保可在 IDE 中点击跳转进行联查与验证。
diff --git a/ruoyi-server/pom.xml b/ruoyi-server/pom.xml
new file mode 100644
index 0000000..158172f
--- /dev/null
+++ b/ruoyi-server/pom.xml
@@ -0,0 +1,188 @@
+<?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>
+        <groupId>org.dromara</groupId>
+        <artifactId>PoJie</artifactId>
+        <version>${revision}</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <packaging>jar</packaging>
+    <artifactId>ruoyi-server</artifactId>
+
+    <description>
+        服务启动入口
+    </description>
+
+    <dependencies>
+
+        <!-- Mysql驱动包 -->
+        <!--<dependency>-->
+        <!--    <groupId>com.mysql</groupId>-->
+        <!--    <artifactId>mysql-connector-j</artifactId>-->
+        <!--</dependency>-->
+
+        <!--        &lt;!&ndash; mp支持的数据库均支持 只需要增加对应的jdbc依赖即可 &ndash;&gt;-->
+        <!--        &lt;!&ndash; Oracle &ndash;&gt;-->
+        <!--        <dependency>-->
+        <!--            <groupId>com.oracle.database.jdbc</groupId>-->
+        <!--            <artifactId>ojdbc8</artifactId>-->
+        <!--        </dependency>-->
+        <!--        &lt;!&ndash; 兼容oracle低版本 &ndash;&gt;-->
+        <!--        <dependency>-->
+        <!--            <groupId>com.oracle.database.nls</groupId>-->
+        <!--            <artifactId>orai18n</artifactId>-->
+        <!--        </dependency>-->
+                <!-- PostgreSql -->
+                <dependency>
+                    <groupId>org.postgresql</groupId>
+                    <artifactId>postgresql</artifactId>
+                </dependency>
+        <!--        &lt;!&ndash; SqlServer &ndash;&gt;-->
+        <!--        <dependency>-->
+        <!--            <groupId>com.microsoft.sqlserver</groupId>-->
+        <!--            <artifactId>mssql-jdbc</artifactId>-->
+        <!--        </dependency>-->
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-doc</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-social</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-ratelimiter</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-mail</artifactId>
+        </dependency>
+
+        <!-- 显式引入 mybatis 公共模块，确保接口默认方法可见 -->
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-mybatis</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-system</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-member</artifactId>
+            <version>${revision}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-mp</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-job</artifactId>
+        </dependency>
+
+        <!-- 代码生成-->
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-generator</artifactId>
+        </dependency>
+
+        <!--  工作流模块  -->
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-workflow</artifactId>
+        </dependency>
+
+        <!--  知识库模块  -->
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-knowledge</artifactId>
+        </dependency>
+
+        <!--  AI中枢模块  -->
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-ai</artifactId>
+        </dependency>
+
+        <!--  聊天模块  -->
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-chat</artifactId>
+        </dependency>
+
+        <!--  支付模块  -->
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-pay</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>de.codecentric</groupId>
+            <artifactId>spring-boot-admin-starter-client</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <!-- skywalking 整合 logback -->
+        <!--        <dependency>-->
+        <!--            <groupId>org.apache.skywalking</groupId>-->
+        <!--            <artifactId>apm-toolkit-logback-1.x</artifactId>-->
+        <!--            <version>${与你的agent探针版本保持一致}</version>-->
+        <!--        </dependency>-->
+        <!--        <dependency>-->
+        <!--            <groupId>org.apache.skywalking</groupId>-->
+        <!--            <artifactId>apm-toolkit-trace</artifactId>-->
+        <!--            <version>${与你的agent探针版本保持一致}</version>-->
+        <!--        </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>
diff --git a/ruoyi-server/src/main/java/org/dromara/PoJieApplication.java b/ruoyi-server/src/main/java/org/dromara/PoJieApplication.java
new file mode 100644
index 0000000..33dae93
--- /dev/null
+++ b/ruoyi-server/src/main/java/org/dromara/PoJieApplication.java
@@ -0,0 +1,22 @@
+package org.dromara;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.context.metrics.buffering.BufferingApplicationStartup;
+
+/**
+ * 启动程序
+ *
+ * @author pengles
+ */
+@SpringBootApplication
+public class PoJieApplication {
+
+    public static void main(String[] args) {
+        SpringApplication application = new SpringApplication(PoJieApplication.class);
+        application.setApplicationStartup(new BufferingApplicationStartup(2048));
+        application.run(args);
+        System.out.println("(♥◠‿◠)ﾉﾞ  PoJie启动成功   ლ(´ڡ`ლ)ﾞ");
+    }
+
+}
diff --git a/ruoyi-server/src/main/java/org/dromara/PoJieServletInitializer.java b/ruoyi-server/src/main/java/org/dromara/PoJieServletInitializer.java
new file mode 100644
index 0000000..86a95a1
--- /dev/null
+++ b/ruoyi-server/src/main/java/org/dromara/PoJieServletInitializer.java
@@ -0,0 +1,18 @@
+package org.dromara;
+
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
+
+/**
+ * web容器中进行部署
+ *
+ * @author pengles
+ */
+public class PoJieServletInitializer extends SpringBootServletInitializer {
+
+    @Override
+    protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
+        return application.sources(PoJieApplication.class);
+    }
+
+}
diff --git a/ruoyi-server/src/main/java/org/dromara/app/controller/AppAuthController.java b/ruoyi-server/src/main/java/org/dromara/app/controller/AppAuthController.java
new file mode 100644
index 0000000..7f15d55
--- /dev/null
+++ b/ruoyi-server/src/main/java/org/dromara/app/controller/AppAuthController.java
@@ -0,0 +1,321 @@
+package org.dromara.app.controller;
+
+import cn.dev33.satoken.annotation.SaIgnore;
+import cn.hutool.core.codec.Base64;
+import cn.hutool.core.util.ObjectUtil;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import me.zhyd.oauth.model.AuthResponse;
+import me.zhyd.oauth.model.AuthUser;
+import me.zhyd.oauth.request.AuthRequest;
+import me.zhyd.oauth.utils.AuthStateUtils;
+import org.dromara.app.domain.vo.AppConfigVo;
+import org.dromara.app.service.AppLoginService;
+import org.dromara.app.service.IAppAuthStrategy;
+import org.dromara.common.core.constant.SystemConstants;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.domain.model.LoginBody;
+import org.dromara.common.core.domain.model.RegisterBody;
+import org.dromara.common.core.domain.model.SocialLoginBody;
+import org.dromara.common.core.utils.MessageUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.core.utils.ValidatorUtils;
+import org.dromara.common.json.utils.JsonUtils;
+import org.dromara.common.ratelimiter.annotation.RateLimiter;
+import org.dromara.common.redis.utils.RedisUtils;
+import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.common.social.config.properties.SocialLoginConfigProperties;
+import org.dromara.common.social.config.properties.SocialProperties;
+import org.dromara.common.social.utils.SocialUtils;
+import org.dromara.member.domain.bo.AppUserBo;
+import org.dromara.member.service.AppSocialAuthService;
+import org.dromara.system.domain.vo.SysClientVo;
+import org.dromara.system.service.SysClientService;
+import org.dromara.system.service.SysConfigService;
+import org.dromara.web.domain.vo.LoginVo;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.nio.charset.StandardCharsets;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * App端认证控制器
+ *
+ * @author pengles
+ */
+@Slf4j
+@SaIgnore
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/app/auth")
+public class AppAuthController {
+
+    private final SocialProperties socialProperties;
+    private final AppLoginService appLoginService;
+    private final org.dromara.app.service.AppLoginRiskService appLoginRiskService;
+    private final SysClientService clientService;
+    private final SysConfigService configService;
+    private final AppSocialAuthService appSocialAuthService;
+
+    /**
+     * App端登录方法
+     *
+     * @param body 登录信息
+     * @return 结果
+     */
+    // TODO: App端暂时不加密，先完善用户端的加密方法在加密
+    // @ApiEncrypt
+    @PostMapping("/login")
+    public R<LoginVo> login(@RequestBody String body) {
+        LoginBody loginBody = JsonUtils.parseObject(body, LoginBody.class);
+        ValidatorUtils.validate(loginBody);
+        // 授权类型和客户端id
+        String clientId = loginBody.getClientId();
+        String grantType = loginBody.getGrantType();
+        SysClientVo client = clientService.queryByClientId(clientId);
+        // 查询不到 client 或 client 内不包含 grantType
+        if (ObjectUtil.isNull(client) || !StringUtils.contains(client.getGrantType(), grantType)) {
+            log.info("客户端id: {} 认证类型：{} 异常!.", clientId, grantType);
+            return R.fail(MessageUtils.message("auth.grant.type.error"));
+        } else if (!SystemConstants.NORMAL.equals(client.getStatus())) {
+            return R.fail(MessageUtils.message("auth.grant.type.blocked"));
+        }
+        // App端登录
+        LoginVo loginVo = IAppAuthStrategy.authenticate(body, client, grantType);
+
+        Long userId = LoginHelper.getUserId();
+        // 记录登录信息
+        appLoginRiskService.checkRisk(userId, LoginHelper.getLoginUser().getIpaddr());
+        appLoginService.recordLoginInfo(userId, LoginHelper.getLoginUser().getIpaddr());
+
+        return R.ok(loginVo);
+    }
+
+    /**
+     * App端退出登录
+     *
+     * @return 结果
+     */
+    @PostMapping("/logout")
+    public R<Void> logout() {
+        appLoginService.logout();
+        return R.ok("退出成功");
+    }
+
+    /**
+     * App端用户注册
+     *
+     * @param user 用户信息
+     * @return 结果
+     */
+    // TODO: App端暂时不加密，先完善用户端的加密方法在加密
+    // @ApiEncrypt
+    @RateLimiter(key = "register", time = 60, count = 1)
+    @PostMapping("/register")
+    public R<Void> register(@Validated @RequestBody RegisterBody user) {
+        if (!configService.selectRegisterEnabled()) {
+            return R.fail("当前系统没有开启注册功能！");
+        }
+        AppUserBo bo = new AppUserBo();
+        bo.setUserName(user.getUsername());
+        bo.setPassword(user.getPassword());
+        bo.setNickName(user.getUsername());
+
+        // 校验是否已存在
+        if (!appLoginService.checkUserNameUnique(bo.getUserName())) {
+            return R.fail("注册失败，账号已存在");
+        }
+
+        // 执行注册
+        return appLoginService.register(bo) ? R.ok() : R.fail("注册失败");
+    }
+
+    /**
+     * 获取App端配置信息
+     *
+     * @return 配置信息
+     */
+    @GetMapping("/config")
+    public R<AppConfigVo> getConfig() {
+        AppConfigVo config = new AppConfigVo();
+        config.setRegisterEnabled(configService.selectRegisterEnabled());
+        // 可以添加更多App端特有的配置
+        return R.ok(config);
+    }
+
+    /**
+     * 获取登录二维码与票据
+     */
+    @GetMapping("/qrcode")
+    public R<java.util.Map<String,String>> getQrCode() {
+        String ticket = cn.hutool.core.util.IdUtil.fastSimpleUUID();
+        RedisUtils.setCacheObject("APP_LOGIN_QR:" + ticket, "PENDING", java.time.Duration.ofMinutes(5));
+        String url = "/wx/mp/qrcode/url?ticket=" + ticket;
+        java.util.Map<String,String> res = new java.util.HashMap<>();
+        res.put("ticket", ticket);
+        res.put("url", url);
+        return R.ok(res);
+    }
+
+    /**
+     * 轮询二维码登录状态
+     */
+    @GetMapping("/qrcode/login")
+    public R<String> pollQrLogin(@RequestParam String ticket) {
+        String key = "APP_LOGIN_QR:" + ticket;
+        String status = RedisUtils.getCacheObject(key);
+        if (status == null) {
+            return R.ok("EXPIRED");
+        }
+        return R.ok(status);
+    }
+
+    /**
+     * 绑定第三方账号
+     *
+     * @param body 第三方账号信息
+     * @return 结果
+     */
+    // TODO: App端暂时不加密，先完善前段的加密方法在加密
+    // @ApiEncrypt
+    @PostMapping("/bind/social")
+    public R<Void> bindSocial(@RequestBody String body) {
+        SocialLoginBody socialLoginBody = JsonUtils.parseObject(body, SocialLoginBody.class);
+        ValidatorUtils.validate(socialLoginBody);
+
+        Long userId = LoginHelper.getUserId();
+        if (userId == null) {
+            return R.fail("请先登录");
+        }
+
+        try {
+            // 获取第三方登录信息
+            AuthResponse<AuthUser> response = SocialUtils.loginAuth(
+                    socialLoginBody.getSource(), socialLoginBody.getSocialCode(),
+                    socialLoginBody.getSocialState(), socialProperties);
+            AuthUser authUserData = response.getData();
+            // 判断授权响应是否成功
+            if (!response.ok()) {
+                return R.fail(response.getMsg());
+            }
+            // 执行绑定逻辑
+            appSocialAuthService.socialRegister(authUserData);
+            log.info("用户 {} 绑定第三方账号成功，平台: {}", userId, socialLoginBody.getSource());
+            return R.ok("绑定成功");
+        } catch (Exception e) {
+            log.error("绑定第三方账号失败", e);
+            return R.fail("绑定失败: " + e.getMessage());
+        }
+    }
+
+    /**
+     * 解绑第三方账号
+     *
+     * @param platform 第三方平台
+     * @return 结果
+     */
+    @PostMapping("/unbind/social")
+    public R<Void> unbindSocial(@RequestParam String platform) {
+        Long userId = LoginHelper.getUserId();
+        if (userId == null) {
+            return R.fail("请先登录");
+        }
+
+        if (StringUtils.isBlank(platform)) {
+            return R.fail("平台参数不能为空");
+        }
+
+        try {
+            // 查找并删除绑定关系
+            boolean success = appSocialAuthService.deleteByUserIdAndPlatform(userId, platform);
+            if (success) {
+                log.info("用户 {} 解绑第三方账号成功，平台: {}", userId, platform);
+                return R.ok("解绑成功");
+            } else {
+                log.warn("用户 {} 尝试解绑不存在的第三方账号，平台: {}", userId, platform);
+                return R.fail("未找到绑定关系");
+            }
+        } catch (Exception e) {
+            log.error("用户 {} 解绑第三方账号失败，平台: {}", userId, platform, e);
+            return R.fail("解绑失败: " + e.getMessage());
+        }
+    }
+
+    /**
+     * 获取App端第三方登录跳转URL
+     *
+     * @param source 登录来源
+     * @param domain 域名
+     * @return 结果
+     */
+    @GetMapping("/binding/{source}")
+    public R<String> authBinding(@PathVariable("source") String source, @RequestParam String domain) {
+        SocialLoginConfigProperties obj = socialProperties.getType().get(source);
+        if (ObjectUtil.isNull(obj)) {
+            return R.fail(source + "平台账号暂不支持");
+        }
+        AuthRequest authRequest = SocialUtils.getAuthRequest(source, socialProperties);
+        Map<String, String> map = new HashMap<>();
+        map.put("domain", domain);
+        map.put("state", AuthStateUtils.createState());
+        String authorizeUrl = authRequest.authorize(Base64.encode(JsonUtils.toJsonString(map), StandardCharsets.UTF_8));
+        return R.ok("操作成功", authorizeUrl);
+    }
+
+    /**
+     * App端社交账号绑定回调(需要token)
+     *
+     * @param loginBody 请求体
+     * @return 结果
+     */
+    @PostMapping("/social/binding")
+    public R<Void> socialBinding(@RequestBody SocialLoginBody loginBody) {
+        // 校验token
+        Long userId = LoginHelper.getUserId();
+        if (userId == null) {
+            return R.fail("请先登录");
+        }
+
+        try {
+            // 获取第三方登录信息
+            AuthResponse<AuthUser> response = SocialUtils.loginAuth(
+                    loginBody.getSource(), loginBody.getSocialCode(),
+                    loginBody.getSocialState(), socialProperties);
+            AuthUser authUserData = response.getData();
+            // 判断授权响应是否成功
+            if (!response.ok()) {
+                return R.fail(response.getMsg());
+            }
+            appSocialAuthService.socialRegister(authUserData);
+            return R.ok("绑定成功");
+        } catch (Exception e) {
+            log.error("社交账号绑定失败", e);
+            return R.fail("绑定失败: " + e.getMessage());
+        }
+    }
+
+    /**
+     * 获取用户绑定的第三方账号列表
+     *
+     * @return 绑定列表
+     */
+    @GetMapping("/social/list")
+    public R<?> getSocialList() {
+        Long userId = LoginHelper.getUserId();
+        if (userId == null) {
+            return R.fail("请先登录");
+        }
+
+        try {
+            var socialList = appSocialAuthService.queryByUserId(userId);
+            return R.ok(socialList);
+        } catch (Exception e) {
+            log.error("获取第三方账号绑定列表失败", e);
+            return R.fail("获取失败: " + e.getMessage());
+        }
+    }
+
+
+}
diff --git a/ruoyi-server/src/main/java/org/dromara/app/controller/AppSessionController.java b/ruoyi-server/src/main/java/org/dromara/app/controller/AppSessionController.java
new file mode 100644
index 0000000..174cd86
--- /dev/null
+++ b/ruoyi-server/src/main/java/org/dromara/app/controller/AppSessionController.java
@@ -0,0 +1,59 @@
+package org.dromara.app.controller;
+
+import cn.dev33.satoken.annotation.SaCheckLogin;
+import lombok.RequiredArgsConstructor;
+import org.dromara.app.session.AppSession;
+import org.dromara.app.session.AppSessionManager;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.satoken.utils.LoginHelper;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
+
+import java.io.IOException;
+import java.time.Duration;
+import java.util.List;
+
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/app/session")
+public class AppSessionController {
+
+    private final AppSessionManager sessionManager;
+
+    @GetMapping("/active")
+    @SaCheckLogin
+    public R<List<AppSession>> active() {
+        Long userId = LoginHelper.getUserId();
+        return R.ok(sessionManager.list(userId));
+    }
+
+    @PostMapping("/terminate")
+    @SaCheckLogin
+    public R<Boolean> terminate(@RequestParam String sessionId) {
+        Long userId = LoginHelper.getUserId();
+        return R.ok(sessionManager.terminate(userId, sessionId));
+    }
+
+    @PostMapping("/heartbeat")
+    @SaCheckLogin
+    public R<Boolean> heartbeat(@RequestParam String sessionId) {
+        Long userId = LoginHelper.getUserId();
+        return R.ok(sessionManager.heartbeat(userId, sessionId, Duration.ofDays(30)));
+    }
+
+    @GetMapping("/sse")
+    @SaCheckLogin
+    public SseEmitter sse() {
+        Long userId = LoginHelper.getUserId();
+        SseEmitter emitter = new SseEmitter(Duration.ofHours(1).toMillis());
+        String ch = "APP:SESS_EVT:" + userId;
+        org.dromara.common.redis.utils.RedisUtils.subscribe(ch, String.class, msg -> {
+            try {
+                emitter.send(SseEmitter.event().name("session").data(msg));
+            } catch (IOException e) {
+                emitter.completeWithError(e);
+            }
+        });
+        return emitter;
+    }
+}
diff --git a/ruoyi-server/src/main/java/org/dromara/app/domain/AppLoginUser.java b/ruoyi-server/src/main/java/org/dromara/app/domain/AppLoginUser.java
new file mode 100644
index 0000000..4b2ff0b
--- /dev/null
+++ b/ruoyi-server/src/main/java/org/dromara/app/domain/AppLoginUser.java
@@ -0,0 +1,118 @@
+package org.dromara.app.domain;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import org.dromara.common.core.domain.model.LoginUser;
+
+import java.io.Serial;
+import java.util.Set;
+
+/**
+ * App登录用户身份权限
+ *
+ * @author pengles
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@NoArgsConstructor
+public class AppLoginUser extends LoginUser {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 用户ID
+     */
+    private Long userId;
+
+    /**
+     * 部门ID
+     */
+    private Long deptId;
+
+    /**
+     * 部门名
+     */
+    private String deptName;
+
+    /**
+     * 用户唯一标识
+     */
+    private String token;
+
+    /**
+     * 用户类型
+     */
+    private String userType;
+
+    /**
+     * 登录时间
+     */
+    private Long loginTime;
+
+    /**
+     * 过期时间
+     */
+    private Long expireTime;
+
+    /**
+     * 登录IP地址
+     */
+    private String ipaddr;
+
+    /**
+     * 登录地点
+     */
+    private String loginLocation;
+
+    /**
+     * 浏览器类型
+     */
+    private String browser;
+
+    /**
+     * 操作系统
+     */
+    private String os;
+
+    /**
+     * 菜单权限
+     */
+    private Set<String> menuPermission;
+
+    /**
+     * 角色权限
+     */
+    private Set<String> rolePermission;
+
+    /**
+     * 用户名
+     */
+    private String username;
+
+    /**
+     * 用户昵称
+     */
+    private String nickname;
+
+    /**
+     * 信息是否完善
+     */
+    private Boolean infoComplete;
+
+    /**
+     * 获取登录id
+     */
+    @Override
+    public String getLoginId() {
+        if (userType == null) {
+            throw new IllegalArgumentException("用户类型不能为空");
+        }
+        if (userId == null) {
+            throw new IllegalArgumentException("用户ID不能为空");
+        }
+        return userType + ":" + userId;
+    }
+
+}
\ No newline at end of file
diff --git a/ruoyi-server/src/main/java/org/dromara/app/domain/vo/AppConfigVo.java b/ruoyi-server/src/main/java/org/dromara/app/domain/vo/AppConfigVo.java
new file mode 100644
index 0000000..6dd6a2f
--- /dev/null
+++ b/ruoyi-server/src/main/java/org/dromara/app/domain/vo/AppConfigVo.java
@@ -0,0 +1,13 @@
+package org.dromara.app.domain.vo;
+
+public class AppConfigVo {
+    private boolean registerEnabled;
+
+    public boolean isRegisterEnabled() {
+        return registerEnabled;
+    }
+
+    public void setRegisterEnabled(boolean registerEnabled) {
+        this.registerEnabled = registerEnabled;
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-server/src/main/java/org/dromara/app/listener/AppUserActionListener.java b/ruoyi-server/src/main/java/org/dromara/app/listener/AppUserActionListener.java
new file mode 100644
index 0000000..92522f5
--- /dev/null
+++ b/ruoyi-server/src/main/java/org/dromara/app/listener/AppUserActionListener.java
@@ -0,0 +1,157 @@
+package org.dromara.app.listener;
+
+import cn.dev33.satoken.listener.SaTokenListener;
+import cn.dev33.satoken.stp.StpUtil;
+import cn.dev33.satoken.stp.parameter.SaLoginParameter;
+import cn.hutool.http.useragent.UserAgent;
+import cn.hutool.http.useragent.UserAgentUtil;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.app.service.AppLoginService;
+import org.dromara.common.core.constant.CacheConstants;
+import org.dromara.common.core.constant.Constants;
+import org.dromara.common.core.domain.dto.UserOnlineDTO;
+import org.dromara.common.core.utils.MessageUtils;
+import org.dromara.common.core.utils.ServletUtils;
+import org.dromara.common.core.utils.SpringUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.core.utils.ip.AddressUtils;
+import org.dromara.common.log.event.LogininforEvent;
+import org.dromara.common.redis.utils.RedisUtils;
+import org.dromara.common.satoken.utils.LoginHelper;
+import org.springframework.stereotype.Component;
+
+import java.time.Duration;
+
+/**
+ * App用户行为 侦听器的实现
+ *
+ * @author pengles
+ */
+@RequiredArgsConstructor
+@Component
+@Slf4j
+public class AppUserActionListener implements SaTokenListener {
+
+    private final AppLoginService appLoginService;
+
+    /**
+     * 每次登录时触发
+     */
+    @Override
+    public void doLogin(String loginType, Object loginId, String tokenValue, SaLoginParameter loginParameter) {
+        UserAgent userAgent = UserAgentUtil.parse(ServletUtils.getRequest().getHeader("User-Agent"));
+        String ip = ServletUtils.getClientIP();
+        UserOnlineDTO dto = new UserOnlineDTO();
+        dto.setIpaddr(ip);
+        dto.setLoginLocation(AddressUtils.getRealAddressByIP(ip));
+        dto.setBrowser(userAgent.getBrowser().getName());
+        dto.setOs(userAgent.getOs().getName());
+        dto.setLoginTime(System.currentTimeMillis());
+        dto.setTokenId(tokenValue);
+        String username = (String) loginParameter.getExtra(LoginHelper.USER_NAME_KEY);
+        dto.setUserName(username);
+        dto.setClientKey((String) loginParameter.getExtra(LoginHelper.CLIENT_KEY));
+        dto.setDeviceType(loginParameter.getDeviceType());
+        dto.setDeptName((String) loginParameter.getExtra(LoginHelper.DEPT_NAME_KEY));
+        if (loginParameter.getTimeout() == -1) {
+            RedisUtils.setCacheObject(CacheConstants.ONLINE_TOKEN_KEY + tokenValue, dto);
+        } else {
+            RedisUtils.setCacheObject(CacheConstants.ONLINE_TOKEN_KEY + tokenValue, dto, Duration.ofSeconds(loginParameter.getTimeout()));
+        }
+        // 记录登录日志
+        LogininforEvent logininforEvent = new LogininforEvent();
+        logininforEvent.setUsername(username);
+        logininforEvent.setStatus(Constants.LOGIN_SUCCESS);
+        logininforEvent.setMessage(MessageUtils.message("user.login.success"));
+        logininforEvent.setRequest(ServletUtils.getRequest());
+        SpringUtils.context().publishEvent(logininforEvent);
+        // 更新App用户登录信息
+        appLoginService.recordLoginInfo((Long) loginParameter.getExtra(LoginHelper.USER_KEY), ip);
+        log.info("app user doLogin, userId:{}, token:{}", loginId, tokenValue);
+    }
+
+    /**
+     * 每次注销时触发
+     */
+    @Override
+    public void doLogout(String loginType, Object loginId, String tokenValue) {
+        RedisUtils.deleteObject(CacheConstants.ONLINE_TOKEN_KEY + tokenValue);
+        log.info("app user doLogout, userId:{}, token:{}", loginId, tokenValue);
+    }
+
+    /**
+     * 每次被踢下线时触发
+     */
+    @Override
+    public void doKickout(String loginType, Object loginId, String tokenValue) {
+        RedisUtils.deleteObject(CacheConstants.ONLINE_TOKEN_KEY + tokenValue);
+        log.info("app user doKickout, userId:{}, token:{}", loginId, tokenValue);
+    }
+
+    /**
+     * 每次被顶下线时触发
+     */
+    @Override
+    public void doReplaced(String loginType, Object loginId, String tokenValue) {
+        RedisUtils.deleteObject(CacheConstants.ONLINE_TOKEN_KEY + tokenValue);
+        log.info("app user doReplaced, userId:{}, token:{}", loginId, tokenValue);
+    }
+
+    /**
+     * 每次被封禁时触发
+     */
+    @Override
+    public void doDisable(String loginType, Object loginId, String service, int level, long disableTime) {
+        log.info("App用户被禁用: loginType={}, loginId={}, service={}, level={}, disableTime={}",
+                loginType, loginId, service, level, disableTime);
+
+        // 删除在线用户信息
+        String tokenValue = StpUtil.getTokenValueByLoginId(loginId);
+        if (StringUtils.isNotBlank(tokenValue)) {
+            RedisUtils.deleteObject(CacheConstants.ONLINE_TOKEN_KEY + tokenValue);
+        }
+    }
+
+    /**
+     * 每次被解封时触发
+     */
+    @Override
+    public void doUntieDisable(String loginType, Object loginId, String service) {
+    }
+
+    /**
+     * 每次打开二级认证时触发
+     */
+    @Override
+    public void doOpenSafe(String loginType, String tokenValue, String service, long safeTime) {
+    }
+
+    /**
+     * 每次关闭二级认证时触发
+     */
+    @Override
+    public void doCloseSafe(String loginType, String tokenValue, String service) {
+    }
+
+    /**
+     * 每次创建Session时触发
+     */
+    @Override
+    public void doCreateSession(String id) {
+    }
+
+    /**
+     * 每次注销Session时触发
+     */
+    @Override
+    public void doLogoutSession(String id) {
+    }
+
+    /**
+     * 每次Token续期时触发
+     */
+    @Override
+    public void doRenewTimeout(String loginType, Object loginId, String tokenValue, long timeout) {
+    }
+}
\ No newline at end of file
diff --git a/ruoyi-server/src/main/java/org/dromara/app/service/AppLoginRiskService.java b/ruoyi-server/src/main/java/org/dromara/app/service/AppLoginRiskService.java
new file mode 100644
index 0000000..e15d934
--- /dev/null
+++ b/ruoyi-server/src/main/java/org/dromara/app/service/AppLoginRiskService.java
@@ -0,0 +1,53 @@
+package org.dromara.app.service;
+
+import cn.hutool.core.util.StrUtil;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.member.domain.vo.AppUserVo;
+import org.dromara.common.core.utils.ip.AddressUtils;
+import org.dromara.common.mail.utils.MailUtils;
+import org.dromara.member.service.AppUserService;
+import org.springframework.stereotype.Service;
+
+/**
+ * App登录异地风险检测服务
+ * 比对用户上次登录IP归属地与本次登录IP归属地，若发生变化则进行日志与邮件告警。
+ */
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class AppLoginRiskService {
+
+    private final AppUserService appUserService;
+
+    /**
+     * 执行异地登录风险检测
+     * @param userId    当前登录用户ID
+     * @param currentIp 本次登录IP
+     */
+    public void checkRisk(Long userId, String currentIp) {
+        AppUserVo user = appUserService.queryById(userId);
+        if (user == null) {
+            return;
+        }
+        String lastIp = StrUtil.blankToDefault(user.getLoginIp(), "");
+        String lastRegion = AddressUtils.getRealAddressByIP(lastIp);
+        String currentRegion = AddressUtils.getRealAddressByIP(currentIp);
+        boolean validLast = !AddressUtils.UNKNOWN_IP.equals(lastRegion) && !AddressUtils.UNKNOWN_ADDRESS.equals(lastRegion);
+        boolean validCurrent = !AddressUtils.UNKNOWN_IP.equals(currentRegion) && !AddressUtils.UNKNOWN_ADDRESS.equals(currentRegion);
+        boolean isLocal = AddressUtils.LOCAL_ADDRESS.equals(lastRegion) || AddressUtils.LOCAL_ADDRESS.equals(currentRegion);
+        if (validLast && validCurrent && !isLocal && !StrUtil.equals(lastRegion, currentRegion)) {
+            log.warn("App用户 {} 异地登录风险, 上次:{}({}), 本次:{}({})", userId, lastRegion, lastIp, currentRegion, currentIp);
+            String email = user.getEmail();
+            if (StrUtil.isNotBlank(email)) {
+                String subject = "异地登录告警";
+                String content = "您的账号检测到异地登录风险\n上次登录: " + lastRegion + " (" + lastIp + ")\n本次登录: " + currentRegion + " (" + currentIp + ")";
+                try {
+                    MailUtils.sendText(email, subject, content);
+                } catch (Exception e) {
+                    log.error("发送异地登录告警邮件失败: {}", e.getMessage());
+                }
+            }
+        }
+    }
+}
diff --git a/ruoyi-server/src/main/java/org/dromara/app/service/AppLoginService.java b/ruoyi-server/src/main/java/org/dromara/app/service/AppLoginService.java
new file mode 100644
index 0000000..d57a1af
--- /dev/null
+++ b/ruoyi-server/src/main/java/org/dromara/app/service/AppLoginService.java
@@ -0,0 +1,151 @@
+package org.dromara.app.service;
+
+import cn.dev33.satoken.exception.NotLoginException;
+import cn.dev33.satoken.stp.StpUtil;
+import cn.hutool.core.util.ObjectUtil;
+import org.dromara.common.core.utils.StringUtils;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.app.domain.AppLoginUser;
+import org.dromara.member.domain.AppUser;
+import org.dromara.member.domain.bo.AppUserBo;
+import org.dromara.common.core.constant.CacheConstants;
+import org.dromara.common.core.constant.Constants;
+import org.dromara.common.core.enums.LoginType;
+import org.dromara.common.core.exception.user.UserException;
+import org.dromara.common.core.utils.MessageUtils;
+import org.dromara.common.core.utils.ServletUtils;
+import org.dromara.common.log.event.LogininforEvent;
+import org.dromara.common.redis.utils.RedisUtils;
+import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.member.service.AppUserService;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.ApplicationEventPublisher;
+import org.springframework.stereotype.Service;
+
+import java.time.Duration;
+import java.time.LocalDateTime;
+import java.util.function.Supplier;
+
+/**
+ * App登录校验方法
+ *
+ * @author pengles
+ */
+@RequiredArgsConstructor
+@Slf4j
+@Service
+public class AppLoginService {
+
+    private final AppUserService appUserService;
+    private final ApplicationEventPublisher eventPublisher;
+    @Value("${user.password.maxRetryCount}")
+    private Integer maxRetryCount;
+    @Value("${user.password.lockTime}")
+    private Integer lockTime;
+
+    /**
+     * 退出登录
+     */
+    public void logout() {
+        try {
+            AppLoginUser loginUser = LoginHelper.getLoginUser();
+            if (ObjectUtil.isNotNull(loginUser)) {
+                StpUtil.logout();
+                recordLogininfor(loginUser.getUsername(), Constants.LOGOUT, MessageUtils.message("user.logout.success"));
+            }
+        } catch (NotLoginException ignored) {
+        }
+    }
+
+    /**
+     * 注册
+     */
+    public Boolean register(AppUserBo bo) {
+        return appUserService.register(bo);
+    }
+
+    /**
+     * 校验用户名唯一
+     */
+    public boolean checkUserNameUnique(String userName) {
+        return appUserService.checkUserNameUnique(userName);
+    }
+
+    /**
+     * 记录登录信息
+     *
+     * @param username 用户名
+     * @param status   状态
+     * @param message  消息内容
+     */
+    public void recordLogininfor(String username, String status, String message) {
+        LogininforEvent logininforEvent = new LogininforEvent();
+        logininforEvent.setUsername(username);
+        logininforEvent.setStatus(status);
+        logininforEvent.setMessage(message);
+        logininforEvent.setRequest(ServletUtils.getRequest());
+        eventPublisher.publishEvent(logininforEvent);
+    }
+
+    /**
+     * 构建登录用户
+     */
+    public AppLoginUser buildLoginUser(AppUser appUser) {
+        AppLoginUser loginUser = new AppLoginUser();
+        loginUser.setUserId(appUser.getUserId());
+        loginUser.setUsername(appUser.getUserName());
+        loginUser.setUserType("app");
+        loginUser.setInfoComplete(StringUtils.isNotBlank(appUser.getPhone()));
+        // 可以根据需要添加更多字段
+        return loginUser;
+    }
+
+    /**
+     * 记录登录信息
+     *
+     * @param userId 用户ID
+     * @param ip     IP地址
+     */
+    public void recordLoginInfo(Long userId, String ip) {
+        AppUser appUser = new AppUser();
+        appUser.setUserId(userId);
+        appUser.setLoginIp(ip);
+        appUser.setLoginDate(LocalDateTime.now());
+        appUserService.updateById(appUser);
+    }
+
+    /**
+     * 登录校验
+     */
+    public void checkLogin(LoginType loginType, String username, Supplier<Boolean> supplier) {
+        String errorKey = CacheConstants.PWD_ERR_CNT_KEY + username;
+        String loginFail = Constants.LOGIN_FAIL;
+
+        // 获取用户登录错误次数，默认为0 (可自定义限制策略 例如: key + username + ip)
+        int errorNumber = ObjectUtil.defaultIfNull(RedisUtils.getCacheObject(errorKey), 0);
+        // 锁定时间内登录 则踢出
+        if (errorNumber >= maxRetryCount) {
+            recordLogininfor(username, loginFail, MessageUtils.message(loginType.getRetryLimitExceed(), maxRetryCount, lockTime));
+            throw new UserException(loginType.getRetryLimitExceed(), maxRetryCount, lockTime);
+        }
+
+        if (supplier.get()) {
+            // 是否第一次
+            errorNumber++;
+            recordLogininfor(username, loginFail, MessageUtils.message(loginType.getRetryLimitCount(), errorNumber));
+            // 达到规定错误次数 则锁定登录
+            if (errorNumber >= maxRetryCount) {
+                RedisUtils.setCacheObject(errorKey, errorNumber, Duration.ofMinutes(lockTime));
+                throw new UserException(loginType.getRetryLimitExceed(), maxRetryCount, lockTime);
+            } else {
+                RedisUtils.setCacheObject(errorKey, errorNumber);
+                throw new UserException(loginType.getRetryLimitCount(), errorNumber);
+            }
+        }
+
+        // 登录成功 清空错误次数
+        RedisUtils.deleteObject(errorKey);
+    }
+
+}
\ No newline at end of file
diff --git a/ruoyi-server/src/main/java/org/dromara/app/service/IAppAuthStrategy.java b/ruoyi-server/src/main/java/org/dromara/app/service/IAppAuthStrategy.java
new file mode 100644
index 0000000..71deda1
--- /dev/null
+++ b/ruoyi-server/src/main/java/org/dromara/app/service/IAppAuthStrategy.java
@@ -0,0 +1,44 @@
+package org.dromara.app.service;
+
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.utils.SpringUtils;
+import org.dromara.system.domain.vo.SysClientVo;
+import org.dromara.web.domain.vo.LoginVo;
+
+/**
+ * App认证策略
+ *
+ * @author pengles
+ */
+public interface IAppAuthStrategy {
+
+    String BASE_NAME = "AppAuthStrategy";
+
+    /**
+     * 登录
+     *
+     * @param body      登录对象
+     * @param client    授权管理视图对象
+     * @param grantType 授权类型
+     * @return 登录验证信息
+     */
+    static LoginVo authenticate(String body, SysClientVo client, String grantType) {
+        // 授权类型和客户端id
+        String beanName = grantType + BASE_NAME;
+        if (!SpringUtils.containsBean(beanName)) {
+            throw new ServiceException("授权类型不正确!");
+        }
+        IAppAuthStrategy instance = SpringUtils.getBean(beanName);
+        return instance.login(body, client);
+    }
+
+    /**
+     * 登录
+     *
+     * @param body   登录对象
+     * @param client 授权管理视图对象
+     * @return 登录验证信息
+     */
+    LoginVo login(String body, SysClientVo client);
+
+}
\ No newline at end of file
diff --git a/ruoyi-server/src/main/java/org/dromara/app/service/impl/AppEmailAuthStrategy.java b/ruoyi-server/src/main/java/org/dromara/app/service/impl/AppEmailAuthStrategy.java
new file mode 100644
index 0000000..ea790a9
--- /dev/null
+++ b/ruoyi-server/src/main/java/org/dromara/app/service/impl/AppEmailAuthStrategy.java
@@ -0,0 +1,107 @@
+package org.dromara.app.service.impl;
+
+import cn.dev33.satoken.stp.StpUtil;
+import cn.dev33.satoken.stp.parameter.SaLoginParameter;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.app.domain.AppLoginUser;
+import org.dromara.member.domain.vo.AppUserVo;
+import org.dromara.app.service.AppLoginService;
+import org.dromara.member.service.AppUserService;
+import org.dromara.app.service.IAppAuthStrategy;
+import org.dromara.common.core.constant.Constants;
+import org.dromara.common.core.constant.GlobalConstants;
+import org.dromara.common.core.domain.model.EmailLoginBody;
+import org.dromara.common.core.enums.LoginType;
+import org.dromara.common.core.exception.user.CaptchaExpireException;
+import org.dromara.common.core.exception.user.UserException;
+import org.dromara.common.core.utils.MessageUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.core.utils.ValidatorUtils;
+import org.dromara.common.json.utils.JsonUtils;
+import org.dromara.common.redis.utils.RedisUtils;
+import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.system.domain.vo.SysClientVo;
+import org.dromara.web.domain.vo.LoginVo;
+import org.springframework.stereotype.Service;
+
+/**
+ * App邮箱认证策略
+ *
+ * @author pengles
+ */
+@Slf4j
+@Service("app_email" + IAppAuthStrategy.BASE_NAME)
+@RequiredArgsConstructor
+public class AppEmailAuthStrategy implements IAppAuthStrategy {
+
+    private final AppLoginService appLoginService;
+    private final AppUserService appUserService;
+
+    @Override
+    public LoginVo login(String body, SysClientVo client) {
+        EmailLoginBody loginBody = JsonUtils.parseObject(body, EmailLoginBody.class);
+        ValidatorUtils.validate(loginBody);
+        String email = loginBody.getEmail();
+        String emailCode = loginBody.getEmailCode();
+
+        AppUserVo user = loadUserByEmail(email);
+        appLoginService.checkLogin(LoginType.EMAIL, user.getUserName(), () -> !validateEmailCode(email, emailCode));
+        // 构建App登录用户
+        AppLoginUser loginUser = new AppLoginUser();
+        loginUser.setUserId(user.getUserId());
+        loginUser.setUsername(user.getUserName());
+        loginUser.setUserType("app");
+
+        loginUser.setClientKey(client.getClientKey());
+        loginUser.setDeviceType(client.getDeviceType());
+        SaLoginParameter model = new SaLoginParameter();
+        model.setDeviceType(client.getDeviceType());
+        // 自定义分配 不同用户体系 不同 token 授权时间 不设置默认走全局 yml 配置
+        // 例如: 后台用户30分钟过期 app用户1天过期
+        model.setTimeout(client.getTimeout());
+        model.setActiveTimeout(client.getActiveTimeout());
+        model.setExtra(LoginHelper.CLIENT_KEY, client.getClientId());
+        // 生成token
+        LoginHelper.login(loginUser, model);
+
+        LoginVo loginVo = new LoginVo();
+        loginVo.setAccessToken(StpUtil.getTokenValue());
+        loginVo.setExpireIn(StpUtil.getTokenTimeout());
+        loginVo.setClientId(client.getClientId());
+        return loginVo;
+    }
+
+    /**
+     * 校验邮箱验证码
+     */
+    private boolean validateEmailCode(String email, String emailCode) {
+        String code = RedisUtils.getCacheObject(GlobalConstants.CAPTCHA_CODE_KEY + email);
+        if (StringUtils.isBlank(code)) {
+            appLoginService.recordLogininfor(email, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.expire"));
+            throw new CaptchaExpireException();
+        }
+        return code.equals(emailCode);
+    }
+
+    /**
+     * 通过邮箱加载用户信息
+     */
+    private AppUserVo loadUserByEmail(String email) {
+        AppUserVo appUser = appUserService.selectUserByEmail(email);
+        if (ObjectUtil.isNull(appUser)) {
+            log.info("登录用户：{} 不存在.", email);
+            throw new UserException("user.not.exists", email);
+        } else if ("1".equals(appUser.getStatus())) {
+            log.info("登录用户：{} 已被停用.", email);
+            throw new UserException("user.blocked", email);
+        }
+        // 将 AppUser 转换为 AppUserVo
+        AppUserVo user = new AppUserVo();
+        BeanUtil.copyProperties(appUser, user);
+        return user;
+    }
+
+}
\ No newline at end of file
diff --git a/ruoyi-server/src/main/java/org/dromara/app/service/impl/AppPasswordAuthStrategy.java b/ruoyi-server/src/main/java/org/dromara/app/service/impl/AppPasswordAuthStrategy.java
new file mode 100644
index 0000000..32073f3
--- /dev/null
+++ b/ruoyi-server/src/main/java/org/dromara/app/service/impl/AppPasswordAuthStrategy.java
@@ -0,0 +1,166 @@
+package org.dromara.app.service.impl;
+
+import cn.dev33.satoken.stp.StpUtil;
+import cn.dev33.satoken.stp.parameter.SaLoginParameter;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.crypto.digest.BCrypt;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.app.domain.AppLoginUser;
+import org.dromara.member.domain.AppUser;
+import org.dromara.member.domain.vo.AppUserVo;
+import org.dromara.app.service.AppLoginService;
+import org.dromara.member.service.AppUserService;
+import org.dromara.app.service.IAppAuthStrategy;
+import org.dromara.app.session.AppSession;
+import org.dromara.app.session.AppSessionManager;
+import org.dromara.common.core.constant.Constants;
+import org.dromara.common.core.constant.GlobalConstants;
+import org.dromara.common.core.domain.model.PasswordLoginBody;
+import org.dromara.common.core.enums.LoginType;
+import org.dromara.common.core.exception.user.CaptchaException;
+import org.dromara.common.core.exception.user.CaptchaExpireException;
+import org.dromara.common.core.exception.user.UserException;
+import org.dromara.common.core.utils.MessageUtils;
+import org.dromara.common.core.utils.ServletUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.core.utils.ValidatorUtils;
+import org.dromara.common.json.utils.JsonUtils;
+import org.dromara.common.redis.utils.RedisUtils;
+import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.common.web.config.properties.CaptchaProperties;
+import org.dromara.system.domain.vo.SysClientVo;
+import org.dromara.web.domain.vo.LoginVo;
+import org.springframework.stereotype.Service;
+
+import java.time.Duration;
+import java.time.Instant;
+import java.util.UUID;
+
+/**
+ * App密码认证策略
+ *
+ * @author pengles
+ */
+@Slf4j
+@Service("app_password" + IAppAuthStrategy.BASE_NAME)
+@RequiredArgsConstructor
+public class AppPasswordAuthStrategy implements IAppAuthStrategy {
+
+    private final CaptchaProperties captchaProperties;
+    private final AppLoginService appLoginService;
+    private final AppUserService appUserService;
+    private final AppSessionManager appSessionManager;
+
+    @Override
+    public LoginVo login(String body, SysClientVo client) {
+        PasswordLoginBody loginBody = JsonUtils.parseObject(body, PasswordLoginBody.class);
+        ValidatorUtils.validate(loginBody);
+        String username = loginBody.getUsername();
+        String password = loginBody.getPassword();
+        String code = loginBody.getCode();
+        String uuid = loginBody.getUuid();
+
+        boolean captchaEnabled = captchaProperties.getEnable();
+        // 验证码开关
+//        if (captchaEnabled) {
+//            validateCaptcha(username, code, uuid);
+//        }
+
+        AppUser appUser = loadUserByUsername(username);
+        appLoginService.checkLogin(LoginType.PASSWORD, username, () -> !BCrypt.checkpw(password, appUser.getPassword()));
+
+        // 创建App登录用户
+        AppLoginUser loginUser = buildAppLoginUser(appUser);
+
+        loginUser.setClientKey(client.getClientKey());
+        loginUser.setDeviceType(client.getDeviceType());
+        SaLoginParameter model = new SaLoginParameter();
+        model.setDeviceType(client.getDeviceType());
+        // 自定义分配 不同用户体系 不同 token 授权时间 不设置默认走全局 yml 配置
+        // 例如: 后台用户30分钟过期 app用户1天过期
+        model.setTimeout(client.getTimeout());
+        model.setActiveTimeout(client.getActiveTimeout());
+        model.setExtra(LoginHelper.CLIENT_KEY, client.getClientId());
+        // 生成token
+        LoginHelper.login(loginUser, model);
+
+        LoginVo loginVo = new LoginVo();
+        loginVo.setAccessToken(StpUtil.getTokenValue());
+        loginVo.setExpireIn(StpUtil.getTokenTimeout());
+        loginVo.setClientId(client.getClientId());
+
+        // 注册会话
+        try {
+            String ua = ServletUtils.getRequest().getHeader("User-Agent");
+            String deviceId = ServletUtils.getRequest().getHeader("X-Device-Id");
+            String ip = LoginHelper.getLoginUser().getIpaddr();
+            AppSession s = new AppSession();
+            s.setSessionId(StpUtil.getTokenValue());
+            s.setUserId(loginUser.getUserId());
+            s.setDeviceType(client.getDeviceType());
+            s.setDeviceId(deviceId != null ? deviceId : UUID.randomUUID().toString());
+            s.setUserAgent(ua);
+            s.setIp(ip);
+            s.setLocation("");
+            long now = Instant.now().toEpochMilli();
+            s.setLoginAt(now);
+            Long ttlSec = StpUtil.getTokenTimeout();
+            s.setExpireAt(now + (ttlSec != null ? ttlSec * 1000 : 24 * 3600 * 1000));
+            s.setActive(true);
+            s.setToken(StpUtil.getTokenValue());
+            appSessionManager.register(s, Duration.ofSeconds(ttlSec != null ? ttlSec : 86400));
+        } catch (Exception ignored) {
+        }
+        return loginVo;
+    }
+
+    /**
+     * 校验验证码
+     *
+     * @param username 用户名
+     * @param code     验证码
+     * @param uuid     唯一标识
+     */
+    private void validateCaptcha(String username, String code, String uuid) {
+        String verifyKey = GlobalConstants.CAPTCHA_CODE_KEY + StringUtils.blankToDefault(uuid, "");
+        String captcha = RedisUtils.getCacheObject(verifyKey);
+        RedisUtils.deleteObject(verifyKey);
+        if (captcha == null) {
+            appLoginService.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.expire"));
+            throw new CaptchaExpireException();
+        }
+        if (!code.equalsIgnoreCase(captcha)) {
+            appLoginService.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.error"));
+            throw new CaptchaException();
+        }
+    }
+
+    /**
+     * 根据用户名加载App用户
+     */
+    private AppUser loadUserByUsername(String username) {
+        AppUserVo user = appUserService.selectUserByUserName(username);
+        if (ObjectUtil.isNull(user)) {
+            log.info("登录用户：{} 不存在.", username);
+            throw new UserException("user.not.exists", username);
+        } else if ("1".equals(user.getStatus())) {
+            log.info("登录用户：{} 已被停用.", username);
+            throw new UserException("user.blocked", username);
+        }
+        return JsonUtils.parseObject(JsonUtils.toJsonString(user), AppUser.class);
+    }
+
+    /**
+     * 构建App登录用户
+     */
+    private AppLoginUser buildAppLoginUser(AppUser appUser) {
+        AppLoginUser loginUser = new AppLoginUser();
+        loginUser.setUserId(appUser.getUserId());
+        loginUser.setUsername(appUser.getUserName());
+        loginUser.setUserType("app");
+        // 设置其他必要字段
+        return loginUser;
+    }
+
+}
diff --git a/ruoyi-server/src/main/java/org/dromara/app/service/impl/AppSmsAuthStrategy.java b/ruoyi-server/src/main/java/org/dromara/app/service/impl/AppSmsAuthStrategy.java
new file mode 100644
index 0000000..1065515
--- /dev/null
+++ b/ruoyi-server/src/main/java/org/dromara/app/service/impl/AppSmsAuthStrategy.java
@@ -0,0 +1,114 @@
+package org.dromara.app.service.impl;
+
+import cn.dev33.satoken.stp.StpUtil;
+import cn.dev33.satoken.stp.parameter.SaLoginParameter;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.app.domain.AppLoginUser;
+import org.dromara.member.domain.vo.AppUserVo;
+import org.dromara.app.service.AppLoginService;
+import org.dromara.member.service.AppUserService;
+import org.dromara.app.service.IAppAuthStrategy;
+import org.dromara.common.core.constant.Constants;
+import org.dromara.common.core.constant.GlobalConstants;
+import org.dromara.common.core.domain.model.SmsLoginBody;
+import org.dromara.common.core.enums.LoginType;
+import org.dromara.common.core.exception.user.CaptchaExpireException;
+import org.dromara.common.core.exception.user.UserException;
+import org.dromara.common.core.utils.MessageUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.core.utils.ValidatorUtils;
+import org.dromara.common.json.utils.JsonUtils;
+import org.dromara.common.redis.utils.RedisUtils;
+import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.system.domain.vo.SysClientVo;
+import org.dromara.web.domain.vo.LoginVo;
+import org.springframework.stereotype.Service;
+
+/**
+ * App短信认证策略
+ *
+ * @author pengles
+ */
+@Slf4j
+@Service("app_sms" + IAppAuthStrategy.BASE_NAME)
+@RequiredArgsConstructor
+public class AppSmsAuthStrategy implements IAppAuthStrategy {
+
+    private final AppLoginService appLoginService;
+    private final AppUserService appUserService;
+
+    @Override
+    public LoginVo login(String body, SysClientVo client) {
+        SmsLoginBody loginBody = JsonUtils.parseObject(body, SmsLoginBody.class);
+        ValidatorUtils.validate(loginBody);
+        String phonenumber = loginBody.getPhonenumber();
+        String smsCode = loginBody.getSmsCode();
+
+        AppUserVo user = loadUserByPhonenumber(phonenumber);
+        appLoginService.checkLogin(LoginType.SMS, user.getUserName(), () -> !validateSmsCode(phonenumber, smsCode));
+        // 构建App登录用户
+        AppLoginUser loginUser = new AppLoginUser();
+        loginUser.setUserId(user.getUserId());
+        loginUser.setUsername(user.getUserName());
+        loginUser.setUserType("app");
+
+        loginUser.setClientKey(client.getClientKey());
+        loginUser.setDeviceType(client.getDeviceType());
+        SaLoginParameter model = new SaLoginParameter();
+        model.setDeviceType(client.getDeviceType());
+        // 自定义分配 不同用户体系 不同 token 授权时间 不设置默认走全局 yml 配置
+        // 例如: 后台用户30分钟过期 app用户1天过期
+        model.setTimeout(client.getTimeout());
+        model.setActiveTimeout(client.getActiveTimeout());
+        model.setExtra(LoginHelper.CLIENT_KEY, client.getClientId());
+        // 生成token
+        LoginHelper.login(loginUser, model);
+
+        LoginVo loginVo = new LoginVo();
+        loginVo.setAccessToken(StpUtil.getTokenValue());
+        loginVo.setExpireIn(StpUtil.getTokenTimeout());
+        loginVo.setClientId(client.getClientId());
+        return loginVo;
+    }
+
+    /**
+     * 校验短信验证码
+     */
+    private boolean validateSmsCode(String phonenumber, String smsCode) {
+        String code = RedisUtils.getCacheObject(GlobalConstants.CAPTCHA_CODE_KEY + phonenumber);
+        if (StringUtils.isBlank(code)) {
+            appLoginService.recordLogininfor(phonenumber, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.expire"));
+            throw new CaptchaExpireException();
+        }
+        return code.equals(smsCode);
+    }
+
+    /**
+     * 通过手机号加载用户信息
+     */
+    private AppUserVo loadUserByPhonenumber(String phonenumber) {
+        AppUserVo appUser = appUserService.selectUserByPhone(phonenumber);
+        if (ObjectUtil.isNull(appUser)) {
+            log.info("登录用户：{} 不存在.", phonenumber);
+            throw new UserException("user.not.exists", phonenumber);
+        } else if ("1".equals(appUser.getStatus())) {
+            log.info("登录用户：{} 已被停用.", phonenumber);
+            throw new UserException("user.blocked", phonenumber);
+        }
+        // 将 AppUser 转换为 AppUserVo
+        AppUserVo user = new AppUserVo();
+        BeanUtil.copyProperties(appUser, user);
+        if (ObjectUtil.isNull(user)) {
+            log.info("登录用户：{} 不存在.", phonenumber);
+            throw new UserException("user.not.exists", phonenumber);
+        } else if ("1".equals(user.getStatus())) {
+            log.info("登录用户：{} 已被停用.", phonenumber);
+            throw new UserException("user.blocked", phonenumber);
+        }
+        return user;
+    }
+
+}
\ No newline at end of file
diff --git a/ruoyi-server/src/main/java/org/dromara/app/service/impl/AppSocialAuthStrategy.java b/ruoyi-server/src/main/java/org/dromara/app/service/impl/AppSocialAuthStrategy.java
new file mode 100644
index 0000000..3f14152
--- /dev/null
+++ b/ruoyi-server/src/main/java/org/dromara/app/service/impl/AppSocialAuthStrategy.java
@@ -0,0 +1,116 @@
+package org.dromara.app.service.impl;
+
+import cn.dev33.satoken.stp.StpUtil;
+import cn.dev33.satoken.stp.parameter.SaLoginParameter;
+import cn.hutool.core.util.ObjectUtil;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import me.zhyd.oauth.model.AuthCallback;
+import me.zhyd.oauth.model.AuthResponse;
+import me.zhyd.oauth.model.AuthUser;
+import me.zhyd.oauth.request.AuthRequest;
+import org.dromara.app.domain.AppLoginUser;
+import org.dromara.member.domain.AppSocialAuth;
+import org.dromara.member.domain.vo.AppUserVo;
+import org.dromara.app.service.AppLoginService;
+import org.dromara.member.service.AppSocialAuthService;
+import org.dromara.member.service.AppUserService;
+import org.dromara.app.service.IAppAuthStrategy;
+import org.dromara.common.core.domain.model.SocialLoginBody;
+import org.dromara.common.core.enums.LoginType;
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.utils.ValidatorUtils;
+import org.dromara.common.json.utils.JsonUtils;
+import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.common.social.config.properties.SocialProperties;
+import org.dromara.common.social.utils.SocialUtils;
+import org.dromara.system.domain.vo.SysClientVo;
+import org.dromara.web.domain.vo.LoginVo;
+import org.springframework.stereotype.Service;
+
+/**
+ * App第三方登录认证策略
+ *
+ * @author pengles
+ */
+@Slf4j
+@Service("app_social" + IAppAuthStrategy.BASE_NAME)
+@RequiredArgsConstructor
+public class AppSocialAuthStrategy implements IAppAuthStrategy {
+
+    private final SocialProperties socialProperties;
+    private final AppUserService appUserService;
+    private final AppLoginService appLoginService;
+    private final AppSocialAuthService appSocialAuthService;
+
+    @Override
+    public LoginVo login(String body, SysClientVo client) {
+        SocialLoginBody loginBody = JsonUtils.parseObject(body, SocialLoginBody.class);
+        ValidatorUtils.validate(loginBody);
+        String source = loginBody.getSource();
+        String socialCode = loginBody.getSocialCode();
+        String socialState = loginBody.getSocialState();
+        // 获取第三方登录信息
+        AuthRequest authRequest = SocialUtils.getAuthRequest(source, socialProperties);
+        AuthCallback callback = AuthCallback.builder()
+                .code(socialCode)
+                .state(socialState)
+                .build();
+        AuthResponse<AuthUser> response = authRequest.login(callback);
+        if (!response.ok()) {
+            throw new ServiceException(response.getMsg());
+        }
+        AuthUser authUserData = response.getData();
+
+        AppUserVo user = loadUserBySocial(authUserData.getSource(), authUserData.getUuid());
+        assert user != null;
+        appLoginService.checkLogin(LoginType.PASSWORD, user.getUserName(), () -> ObjectUtil.isNull(user));
+        // 构建App登录用户
+        AppLoginUser loginUser = new AppLoginUser();
+        loginUser.setUserId(user.getUserId());
+        loginUser.setUsername(user.getUserName());
+        loginUser.setUserType("app");
+
+        loginUser.setClientKey(client.getClientKey());
+        loginUser.setDeviceType(client.getDeviceType());
+        SaLoginParameter model = new SaLoginParameter();
+        model.setDeviceType(client.getDeviceType());
+        // 自定义分配 不同用户体系 不同 token 授权时间 不设置默认走全局 yml 配置
+        // 例如: 后台用户30分钟过期 app用户1天过期
+        model.setTimeout(client.getTimeout());
+        model.setActiveTimeout(client.getActiveTimeout());
+        model.setExtra(LoginHelper.CLIENT_KEY, client.getClientId());
+        // 生成token
+        LoginHelper.login(loginUser, model);
+
+        LoginVo loginVo = new LoginVo();
+        loginVo.setAccessToken(StpUtil.getTokenValue());
+        loginVo.setExpireIn(StpUtil.getTokenTimeout());
+        loginVo.setClientId(client.getClientId());
+        return loginVo;
+    }
+
+    /**
+     * 通过第三方信息查找用户
+     */
+    private AppUserVo loadUserBySocial(String source, String openId) {
+        // 根据第三方平台信息查找绑定的App用户
+        log.info("App端第三方登录查找用户，source: {}, openId: {}", source, openId);
+
+        // 首先通过openId查找
+        AppSocialAuth socialAuth = appSocialAuthService.queryByPlatformAndOpenId(source, openId);
+
+        if (socialAuth != null && socialAuth.getUserId() != null) {
+            // 找到绑定的用户，返回用户信息
+            AppUserVo user = appUserService.queryById(socialAuth.getUserId());
+            if (user != null) {
+                log.info("通过openId找到绑定用户，userId: {}, userName: {}", user.getUserId(), user.getUserName());
+                return user;
+            }
+        }
+
+        log.warn("未找到与第三方账号绑定的App用户，source: {}, openId: {}", source, openId);
+        return null;
+    }
+
+}
\ No newline at end of file
diff --git a/ruoyi-server/src/main/java/org/dromara/app/service/impl/AppWechatMiniprogramAuthStrategy.java b/ruoyi-server/src/main/java/org/dromara/app/service/impl/AppWechatMiniprogramAuthStrategy.java
new file mode 100644
index 0000000..50f82e0
--- /dev/null
+++ b/ruoyi-server/src/main/java/org/dromara/app/service/impl/AppWechatMiniprogramAuthStrategy.java
@@ -0,0 +1,118 @@
+package org.dromara.app.service.impl;
+
+import cn.dev33.satoken.stp.StpUtil;
+import cn.dev33.satoken.stp.parameter.SaLoginParameter;
+import cn.hutool.core.util.ObjectUtil;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import me.zhyd.oauth.model.AuthCallback;
+import me.zhyd.oauth.model.AuthResponse;
+import me.zhyd.oauth.model.AuthToken;
+import me.zhyd.oauth.model.AuthUser;
+import me.zhyd.oauth.request.AuthRequest;
+import org.dromara.app.domain.AppLoginUser;
+import org.dromara.member.domain.vo.AppUserVo;
+import org.dromara.member.service.AppSocialAuthService;
+import org.dromara.app.service.IAppAuthStrategy;
+import org.dromara.common.core.domain.model.XcxLoginBody;
+import org.dromara.common.core.exception.user.UserException;
+import org.dromara.common.core.utils.ValidatorUtils;
+import org.dromara.common.json.utils.JsonUtils;
+import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.common.social.config.properties.SocialProperties;
+import org.dromara.common.social.utils.SocialUtils;
+import org.dromara.system.domain.vo.SysClientVo;
+import org.dromara.web.domain.vo.LoginVo;
+import org.springframework.stereotype.Service;
+
+/**
+ * App端微信小程序认证策略
+ * 支持微信小程序登录，通过微信小程序授权码获取用户信息并完成登录
+ *
+ * @author pengles
+ */
+@Slf4j
+@Service("app_wechat_miniprogram" + IAppAuthStrategy.BASE_NAME)
+@RequiredArgsConstructor
+public class AppWechatMiniprogramAuthStrategy implements IAppAuthStrategy {
+
+    private final SocialProperties socialProperties;
+    private final AppSocialAuthService appSocialAuthService;
+
+    @Override
+    public LoginVo login(String body, SysClientVo client) {
+        XcxLoginBody loginBody = JsonUtils.parseObject(body, XcxLoginBody.class);
+        ValidatorUtils.validate(loginBody);
+
+        // xcxCode 为小程序调用 wx.login 授权后获取
+        String xcxCode = loginBody.getCode();
+        // 多个小程序识别使用
+        String appid = loginBody.getAppid();
+
+        // 校验 appid + appsecret + xcxCode 调用登录凭证校验接口 获取 session_key 与 openid
+        // 使用SocialUtils获取微信小程序的AuthRequest
+        AuthRequest authRequest = SocialUtils.getAuthRequest("wechat_miniprogram", socialProperties);
+        if (authRequest == null) {
+            throw new UserException("未配置微信小程序登录");
+        }
+        AuthCallback authCallback = new AuthCallback();
+        authCallback.setCode(xcxCode);
+        AuthResponse<AuthUser> response = authRequest.login(authCallback);
+
+        String openid = null;
+        String unionId = null;
+        if (response.ok()) {
+            AuthToken token = response.getData().getToken();
+            openid = token.getOpenId();
+            // 微信小程序只有关联到微信开放平台下之后才能获取到 unionId，因此unionId不一定能返回。
+            unionId = token.getUnionId();
+        } else {
+            throw new UserException("第三方登录失败，原因：" + response.getMsg());
+        }
+
+        AppUserVo user = loadUserByWxId("wechat_miniprogram", openid, unionId);
+        if (ObjectUtil.isNull(user)) {
+            throw new UserException("登录失败，请先绑定用户账号");
+        }
+
+        // 此处可根据登录用户的数据不同 自行创建 loginUser 属性不够用继承扩展就行了
+        AppLoginUser loginUser = new AppLoginUser();
+        loginUser.setUserId(user.getUserId());
+        loginUser.setUsername(user.getUserName());
+        loginUser.setNickname(user.getNickName());
+        loginUser.setUserType("app");
+        loginUser.setClientKey(client.getClientKey());
+        loginUser.setDeviceType(client.getDeviceType());
+
+        SaLoginParameter model = new SaLoginParameter();
+        model.setDeviceType(client.getDeviceType());
+        // 自定义分配 不同用户体系 不同 token 授权时间 不设置默认走全局 yml 配置
+        // 例如: 后台用户30分钟过期 app用户1天过期
+        model.setTimeout(client.getTimeout());
+        model.setActiveTimeout(client.getActiveTimeout());
+        model.setExtra(LoginHelper.CLIENT_KEY, client.getClientId());
+        // 生成token
+        LoginHelper.login(loginUser, model);
+
+        LoginVo loginVo = new LoginVo();
+        loginVo.setAccessToken(StpUtil.getTokenValue());
+        loginVo.setExpireIn(StpUtil.getTokenTimeout());
+        loginVo.setClientId(client.getClientId());
+        loginVo.setOpenid(openid);
+        return loginVo;
+    }
+
+    /**
+     * 通过微信标识加载用户信息，优先 unionId，回退 openId
+     */
+    private AppUserVo loadUserByWxId(String platform, String openid, String unionId) {
+        if (ObjectUtil.isNotEmpty(unionId)) {
+            AppUserVo byUnion = appSocialAuthService.selectUserByPlatformAndUnionId(platform, unionId);
+            if (ObjectUtil.isNotNull(byUnion)) {
+                return byUnion;
+            }
+        }
+        return appSocialAuthService.selectUserByPlatformAndOpenId(platform, openid);
+    }
+
+}
diff --git a/ruoyi-server/src/main/java/org/dromara/app/service/impl/AppWechatMpAuthStrategy.java b/ruoyi-server/src/main/java/org/dromara/app/service/impl/AppWechatMpAuthStrategy.java
new file mode 100644
index 0000000..b8885a5
--- /dev/null
+++ b/ruoyi-server/src/main/java/org/dromara/app/service/impl/AppWechatMpAuthStrategy.java
@@ -0,0 +1,130 @@
+package org.dromara.app.service.impl;
+
+import cn.dev33.satoken.stp.StpUtil;
+import cn.dev33.satoken.stp.parameter.SaLoginParameter;
+import cn.hutool.core.util.ObjectUtil;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import me.zhyd.oauth.model.AuthCallback;
+import me.zhyd.oauth.model.AuthResponse;
+import me.zhyd.oauth.model.AuthUser;
+import me.zhyd.oauth.request.AuthRequest;
+import org.dromara.app.domain.AppLoginUser;
+import org.dromara.member.domain.vo.AppUserVo;
+import org.dromara.member.service.AppSocialAuthService;
+import org.dromara.app.service.IAppAuthStrategy;
+import org.dromara.common.core.domain.model.SocialLoginBody;
+import org.dromara.common.core.exception.user.UserException;
+import org.dromara.common.core.utils.ValidatorUtils;
+import org.dromara.common.json.utils.JsonUtils;
+import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.common.social.config.properties.SocialProperties;
+import org.dromara.common.social.utils.SocialUtils;
+import org.dromara.system.domain.vo.SysClientVo;
+import org.dromara.web.domain.vo.LoginVo;
+import org.springframework.stereotype.Service;
+
+/**
+ * App端微信公众号认证策略
+ * 处理微信公众号环境下的OAuth2登录逻辑
+ * 依赖 justauth.type.wechat_mp 配置项
+ *
+ * @author pengles
+ */
+@Slf4j
+@Service("app_wechat_mp" + IAppAuthStrategy.BASE_NAME)
+@RequiredArgsConstructor
+public class AppWechatMpAuthStrategy implements IAppAuthStrategy {
+
+    private final SocialProperties socialProperties;
+    private final AppSocialAuthService appSocialAuthService;
+
+    /**
+     * 微信公众号登录核心逻辑
+     *
+     * @param body   登录请求体，包含 socialCode 和 socialState
+     * @param client 客户端配置
+     * @return 登录结果 LoginVo
+     */
+    @Override
+    public LoginVo login(String body, SysClientVo client) {
+        SocialLoginBody loginBody = JsonUtils.parseObject(body, SocialLoginBody.class);
+        ValidatorUtils.validate(loginBody);
+
+        String code = loginBody.getSocialCode();
+        String state = loginBody.getSocialState();
+
+        // 使用SocialUtils获取微信公众号的AuthRequest
+        // 对应 application.yml 中 justauth.type.wechat_mp 的配置
+        AuthRequest authRequest = SocialUtils.getAuthRequest("wechat_mp", socialProperties);
+        if (authRequest == null) {
+            throw new UserException("未配置微信公众号登录");
+        }
+
+        // 构造回调参数
+        AuthCallback authCallback = new AuthCallback();
+        authCallback.setCode(code);
+        authCallback.setState(state);
+        // 执行第三方登录请求，换取 Access Token 和 User Info
+        AuthResponse<AuthUser> response = authRequest.login(authCallback);
+
+        String openid;
+        String unionId = null;
+        if (response.ok()) {
+            AuthUser authUser = response.getData();
+            openid = authUser.getUuid();
+            if (authUser.getToken() != null) {
+                unionId = authUser.getToken().getUnionId();
+            }
+        } else {
+            throw new UserException("第三方登录失败，原因：" + response.getMsg());
+        }
+
+        // 根据 OpenId 或 UnionId 查找系统用户
+        AppUserVo user = loadUserByWxId("wechat_mp", openid, unionId);
+        if (ObjectUtil.isNull(user)) {
+            throw new UserException("登录失败，请先绑定用户账号");
+        }
+
+        // 此处可根据登录用户的数据不同 自行创建 loginUser 属性不够用继承扩展就行了
+        AppLoginUser loginUser = new AppLoginUser();
+        loginUser.setUserId(user.getUserId());
+        loginUser.setUsername(user.getUserName());
+        loginUser.setNickname(user.getNickName());
+        loginUser.setUserType("app");
+        loginUser.setClientKey(client.getClientKey());
+        loginUser.setDeviceType(client.getDeviceType());
+        SaLoginParameter model = new SaLoginParameter();
+        model.setDeviceType(client.getDeviceType());
+        // 自定义分配 不同用户体系 不同 token 授权时间 不设置默认走全局 yml 配置
+        // 例如: 后台用户30分钟过期 app用户1天过期
+        model.setTimeout(client.getTimeout());
+        model.setActiveTimeout(client.getActiveTimeout());
+        model.setExtra(LoginHelper.CLIENT_KEY, client.getClientId());
+        // 生成token
+        LoginHelper.login(loginUser, model);
+
+        LoginVo loginVo = new LoginVo();
+        loginVo.setAccessToken(StpUtil.getTokenValue());
+        loginVo.setExpireIn(StpUtil.getTokenTimeout());
+        loginVo.setClientId(client.getClientId());
+        loginVo.setOpenid(openid);
+        return loginVo;
+    }
+
+    /**
+     * 通过微信标识加载用户信息，优先使用 unionId（跨应用统一标识），缺失时回退使用 openId
+     * @param platform 平台标识（wechat_mp / wechat_open / wechat_miniprogram）
+     * @param openid   微信 openId
+     * @param unionId  微信 unionId（可能为空）
+     */
+    private AppUserVo loadUserByWxId(String platform, String openid, String unionId) {
+        if (ObjectUtil.isNotEmpty(unionId)) {
+            AppUserVo byUnion = appSocialAuthService.selectUserByPlatformAndUnionId(platform, unionId);
+            if (ObjectUtil.isNotNull(byUnion)) {
+                return byUnion;
+            }
+        }
+        return appSocialAuthService.selectUserByPlatformAndOpenId(platform, openid);
+    }
+}
diff --git a/ruoyi-server/src/main/java/org/dromara/app/service/impl/AppWechatOpenAuthStrategy.java b/ruoyi-server/src/main/java/org/dromara/app/service/impl/AppWechatOpenAuthStrategy.java
new file mode 100644
index 0000000..b545199
--- /dev/null
+++ b/ruoyi-server/src/main/java/org/dromara/app/service/impl/AppWechatOpenAuthStrategy.java
@@ -0,0 +1,128 @@
+package org.dromara.app.service.impl;
+
+import cn.dev33.satoken.stp.StpUtil;
+import cn.dev33.satoken.stp.parameter.SaLoginParameter;
+import cn.hutool.core.util.ObjectUtil;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import me.zhyd.oauth.model.AuthCallback;
+import me.zhyd.oauth.model.AuthResponse;
+import me.zhyd.oauth.model.AuthUser;
+import me.zhyd.oauth.request.AuthRequest;
+import org.dromara.app.domain.AppLoginUser;
+import org.dromara.member.domain.vo.AppUserVo;
+import org.dromara.member.service.AppSocialAuthService;
+import org.dromara.app.service.IAppAuthStrategy;
+import org.dromara.common.core.domain.model.SocialLoginBody;
+import org.dromara.common.core.exception.user.UserException;
+import org.dromara.common.core.utils.ValidatorUtils;
+import org.dromara.common.json.utils.JsonUtils;
+import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.common.social.config.properties.SocialProperties;
+import org.dromara.common.social.utils.SocialUtils;
+import org.dromara.system.domain.vo.SysClientVo;
+import org.dromara.web.domain.vo.LoginVo;
+import org.springframework.stereotype.Service;
+
+/**
+ * App端微信开放平台认证策略
+ * 处理微信开放平台（APP端/网站应用）环境下的OAuth2登录逻辑
+ * 依赖 justauth.type.wechat_open 配置项
+ * 通常用于APP原生微信登录
+ *
+ * @author pengles
+ */
+@Slf4j
+@Service("app_wechat_open" + IAppAuthStrategy.BASE_NAME)
+@RequiredArgsConstructor
+public class AppWechatOpenAuthStrategy implements IAppAuthStrategy {
+
+    private final SocialProperties socialProperties;
+    private final AppSocialAuthService appSocialAuthService;
+
+    /**
+     * 微信开放平台登录核心逻辑
+     *
+     * @param body   登录请求体，包含 socialCode 和 socialState
+     * @param client 客户端配置
+     * @return 登录结果 LoginVo
+     */
+    @Override
+    public LoginVo login(String body, SysClientVo client) {
+        SocialLoginBody loginBody = JsonUtils.parseObject(body, SocialLoginBody.class);
+        ValidatorUtils.validate(loginBody);
+
+        String code = loginBody.getSocialCode();
+        String state = loginBody.getSocialState();
+
+        // 使用SocialUtils获取微信开放平台的AuthRequest
+        // 对应 application.yml 中 justauth.type.wechat_open 的配置
+        AuthRequest authRequest = SocialUtils.getAuthRequest("wechat_open", socialProperties);
+        if (authRequest == null) {
+            throw new UserException("未配置微信开放平台登录");
+        }
+
+        // 构造回调参数
+        AuthCallback authCallback = new AuthCallback();
+        authCallback.setCode(code);
+        authCallback.setState(state);
+        // 执行第三方登录请求，换取 Access Token 和 User Info
+        AuthResponse<AuthUser> response = authRequest.login(authCallback);
+
+        String openid;
+        String unionId = null;
+        if (response.ok()) {
+            AuthUser authUser = response.getData();
+            openid = authUser.getUuid();
+            if (authUser.getToken() != null) {
+                unionId = authUser.getToken().getUnionId();
+            }
+        } else {
+            throw new UserException("第三方登录失败，原因：" + response.getMsg());
+        }
+
+        // 根据 OpenId 或 UnionId 查找系统用户
+        AppUserVo user = loadUserByWxId("wechat_open", openid, unionId);
+        if (ObjectUtil.isNull(user)) {
+            throw new UserException("登录失败，请先绑定用户账号");
+        }
+
+        // 此处可根据登录用户的数据不同 自行创建 loginUser 属性不够用继承扩展就行了
+        AppLoginUser loginUser = new AppLoginUser();
+        loginUser.setUserId(user.getUserId());
+        loginUser.setUsername(user.getUserName());
+        loginUser.setNickname(user.getNickName());
+        loginUser.setUserType("app");
+        loginUser.setClientKey(client.getClientKey());
+        loginUser.setDeviceType(client.getDeviceType());
+        SaLoginParameter model = new SaLoginParameter();
+        model.setDeviceType(client.getDeviceType());
+        // 自定义分配 不同用户体系 不同 token 授权时间 不设置默认走全局 yml 配置
+        // 例如: 后台用户30分钟过期 app用户1天过期
+        model.setTimeout(client.getTimeout());
+        model.setActiveTimeout(client.getActiveTimeout());
+        model.setExtra(LoginHelper.CLIENT_KEY, client.getClientId());
+        // 生成token
+        LoginHelper.login(loginUser, model);
+
+        LoginVo loginVo = new LoginVo();
+        loginVo.setAccessToken(StpUtil.getTokenValue());
+        loginVo.setExpireIn(StpUtil.getTokenTimeout());
+        loginVo.setClientId(client.getClientId());
+        loginVo.setOpenid(openid);
+        return loginVo;
+    }
+
+    /**
+     * 通过微信标识加载用户信息，优先 unionId，回退 openId
+     */
+    private AppUserVo loadUserByWxId(String platform, String openid, String unionId) {
+        if (ObjectUtil.isNotEmpty(unionId)) {
+            AppUserVo byUnion = appSocialAuthService.selectUserByPlatformAndUnionId(platform, unionId);
+            if (ObjectUtil.isNotNull(byUnion)) {
+                return byUnion;
+            }
+        }
+        return appSocialAuthService.selectUserByPlatformAndOpenId(platform, openid);
+    }
+}
diff --git a/ruoyi-server/src/main/java/org/dromara/app/session/AppSession.java b/ruoyi-server/src/main/java/org/dromara/app/session/AppSession.java
new file mode 100644
index 0000000..1304aee
--- /dev/null
+++ b/ruoyi-server/src/main/java/org/dromara/app/session/AppSession.java
@@ -0,0 +1,19 @@
+package org.dromara.app.session;
+
+import lombok.Data;
+
+@Data
+public class AppSession {
+    private String sessionId;
+    private Long userId;
+    private String deviceType;
+    private String deviceId;
+    private String userAgent;
+    private String ip;
+    private String location;
+    private long loginAt;
+    private long expireAt;
+    private boolean active;
+    private String token;
+}
+
diff --git a/ruoyi-server/src/main/java/org/dromara/app/session/AppSessionManager.java b/ruoyi-server/src/main/java/org/dromara/app/session/AppSessionManager.java
new file mode 100644
index 0000000..9d120bf
--- /dev/null
+++ b/ruoyi-server/src/main/java/org/dromara/app/session/AppSessionManager.java
@@ -0,0 +1,80 @@
+package org.dromara.app.session;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.json.utils.JsonUtils;
+import org.dromara.common.redis.utils.RedisUtils;
+import org.springframework.stereotype.Component;
+
+import java.time.Duration;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class AppSessionManager {
+    private static final String KEY_INDEX_FMT = "APP:SESS_INDEX:%s";
+    private static final String KEY_SESS_FMT = "APP:SESS:%s:%s";
+    private static final String CH_EVT_FMT = "APP:SESS_EVT:%s";
+
+    public void register(AppSession s, Duration ttl) {
+        String indexKey = indexKey(s.getUserId());
+        String sessKey = sessKey(s.getUserId(), s.getSessionId());
+        RedisUtils.addCacheSet(indexKey, sessKey);
+        RedisUtils.setCacheObject(sessKey, JsonUtils.toJsonString(s), ttl);
+        publishEvent(s.getUserId(), "REGISTER", s.getSessionId());
+    }
+
+    public List<AppSession> list(Long userId) {
+        String indexKey = indexKey(userId);
+        Set<String> keys = RedisUtils.getCacheSet(indexKey);
+        List<AppSession> out = new ArrayList<>();
+        if (keys != null) {
+            for (String k : keys) {
+                String val = RedisUtils.getCacheObject(k);
+                if (val != null) {
+                    out.add(JsonUtils.parseObject(val, AppSession.class));
+                }
+            }
+        }
+        return out;
+    }
+
+    public boolean terminate(Long userId, String sessionId) {
+        String indexKey = indexKey(userId);
+        String sessKey = sessKey(userId, sessionId);
+        RedisUtils.deleteObject(sessKey);
+        try {
+            org.redisson.api.RSet<String> set = org.dromara.common.redis.utils.RedisUtils.getClient().getSet(indexKey);
+            set.remove(sessKey);
+        } catch (Exception ignored) {
+        }
+        publishEvent(userId, "TERMINATE", sessionId);
+        return true;
+    }
+
+    public boolean heartbeat(Long userId, String sessionId, Duration ttlExtend) {
+        String sessKey = sessKey(userId, sessionId);
+        String val = RedisUtils.getCacheObject(sessKey);
+        if (val == null) return false;
+        AppSession s = JsonUtils.parseObject(val, AppSession.class);
+        RedisUtils.setCacheObject(sessKey, JsonUtils.toJsonString(s), ttlExtend);
+        publishEvent(userId, "HEARTBEAT", sessionId);
+        return true;
+    }
+
+    public void publishEvent(Long userId, String type, String sessionId) {
+        String ch = String.format(CH_EVT_FMT, userId);
+        String payload = type + ":" + sessionId;
+        RedisUtils.publish(ch, payload);
+    }
+
+    private String indexKey(Long userId) {
+        return String.format(KEY_INDEX_FMT, userId);
+    }
+    private String sessKey(Long userId, String sessionId) {
+        return String.format(KEY_SESS_FMT, userId, sessionId);
+    }
+}
diff --git a/ruoyi-server/src/main/java/org/dromara/web/config/AppInfoCompletionFilter.java b/ruoyi-server/src/main/java/org/dromara/web/config/AppInfoCompletionFilter.java
new file mode 100644
index 0000000..780778d
--- /dev/null
+++ b/ruoyi-server/src/main/java/org/dromara/web/config/AppInfoCompletionFilter.java
@@ -0,0 +1,73 @@
+package org.dromara.web.config;
+
+import cn.dev33.satoken.exception.NotLoginException;
+import org.dromara.app.domain.AppLoginUser;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.domain.model.LoginUser;
+import org.dromara.common.json.utils.JsonUtils;
+import org.dromara.common.core.utils.ServletUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.satoken.utils.LoginHelper;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.HttpStatus;
+import org.springframework.util.AntPathMatcher;
+
+import jakarta.servlet.*;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * App用户信息补全过滤器
+ *
+ * @author Pair-Programmer
+ */
+public class AppInfoCompletionFilter implements Filter {
+
+    @Value("#{'${app.auth.whitelist:/app/user/profile,/app/user/bind,/app/auth/logout}'.split(',')}")
+    private List<String> whitelist;
+
+    private final AntPathMatcher pathMatcher = new AntPathMatcher();
+
+    @Override
+    public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
+        HttpServletRequest httpRequest = (HttpServletRequest) request;
+        String uri = httpRequest.getRequestURI();
+
+        // 仅处理App端请求
+        if (StringUtils.startsWith(uri, "/app")) {
+            try {
+                // 尝试获取登录用户，若未登录会抛出异常或返回null
+                LoginUser loginUser = LoginHelper.getLoginUser();
+                
+                // 仅针对App登录用户进行检查
+                if (loginUser instanceof AppLoginUser appUser) {
+                    // 如果信息不完善 (infoComplete 为 false 或 null)
+                    if (Boolean.FALSE.equals(appUser.getInfoComplete())) {
+                        // 检查白名单
+                        boolean isAllowed = false;
+                        if (whitelist != null) {
+                            for (String pattern : whitelist) {
+                                if (pathMatcher.match(pattern.trim(), uri)) {
+                                    isAllowed = true;
+                                    break;
+                                }
+                            }
+                        }
+
+                        if (!isAllowed) {
+                            ServletUtils.renderString((HttpServletResponse) response,
+                                JsonUtils.toJsonString(R.fail(403, "用户信息未补全，请先完善信息")));
+                            return;
+                        }
+                    }
+                }
+            } catch (Exception ignored) {
+                // 未登录或其他异常（如Token无效），放行交由后续认证过滤器或拦截器处理
+            }
+        }
+
+        chain.doFilter(request, response);
+    }
+}
diff --git a/ruoyi-server/src/main/java/org/dromara/web/config/RiskInterceptor.java b/ruoyi-server/src/main/java/org/dromara/web/config/RiskInterceptor.java
new file mode 100644
index 0000000..fc6869d
--- /dev/null
+++ b/ruoyi-server/src/main/java/org/dromara/web/config/RiskInterceptor.java
@@ -0,0 +1,52 @@
+package org.dromara.web.config;
+
+import cn.dev33.satoken.stp.StpUtil;
+import cn.hutool.core.util.ObjectUtil;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.json.utils.JsonUtils;
+import org.dromara.common.core.utils.ServletUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.springframework.web.servlet.HandlerInterceptor;
+
+/**
+ * 风险控制拦截器
+ *
+ * @author Pair-Programmer
+ */
+public class RiskInterceptor implements HandlerInterceptor {
+
+    public static final String RISK_LOCKED_KEY = "RISK_LOCKED";
+
+    @Override
+    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) {
+        // 仅处理登录用户
+        if (!StpUtil.isLogin()) {
+            return true;
+        }
+
+        // 检查 Session 是否有风险锁
+        Object isLocked = StpUtil.getSession().get(RISK_LOCKED_KEY);
+        if (ObjectUtil.isNotNull(isLocked) && (Boolean) isLocked) {
+            String uri = request.getRequestURI();
+            
+            // 白名单：改密接口、登出接口、获取个人信息(用于页面展示)
+            // 注意：具体路径需根据实际 Controller 调整
+            if (StringUtils.equalsAnyIgnoreCase(uri, 
+                "/system/user/profile/updatePwd", 
+                "/auth/logout",
+                "/system/user/profile"
+            )) {
+                return true;
+            }
+
+            // 拦截并返回 403
+            ServletUtils.renderString(response, 
+                JsonUtils.toJsonString(R.fail(403, "检测到异常登录，请强制修改密码后继续操作")));
+            return false;
+        }
+
+        return true;
+    }
+}
diff --git a/ruoyi-server/src/main/java/org/dromara/web/config/WebMvcPlusConfig.java b/ruoyi-server/src/main/java/org/dromara/web/config/WebMvcPlusConfig.java
new file mode 100644
index 0000000..59bd292
--- /dev/null
+++ b/ruoyi-server/src/main/java/org/dromara/web/config/WebMvcPlusConfig.java
@@ -0,0 +1,41 @@
+package org.dromara.web.config;
+
+import org.springframework.boot.web.servlet.FilterRegistrationBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+/**
+ * Web MVC 扩展配置
+ *
+ * @author Pair-Programmer
+ */
+@Configuration
+public class WebMvcPlusConfig implements WebMvcConfigurer {
+
+    @Override
+    public void addInterceptors(InterceptorRegistry registry) {
+        // 注册风险控制拦截器
+        registry.addInterceptor(new RiskInterceptor())
+            .addPathPatterns("/system/**", "/monitor/**", "/tool/**");
+    }
+
+    @Bean
+    public AppInfoCompletionFilter appInfoCompletionFilter() {
+        return new AppInfoCompletionFilter();
+    }
+
+    @Bean
+    public FilterRegistrationBean<AppInfoCompletionFilter> appInfoCompletionFilterRegistration(AppInfoCompletionFilter filter) {
+        FilterRegistrationBean<AppInfoCompletionFilter> registration = new FilterRegistrationBean<>(filter);
+        registration.addUrlPatterns("/app/*");
+        registration.setName("appInfoCompletionFilter");
+        // 顺序需在 Sa-Token 认证过滤器之后，但在业务逻辑之前
+        // Sa-Token 拦截器在 Interceptor 层，Filter 在 Servlet 层。
+        // 但 LoginHelper 需要 Token，Token 在 Header 里，随时可取。
+        // 关键是 Filter 需要在请求处理前执行。
+        registration.setOrder(100);
+        return registration;
+    }
+}
diff --git a/ruoyi-server/src/main/java/org/dromara/web/config/properties/RiskControlProperties.java b/ruoyi-server/src/main/java/org/dromara/web/config/properties/RiskControlProperties.java
new file mode 100644
index 0000000..2326501
--- /dev/null
+++ b/ruoyi-server/src/main/java/org/dromara/web/config/properties/RiskControlProperties.java
@@ -0,0 +1,41 @@
+package org.dromara.web.config.properties;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+/**
+ * 风险控制配置
+ *
+ * @author Pair-Programmer
+ */
+@Data
+@Component
+@ConfigurationProperties(prefix = "sys.risk")
+public class RiskControlProperties {
+
+    /**
+     * 是否开启风险检测
+     */
+    private Boolean enabled = true;
+
+    /**
+     * 风险阈值 (0-100)
+     */
+    private Integer threshold = 60;
+
+    /**
+     * 异地登录权重
+     */
+    private Integer geoWeight = 50;
+
+    /**
+     * 新设备权重
+     */
+    private Integer deviceWeight = 30;
+
+    /**
+     * 非工作时间权重 (00:00-06:00)
+     */
+    private Integer timeWeight = 10;
+}
diff --git a/ruoyi-server/src/main/java/org/dromara/web/controller/AuthController.java b/ruoyi-server/src/main/java/org/dromara/web/controller/AuthController.java
new file mode 100644
index 0000000..981581a
--- /dev/null
+++ b/ruoyi-server/src/main/java/org/dromara/web/controller/AuthController.java
@@ -0,0 +1,208 @@
+package org.dromara.web.controller;
+
+import cn.dev33.satoken.annotation.SaIgnore;
+import cn.dev33.satoken.stp.StpUtil;
+import cn.hutool.core.codec.Base64;
+import cn.hutool.core.util.ObjectUtil;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import me.zhyd.oauth.model.AuthResponse;
+import me.zhyd.oauth.model.AuthUser;
+import me.zhyd.oauth.request.AuthRequest;
+import me.zhyd.oauth.utils.AuthStateUtils;
+import org.dromara.common.core.constant.SystemConstants;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.domain.model.LoginBody;
+import org.dromara.common.core.domain.model.RegisterBody;
+import org.dromara.common.core.domain.model.SocialLoginBody;
+import org.dromara.common.core.utils.MessageUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.core.utils.ValidatorUtils;
+import org.dromara.common.encrypt.annotation.ApiEncrypt;
+import org.dromara.common.json.utils.JsonUtils;
+import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.common.social.config.properties.SocialLoginConfigProperties;
+import org.dromara.common.social.config.properties.SocialProperties;
+import org.dromara.common.social.utils.SocialUtils;
+import org.dromara.common.sse.dto.SseMessageDto;
+import org.dromara.common.sse.utils.SseMessageUtils;
+import org.dromara.system.domain.vo.SysClientVo;
+import org.dromara.system.service.SysClientService;
+import org.dromara.system.service.SysConfigService;
+import org.dromara.system.service.SysSocialService;
+import org.dromara.web.domain.vo.LoginVo;
+import org.dromara.web.service.IAuthStrategy;
+import org.dromara.web.service.SysLoginService;
+import org.dromara.web.service.SysRegisterService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.nio.charset.StandardCharsets;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * 认证
+ *
+ * @author pengles
+ */
+@Slf4j
+@SaIgnore
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/auth")
+public class AuthController {
+
+    private final SocialProperties socialProperties;
+    private final SysLoginService loginService;
+    private final SysRegisterService registerService;
+    private final SysConfigService configService;
+    private final SysSocialService socialUserService;
+    private final SysClientService clientService;
+    private final ScheduledExecutorService scheduledExecutorService;
+
+
+    /**
+     * 登录方法
+     *
+     * @param body 登录信息
+     * @return 结果
+     */
+    @ApiEncrypt
+    @PostMapping("/login")
+    public R<LoginVo> login(@RequestBody String body) {
+        LoginBody loginBody = JsonUtils.parseObject(body, LoginBody.class);
+        ValidatorUtils.validate(loginBody);
+        // 授权类型和客户端id
+        String clientId = loginBody.getClientId();
+        String grantType = loginBody.getGrantType();
+        SysClientVo client = clientService.queryByClientId(clientId);
+        // 查询不到 client 或 client 内不包含 grantType
+        if (ObjectUtil.isNull(client) || !StringUtils.contains(client.getGrantType(), grantType)) {
+            log.info("客户端id: {} 认证类型：{} 异常!.", clientId, grantType);
+            return R.fail(MessageUtils.message("auth.grant.type.error"));
+        } else if (!SystemConstants.NORMAL.equals(client.getStatus())) {
+            return R.fail(MessageUtils.message("auth.grant.type.blocked"));
+        }
+        // 登录
+        LoginVo loginVo = IAuthStrategy.login(body, client, grantType);
+
+        Long userId = LoginHelper.getUserId();
+        scheduledExecutorService.schedule(() -> {
+            SseMessageDto dto = new SseMessageDto();
+            dto.setMessage("欢迎登录RuoYi-Vue-Plus后台管理系统");
+            dto.setUserIds(List.of(userId));
+            SseMessageUtils.publishMessage(dto);
+        }, 5, TimeUnit.SECONDS);
+        return R.ok(loginVo);
+    }
+
+    /**
+     * 获取跳转URL
+     *
+     * @param source 登录来源
+     * @return 结果
+     */
+    @GetMapping("/binding/{source}")
+    public R<String> authBinding(@PathVariable("source") String source, @RequestParam String domain) {
+        SocialLoginConfigProperties obj = socialProperties.getType().get(source);
+        if (ObjectUtil.isNull(obj)) {
+            return R.fail(source + "平台账号暂不支持");
+        }
+        AuthRequest authRequest = SocialUtils.getAuthRequest(source, socialProperties);
+        Map<String, String> map = new HashMap<>();
+        map.put("domain", domain);
+        map.put("state", AuthStateUtils.createState());
+        String authorizeUrl = authRequest.authorize(Base64.encode(JsonUtils.toJsonString(map), StandardCharsets.UTF_8));
+        return R.ok("操作成功", authorizeUrl);
+    }
+
+    /**
+     * 前端回调绑定授权(需要token)
+     *
+     * @param loginBody 请求体
+     * @return 结果
+     */
+    @PostMapping("/social/callback")
+    public R<Void> socialCallback(@RequestBody SocialLoginBody loginBody) {
+        // 校验token
+        StpUtil.checkLogin();
+        // 获取第三方登录信息
+        AuthResponse<AuthUser> response = SocialUtils.loginAuth(
+                loginBody.getSource(), loginBody.getSocialCode(),
+                loginBody.getSocialState(), socialProperties);
+        AuthUser authUserData = response.getData();
+        // 判断授权响应是否成功
+        if (!response.ok()) {
+            return R.fail(response.getMsg());
+        }
+        loginService.socialRegister(authUserData);
+        return R.ok();
+    }
+
+
+    /**
+     * 取消授权(需要token)
+     *
+     * @param socialId socialId
+     */
+    @DeleteMapping(value = "/unlock/{socialId}")
+    public R<Void> unlockSocial(@PathVariable Long socialId) {
+        // 校验token
+        StpUtil.checkLogin();
+        Boolean rows = socialUserService.deleteWithValidById(socialId);
+        return rows ? R.ok() : R.fail("取消授权失败");
+    }
+
+
+    /**
+     * 退出登录
+     */
+    @PostMapping("/logout")
+    public R<Void> logout() {
+        loginService.logout();
+        return R.ok("退出成功");
+    }
+
+    /**
+     * 用户注册
+     */
+    @ApiEncrypt
+    @PostMapping("/register")
+    public R<Void> register(@Validated @RequestBody RegisterBody user) {
+        if (!configService.selectRegisterEnabled()) {
+            return R.fail("当前系统没有开启注册功能！");
+        }
+        registerService.register(user);
+        return R.ok();
+    }
+
+    /**
+     * 登录页面租户下拉框（兼容多租户前端）
+     */
+    @GetMapping("/tenant/list")
+    public R<TenantListVo> tenantList() {
+        return R.ok(TenantListVo.DISABLED_TENANT);
+    }
+
+    /**
+     * 租户下拉列表
+     *
+     * @param tenantEnabled 租户开关
+     */
+    public record TenantListVo(boolean tenantEnabled) {
+
+        /**
+         * 禁用租户，租户开关响应false（即关闭），让前端关闭租户功能
+         */
+        public static final TenantListVo DISABLED_TENANT = TenantListVo.of(false);
+
+        public static TenantListVo of(boolean tenantEnabled) {
+            return new TenantListVo(tenantEnabled);
+        }
+    }
+
+}
diff --git a/ruoyi-server/src/main/java/org/dromara/web/controller/CaptchaController.java b/ruoyi-server/src/main/java/org/dromara/web/controller/CaptchaController.java
new file mode 100644
index 0000000..afd6fe5
--- /dev/null
+++ b/ruoyi-server/src/main/java/org/dromara/web/controller/CaptchaController.java
@@ -0,0 +1,154 @@
+package org.dromara.web.controller;
+
+import cn.dev33.satoken.annotation.SaIgnore;
+import cn.hutool.captcha.AbstractCaptcha;
+import cn.hutool.captcha.generator.CodeGenerator;
+import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.RandomUtil;
+import jakarta.validation.constraints.NotBlank;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.constant.Constants;
+import org.dromara.common.core.constant.GlobalConstants;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.utils.SpringUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.core.utils.reflect.ReflectUtils;
+import org.dromara.common.mail.config.properties.MailProperties;
+import org.dromara.common.mail.utils.MailUtils;
+import org.dromara.common.ratelimiter.annotation.RateLimiter;
+import org.dromara.common.ratelimiter.enums.LimitType;
+import org.dromara.common.redis.utils.RedisUtils;
+import org.dromara.common.web.config.properties.CaptchaProperties;
+import org.dromara.common.web.enums.CaptchaType;
+import org.dromara.sms4j.api.SmsBlend;
+import org.dromara.sms4j.api.entity.SmsResponse;
+import org.dromara.sms4j.core.factory.SmsFactory;
+import org.dromara.web.domain.vo.CaptchaVo;
+import org.springframework.expression.Expression;
+import org.springframework.expression.ExpressionParser;
+import org.springframework.expression.spel.standard.SpelExpressionParser;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.time.Duration;
+import java.util.LinkedHashMap;
+
+/**
+ * 验证码操作处理
+ *
+ * @author pengles
+ */
+@SaIgnore
+@Slf4j
+@Validated
+@RequiredArgsConstructor
+@RestController
+public class CaptchaController {
+
+    private final CaptchaProperties captchaProperties;
+    private final MailProperties mailProperties;
+
+    /**
+     * 短信验证码
+     *
+     * @param phonenumber 用户手机号
+     */
+    @RateLimiter(key = "#phonenumber", time = 60, count = 1)
+    @GetMapping("/resource/sms/code")
+    public R<Void> smsCode(@NotBlank(message = "{user.phonenumber.not.blank}") String phonenumber) {
+        String key = GlobalConstants.CAPTCHA_CODE_KEY + phonenumber;
+        String code = RandomUtil.randomNumbers(4);
+        RedisUtils.setCacheObject(key, code, Duration.ofMinutes(Constants.CAPTCHA_EXPIRATION));
+        // 验证码模板id 自行处理 (查数据库或写死均可)
+        String templateId = "";
+        LinkedHashMap<String, String> map = new LinkedHashMap<>(1);
+        map.put("code", code);
+        SmsBlend smsBlend = SmsFactory.getSmsBlend("config1");
+        SmsResponse smsResponse = smsBlend.sendMessage(phonenumber, templateId, map);
+        if (!smsResponse.isSuccess()) {
+            log.error("验证码短信发送异常 => {}", smsResponse);
+            return R.fail(smsResponse.getData().toString());
+        }
+        return R.ok();
+    }
+
+    /**
+     * 邮箱验证码
+     *
+     * @param email 邮箱
+     */
+    @GetMapping("/resource/email/code")
+    public R<Void> emailCode(@NotBlank(message = "{user.email.not.blank}") String email) {
+        if (!mailProperties.getEnabled()) {
+            return R.fail("当前系统没有开启邮箱功能！");
+        }
+        SpringUtils.getAopProxy(this).emailCodeImpl(email);
+        return R.ok();
+    }
+
+    /**
+     * 邮箱验证码
+     * 独立方法避免验证码关闭之后仍然走限流
+     */
+    @RateLimiter(key = "#email", time = 60, count = 1)
+    public void emailCodeImpl(String email) {
+        String key = GlobalConstants.CAPTCHA_CODE_KEY + email;
+        String code = RandomUtil.randomNumbers(4);
+        RedisUtils.setCacheObject(key, code, Duration.ofMinutes(Constants.CAPTCHA_EXPIRATION));
+        try {
+            MailUtils.sendText(email, "登录验证码", "您本次验证码为：" + code + "，有效性为" + Constants.CAPTCHA_EXPIRATION + "分钟，请尽快填写。");
+        } catch (Exception e) {
+            log.error("验证码短信发送异常 => {}", e.getMessage());
+            throw new ServiceException(e.getMessage());
+        }
+    }
+
+    /**
+     * 生成验证码
+     */
+    @GetMapping("/auth/code")
+    public R<CaptchaVo> getCode() {
+        boolean captchaEnabled = captchaProperties.getEnable();
+        if (!captchaEnabled) {
+            CaptchaVo captchaVo = new CaptchaVo();
+            captchaVo.setCaptchaEnabled(false);
+            return R.ok(captchaVo);
+        }
+        return R.ok(SpringUtils.getAopProxy(this).getCodeImpl());
+    }
+
+    /**
+     * 生成验证码
+     * 独立方法避免验证码关闭之后仍然走限流
+     */
+    @RateLimiter(time = 60, count = 10, limitType = LimitType.IP)
+    public CaptchaVo getCodeImpl() {
+        // 保存验证码信息
+        String uuid = IdUtil.simpleUUID();
+        String verifyKey = GlobalConstants.CAPTCHA_CODE_KEY + uuid;
+        // 生成验证码
+        CaptchaType captchaType = captchaProperties.getType();
+        boolean isMath = CaptchaType.MATH == captchaType;
+        Integer length = isMath ? captchaProperties.getNumberLength() : captchaProperties.getCharLength();
+        CodeGenerator codeGenerator = ReflectUtils.newInstance(captchaType.getClazz(), length);
+        AbstractCaptcha captcha = SpringUtils.getBean(captchaProperties.getCategory().getClazz());
+        captcha.setGenerator(codeGenerator);
+        captcha.createCode();
+        // 如果是数学验证码，使用SpEL表达式处理验证码结果
+        String code = captcha.getCode();
+        if (isMath) {
+            ExpressionParser parser = new SpelExpressionParser();
+            Expression exp = parser.parseExpression(StringUtils.remove(code, "="));
+            code = exp.getValue(String.class);
+        }
+        RedisUtils.setCacheObject(verifyKey, code, Duration.ofMinutes(Constants.CAPTCHA_EXPIRATION));
+        CaptchaVo captchaVo = new CaptchaVo();
+        captchaVo.setUuid(uuid);
+        captchaVo.setImg(captcha.getImageBase64());
+        return captchaVo;
+    }
+
+}
diff --git a/ruoyi-server/src/main/java/org/dromara/web/controller/IndexController.java b/ruoyi-server/src/main/java/org/dromara/web/controller/IndexController.java
new file mode 100644
index 0000000..0777fd2
--- /dev/null
+++ b/ruoyi-server/src/main/java/org/dromara/web/controller/IndexController.java
@@ -0,0 +1,28 @@
+package org.dromara.web.controller;
+
+import cn.dev33.satoken.annotation.SaIgnore;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.utils.SpringUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 首页
+ *
+ * @author pengles
+ */
+@SaIgnore
+@RequiredArgsConstructor
+@RestController
+public class IndexController {
+
+    /**
+     * 访问首页，提示语
+     */
+    @GetMapping("/")
+    public String index() {
+        return StringUtils.format("欢迎使用{}后台管理框架，请通过前端地址访问。", SpringUtils.getApplicationName());
+    }
+
+}
diff --git a/ruoyi-server/src/main/java/org/dromara/web/domain/vo/CaptchaVo.java b/ruoyi-server/src/main/java/org/dromara/web/domain/vo/CaptchaVo.java
new file mode 100644
index 0000000..8160b58
--- /dev/null
+++ b/ruoyi-server/src/main/java/org/dromara/web/domain/vo/CaptchaVo.java
@@ -0,0 +1,28 @@
+package org.dromara.web.domain.vo;
+
+import lombok.Data;
+
+/**
+ * 验证码信息
+ *
+ * @author pengles
+ */
+@Data
+public class CaptchaVo {
+
+    /**
+     * 是否开启验证码
+     */
+    private Boolean captchaEnabled = true;
+
+    /**
+     * 验证码唯一标识
+     */
+    private String uuid;
+
+    /**
+     * 验证码图片
+     */
+    private String img;
+
+}
diff --git a/ruoyi-server/src/main/java/org/dromara/web/domain/vo/LoginVo.java b/ruoyi-server/src/main/java/org/dromara/web/domain/vo/LoginVo.java
new file mode 100644
index 0000000..0b0afd7
--- /dev/null
+++ b/ruoyi-server/src/main/java/org/dromara/web/domain/vo/LoginVo.java
@@ -0,0 +1,54 @@
+package org.dromara.web.domain.vo;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+/**
+ * 登录验证信息
+ *
+ * @author pengles
+ */
+@Data
+public class LoginVo {
+
+    /**
+     * 授权令牌
+     */
+    @JsonProperty("access_token")
+    private String accessToken;
+
+    /**
+     * 刷新令牌
+     */
+    @JsonProperty("refresh_token")
+    private String refreshToken;
+
+    /**
+     * 授权令牌 access_token 的有效期
+     */
+    @JsonProperty("expire_in")
+    private Long expireIn;
+
+    /**
+     * 刷新令牌 refresh_token 的有效期
+     */
+    @JsonProperty("refresh_expire_in")
+    private Long refreshExpireIn;
+
+    /**
+     * 应用id
+     */
+    @JsonProperty("client_id")
+    private String clientId;
+
+    /**
+     * 令牌权限
+     */
+    private String scope;
+
+    /**
+     * 用户 openid
+     */
+    private String openid;
+
+}
diff --git a/ruoyi-server/src/main/java/org/dromara/web/listener/UserActionListener.java b/ruoyi-server/src/main/java/org/dromara/web/listener/UserActionListener.java
new file mode 100644
index 0000000..d5c38e9
--- /dev/null
+++ b/ruoyi-server/src/main/java/org/dromara/web/listener/UserActionListener.java
@@ -0,0 +1,173 @@
+package org.dromara.web.listener;
+
+import cn.dev33.satoken.listener.SaTokenListener;
+import cn.dev33.satoken.stp.StpUtil;
+import cn.dev33.satoken.stp.parameter.SaLoginParameter;
+import cn.hutool.http.useragent.UserAgent;
+import cn.hutool.http.useragent.UserAgentUtil;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.constant.CacheConstants;
+import org.dromara.common.core.constant.Constants;
+import org.dromara.common.core.domain.dto.UserOnlineDTO;
+import org.dromara.common.core.utils.MessageUtils;
+import org.dromara.common.core.utils.ServletUtils;
+import org.dromara.common.core.utils.SpringUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.core.utils.ip.AddressUtils;
+import org.dromara.common.log.event.LogininforEvent;
+import org.dromara.common.redis.utils.RedisUtils;
+import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.web.config.properties.RiskControlProperties;
+import org.dromara.web.service.RiskControlService;
+import org.dromara.web.service.SysLoginService;
+import org.springframework.stereotype.Component;
+
+import java.time.Duration;
+
+/**
+ * 用户行为 侦听器的实现
+ *
+ * @author pengles
+ */
+@RequiredArgsConstructor
+@Component
+@Slf4j
+public class UserActionListener implements SaTokenListener {
+
+    private final SysLoginService loginService;
+    private final RiskControlService riskControlService;
+    private final RiskControlProperties riskProperties;
+
+    /**
+     * 每次登录时触发
+     */
+    @Override
+    public void doLogin(String loginType, Object loginId, String tokenValue, SaLoginParameter loginParameter) {
+        UserAgent userAgent = UserAgentUtil.parse(ServletUtils.getRequest().getHeader("User-Agent"));
+        String ip = ServletUtils.getClientIP();
+        UserOnlineDTO dto = new UserOnlineDTO();
+        dto.setIpaddr(ip);
+        dto.setLoginLocation(AddressUtils.getRealAddressByIP(ip));
+        dto.setBrowser(userAgent.getBrowser().getName());
+        dto.setOs(userAgent.getOs().getName());
+        dto.setLoginTime(System.currentTimeMillis());
+        dto.setTokenId(tokenValue);
+        String username = (String) loginParameter.getExtra(LoginHelper.USER_NAME_KEY);
+        dto.setUserName(username);
+        dto.setClientKey((String) loginParameter.getExtra(LoginHelper.CLIENT_KEY));
+        dto.setDeviceType(loginParameter.getDeviceType());
+        dto.setDeptName((String) loginParameter.getExtra(LoginHelper.DEPT_NAME_KEY));
+        if (loginParameter.getTimeout() == -1) {
+            RedisUtils.setCacheObject(CacheConstants.ONLINE_TOKEN_KEY + tokenValue, dto);
+        } else {
+            RedisUtils.setCacheObject(CacheConstants.ONLINE_TOKEN_KEY + tokenValue, dto, Duration.ofSeconds(loginParameter.getTimeout()));
+        }
+
+        // 风险检测 (仅针对 sys 用户)
+        // 假设 "login" 是 sys 用户的 loginType (SaToken 默认配置)
+//        if ("login".equals(loginType)) {
+//            int score = riskControlService.assessRisk(username, ip, ServletUtils.getRequest().getHeader("User-Agent"));
+//            if (score > riskProperties.getThreshold()) {
+//                log.warn("用户 {} 登录风险过高 (score={})，已锁定会话", username, score);
+//                StpUtil.getSession().set(RiskInterceptor.RISK_LOCKED_KEY, true);
+//                // 可以在此触发邮件/短信告警
+//            }
+//        }
+
+        // 记录登录日志
+        LogininforEvent logininforEvent = new LogininforEvent();
+        logininforEvent.setUsername(username);
+        logininforEvent.setStatus(Constants.LOGIN_SUCCESS);
+        logininforEvent.setMessage(MessageUtils.message("user.login.success"));
+        logininforEvent.setRequest(ServletUtils.getRequest());
+        SpringUtils.context().publishEvent(logininforEvent);
+        // 更新登录信息
+        loginService.recordLoginInfo((Long) loginParameter.getExtra(LoginHelper.USER_KEY), ip);
+        log.info("user doLogin, userId:{}, token:{}", loginId, tokenValue);
+    }
+
+    /**
+     * 每次注销时触发
+     */
+    @Override
+    public void doLogout(String loginType, Object loginId, String tokenValue) {
+        RedisUtils.deleteObject(CacheConstants.ONLINE_TOKEN_KEY + tokenValue);
+        log.info("user doLogout, userId:{}, token:{}", loginId, tokenValue);
+    }
+
+    /**
+     * 每次被踢下线时触发
+     */
+    @Override
+    public void doKickout(String loginType, Object loginId, String tokenValue) {
+        RedisUtils.deleteObject(CacheConstants.ONLINE_TOKEN_KEY + tokenValue);
+        log.info("user doKickout, userId:{}, token:{}", loginId, tokenValue);
+    }
+
+    /**
+     * 每次被顶下线时触发
+     */
+    @Override
+    public void doReplaced(String loginType, Object loginId, String tokenValue) {
+        RedisUtils.deleteObject(CacheConstants.ONLINE_TOKEN_KEY + tokenValue);
+        log.info("user doReplaced, userId:{}, token:{}", loginId, tokenValue);
+    }
+
+    /**
+     * 每次被封禁时触发
+     */
+    @Override
+    public void doDisable(String loginType, Object loginId, String service, int level, long disableTime) {
+        log.info("用户被禁用: loginType={}, loginId={}, service={}, level={}, disableTime={}",
+                loginType, loginId, service, level, disableTime);
+
+        // 删除在线用户信息
+        String tokenValue = StpUtil.getTokenValueByLoginId(loginId);
+        if (StringUtils.isNotBlank(tokenValue)) {
+            RedisUtils.deleteObject(CacheConstants.ONLINE_TOKEN_KEY + tokenValue);
+        }
+    }
+
+    /**
+     * 每次被解封时触发
+     */
+    @Override
+    public void doUntieDisable(String loginType, Object loginId, String service) {
+    }
+
+    /**
+     * 每次打开二级认证时触发
+     */
+    @Override
+    public void doOpenSafe(String loginType, String tokenValue, String service, long safeTime) {
+    }
+
+    /**
+     * 每次创建Session时触发
+     */
+    @Override
+    public void doCloseSafe(String loginType, String tokenValue, String service) {
+    }
+
+    /**
+     * 每次创建Session时触发
+     */
+    @Override
+    public void doCreateSession(String id) {
+    }
+
+    /**
+     * 每次注销Session时触发
+     */
+    @Override
+    public void doLogoutSession(String id) {
+    }
+
+    /**
+     * 每次Token续期时触发
+     */
+    @Override
+    public void doRenewTimeout(String loginType, Object loginId, String tokenValue, long timeout) {
+    }
+}
diff --git a/ruoyi-server/src/main/java/org/dromara/web/service/IAuthStrategy.java b/ruoyi-server/src/main/java/org/dromara/web/service/IAuthStrategy.java
new file mode 100644
index 0000000..0578b68
--- /dev/null
+++ b/ruoyi-server/src/main/java/org/dromara/web/service/IAuthStrategy.java
@@ -0,0 +1,45 @@
+package org.dromara.web.service;
+
+
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.utils.SpringUtils;
+import org.dromara.system.domain.vo.SysClientVo;
+import org.dromara.web.domain.vo.LoginVo;
+
+/**
+ * 授权策略
+ *
+ * @author pengles
+ */
+public interface IAuthStrategy {
+
+    String BASE_NAME = "AuthStrategy";
+
+    /**
+     * 登录
+     *
+     * @param body      登录对象
+     * @param client    授权管理视图对象
+     * @param grantType 授权类型
+     * @return 登录验证信息
+     */
+    static LoginVo login(String body, SysClientVo client, String grantType) {
+        // 授权类型和客户端id
+        String beanName = grantType + BASE_NAME;
+        if (!SpringUtils.containsBean(beanName)) {
+            throw new ServiceException("授权类型不正确!");
+        }
+        IAuthStrategy instance = SpringUtils.getBean(beanName);
+        return instance.login(body, client);
+    }
+
+    /**
+     * 登录
+     *
+     * @param body   登录对象
+     * @param client 授权管理视图对象
+     * @return 登录验证信息
+     */
+    LoginVo login(String body, SysClientVo client);
+
+}
diff --git a/ruoyi-server/src/main/java/org/dromara/web/service/RiskControlService.java b/ruoyi-server/src/main/java/org/dromara/web/service/RiskControlService.java
new file mode 100644
index 0000000..26a8911
--- /dev/null
+++ b/ruoyi-server/src/main/java/org/dromara/web/service/RiskControlService.java
@@ -0,0 +1,137 @@
+package org.dromara.web.service;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.http.useragent.UserAgent;
+import cn.hutool.http.useragent.UserAgentUtil;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.constant.Constants;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.core.utils.ip.AddressUtils;
+import org.dromara.system.domain.bo.SysLogininforBo;
+import org.dromara.system.domain.vo.SysLogininforVo;
+import org.dromara.system.service.SysLogininforService;
+import org.dromara.web.config.properties.RiskControlProperties;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+/**
+ * 风险控制服务
+ *
+ * @author Pair-Programmer
+ */
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class RiskControlService {
+
+    private final SysLogininforService logininforService;
+    private final RiskControlProperties properties;
+
+    /**
+     * 评估登录风险
+     *
+     * @param username  用户名
+     * @param currentIp 当前IP
+     * @param uaStr     User-Agent字符串
+     * @return 风险分数 (0-100)
+     */
+    public int assessRisk(String username, String currentIp, String uaStr) {
+        if (!properties.getEnabled()) {
+            return 0;
+        }
+
+        int score = 0;
+        String currentAddress = AddressUtils.getRealAddressByIP(currentIp);
+        UserAgent currentUserAgent = UserAgentUtil.parse(uaStr);
+
+        // 1. 获取最近成功的登录记录 (取最近10条)
+        SysLogininforBo query = new SysLogininforBo();
+        query.setUserName(username);
+        query.setStatus(Constants.SUCCESS);
+        // 这里假设 selectLogininforList 是按时间倒序的，且我们可以通过PageHelper或流截取
+        // 由于是 Service 调用，我们先获取列表然后手动截取，或者依赖 Mapper 的分页（这里简化处理）
+        List<SysLogininforVo> historyList = logininforService.selectLogininforList(query);
+        
+        // 如果是首次登录或无历史记录，视为低风险
+        if (CollUtil.isEmpty(historyList)) {
+            return 0;
+        }
+
+        // 截取最近 10 条作为基线
+        List<SysLogininforVo> baseline = historyList.stream().limit(10).collect(Collectors.toList());
+
+        // 2. 检查异地登录 (省份是否变化)
+        boolean isGeoAnomaly = true;
+        Set<String> validLocations = baseline.stream()
+            .map(SysLogininforVo::getLoginLocation)
+            .filter(StrUtil::isNotBlank)
+            .map(this::extractProvince)
+            .collect(Collectors.toSet());
+        
+        String currentProvince = extractProvince(currentAddress);
+        if (validLocations.contains(currentProvince)) {
+            isGeoAnomaly = false;
+        } else {
+            // 特殊处理：如果历史记录都是“未知”或“内网IP”，且当前是公网IP，可能误报，暂且认为是异地
+            log.info("风险检测-异地登录: 用户={}, 历史={}, 当前={}", username, validLocations, currentProvince);
+        }
+
+        if (isGeoAnomaly) {
+            score += properties.getGeoWeight();
+        }
+
+        // 3. 检查新设备 (Browser + OS)
+        boolean isNewDevice = true;
+        Set<String> knownDevices = baseline.stream()
+            .map(log -> log.getBrowser() + " on " + log.getOs())
+            .collect(Collectors.toSet());
+        
+        String currentDevice = currentUserAgent.getBrowser().getName() + " on " + currentUserAgent.getOs().getName();
+        if (knownDevices.contains(currentDevice)) {
+            isNewDevice = false;
+        } else {
+            log.info("风险检测-新设备: 用户={}, 历史={}, 当前={}", username, knownDevices, currentDevice);
+        }
+
+        if (isNewDevice) {
+            score += properties.getDeviceWeight();
+        }
+
+        // 4. 检查非工作时间 (00:00 - 06:00)
+        int hour = DateUtil.hour(new Date(), true);
+        if (hour >= 0 && hour < 6) {
+            score += properties.getTimeWeight();
+        }
+
+        log.info("风险检测完成: 用户={}, 总分={}, 详情(Geo={}, Device={}, Time={})", 
+            username, score, isGeoAnomaly, isNewDevice, (hour >= 0 && hour < 6));
+        
+        return score;
+    }
+
+    /**
+     * 提取省份 (简单截取)
+     */
+    private String extractProvince(String location) {
+        if (StrUtil.isBlank(location)) {
+            return "Unknown";
+        }
+        // 假设 location 格式为 "XX省 XX市" 或 "XX省"
+        // 简单处理：取前2-3个字符，或者根据空格分割
+        if (location.contains("省")) {
+            return location.substring(0, location.indexOf("省") + 1);
+        }
+        // 直辖市
+        if (location.startsWith("北京") || location.startsWith("上海") || location.startsWith("天津") || location.startsWith("重庆")) {
+            return location.substring(0, 2);
+        }
+        return location; // 无法识别则返回原值
+    }
+}
diff --git a/ruoyi-server/src/main/java/org/dromara/web/service/SysLoginService.java b/ruoyi-server/src/main/java/org/dromara/web/service/SysLoginService.java
new file mode 100644
index 0000000..659106c
--- /dev/null
+++ b/ruoyi-server/src/main/java/org/dromara/web/service/SysLoginService.java
@@ -0,0 +1,205 @@
+package org.dromara.web.service;
+
+import cn.dev33.satoken.exception.NotLoginException;
+import cn.dev33.satoken.stp.StpUtil;
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.lang.Opt;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.lock.annotation.Lock4j;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import me.zhyd.oauth.model.AuthUser;
+import org.dromara.common.core.constant.CacheConstants;
+import org.dromara.common.core.constant.Constants;
+import org.dromara.common.core.domain.dto.PostDTO;
+import org.dromara.common.core.domain.dto.RoleDTO;
+import org.dromara.common.core.domain.model.LoginUser;
+import org.dromara.common.core.enums.LoginType;
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.exception.user.UserException;
+import org.dromara.common.core.utils.MessageUtils;
+import org.dromara.common.core.utils.ServletUtils;
+import org.dromara.common.core.utils.SpringUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.log.event.LogininforEvent;
+import org.dromara.common.mybatis.helper.DataPermissionHelper;
+import org.dromara.common.redis.utils.RedisUtils;
+import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.system.domain.bo.SysSocialBo;
+import org.dromara.system.domain.vo.*;
+import org.dromara.system.service.*;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+
+import java.time.Duration;
+import java.util.List;
+import java.util.function.Supplier;
+
+/**
+ * 登录校验方法
+ *
+ * @author pengles
+ */
+@RequiredArgsConstructor
+@Slf4j
+@Service
+public class SysLoginService {
+
+    @Value("${user.password.maxRetryCount}")
+    private Integer maxRetryCount;
+
+    @Value("${user.password.lockTime}")
+    private Integer lockTime;
+
+    private final SysPermissionService permissionService;
+    private final SysSocialService sysSocialService;
+    private final SysRoleService roleService;
+    private final SysDeptService deptService;
+    private final SysPostService postService;
+    private final SysUserService userService;
+
+
+    /**
+     * 绑定第三方用户
+     *
+     * @param authUserData 授权响应实体
+     */
+    @Lock4j
+    public void socialRegister(AuthUser authUserData) {
+        String authId = authUserData.getSource() + authUserData.getUuid();
+        // 第三方用户信息
+        SysSocialBo bo = BeanUtil.toBean(authUserData, SysSocialBo.class);
+        BeanUtil.copyProperties(authUserData.getToken(), bo);
+        Long userId = LoginHelper.getUserId();
+        bo.setUserId(userId);
+        bo.setAuthId(authId);
+        bo.setOpenId(authUserData.getUuid());
+        bo.setUserName(authUserData.getUsername());
+        bo.setNickName(authUserData.getNickname());
+        List<SysSocialVo> checkList = sysSocialService.selectByAuthId(authId);
+        if (CollUtil.isNotEmpty(checkList)) {
+            throw new ServiceException("此三方账号已经被绑定!");
+        }
+        // 查询是否已经绑定用户
+        SysSocialBo params = new SysSocialBo();
+        params.setUserId(userId);
+        params.setSource(bo.getSource());
+        List<SysSocialVo> list = sysSocialService.queryList(params);
+        if (CollUtil.isEmpty(list)) {
+            // 没有绑定用户, 新增用户信息
+            sysSocialService.insertByBo(bo);
+        } else {
+            // 更新用户信息
+            bo.setId(list.get(0).getId());
+            sysSocialService.updateByBo(bo);
+            // 如果要绑定的平台账号已经被绑定过了 是否抛异常自行决断
+            // throw new ServiceException("此平台账号已经被绑定!");
+        }
+    }
+
+
+    /**
+     * 退出登录
+     */
+    public void logout() {
+        try {
+            LoginUser loginUser = LoginHelper.getLoginUser();
+            if (ObjectUtil.isNull(loginUser)) {
+                return;
+            }
+            recordLogininfor(loginUser.getUsername(), Constants.LOGOUT, MessageUtils.message("user.logout.success"));
+        } catch (NotLoginException ignored) {
+        } finally {
+            try {
+                StpUtil.logout();
+            } catch (NotLoginException ignored) {
+            }
+        }
+    }
+
+    /**
+     * 记录登录信息
+     *
+     * @param username 用户名
+     * @param status   状态
+     * @param message  消息内容
+     */
+    public void recordLogininfor(String username, String status, String message) {
+        LogininforEvent logininforEvent = new LogininforEvent();
+        logininforEvent.setUsername(username);
+        logininforEvent.setStatus(status);
+        logininforEvent.setMessage(message);
+        logininforEvent.setRequest(ServletUtils.getRequest());
+        SpringUtils.context().publishEvent(logininforEvent);
+    }
+
+    /**
+     * 构建登录用户
+     */
+    public LoginUser buildLoginUser(SysUserVo user) {
+        LoginUser loginUser = new LoginUser();
+        Long userId = user.getUserId();
+        loginUser.setUserId(userId);
+        loginUser.setDeptId(user.getDeptId());
+        loginUser.setUsername(user.getUserName());
+        loginUser.setNickname(user.getNickName());
+        loginUser.setUserType(user.getUserType());
+        loginUser.setMenuPermission(permissionService.getMenuPermission(userId));
+        loginUser.setRolePermission(permissionService.getRolePermission(userId));
+        if (ObjectUtil.isNotNull(user.getDeptId())) {
+            Opt<SysDeptVo> deptOpt = Opt.of(user.getDeptId()).map(deptService::selectDeptById);
+            loginUser.setDeptName(deptOpt.map(SysDeptVo::getDeptName).orElse(StringUtils.EMPTY));
+            loginUser.setDeptCategory(deptOpt.map(SysDeptVo::getDeptCategory).orElse(StringUtils.EMPTY));
+        }
+        List<SysRoleVo> roles = roleService.selectRolesByUserId(userId);
+        List<SysPostVo> posts = postService.selectPostsByUserId(userId);
+        loginUser.setRoles(BeanUtil.copyToList(roles, RoleDTO.class));
+        loginUser.setPosts(BeanUtil.copyToList(posts, PostDTO.class));
+        return loginUser;
+    }
+
+    /**
+     * 记录登录信息
+     *
+     * @param userId 用户ID
+     */
+    public void recordLoginInfo(Long userId, String ip) {
+        DataPermissionHelper.ignore(() -> userService.updateLoginInfo(userId, ip));
+    }
+
+    /**
+     * 登录校验
+     */
+    public void checkLogin(LoginType loginType, String username, Supplier<Boolean> supplier) {
+        String errorKey = CacheConstants.PWD_ERR_CNT_KEY + username;
+        String loginFail = Constants.LOGIN_FAIL;
+
+        // 获取用户登录错误次数，默认为0 (可自定义限制策略 例如: key + username + ip)
+        int errorNumber = ObjectUtil.defaultIfNull(RedisUtils.getCacheObject(errorKey), 0);
+        // 锁定时间内登录 则踢出
+        if (errorNumber >= maxRetryCount) {
+            recordLogininfor(username, loginFail, MessageUtils.message(loginType.getRetryLimitExceed(), maxRetryCount, lockTime));
+            throw new UserException(loginType.getRetryLimitExceed(), maxRetryCount, lockTime);
+        }
+
+        if (supplier.get()) {
+            // 错误次数递增
+            errorNumber++;
+            RedisUtils.setCacheObject(errorKey, errorNumber, Duration.ofMinutes(lockTime));
+            // 达到规定错误次数 则锁定登录
+            if (errorNumber >= maxRetryCount) {
+                recordLogininfor(username, loginFail, MessageUtils.message(loginType.getRetryLimitExceed(), maxRetryCount, lockTime));
+                throw new UserException(loginType.getRetryLimitExceed(), maxRetryCount, lockTime);
+            } else {
+                // 未达到规定错误次数
+                recordLogininfor(username, loginFail, MessageUtils.message(loginType.getRetryLimitCount(), errorNumber));
+                throw new UserException(loginType.getRetryLimitCount(), errorNumber);
+            }
+        }
+
+        // 登录成功 清空错误次数
+        RedisUtils.deleteObject(errorKey);
+    }
+
+}
diff --git a/ruoyi-server/src/main/java/org/dromara/web/service/SysRegisterService.java b/ruoyi-server/src/main/java/org/dromara/web/service/SysRegisterService.java
new file mode 100644
index 0000000..99a2971
--- /dev/null
+++ b/ruoyi-server/src/main/java/org/dromara/web/service/SysRegisterService.java
@@ -0,0 +1,108 @@
+package org.dromara.web.service;
+
+import cn.hutool.crypto.digest.BCrypt;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.constant.Constants;
+import org.dromara.common.core.constant.GlobalConstants;
+import org.dromara.common.core.domain.model.RegisterBody;
+import org.dromara.common.core.enums.UserType;
+import org.dromara.common.core.exception.user.CaptchaException;
+import org.dromara.common.core.exception.user.CaptchaExpireException;
+import org.dromara.common.core.exception.user.UserException;
+import org.dromara.common.core.utils.MessageUtils;
+import org.dromara.common.core.utils.ServletUtils;
+import org.dromara.common.core.utils.SpringUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.log.event.LogininforEvent;
+import org.dromara.common.redis.utils.RedisUtils;
+import org.dromara.common.web.config.properties.CaptchaProperties;
+import org.dromara.system.domain.SysUser;
+import org.dromara.system.domain.bo.SysUserBo;
+import org.dromara.system.mapper.SysUserMapper;
+import org.dromara.system.service.SysUserService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 注册校验方法
+ *
+ * @author pengles
+ */
+@RequiredArgsConstructor
+@Service
+public class SysRegisterService {
+
+    private final SysUserService userService;
+    private final SysUserMapper userMapper;
+    private final CaptchaProperties captchaProperties;
+
+    /**
+     * 注册
+     */
+    public void register(RegisterBody registerBody) {
+        String username = registerBody.getUsername();
+        String password = registerBody.getPassword();
+        // 校验用户类型是否存在
+        String userType = UserType.getUserType(registerBody.getUserType()).getUserType();
+
+        boolean captchaEnabled = captchaProperties.getEnable();
+        // 验证码开关
+        if (captchaEnabled) {
+            validateCaptcha(username, registerBody.getCode(), registerBody.getUuid());
+        }
+        SysUserBo sysUser = new SysUserBo();
+        sysUser.setUserName(username);
+        sysUser.setNickName(username);
+        sysUser.setPassword(BCrypt.hashpw(password));
+        sysUser.setUserType(userType);
+
+        boolean exist = !userService.checkUserNameUnique(sysUser);
+        if (exist) {
+            throw new UserException("user.register.save.error", username);
+        }
+        boolean regFlag = userService.registerUser(sysUser);
+        if (!regFlag) {
+            throw new UserException("user.register.error");
+        }
+        recordLogininfor(username, Constants.REGISTER, MessageUtils.message("user.register.success"));
+    }
+
+    /**
+     * 校验验证码
+     *
+     * @param username 用户名
+     * @param code     验证码
+     * @param uuid     唯一标识
+     */
+    public void validateCaptcha(String username, String code, String uuid) {
+        String verifyKey = GlobalConstants.CAPTCHA_CODE_KEY + StringUtils.blankToDefault(uuid, "");
+        String captcha = RedisUtils.getCacheObject(verifyKey);
+        RedisUtils.deleteObject(verifyKey);
+        if (captcha == null) {
+            recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.expire"));
+            throw new CaptchaExpireException();
+        }
+        if (!code.equalsIgnoreCase(captcha)) {
+            recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.error"));
+            throw new CaptchaException();
+        }
+    }
+
+    /**
+     * 记录登录信息
+     *
+     * @param username 用户名
+     * @param status   状态
+     * @param message  消息内容
+     * @return
+     */
+    private void recordLogininfor(String username, String status, String message) {
+        LogininforEvent logininforEvent = new LogininforEvent();
+        logininforEvent.setUsername(username);
+        logininforEvent.setStatus(status);
+        logininforEvent.setMessage(message);
+        logininforEvent.setRequest(ServletUtils.getRequest());
+        SpringUtils.context().publishEvent(logininforEvent);
+    }
+
+}
diff --git a/ruoyi-server/src/main/java/org/dromara/web/service/impl/EmailAuthStrategy.java b/ruoyi-server/src/main/java/org/dromara/web/service/impl/EmailAuthStrategy.java
new file mode 100644
index 0000000..f075861
--- /dev/null
+++ b/ruoyi-server/src/main/java/org/dromara/web/service/impl/EmailAuthStrategy.java
@@ -0,0 +1,99 @@
+package org.dromara.web.service.impl;
+
+import cn.dev33.satoken.stp.StpUtil;
+import cn.dev33.satoken.stp.parameter.SaLoginParameter;
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.constant.Constants;
+import org.dromara.common.core.constant.GlobalConstants;
+import org.dromara.common.core.constant.SystemConstants;
+import org.dromara.common.core.domain.model.EmailLoginBody;
+import org.dromara.common.core.domain.model.LoginUser;
+import org.dromara.common.core.enums.LoginType;
+import org.dromara.common.core.exception.user.CaptchaExpireException;
+import org.dromara.common.core.exception.user.UserException;
+import org.dromara.common.core.utils.MessageUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.core.utils.ValidatorUtils;
+import org.dromara.common.json.utils.JsonUtils;
+import org.dromara.common.redis.utils.RedisUtils;
+import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.system.domain.vo.SysClientVo;
+import org.dromara.system.domain.vo.SysUserVo;
+import org.dromara.system.service.SysUserService;
+import org.dromara.web.domain.vo.LoginVo;
+import org.dromara.web.service.IAuthStrategy;
+import org.dromara.web.service.SysLoginService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 邮件认证策略
+ *
+ * @author pengles
+ */
+@Slf4j
+@Service("email" + IAuthStrategy.BASE_NAME)
+@RequiredArgsConstructor
+public class EmailAuthStrategy implements IAuthStrategy {
+
+    private final SysLoginService loginService;
+    private final SysUserService userService;
+
+    @Override
+    public LoginVo login(String body, SysClientVo client) {
+        EmailLoginBody loginBody = JsonUtils.parseObject(body, EmailLoginBody.class);
+        ValidatorUtils.validate(loginBody);
+        String email = loginBody.getEmail();
+        String emailCode = loginBody.getEmailCode();
+
+        SysUserVo user = loadUserByEmail(email);
+        loginService.checkLogin(LoginType.EMAIL, user.getUserName(), () -> !validateEmailCode(email, emailCode));
+        // 此处可根据登录用户的数据不同 自行创建 loginUser 属性不够用继承扩展就行了
+        LoginUser loginUser = loginService.buildLoginUser(user);
+
+        loginUser.setClientKey(client.getClientKey());
+        loginUser.setDeviceType(client.getDeviceType());
+        SaLoginParameter model = new SaLoginParameter();
+        model.setDeviceType(client.getDeviceType());
+        // 自定义分配 不同用户体系 不同 token 授权时间 不设置默认走全局 yml 配置
+        // 例如: 后台用户30分钟过期 app用户1天过期
+        model.setTimeout(client.getTimeout());
+        model.setActiveTimeout(client.getActiveTimeout());
+        model.setExtra(LoginHelper.CLIENT_KEY, client.getClientId());
+        // 生成token
+        LoginHelper.login(loginUser, model);
+
+        LoginVo loginVo = new LoginVo();
+        loginVo.setAccessToken(StpUtil.getTokenValue());
+        loginVo.setExpireIn(StpUtil.getTokenTimeout());
+        loginVo.setClientId(client.getClientId());
+        return loginVo;
+    }
+
+    /**
+     * 校验邮箱验证码
+     */
+    private boolean validateEmailCode(String email, String emailCode) {
+        String code = RedisUtils.getCacheObject(GlobalConstants.CAPTCHA_CODE_KEY + email);
+        if (StringUtils.isBlank(code)) {
+            loginService.recordLogininfor(email, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.expire"));
+            throw new CaptchaExpireException();
+        }
+        return code.equals(emailCode);
+    }
+
+    private SysUserVo loadUserByEmail(String email) {
+        SysUserVo user = userService.selectUserByEmail(email);
+        if (ObjectUtil.isNull(user)) {
+            log.info("登录用户：{} 不存在.", email);
+            throw new UserException("user.not.exists", email);
+        } else if (SystemConstants.DISABLE.equals(user.getStatus())) {
+            log.info("登录用户：{} 已被停用.", email);
+            throw new UserException("user.blocked", email);
+        }
+        return user;
+    }
+
+}
diff --git a/ruoyi-server/src/main/java/org/dromara/web/service/impl/PasswordAuthStrategy.java b/ruoyi-server/src/main/java/org/dromara/web/service/impl/PasswordAuthStrategy.java
new file mode 100644
index 0000000..db779ba
--- /dev/null
+++ b/ruoyi-server/src/main/java/org/dromara/web/service/impl/PasswordAuthStrategy.java
@@ -0,0 +1,120 @@
+package org.dromara.web.service.impl;
+
+import cn.dev33.satoken.stp.StpUtil;
+import cn.dev33.satoken.stp.parameter.SaLoginParameter;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.crypto.digest.BCrypt;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.constant.Constants;
+import org.dromara.common.core.constant.GlobalConstants;
+import org.dromara.common.core.constant.SystemConstants;
+import org.dromara.common.core.domain.model.LoginUser;
+import org.dromara.common.core.domain.model.PasswordLoginBody;
+import org.dromara.common.core.enums.LoginType;
+import org.dromara.common.core.exception.user.CaptchaException;
+import org.dromara.common.core.exception.user.CaptchaExpireException;
+import org.dromara.common.core.exception.user.UserException;
+import org.dromara.common.core.utils.MessageUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.core.utils.ValidatorUtils;
+import org.dromara.common.json.utils.JsonUtils;
+import org.dromara.common.redis.utils.RedisUtils;
+import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.common.web.config.properties.CaptchaProperties;
+import org.dromara.system.domain.vo.SysClientVo;
+import org.dromara.system.domain.vo.SysUserVo;
+import org.dromara.system.service.SysUserService;
+import org.dromara.web.domain.vo.LoginVo;
+import org.dromara.web.service.IAuthStrategy;
+import org.dromara.web.service.SysLoginService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 密码认证策略
+ *
+ * @author pengles
+ */
+@Slf4j
+@Service("password" + IAuthStrategy.BASE_NAME)
+@RequiredArgsConstructor
+public class PasswordAuthStrategy implements IAuthStrategy {
+
+    private final CaptchaProperties captchaProperties;
+    private final SysLoginService loginService;
+    private final SysUserService userService;
+
+    @Override
+    public LoginVo login(String body, SysClientVo client) {
+        PasswordLoginBody loginBody = JsonUtils.parseObject(body, PasswordLoginBody.class);
+        ValidatorUtils.validate(loginBody);
+        String username = loginBody.getUsername();
+        String password = loginBody.getPassword();
+        String code = loginBody.getCode();
+        String uuid = loginBody.getUuid();
+
+        boolean captchaEnabled = captchaProperties.getEnable();
+        // 验证码开关
+        if (captchaEnabled) {
+            validateCaptcha(username, code, uuid);
+        }
+
+        SysUserVo user = loadUserByUsername(username);
+        loginService.checkLogin(LoginType.PASSWORD, username, () -> !BCrypt.checkpw(password, user.getPassword()));
+
+        // 此处可根据登录用户的数据不同 自行创建 loginUser
+        LoginUser loginUser = loginService.buildLoginUser(user);
+
+        loginUser.setClientKey(client.getClientKey());
+        loginUser.setDeviceType(client.getDeviceType());
+        SaLoginParameter model = new SaLoginParameter();
+        model.setDeviceType(client.getDeviceType());
+        // 自定义分配 不同用户体系 不同 token 授权时间 不设置默认走全局 yml 配置
+        // 例如: 后台用户30分钟过期 app用户1天过期
+        model.setTimeout(client.getTimeout());
+        model.setActiveTimeout(client.getActiveTimeout());
+        model.setExtra(LoginHelper.CLIENT_KEY, client.getClientId());
+        // 生成token
+        LoginHelper.login(loginUser, model);
+
+        LoginVo loginVo = new LoginVo();
+        loginVo.setAccessToken(StpUtil.getTokenValue());
+        loginVo.setExpireIn(StpUtil.getTokenTimeout());
+        loginVo.setClientId(client.getClientId());
+        return loginVo;
+    }
+
+    /**
+     * 校验验证码
+     *
+     * @param username 用户名
+     * @param code     验证码
+     * @param uuid     唯一标识
+     */
+    private void validateCaptcha(String username, String code, String uuid) {
+        String verifyKey = GlobalConstants.CAPTCHA_CODE_KEY + StringUtils.blankToDefault(uuid, "");
+        String captcha = RedisUtils.getCacheObject(verifyKey);
+        RedisUtils.deleteObject(verifyKey);
+        if (captcha == null) {
+            loginService.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.expire"));
+            throw new CaptchaExpireException();
+        }
+        if (!code.equalsIgnoreCase(captcha)) {
+            loginService.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.error"));
+            throw new CaptchaException();
+        }
+    }
+
+    private SysUserVo loadUserByUsername(String username) {
+        SysUserVo user = userService.selectUserByUserName(username);
+        if (ObjectUtil.isNull(user)) {
+            log.info("登录用户：{} 不存在.", username);
+            throw new UserException("user.not.exists", username);
+        } else if (SystemConstants.DISABLE.equals(user.getStatus())) {
+            log.info("登录用户：{} 已被停用.", username);
+            throw new UserException("user.blocked", username);
+        }
+        return user;
+    }
+
+}
diff --git a/ruoyi-server/src/main/java/org/dromara/web/service/impl/SmsAuthStrategy.java b/ruoyi-server/src/main/java/org/dromara/web/service/impl/SmsAuthStrategy.java
new file mode 100644
index 0000000..7d9cd0f
--- /dev/null
+++ b/ruoyi-server/src/main/java/org/dromara/web/service/impl/SmsAuthStrategy.java
@@ -0,0 +1,99 @@
+package org.dromara.web.service.impl;
+
+import cn.dev33.satoken.stp.StpUtil;
+import cn.dev33.satoken.stp.parameter.SaLoginParameter;
+import cn.hutool.core.util.ObjectUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.constant.Constants;
+import org.dromara.common.core.constant.GlobalConstants;
+import org.dromara.common.core.constant.SystemConstants;
+import org.dromara.common.core.domain.model.LoginUser;
+import org.dromara.common.core.domain.model.SmsLoginBody;
+import org.dromara.common.core.enums.LoginType;
+import org.dromara.common.core.exception.user.CaptchaExpireException;
+import org.dromara.common.core.exception.user.UserException;
+import org.dromara.common.core.utils.MessageUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.core.utils.ValidatorUtils;
+import org.dromara.common.json.utils.JsonUtils;
+import org.dromara.common.redis.utils.RedisUtils;
+import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.system.domain.vo.SysClientVo;
+import org.dromara.system.domain.vo.SysUserVo;
+import org.dromara.system.service.SysUserService;
+import org.dromara.web.domain.vo.LoginVo;
+import org.dromara.web.service.IAuthStrategy;
+import org.dromara.web.service.SysLoginService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * 短信认证策略
+ *
+ * @author pengles
+ */
+@Slf4j
+@Service("sms" + IAuthStrategy.BASE_NAME)
+public class SmsAuthStrategy implements IAuthStrategy {
+
+    @Autowired
+    private SysLoginService loginService;
+    @Autowired
+    private SysUserService userService;
+
+    @Override
+    public LoginVo login(String body, SysClientVo client) {
+        SmsLoginBody loginBody = JsonUtils.parseObject(body, SmsLoginBody.class);
+        ValidatorUtils.validate(loginBody);
+        String phonenumber = loginBody.getPhonenumber();
+        String smsCode = loginBody.getSmsCode();
+
+        SysUserVo user = loadUserByPhonenumber(phonenumber);
+        loginService.checkLogin(LoginType.SMS, user.getUserName(), () -> !validateSmsCode(phonenumber, smsCode));
+        // 此处可根据登录用户的数据不同 自行创建 loginUser 属性不够用继承扩展就行了
+        LoginUser loginUser = loginService.buildLoginUser(user);
+
+        loginUser.setClientKey(client.getClientKey());
+        loginUser.setDeviceType(client.getDeviceType());
+        SaLoginParameter model = new SaLoginParameter();
+        model.setDeviceType(client.getDeviceType());
+        // 自定义分配 不同用户体系 不同 token 授权时间 不设置默认走全局 yml 配置
+        // 例如: 后台用户30分钟过期 app用户1天过期
+        model.setTimeout(client.getTimeout());
+        model.setActiveTimeout(client.getActiveTimeout());
+        model.setExtra(LoginHelper.CLIENT_KEY, client.getClientId());
+        // 生成token
+        LoginHelper.login(loginUser, model);
+
+        LoginVo loginVo = new LoginVo();
+        loginVo.setAccessToken(StpUtil.getTokenValue());
+        loginVo.setExpireIn(StpUtil.getTokenTimeout());
+        loginVo.setClientId(client.getClientId());
+        return loginVo;
+    }
+
+    /**
+     * 校验短信验证码
+     */
+    private boolean validateSmsCode(String phonenumber, String smsCode) {
+        String code = RedisUtils.getCacheObject(GlobalConstants.CAPTCHA_CODE_KEY + phonenumber);
+        if (StringUtils.isBlank(code)) {
+            loginService.recordLogininfor(phonenumber, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.expire"));
+            throw new CaptchaExpireException();
+        }
+        return code.equals(smsCode);
+    }
+
+    private SysUserVo loadUserByPhonenumber(String phonenumber) {
+        SysUserVo user = userService.selectUserByPhonenumber(phonenumber);
+        if (ObjectUtil.isNull(user)) {
+            log.info("登录用户：{} 不存在.", phonenumber);
+            throw new UserException("user.not.exists", phonenumber);
+        } else if (SystemConstants.DISABLE.equals(user.getStatus())) {
+            log.info("登录用户：{} 已被停用.", phonenumber);
+            throw new UserException("user.blocked", phonenumber);
+        }
+        return user;
+    }
+
+}
diff --git a/ruoyi-server/src/main/java/org/dromara/web/service/impl/SocialAuthStrategy.java b/ruoyi-server/src/main/java/org/dromara/web/service/impl/SocialAuthStrategy.java
new file mode 100644
index 0000000..78379be
--- /dev/null
+++ b/ruoyi-server/src/main/java/org/dromara/web/service/impl/SocialAuthStrategy.java
@@ -0,0 +1,107 @@
+package org.dromara.web.service.impl;
+
+import cn.dev33.satoken.stp.StpUtil;
+import cn.dev33.satoken.stp.parameter.SaLoginParameter;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import me.zhyd.oauth.model.AuthResponse;
+import me.zhyd.oauth.model.AuthUser;
+import org.dromara.common.core.constant.SystemConstants;
+import org.dromara.common.core.domain.model.LoginUser;
+import org.dromara.common.core.domain.model.SocialLoginBody;
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.exception.user.UserException;
+import org.dromara.common.core.utils.ValidatorUtils;
+import org.dromara.common.json.utils.JsonUtils;
+import org.dromara.common.satoken.utils.LoginHelper;
+import org.dromara.common.social.config.properties.SocialProperties;
+import org.dromara.common.social.utils.SocialUtils;
+import org.dromara.system.domain.vo.SysClientVo;
+import org.dromara.system.domain.vo.SysSocialVo;
+import org.dromara.system.domain.vo.SysUserVo;
+import org.dromara.system.service.SysUserService;
+import org.dromara.system.service.SysSocialService;
+import org.dromara.web.domain.vo.LoginVo;
+import org.dromara.web.service.IAuthStrategy;
+import org.dromara.web.service.SysLoginService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 第三方授权策略
+ *
+ * @author pengles
+ */
+@Slf4j
+@Service("social" + IAuthStrategy.BASE_NAME)
+@RequiredArgsConstructor
+public class SocialAuthStrategy implements IAuthStrategy {
+
+    private final SocialProperties socialProperties;
+    private final SysSocialService sysSocialService;
+    private final SysUserService userService;
+    private final SysLoginService loginService;
+
+    /**
+     * 登录-第三方授权登录
+     *
+     * @param body   登录信息
+     * @param client 客户端信息
+     */
+    @Override
+    public LoginVo login(String body, SysClientVo client) {
+        SocialLoginBody loginBody = JsonUtils.parseObject(body, SocialLoginBody.class);
+        ValidatorUtils.validate(loginBody);
+        AuthResponse<AuthUser> response = SocialUtils.loginAuth(
+                loginBody.getSource(), loginBody.getSocialCode(),
+                loginBody.getSocialState(), socialProperties);
+        if (!response.ok()) {
+            throw new ServiceException(response.getMsg());
+        }
+        AuthUser authUserData = response.getData();
+
+        List<SysSocialVo> list = sysSocialService.selectByAuthId(authUserData.getSource() + authUserData.getUuid());
+        if (CollUtil.isEmpty(list)) {
+            throw new ServiceException("你还没有绑定第三方账号，绑定后才可以登录！");
+        }
+        SysSocialVo social = list.get(0);
+
+        SysUserVo user = loadUser(social.getUserId());
+        // 此处可根据登录用户的数据不同 自行创建 loginUser 属性不够用继承扩展就行了
+        LoginUser loginUser = loginService.buildLoginUser(user);
+
+        loginUser.setClientKey(client.getClientKey());
+        loginUser.setDeviceType(client.getDeviceType());
+        SaLoginParameter model = new SaLoginParameter();
+        model.setDeviceType(client.getDeviceType());
+        // 自定义分配 不同用户体系 不同 token 授权时间 不设置默认走全局 yml 配置
+        // 例如: 后台用户30分钟过期 app用户1天过期
+        model.setTimeout(client.getTimeout());
+        model.setActiveTimeout(client.getActiveTimeout());
+        model.setExtra(LoginHelper.CLIENT_KEY, client.getClientId());
+        // 生成token
+        LoginHelper.login(loginUser, model);
+
+        LoginVo loginVo = new LoginVo();
+        loginVo.setAccessToken(StpUtil.getTokenValue());
+        loginVo.setExpireIn(StpUtil.getTokenTimeout());
+        loginVo.setClientId(client.getClientId());
+        return loginVo;
+    }
+
+    private SysUserVo loadUser(Long userId) {
+        SysUserVo user = userService.selectUserById(userId);
+        if (ObjectUtil.isNull(user)) {
+            log.info("登录用户：{} 不存在.", "");
+            throw new UserException("user.not.exists", "");
+        } else if (SystemConstants.DISABLE.equals(user.getStatus())) {
+            log.info("登录用户：{} 已被停用.", "");
+            throw new UserException("user.blocked", "");
+        }
+        return user;
+    }
+
+}
diff --git a/ruoyi-server/src/main/resources/.DS_Store b/ruoyi-server/src/main/resources/.DS_Store
new file mode 100644
index 0000000..7307769
Binary files /dev/null and b/ruoyi-server/src/main/resources/.DS_Store differ
diff --git a/ruoyi-server/src/main/resources/application-ai.yml b/ruoyi-server/src/main/resources/application-ai.yml
new file mode 100644
index 0000000..8928f3d
--- /dev/null
+++ b/ruoyi-server/src/main/resources/application-ai.yml
@@ -0,0 +1,274 @@
+# AI模块配置
+ruoyi:
+  ai:
+    # 是否启用AI模块
+    enabled: true
+    
+    # 默认配置
+    default:
+      # 默认超时时间(秒)
+      timeout: 30
+      # 默认最大重试次数
+      max-retries: 3
+      # 默认最大并发数
+      max-concurrency: 10
+      # 默认权重
+      weight: 1
+      # 默认优先级
+      priority: 0
+    
+    # 缓存配置
+    cache:
+      # 是否启用缓存
+      enabled: true
+      # 缓存过期时间(分钟)
+      expire-minutes: 60
+      # 缓存键前缀
+      key-prefix: "ai:chat:cache:"
+    
+    # 健康检查配置
+    health:
+      # 健康检查间隔(秒)
+      check-interval: 60
+      # 健康检查超时时间(秒)
+      check-timeout: 10
+      # 缓存键前缀
+      cache-prefix: "ai:health:"
+    
+    # 流式响应配置
+    stream:
+      # 是否启用流式响应
+      enabled: true
+      # 流式响应缓冲区大小
+      buffer-size: 1024
+      # 流式响应超时时间(秒)
+      timeout: 60
+    
+    # 负载均衡配置
+    load-balance:
+      # 负载均衡策略(ROUND_ROBIN, WEIGHTED_ROUND_ROBIN, RANDOM, LEAST_CONNECTIONS)
+      strategy: WEIGHTED_ROUND_ROBIN
+      # 是否启用健康检查
+      health-check: true
+    
+    # 熔断器配置
+    circuit-breaker:
+      # 是否启用熔断器
+      enabled: true
+      # 失败阈值
+      failure-threshold: 5
+      # 恢复时间(秒)
+      recovery-timeout: 30
+      # 半开状态最大请求数
+      half-open-max-calls: 3
+    
+    # 限流配置
+    rate-limit:
+      # 是否启用限流
+      enabled: true
+      # 每秒最大请求数
+      max-requests-per-second: 100
+      # 突发请求数
+      burst-capacity: 200
+    
+    # 监控配置
+    monitoring:
+      # 是否启用监控
+      enabled: true
+      # 统计数据保留天数
+      stats-retention-days: 30
+      # 是否记录详细日志
+      detailed-logging: false
+    
+    # 故障转移配置
+    failover:
+      enabled: true
+      check-interval-seconds: 30
+      failure-threshold: 3
+      recovery-threshold: 2
+    
+    # 知识库配置
+    knowledge:
+      enabled: true
+      default-search-count: 5
+      similarity-threshold: 0.7
+      max-context-length: 4000
+      reranker-enabled: false
+      embedding:
+        base-url:
+        default-model: bge-large-zh
+      vector-store:
+        type: db
+        qdrant:
+          base-url: http://localhost:6333
+          api-key:
+          collection: knowledge_vectors
+          distance: Cosine
+        weaviate:
+          base-url: http://localhost:8080
+          api-key:
+          class-name: KnowledgeVector
+      chunk:
+        size: 1000
+        overlap: 100
+
+    # 外部AI配置
+    external-ai:
+      # OpenAI配置
+      openai:
+        enabled: false
+        api-key: ${OPENAI_API_KEY:}
+        base-url: https://api.openai.com
+        default-model: gpt-3.5-turbo
+        timeout: 60s
+      
+      # Azure配置
+      azure:
+        enabled: false
+        api-key: ${AZURE_API_KEY:}
+        endpoint: ${AZURE_ENDPOINT:}
+        deployment-name: ${AZURE_DEPLOYMENT_NAME:}
+        api-version: 2023-12-01-preview
+      
+      # ChatGLM配置
+      chatglm:
+        enabled: false
+        api-key: ${CHATGLM_API_KEY:}
+        base-url: https://open.bigmodel.cn
+        default-model: glm-4
+      
+      # 通义千问配置
+      qwen:
+        enabled: false
+        api-key: ${QWEN_API_KEY:}
+        base-url: https://dashscope.aliyuncs.com
+        default-model: qwen-turbo
+      
+      # 智谱AI配置
+      zhipu:
+        enabled: false
+        api-key: ${ZHIPU_API_KEY:}
+        base-url: https://open.bigmodel.cn
+        default-model: glm-4
+    
+    # AI平台配置
+    ai-platform:
+      # FastGPT配置
+      fastgpt:
+        enabled: false
+        base-url: ${FASTGPT_BASE_URL:}
+        api-key: ${FASTGPT_API_KEY:}
+        default-app-id: ${FASTGPT_DEFAULT_APP_ID:}
+      
+      # Coze配置
+      coze:
+        enabled: false
+        base-url: https://www.coze.com
+        api-key: ${COZE_API_KEY:}
+        default-bot-id: ${COZE_DEFAULT_BOT_ID:}
+      
+      # DIFY配置
+      dify:
+        enabled: false
+        base-url: ${DIFY_BASE_URL:}
+        api-key: ${DIFY_API_KEY:}
+        default-app-id: ${DIFY_DEFAULT_APP_ID:}
+    
+    # Provider特定配置
+    providers:
+      # OpenAI配置
+      openai:
+        # API基础URL
+        base-url: "https://api.openai.com/v1"
+        # 默认模型
+        default-model: "gpt-3.5-turbo"
+        # 支持的模型列表
+        supported-models:
+          - "gpt-3.5-turbo"
+          - "gpt-4"
+          - "gpt-4-turbo"
+      
+      # Azure OpenAI配置
+      azure-openai:
+        # API版本
+        api-version: "2023-12-01-preview"
+        # 默认模型
+        default-model: "gpt-35-turbo"
+        # 支持的模型列表
+        supported-models:
+          - "gpt-35-turbo"
+          - "gpt-4"
+      
+      # ChatGLM配置
+      chatglm:
+        # API基础URL
+        base-url: "https://open.bigmodel.cn/api/paas/v4"
+        # 默认模型
+        default-model: "glm-4"
+        # 支持的模型列表
+        supported-models:
+          - "glm-4"
+          - "glm-3-turbo"
+      
+      # 通义千问配置
+      qwen:
+        # API基础URL
+        base-url: "https://dashscope.aliyuncs.com/api/v1"
+        # 默认模型
+        default-model: "qwen-turbo"
+        # 支持的模型列表
+        supported-models:
+          - "qwen-turbo"
+          - "qwen-plus"
+          - "qwen-max"
+      
+      # 智谱AI配置
+      zhipu:
+        # API基础URL
+        base-url: "https://open.bigmodel.cn/api/paas/v4"
+        # 默认模型
+        default-model: "glm-4"
+        # 支持的模型列表
+        supported-models:
+          - "glm-4"
+          - "glm-3-turbo"
+      
+      # FastGPT配置
+      fastgpt:
+        # 默认模型
+        default-model: "fastgpt"
+        # 支持的模型列表
+        supported-models:
+          - "fastgpt"
+      
+      # Coze配置
+      coze:
+        # API基础URL
+        base-url: "https://www.coze.cn/api"
+        # 默认模型
+        default-model: "coze"
+        # 支持的模型列表
+        supported-models:
+          - "coze"
+      
+      # Dify配置
+      dify:
+        # 默认模型
+        default-model: "dify"
+        # 支持的模型列表
+        supported-models:
+          - "dify"
+      
+      # 知识库配置
+      knowledge:
+        # 是否启用
+        enabled: true
+        # 默认模型
+        default-model: "knowledge"
+        # 支持的模型列表
+        supported-models:
+          - "knowledge"
+        # 相似度阈值
+        similarity-threshold: 0.7
+        # 最大返回结果数
+        max-results: 10
diff --git a/ruoyi-server/src/main/resources/application-dev.yml b/ruoyi-server/src/main/resources/application-dev.yml
new file mode 100644
index 0000000..438ebec
--- /dev/null
+++ b/ruoyi-server/src/main/resources/application-dev.yml
@@ -0,0 +1,337 @@
+--- # 监控中心配置
+spring.boot.admin.client:
+  # 增加客户端开关
+  enabled: false
+  url: http://localhost:9090/admin
+  instance:
+    service-host-type: IP
+    metadata:
+      username: ${spring.boot.admin.client.username}
+      userpassword: ${spring.boot.admin.client.password}
+  username: @monitor.username@
+  password: @monitor.password@
+
+--- # snail-job 配置
+snail-job:
+  enabled: false
+  # 需要在 SnailJob 后台组管理创建对应名称的组,然后创建任务的时候选择对应的组,才能正确分派任务
+  group: "ruoyi_group"
+  # SnailJob 接入验证令牌 详见 script/sql/ry_job.sql `sj_group_config` 表
+  token: "SJ_cKqBTPzCsWA3VyuCfFoccmuIEGXjr5KT"
+  server:
+    host: 127.0.0.1
+    port: 17888
+  # 命名空间UUID 详见 script/sql/ry_job.sql `sj_namespace`表`unique_id`字段
+  namespace: ${spring.profiles.active}
+  # 随主应用端口漂移
+  port: 2${server.port}
+  # 客户端ip指定
+  host:
+  # RPC类型: netty, grpc
+  rpc-type: grpc
+
+--- # 数据源配置
+spring:
+  datasource:
+    type: com.zaxxer.hikari.HikariDataSource
+    # 动态数据源文档 https://www.kancloud.cn/tracy5546/dynamic-datasource/content
+    dynamic:
+      # 性能分析插件(有性能损耗 不建议生产环境使用)
+      p6spy: true
+      # 设置默认的数据源或者数据源组,默认值即为 master
+      primary: master
+      # 严格模式 匹配不到数据源则报错
+      strict: true
+      datasource:
+        # 主库数据源
+        master:
+          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: postgres
+          password: 123456
+      #        # 从库数据源
+      #        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&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
+      #          username:
+      #          password:
+      #        oracle:
+      #          type: ${spring.datasource.type}
+      #          driverClassName: oracle.jdbc.OracleDriver
+      #          url: jdbc:oracle:thin:@//localhost:1521/XE
+      #          username: ROOT
+      #          password: root
+      #        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
+        # 多久检查一次连接的活性
+        keepaliveTime: 30000
+
+--- # redis 单机配置(单机与集群只能开启一个另一个需要注释掉)
+spring.data:
+  redis:
+    # 地址
+    host: localhost
+    # 端口，默认为6379
+    port: 6379
+    # 数据库索引
+    database: 0
+    # redis 密码必须配置
+    password: 123456
+    # 连接超时时间
+    timeout: 10s
+    # 是否开启ssl连接
+    ssl.enabled: false
+
+# redisson 配置
+redisson:
+  # redis key前缀
+  keyPrefix:
+  # 线程池数量
+  threads: 4
+  # Netty线程池数量
+  nettyThreads: 8
+  # 单节点配置
+  singleServerConfig:
+    # 客户端名称 不能用中文
+    clientName: RuoYi-Vue-Plus
+    # 最小空闲连接数
+    connectionMinimumIdleSize: 8
+    # 连接池大小
+    connectionPoolSize: 32
+    # 连接空闲超时，单位：毫秒
+    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 短信 支持 阿里云 腾讯云 云片 等等各式各样的短信服务商
+# https://sms4j.com/doc3/ 差异配置文档地址 支持单厂商多配置，可以配置多个同时使用
+sms:
+  # 配置源类型用于标定配置来源(interface,yaml)
+  config-type: yaml
+  # 用于标定yml中的配置是否开启短信拦截，接口配置不受此限制
+  restricted: true
+  # 短信拦截限制单手机号每分钟最大发送，只对开启了拦截的配置有效
+  minute-max: 1
+  # 短信拦截限制单手机号每日最大发送量，只对开启了拦截的配置有效
+  account-max: 30
+  # 以下配置来自于 org.dromara.sms4j.provider.config.BaseConfig类中
+  blends:
+    # 唯一ID 用于发送短信寻找具体配置 随便定义别用中文即可
+    # 可以同时存在两个相同厂商 例如: ali1 ali2 两个不同的阿里短信账号
+    config1:
+      # 框架定义的厂商名称标识，标定此配置是哪个厂商，详细请看厂商标识介绍部分
+      supplier: alibaba
+      # 有些称为accessKey有些称之为apiKey，也有称为sdkKey或者appId。
+      access-key-id: 您的accessKey
+      # 称为accessSecret有些称之为apiSecret
+      access-key-secret: 您的accessKeySecret
+      signature: 您的短信签名
+      sdk-app-id: 您的sdkAppId
+    config2:
+      # 厂商标识，标定此配置是哪个厂商，详细请看厂商标识介绍部分
+      supplier: tencent
+      access-key-id: 您的accessKey
+      access-key-secret: 您的accessKeySecret
+      signature: 您的短信签名
+      sdk-app-id: 您的sdkAppId
+
+
+--- # 三方授权
+justauth:
+  # 前端外网访问地址
+  address: http://localhost:80
+  type:
+    maxkey:
+      # maxkey 服务器地址
+      # 注意 如下均配置均不需要修改 maxkey 已经内置好了数据
+      server-url: http://sso.maxkey.top
+      client-id: 876892492581044224
+      client-secret: x1Y5MTMwNzIwMjMxNTM4NDc3Mzche8
+      redirect-uri: ${justauth.address}/social-callback?source=maxkey
+    topiam:
+      # topiam 服务器地址
+      server-url: http://127.0.0.1:1898/api/v1/authorize/y0q************spq***********8ol
+      client-id: 449c4*********937************759
+      client-secret: ac7***********1e0************28d
+      redirect-uri: ${justauth.address}/social-callback?source=topiam
+      scopes: [ openid, email, phone, profile ]
+    qq:
+      client-id: 10**********6
+      client-secret: 1f7d08**********5b7**********29e
+      redirect-uri: ${justauth.address}/social-callback?source=qq
+      union-id: false
+    weibo:
+      client-id: 10**********6
+      client-secret: 1f7d08**********5b7**********29e
+      redirect-uri: ${justauth.address}/social-callback?source=weibo
+    gitee:
+      client-id: 9ceb2ba3150369c0278f69f7eab35ba41dd011a568368c65bb132125a4d95821
+      client-secret: 9801fe69875da3b56f0773ae6737d416b6888f3f4af04d6bca5b63055728859c
+      redirect-uri: ${justauth.address}/social-callback?source=gitee
+    dingtalk:
+      client-id: 10**********6
+      client-secret: 1f7d08**********5b7**********29e
+      redirect-uri: ${justauth.address}/social-callback?source=dingtalk
+    baidu:
+      client-id: 10**********6
+      client-secret: 1f7d08**********5b7**********29e
+      redirect-uri: ${justauth.address}/social-callback?source=baidu
+    csdn:
+      client-id: 10**********6
+      client-secret: 1f7d08**********5b7**********29e
+      redirect-uri: ${justauth.address}/social-callback?source=csdn
+    coding:
+      client-id: 10**********6
+      client-secret: 1f7d08**********5b7**********29e
+      redirect-uri: ${justauth.address}/social-callback?source=coding
+      coding-group-name: xx
+    oschina:
+      client-id: 10**********6
+      client-secret: 1f7d08**********5b7**********29e
+      redirect-uri: ${justauth.address}/social-callback?source=oschina
+    alipay_wallet:
+      client-id: 10**********6
+      client-secret: 1f7d08**********5b7**********29e
+      redirect-uri: ${justauth.address}/social-callback?source=alipay_wallet
+      alipay-public-key: MIIB**************DAQAB
+    wechat_open:
+      client-id: 10**********6
+      client-secret: 1f7d08**********5b7**********29e
+      redirect-uri: ${justauth.address}/social-callback?source=wechat_open
+    wechat_mp:
+      client-id: 10**********6
+      client-secret: 1f7d08**********5b7**********29e
+      redirect-uri: ${justauth.address}/social-callback?source=wechat_mp
+    wechat_miniprogram:
+      client-id: wx329e1cc66e69f88a
+      client-secret: 181c3b076969a5cb935fb88f5fe6347b
+      redirect-uri: ${justauth.address}/social-callback?source=wechat_miniprogram
+    wechat_enterprise:
+      client-id: 10**********6
+      client-secret: 1f7d08**********5b7**********29e
+      redirect-uri: ${justauth.address}/social-callback?source=wechat_enterprise
+      agent-id: 1000002
+    gitlab:
+      client-id: 10**********6
+      client-secret: 1f7d08**********5b7**********29e
+      redirect-uri: ${justauth.address}/social-callback?source=gitlab
+    gitea:
+      # 前端改动 https://gitee.com/JavaLionLi/plus-ui/pulls/204
+      # gitea 服务器地址
+      server-url: https://demo.gitea.com
+      client-id: 10**********6
+      client-secret: 1f7d08**********5b7**********29e
+      redirect-uri: ${justauth.address}/social-callback?source=gitea
+
+
+--- # 微信平台
+wx:
+  miniapp:
+    configs:
+      # 测试号
+      - appid: wxb1e1ffda7cb636e9
+        secret: 80bae6f0fd391a95a89f5ad867bd6991
+        token: mvlcmI66IVHDLZP8ZFdCKy6okr2thHgr
+        aesKey: #微信小程序消息服务器配置的EncodingAESKey
+        msgDataFormat: JSON
+      # 测试号
+      - appid: wxb1e1ffda7cb636e1
+        secret: 083ae010dae63a0e2efa851245581802
+        token: mvlcmI66IVHDLZP8ZFdCKy6okr2thHgr
+        aesKey: Jv70essZrhV4cguBvUh4nwu3bjVTQcRJeAUzqBBbdqz
+        msgDataFormat: JSON
+  mp:
+    useRedis: false
+    redisConfig:
+      host:
+      port:
+      database:
+      password:
+      timeout:
+    configs:
+      # 测试号
+      - appId: wxb1e1ffda7cb636e9
+        secret: aab69b83d10226bd8608ec4cf6c6ec0c
+        token: mvlcmI66IVHDLZP8ZFdCKy6okr2thHgr
+        aesKey:
+        oauth2RedirectUrl: http://192.168.0.3:8080/pages/home/main
+        qrConnectRedirectUrl: http://192.168.0.3:8080/pages/home/main
+      # 测试号
+      - appId: wxb1e1ffda7cb636e1
+        secret: aab69b83d10226bd8608ec4cf6c6ec0c
+        token: mvlcmI66IVHDLZP8ZFdCKy6okr2thHgr
+        aesKey: WCnqUoRueykM2E3oDsFAacXBUjioC10EfxwO2TMhYhT
+        oauth2RedirectUrl: http://192.168.0.22:9090/#/pages/index
+        qrConnectRedirectUrl: http://192.168.0.22:8080/#/pages/index
+
+pay:
+  alipay:
+    appId: 2021003164606727
+    mchId: 2088541440500474
+    serverUrl: https://openapi.alipay.com/gateway.do
+    alipayPublicKey: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmDCp3S+3WiWZsZPrTZU40wgnb2LlGPxlUnPrlGGZipKtSx+qNrquh0gfWFFXx4PxArkJN2bh39eeUHlNb+WUTQJLq8eMa7jLw8WRpfi5e0O0zzwv8XGGqc3Rt97RAQqOTXTPUJ0hVMtr6DLX/0aE9p3kTh4+BK9pGo/o9HK/NDG5zKP6DDuAfAOpY48ktFmhZOHd799Ki8p7w2CRLxAmuicC8RaQsR7jv/AJLEIwF7WIAmJmviDDhjuHOyUaqoHEC14EHmVw68IBK5xcFct7QvRjJoi703zc7yXlzClRdkjw06PC8SQ267TRg0z1jYRPyDBzDRhjvv1rZPijtwC7JQIDAQAB
+    privateKey: MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCYMKndL7daJZmxk+tNlTjTCCdvYuUY/GVSc+uUYZmKkq1LH6o2uq6HSB9YUVfHg/ECuQk3ZuHf155QeU1v5ZRNAkurx4xruMvDxZGl+Ll7Q7TPPC/xcYapzdG33tEBCo5NdM9QnSFUy2voMtf/RoT2neROHj4Er2kaj+j0cr80MbnMo/oMO4B8A6ljjyS0WaFk4d3v30qLynvDYJEvECa6JwLxFpCxHuO/8AksQjAXtYgCYma+IMOGO4c7JRqqgcQLXgQeZXDrwgErnFwVy3tC9GMmiLvTfNzvJeXMKVF2SPDTo8LxJDbrtNGDTPWNhE/IMHMNGGO+/Wtk+KO3ALslAgMBAAECggEAUBx9rgLqHzffuYxFtqcwLFYEfCuwsQBbTZXbklX1/u3K7tqSPRDzwh6C8XiQHmQjv+0rHtC3YZ8cpPvVeWt+LzNgJeJ61lGGYV1kl9tft7UiPlxOWGgMHOJM3N8bYdLuqXMtlh/AZeRWvvnUnXm/kBn5De35c3nqd6L9W3/zikM5y9MuMQR23iSaNtoeBVGLkX/i9otf12+UrWv/loLJpqLCw8C5MT+zbXZgFZG/zBHjk6oUoiYB9NLUj0C+V9w6/ROGXoBAfBYEbxVgiQKIlSySdozYOlzt3Mp0FSS/RevjNoVHj4eDiOQZDxGkpzEg8LRSwhUn254/echQSyuimQKBgQDafIXftqpt9ts27S/q4GSHMB1qN9QiKJ6iZAAel98bEe42Zvum0nEUxxGQ2tADBtz+lnHBi4VvSrid9O1fsmih0FtXMZcG6hMBY49G1fXpbhGI6kSZBxKPeDgiLb0rgmvAdCBtgUx6ML50lW0dVwEXbobQ2LKVqOE/LNlnPU5QnwKBgQCyUh0q8Lqk4cXDg/qnYHbtv43CBOend/frBsSxrYKkf6CiV2kbKJFeBSjBOD8YtGad1Pm2EhloAotJUAh2nqybV4CQkBZUEYQDtM2b5yJF8xCn5lbf+S7rmij1zP0dyOtLdKiOMwtRdBFJJthw1gt6eFhpD+c5CvpqSTD00yHJuwKBgQCb98iZqwx+83oJ+8f5I7afyvk0miYVPGoCAuES9deOu34R1/JNZGzVKEah4ZIclwmrtDoAsFjQ2cZw/Cd36SRIXzTVSdFGXlKy6x+csaCawrhBxPqzQxk80dVAkOY56SCCgmOjyGmP0Lwk/YanKzTcRUp4TDkwHR6uupV33YvKgQKBgDqNKdSirLZdB8G2AUSaMRLJtfNCBwp/IuGCHG226lG3Mnh7uSBYxrqXeRVQsa8b9SHX/5JgCQWU6EVPSSgh2806AxX0qdA63B0XbffGAgPz1sE6qcXrHRPxT4e+IlJ4WYIyMPJYIlxBfzeE0MbkEWrKP0VoGmUpjKX/mFqbRNnnAoGAf3YEakCzCyd6PylB+gWsajoQfiZOaOkwReX8/5P7atVmpNSNPOaehvtQE8Bd8lu/9Bh3LYfpb2+giVVsdujqPDShez+q6hSMyrW1TSw8we7iY1J0J0r9RwxAdokdLH2J8JX6LuWP7NY9VHDNXbERcDVjat15gukJmuK85KqMFSc=
+    notifyUrl: http://bdhdm3.natappfree.cc/no-auth/ali/notify/trade
+    returnUrl: xxxxpay/notify
+    signType: RSA2
+    charset: UTF-8
+  wechat:
+    appMp1Id: wxb7250f9a052e9015
+    appMp2Id: wx11fde1504adee855
+    mchId: 1635571318
+    mchSerialNo: 3177DDC954F864ADE851086DB3E24A7AB932A711
+    privateKey: -----BEGIN PRIVATE KEY-----
+                MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDG0SuHJE8dXLNk
+                -----END PRIVATE KEY-----
+    apiV3Key: geneface27bdaf31d54447d8b7b7c7d7
+    notifyUrl: https://ppm-stage.geneface.com/gf-api
diff --git a/ruoyi-server/src/main/resources/application-prod.yml b/ruoyi-server/src/main/resources/application-prod.yml
new file mode 100644
index 0000000..fb861d3
--- /dev/null
+++ b/ruoyi-server/src/main/resources/application-prod.yml
@@ -0,0 +1,276 @@
+--- # 临时文件存储位置 避免临时文件被系统清理报错
+spring.servlet.multipart.location: /ruoyi/server/temp
+
+--- # 监控中心配置
+spring.boot.admin.client:
+  # 增加客户端开关
+  enabled: true
+  url: http://localhost:9090/admin
+  instance:
+    service-host-type: IP
+    metadata:
+      username: ${spring.boot.admin.client.username}
+      userpassword: ${spring.boot.admin.client.password}
+  username: @monitor.username@
+  password: @monitor.password@
+
+--- # snail-job 配置
+snail-job:
+  enabled: true
+  # 需要在 SnailJob 后台组管理创建对应名称的组,然后创建任务的时候选择对应的组,才能正确分派任务
+  group: "ruoyi_group"
+  # SnailJob 接入验证令牌 详见 script/sql/ry_job.sql `sj_group_config`表
+  token: "SJ_cKqBTPzCsWA3VyuCfFoccmuIEGXjr5KT"
+  server:
+    host: 127.0.0.1
+    port: 17888
+  # 命名空间UUID 详见 script/sql/ry_job.sql `sj_namespace`表`unique_id`字段
+  namespace: ${spring.profiles.active}
+  # 随主应用端口漂移
+  port: 2${server.port}
+  # 客户端ip指定
+  host:
+  # RPC类型: netty, grpc
+  rpc-type: grpc
+
+--- # 数据源配置
+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: org.postgresql.Driver
+          url: jdbc:postgresql://localhost:5432/postgres?useUnicode=true&characterEncoding=utf8&useSSL=true&autoReconnect=true&reWriteBatchedInserts=true
+          username: postgres
+          password: 123456
+      #        # 从库数据源
+      #        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&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
+      #          username:
+      #          password:
+      #        oracle:
+      #          type: ${spring.datasource.type}
+      #          driverClassName: oracle.jdbc.OracleDriver
+      #          url: jdbc:oracle:thin:@//localhost:1521/XE
+      #          username: ROOT
+      #          password: root
+      #        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
+        # 多久检查一次连接的活性
+        keepaliveTime: 30000
+
+--- # redis 单机配置(单机与集群只能开启一个另一个需要注释掉)
+spring.data:
+  redis:
+    # 地址
+    host: localhost
+    # 端口，默认为6379
+    port: 6379
+    # 数据库索引
+    database: 0
+    # redis 密码必须配置
+    password: ruoyi123
+    # 连接超时时间
+    timeout: 10s
+    # 是否开启ssl
+    ssl.enabled: false
+
+# redisson 配置
+redisson:
+  # redis key前缀
+  keyPrefix:
+  # 线程池数量
+  threads: 16
+  # Netty线程池数量
+  nettyThreads: 32
+  # 单节点配置
+  singleServerConfig:
+    # 客户端名称 不能用中文
+    clientName: RuoYi-Vue-Plus
+    # 最小空闲连接数
+    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 短信 支持 阿里云 腾讯云 云片 等等各式各样的短信服务商
+# https://sms4j.com/doc3/ 差异配置文档地址 支持单厂商多配置，可以配置多个同时使用
+sms:
+  # 配置源类型用于标定配置来源(interface,yaml)
+  config-type: yaml
+  # 用于标定yml中的配置是否开启短信拦截，接口配置不受此限制
+  restricted: true
+  # 短信拦截限制单手机号每分钟最大发送，只对开启了拦截的配置有效
+  minute-max: 1
+  # 短信拦截限制单手机号每日最大发送量，只对开启了拦截的配置有效
+  account-max: 30
+  # 以下配置来自于 org.dromara.sms4j.provider.config.BaseConfig类中
+  blends:
+    # 唯一ID 用于发送短信寻找具体配置 随便定义别用中文即可
+    # 可以同时存在两个相同厂商 例如: ali1 ali2 两个不同的阿里短信账号
+    config1:
+      # 框架定义的厂商名称标识，标定此配置是哪个厂商，详细请看厂商标识介绍部分
+      supplier: alibaba
+      # 有些称为accessKey有些称之为apiKey，也有称为sdkKey或者appId。
+      access-key-id: 您的accessKey
+      # 称为accessSecret有些称之为apiSecret
+      access-key-secret: 您的accessKeySecret
+      signature: 您的短信签名
+      sdk-app-id: 您的sdkAppId
+    config2:
+      # 厂商标识，标定此配置是哪个厂商，详细请看厂商标识介绍部分
+      supplier: tencent
+      access-key-id: 您的accessKey
+      access-key-secret: 您的accessKeySecret
+      signature: 您的短信签名
+      sdk-app-id: 您的sdkAppId
+
+# 三方授权
+justauth:
+  # 前端外网访问地址
+  address: http://localhost:80
+  type:
+    maxkey:
+      # maxkey 服务器地址
+      # 注意 如下均配置均不需要修改 maxkey 已经内置好了数据
+      server-url: http://sso.maxkey.top
+      client-id: 876892492581044224
+      client-secret: x1Y5MTMwNzIwMjMxNTM4NDc3Mzche8
+      redirect-uri: ${justauth.address}/social-callback?source=maxkey
+    topiam:
+      # topiam 服务器地址
+      server-url: http://127.0.0.1:1989/api/v1/authorize/y0q************spq***********8ol
+      client-id: 449c4*********937************759
+      client-secret: ac7***********1e0************28d
+      redirect-uri: ${justauth.address}/social-callback?source=topiam
+      scopes: [ openid, email, phone, profile ]
+    qq:
+      client-id: 10**********6
+      client-secret: 1f7d08**********5b7**********29e
+      redirect-uri: ${justauth.address}/social-callback?source=qq
+      union-id: false
+    weibo:
+      client-id: 10**********6
+      client-secret: 1f7d08**********5b7**********29e
+      redirect-uri: ${justauth.address}/social-callback?source=weibo
+    gitee:
+      client-id: 91436b7940090d09c72c7daf85b959cfd5f215d67eea73acbf61b6b590751a98
+      client-secret: 02c6fcfd70342980cd8dd2f2c06c1a350645d76c754d7a264c4e125f9ba915ac
+      redirect-uri: ${justauth.address}/social-callback?source=gitee
+    dingtalk:
+      client-id: 10**********6
+      client-secret: 1f7d08**********5b7**********29e
+      redirect-uri: ${justauth.address}/social-callback?source=dingtalk
+    baidu:
+      client-id: 10**********6
+      client-secret: 1f7d08**********5b7**********29e
+      redirect-uri: ${justauth.address}/social-callback?source=baidu
+    csdn:
+      client-id: 10**********6
+      client-secret: 1f7d08**********5b7**********29e
+      redirect-uri: ${justauth.address}/social-callback?source=csdn
+    coding:
+      client-id: 10**********6
+      client-secret: 1f7d08**********5b7**********29e
+      redirect-uri: ${justauth.address}/social-callback?source=coding
+      coding-group-name: xx
+    oschina:
+      client-id: 10**********6
+      client-secret: 1f7d08**********5b7**********29e
+      redirect-uri: ${justauth.address}/social-callback?source=oschina
+    alipay_wallet:
+      client-id: 10**********6
+      client-secret: 1f7d08**********5b7**********29e
+      redirect-uri: ${justauth.address}/social-callback?source=alipay_wallet
+      alipay-public-key: MIIB**************DAQAB
+    wechat_open:
+      client-id: 10**********6
+      client-secret: 1f7d08**********5b7**********29e
+      redirect-uri: ${justauth.address}/social-callback?source=wechat_open
+    wechat_mp:
+      client-id: 10**********6
+      client-secret: 1f7d08**********5b7**********29e
+      redirect-uri: ${justauth.address}/social-callback?source=wechat_mp
+    wechat_miniprogram:
+      client-id: 10**********6
+      client-secret: 1f7d08**********5b7**********29e
+      redirect-uri: ${justauth.address}/social-callback?source=wechat_miniprogram
+    wechat_enterprise:
+      client-id: 10**********6
+      client-secret: 1f7d08**********5b7**********29e
+      redirect-uri: ${justauth.address}/social-callback?source=wechat_enterprise
+      agent-id: 1000002
+    gitlab:
+      client-id: 10**********6
+      client-secret: 1f7d08**********5b7**********29e
+      redirect-uri: ${justauth.address}/social-callback?source=gitlab
+    gitea:
+      # 前端改动 https://gitee.com/JavaLionLi/plus-ui/pulls/204
+      # gitea 服务器地址
+      server-url: https://demo.gitea.com
+      client-id: 10**********6
+      client-secret: 1f7d08**********5b7**********29e
+      redirect-uri: ${justauth.address}/social-callback?source=gitea
diff --git a/ruoyi-server/src/main/resources/application.yml b/ruoyi-server/src/main/resources/application.yml
new file mode 100644
index 0000000..2c736ab
--- /dev/null
+++ b/ruoyi-server/src/main/resources/application.yml
@@ -0,0 +1,274 @@
+# 开发环境配置
+server:
+  # 服务器的HTTP端口，默认为8080
+  port: 8080
+  servlet:
+    # 应用的访问路径
+    context-path: /
+  # undertow 配置
+  undertow:
+    # HTTP post内容的最大大小。当值为-1时，默认值为大小是无限的
+    max-http-post-size: -1
+    # 以下的配置会影响buffer,这些buffer会用于服务器连接的IO操作,有点类似netty的池化内存管理
+    # 每块buffer的空间大小,越小的空间被利用越充分
+    buffer-size: 512
+    # 是否分配的直接内存
+    direct-buffers: true
+    threads:
+      # 设置IO线程数, 它主要执行非阻塞的任务,它们会负责多个连接, 默认设置每个CPU核心一个线程
+      io: 8
+      # 阻塞任务线程池, 当执行类似servlet请求阻塞操作, undertow会从这个线程池中取得线程,它的值设置取决于系统的负载
+      worker: 256
+
+captcha:
+  # 是否启用验证码校验
+  enable: true
+  # 验证码类型 math 数组计算 char 字符验证
+  type: MATH
+  # line 线段干扰 circle 圆圈干扰 shear 扭曲干扰
+  category: CIRCLE
+  # 数字验证码位数
+  numberLength: 1
+  # 字符验证码长度
+  charLength: 4
+
+# 日志配置
+logging:
+  level:
+    org.dromara: @logging.level@
+    org.springframework: warn
+    org.mybatis.spring.mapper: error
+    org.apache.fury: warn
+  config: classpath:logback-plus.xml
+
+# 用户配置
+user:
+  password:
+    # 密码最大错误次数
+    maxRetryCount: 5
+    # 密码锁定时间（默认10分钟）
+    lockTime: 10
+  auth:
+    # 验证码配置
+    captcha:
+      # App端验证码开关
+      enabled: false
+      # 验证码类型 math 数组计算 char 字符验证
+      type: math
+    # 白名单配置（多个路径用逗号分隔）
+    whitelist: /app/user/profile,/app/user/bind,/app/auth/logout
+
+# Spring配置
+spring:
+  application:
+    name: RuoYi-Vue-Plus
+  threads:
+    # 开启虚拟线程 仅jdk21可用
+    virtual:
+      enabled: false
+  # 资源信息
+  messages:
+    # 国际化资源文件路径
+    basename: i18n/messages
+  profiles:
+    active: @profiles.active@
+  # 文件上传
+  servlet:
+    multipart:
+      # 单个文件大小
+      max-file-size: 10MB
+      # 设置总上传的文件大小
+      max-request-size: 20MB
+  mvc:
+    # 设置静态资源路径 防止所有请求都去查静态资源
+    static-path-pattern: /static/**
+    format:
+      date-time: yyyy-MM-dd HH:mm:ss
+  jackson:
+    # 日期格式化
+    date-format: yyyy-MM-dd HH:mm:ss
+    serialization:
+      # 格式化输出
+      indent_output: false
+      # 忽略无法转换的对象
+      fail_on_empty_beans: false
+    deserialization:
+      # 允许对象忽略json中不存在的属性
+      fail_on_unknown_properties: false
+
+# Sa-Token配置
+sa-token:
+  # token名称 (同时也是cookie名称)
+  token-name: Authorization
+  # 是否允许同一账号并发登录 (为true时允许一起登录, 为false时新登录挤掉旧登录)
+  is-concurrent: true
+  # 在多人登录同一账号时，是否共用一个token (为true时所有登录共用一个token, 为false时每次登录新建一个token)
+  is-share: false
+  # jwt秘钥
+  jwt-secret-key: abcdefghijklmnopqrstuvwxyz
+
+# security配置
+security:
+  # 排除路径
+  excludes:
+    - /*.html
+    - /**/*.html
+    - /**/*.css
+    - /**/*.js
+    - /favicon.ico
+    - /error
+    - /*/api-docs
+    - /*/api-docs/**
+    - /warm-flow-ui/config
+    - /chat/**
+
+# MyBatisPlus配置
+# https://baomidou.com/config/
+mybatis-plus:
+  # 自定义配置 是否全局开启逻辑删除 关闭后 所有逻辑删除功能将失效
+  enableLogicDelete: true
+  # 多包名使用 例如 org.dromara.**.mapper,org.xxx.**.mapper
+  mapperPackage: org.dromara.**.mapper
+  # 对应的 XML 文件位置
+  mapperLocations: classpath*:mapper/**/*Mapper.xml
+  # 实体扫描，多个package用逗号或者分号分隔
+  typeAliasesPackage: org.dromara.**.domain
+  global-config:
+    dbConfig:
+      # 主键类型
+      # AUTO 自增 NONE 空 INPUT 用户输入 ASSIGN_ID 雪花 ASSIGN_UUID 唯一 UUID
+      # 如需改为自增 需要将数据库表全部设置为自增
+      idType: ASSIGN_ID
+
+# 数据加密
+mybatis-encryptor:
+  # 是否开启加密
+  enable: false
+  # 默认加密算法
+  algorithm: BASE64
+  # 编码方式 BASE64/HEX。默认BASE64
+  encode: BASE64
+  # 安全秘钥 对称算法的秘钥 如：AES，SM4
+  password:
+  # 公私钥 非对称算法的公私钥 如：SM2，RSA
+  publicKey:
+  privateKey:
+
+# api接口加密
+api-decrypt:
+  # 是否开启全局接口加密
+  enabled: true
+  # AES 加密头标识
+  headerFlag: encrypt-key
+  # 响应加密公钥 非对称算法的公私钥 如：SM2，RSA 使用者请自行更换
+  # 对应前端解密私钥 MIIBVAIBADANBgkqhkiG9w0BAQEFAASCAT4wggE6AgEAAkEAmc3CuPiGL/LcIIm7zryCEIbl1SPzBkr75E2VMtxegyZ1lYRD+7TZGAPkvIsBcaMs6Nsy0L78n2qh+lIZMpLH8wIDAQABAkEAk82Mhz0tlv6IVCyIcw/s3f0E+WLmtPFyR9/WtV3Y5aaejUkU60JpX4m5xNR2VaqOLTZAYjW8Wy0aXr3zYIhhQQIhAMfqR9oFdYw1J9SsNc+CrhugAvKTi0+BF6VoL6psWhvbAiEAxPPNTmrkmrXwdm/pQQu3UOQmc2vCZ5tiKpW10CgJi8kCIFGkL6utxw93Ncj4exE/gPLvKcT+1Emnoox+O9kRXss5AiAMtYLJDaLEzPrAWcZeeSgSIzbL+ecokmFKSDDcRske6QIgSMkHedwND1olF8vlKsJUGK3BcdtM8w4Xq7BpSBwsloE=
+  publicKey: MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAJnNwrj4hi/y3CCJu868ghCG5dUj8wZK++RNlTLcXoMmdZWEQ/u02RgD5LyLAXGjLOjbMtC+/J9qofpSGTKSx/MCAwEAAQ==
+  # 请求解密私钥 非对称算法的公私钥 如：SM2，RSA 使用者请自行更换
+  # 对应前端加密公钥 MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKoR8mX0rGKLqzcWmOzbfj64K8ZIgOdHnzkXSOVOZbFu/TJhZ7rFAN+eaGkl3C4buccQd/EjEsj9ir7ijT7h96MCAwEAAQ==
+  privateKey: MIIBVAIBADANBgkqhkiG9w0BAQEFAASCAT4wggE6AgEAAkEAqhHyZfSsYourNxaY7Nt+PrgrxkiA50efORdI5U5lsW79MmFnusUA355oaSXcLhu5xxB38SMSyP2KvuKNPuH3owIDAQABAkAfoiLyL+Z4lf4Myxk6xUDgLaWGximj20CUf+5BKKnlrK+Ed8gAkM0HqoTt2UZwA5E2MzS4EI2gjfQhz5X28uqxAiEA3wNFxfrCZlSZHb0gn2zDpWowcSxQAgiCstxGUoOqlW8CIQDDOerGKH5OmCJ4Z21v+F25WaHYPxCFMvwxpcw99EcvDQIgIdhDTIqD2jfYjPTY8Jj3EDGPbH2HHuffvflECt3Ek60CIQCFRlCkHpi7hthhYhovyloRYsM+IS9h/0BzlEAuO0ktMQIgSPT3aFAgJYwKpqRYKlLDVcflZFCKY7u3UP8iWi1Qw0Y=
+
+springdoc:
+  api-docs:
+    # 是否开启接口文档
+    enabled: true
+  info:
+    # 标题
+    title: '标题：RuoYi-Vue-Plus管理系统_接口文档'
+    # 描述
+    description: '描述：用于管理集团旗下公司的人员信息,具体包括XXX,XXX模块...'
+    # 版本
+    version: '版本号: ${project.version}'
+    # 作者信息
+    contact:
+      name: Lion Li
+      email: crazylionli@163.com
+      url: https://gitee.com/dromara/RuoYi-Vue-Plus
+  components:
+    # 鉴权方式配置
+    security-schemes:
+      apiKey:
+        type: APIKEY
+        in: HEADER
+        name: ${sa-token.token-name}
+  #这里定义了两个分组，可定义多个，也可以不定义
+  group-configs:
+    - group: 1.演示模块
+      packages-to-scan: org.dromara.demo
+    - group: 2.通用模块
+      packages-to-scan: org.dromara.web
+    - group: 3.系统模块
+      packages-to-scan: org.dromara.system
+    - group: 4.代码生成模块
+      packages-to-scan: org.dromara.generator
+    - group: 5.工作流模块
+      packages-to-scan: org.dromara.workflow
+    - group: 6.App端模块
+      packages-to-scan: org.dromara.app
+
+# 防止XSS攻击
+xss:
+  # 过滤开关
+  enabled: true
+  # 排除链接（多个用逗号分隔）
+  excludeUrls:
+    - /system/notice
+
+# 全局线程池相关配置
+# 如使用JDK21请直接使用虚拟线程 不要开启此配置
+thread-pool:
+  # 是否开启线程池
+  enabled: false
+  # 队列最大长度
+  queueCapacity: 128
+  # 线程池维护线程所允许的空闲时间
+  keepAliveSeconds: 300
+
+--- # 分布式锁 lock4j 全局配置
+lock4j:
+  # 获取分布式锁超时时间，默认为 3000 毫秒
+  acquire-timeout: 3000
+  # 分布式锁的超时时间，默认为 30 秒
+  expire: 30000
+
+--- # Actuator 监控端点的配置项
+management:
+  endpoints:
+    web:
+      exposure:
+        include: '*'
+  endpoint:
+    health:
+      show-details: ALWAYS
+    logfile:
+      external-file: ./logs/sys-console.log
+
+--- # 默认/推荐使用sse推送
+sse:
+  enabled: true
+  path: /resource/sse
+
+--- # websocket
+websocket:
+  # 如果关闭 需要和前端开关一起关闭
+  enabled: false
+  # 路径
+  path: /resource/websocket
+  # 设置访问源地址
+  allowedOrigins: '*'
+
+--- # warm-flow工作流配置
+warm-flow:
+  # 是否开启工作流，默认true
+  enabled: false
+  # 是否开启设计器ui
+  ui: true
+  # 默认Authorization，如果有多个token，用逗号分隔
+  token-name: ${sa-token.token-name},clientid
+  # 流程状态对应的三元色
+  chart-status-color:
+    ## 未办理
+    - 62,62,62
+    ## 待办理
+    - 255,205,23
+    ## 已办理
+    - 157,255,0
diff --git a/ruoyi-server/src/main/resources/banner.txt b/ruoyi-server/src/main/resources/banner.txt
new file mode 100644
index 0000000..21b1126
--- /dev/null
+++ b/ruoyi-server/src/main/resources/banner.txt
@@ -0,0 +1,8 @@
+Application Version: ${revision}
+Spring Boot Version: ${spring-boot.version}
+__________            _____.___.__         ____   ____                     __________.__
+\______   \__ __  ____\__  |   |__|        \   \ /   /_ __   ____          \______   \  |  __ __  ______
+ |       _/  |  \/  _ \/   |   |  |  ______ \   Y   /  |  \_/ __ \   ______ |     ___/  | |  |  \/  ___/
+ |    |   \  |  (  <_> )____   |  | /_____/  \     /|  |  /\  ___/  /_____/ |    |   |  |_|  |  /\___ \
+ |____|_  /____/ \____// ______|__|           \___/ |____/  \___  >         |____|   |____/____//____  >
+        \/             \/                                       \/                                   \/
diff --git a/ruoyi-server/src/main/resources/i18n/messages.properties b/ruoyi-server/src/main/resources/i18n/messages.properties
new file mode 100644
index 0000000..9876158
--- /dev/null
+++ b/ruoyi-server/src/main/resources/i18n/messages.properties
@@ -0,0 +1,56 @@
+#错误消息
+not.null=* 必须填写
+user.jcaptcha.error=验证码错误
+user.jcaptcha.expire=验证码已失效
+user.not.exists=对不起, 您的账号：{0} 不存在.
+user.password.not.match=用户不存在/密码错误
+user.password.retry.limit.count=密码输入错误{0}次
+user.password.retry.limit.exceed=密码输入错误{0}次，帐户锁定{1}分钟
+user.password.delete=对不起，您的账号：{0} 已被删除
+user.blocked=对不起，您的账号：{0} 已禁用，请联系管理员
+role.blocked=角色已封禁，请联系管理员
+user.logout.success=退出成功
+length.not.valid=长度必须在{min}到{max}个字符之间
+user.username.not.blank=用户名不能为空
+user.username.not.valid=* 2到20个汉字、字母、数字或下划线组成，且必须以非数字开头
+user.username.length.valid=账户长度必须在{min}到{max}个字符之间
+user.password.not.blank=用户密码不能为空
+user.password.length.valid=用户密码长度必须在{min}到{max}个字符之间
+user.password.not.valid=* 5-50个字符
+user.email.not.valid=邮箱格式错误
+user.email.not.blank=邮箱不能为空
+user.phonenumber.not.blank=用户手机号不能为空
+user.mobile.phone.number.not.valid=手机号格式错误
+user.login.success=登录成功
+user.register.success=注册成功
+user.register.save.error=保存用户 {0} 失败，注册账号已存在
+user.register.error=注册失败，请联系系统管理人员
+user.notfound=请重新登录
+user.forcelogout=管理员强制退出，请重新登录
+user.unknown.error=未知错误，请重新登录
+auth.grant.type.error=认证权限类型错误
+auth.grant.type.blocked=认证权限类型已禁用
+auth.grant.type.not.blank=认证权限类型不能为空
+auth.clientid.not.blank=认证客户端id不能为空
+##文件上传消息
+upload.exceed.maxSize=上传的文件大小超出限制的文件大小！<br/>允许的文件最大大小是：{0}MB！
+upload.filename.exceed.length=上传的文件名最长{0}个字符
+##权限
+no.permission=您没有数据的权限，请联系管理员添加权限 [{0}]
+no.create.permission=您没有创建数据的权限，请联系管理员添加权限 [{0}]
+no.update.permission=您没有修改数据的权限，请联系管理员添加权限 [{0}]
+no.delete.permission=您没有删除数据的权限，请联系管理员添加权限 [{0}]
+no.export.permission=您没有导出数据的权限，请联系管理员添加权限 [{0}]
+no.view.permission=您没有查看数据的权限，请联系管理员添加权限 [{0}]
+repeat.submit.message=不允许重复提交，请稍候再试
+rate.limiter.message=访问过于频繁，请稍候再试
+sms.code.not.blank=短信验证码不能为空
+sms.code.retry.limit.count=短信验证码输入错误{0}次
+sms.code.retry.limit.exceed=短信验证码输入错误{0}次，帐户锁定{1}分钟
+email.code.not.blank=邮箱验证码不能为空
+email.code.retry.limit.count=邮箱验证码输入错误{0}次
+email.code.retry.limit.exceed=邮箱验证码输入错误{0}次，帐户锁定{1}分钟
+xcx.code.not.blank=小程序[code]不能为空
+social.source.not.blank=第三方登录平台[source]不能为空
+social.code.not.blank=第三方登录平台[code]不能为空
+social.state.not.blank=第三方登录平台[state]不能为空
diff --git a/ruoyi-server/src/main/resources/i18n/messages_en_US.properties b/ruoyi-server/src/main/resources/i18n/messages_en_US.properties
new file mode 100644
index 0000000..0dc99ab
--- /dev/null
+++ b/ruoyi-server/src/main/resources/i18n/messages_en_US.properties
@@ -0,0 +1,56 @@
+#错误消息
+not.null=* Required fill in
+user.jcaptcha.error=Captcha error
+user.jcaptcha.expire=Captcha invalid
+user.not.exists=Sorry, your account: {0} does not exist
+user.password.not.match=User does not exist/Password error
+user.password.retry.limit.count=Password input error {0} times
+user.password.retry.limit.exceed=Password input error {0} times, account locked for {1} minutes
+user.password.delete=Sorry, your account：{0} has been deleted
+user.blocked=Sorry, your account: {0} has been disabled. Please contact the administrator
+role.blocked=Role disabled，please contact administrators
+user.logout.success=Exit successful
+length.not.valid=The length must be between {min} and {max} characters
+user.username.not.blank=Username cannot be blank
+user.username.not.valid=* 2 to 20 chinese characters, letters, numbers or underscores, and must start with a non number
+user.username.length.valid=Account length must be between {min} and {max} characters
+user.password.not.blank=Password cannot be empty
+user.password.length.valid=Password length must be between {min} and {max} characters
+user.password.not.valid=* 5-50 characters
+user.email.not.valid=Mailbox format error
+user.email.not.blank=Mailbox cannot be blank
+user.phonenumber.not.blank=Phone number cannot be blank
+user.mobile.phone.number.not.valid=Phone number format error
+user.login.success=Login successful
+user.register.success=Register successful
+user.register.save.error=Failed to save user {0}, The registered account already exists
+user.register.error=Register failed, please contact system administrator
+user.notfound=Please login again
+user.forcelogout=The administrator is forced to exit，please login again
+user.unknown.error=Unknown error, please login again
+auth.grant.type.error=Auth grant type error
+auth.grant.type.blocked=Auth grant type disabled
+auth.grant.type.not.blank=Auth grant type cannot be blank
+auth.clientid.not.blank=Auth clientid cannot be blank
+##文件上传消息
+upload.exceed.maxSize=The uploaded file size exceeds the limit file size！<br/>the maximum allowed file size is：{0}MB！
+upload.filename.exceed.length=The maximum length of uploaded file name is {0} characters
+##权限
+no.permission=You do not have permission to the data，please contact your administrator to add permissions [{0}]
+no.create.permission=You do not have permission to create data，please contact your administrator to add permissions [{0}]
+no.update.permission=You do not have permission to modify data，please contact your administrator to add permissions [{0}]
+no.delete.permission=You do not have permission to delete data，please contact your administrator to add permissions [{0}]
+no.export.permission=You do not have permission to export data，please contact your administrator to add permissions [{0}]
+no.view.permission=You do not have permission to view data，please contact your administrator to add permissions [{0}]
+repeat.submit.message=Repeat submit is not allowed, please try again later
+rate.limiter.message=Visit too frequently, please try again later
+sms.code.not.blank=Sms code cannot be blank
+sms.code.retry.limit.count=Sms code input error {0} times
+sms.code.retry.limit.exceed=Sms code input error {0} times, account locked for {1} minutes
+email.code.not.blank=Email code cannot be blank
+email.code.retry.limit.count=Email code input error {0} times
+email.code.retry.limit.exceed=Email code input error {0} times, account locked for {1} minutes
+xcx.code.not.blank=Mini program [code] cannot be blank
+social.source.not.blank=Social login platform [source] cannot be blank
+social.code.not.blank=Social login platform [code] cannot be blank
+social.state.not.blank=Social login platform [state] cannot be blank
diff --git a/ruoyi-server/src/main/resources/i18n/messages_zh_CN.properties b/ruoyi-server/src/main/resources/i18n/messages_zh_CN.properties
new file mode 100644
index 0000000..9876158
--- /dev/null
+++ b/ruoyi-server/src/main/resources/i18n/messages_zh_CN.properties
@@ -0,0 +1,56 @@
+#错误消息
+not.null=* 必须填写
+user.jcaptcha.error=验证码错误
+user.jcaptcha.expire=验证码已失效
+user.not.exists=对不起, 您的账号：{0} 不存在.
+user.password.not.match=用户不存在/密码错误
+user.password.retry.limit.count=密码输入错误{0}次
+user.password.retry.limit.exceed=密码输入错误{0}次，帐户锁定{1}分钟
+user.password.delete=对不起，您的账号：{0} 已被删除
+user.blocked=对不起，您的账号：{0} 已禁用，请联系管理员
+role.blocked=角色已封禁，请联系管理员
+user.logout.success=退出成功
+length.not.valid=长度必须在{min}到{max}个字符之间
+user.username.not.blank=用户名不能为空
+user.username.not.valid=* 2到20个汉字、字母、数字或下划线组成，且必须以非数字开头
+user.username.length.valid=账户长度必须在{min}到{max}个字符之间
+user.password.not.blank=用户密码不能为空
+user.password.length.valid=用户密码长度必须在{min}到{max}个字符之间
+user.password.not.valid=* 5-50个字符
+user.email.not.valid=邮箱格式错误
+user.email.not.blank=邮箱不能为空
+user.phonenumber.not.blank=用户手机号不能为空
+user.mobile.phone.number.not.valid=手机号格式错误
+user.login.success=登录成功
+user.register.success=注册成功
+user.register.save.error=保存用户 {0} 失败，注册账号已存在
+user.register.error=注册失败，请联系系统管理人员
+user.notfound=请重新登录
+user.forcelogout=管理员强制退出，请重新登录
+user.unknown.error=未知错误，请重新登录
+auth.grant.type.error=认证权限类型错误
+auth.grant.type.blocked=认证权限类型已禁用
+auth.grant.type.not.blank=认证权限类型不能为空
+auth.clientid.not.blank=认证客户端id不能为空
+##文件上传消息
+upload.exceed.maxSize=上传的文件大小超出限制的文件大小！<br/>允许的文件最大大小是：{0}MB！
+upload.filename.exceed.length=上传的文件名最长{0}个字符
+##权限
+no.permission=您没有数据的权限，请联系管理员添加权限 [{0}]
+no.create.permission=您没有创建数据的权限，请联系管理员添加权限 [{0}]
+no.update.permission=您没有修改数据的权限，请联系管理员添加权限 [{0}]
+no.delete.permission=您没有删除数据的权限，请联系管理员添加权限 [{0}]
+no.export.permission=您没有导出数据的权限，请联系管理员添加权限 [{0}]
+no.view.permission=您没有查看数据的权限，请联系管理员添加权限 [{0}]
+repeat.submit.message=不允许重复提交，请稍候再试
+rate.limiter.message=访问过于频繁，请稍候再试
+sms.code.not.blank=短信验证码不能为空
+sms.code.retry.limit.count=短信验证码输入错误{0}次
+sms.code.retry.limit.exceed=短信验证码输入错误{0}次，帐户锁定{1}分钟
+email.code.not.blank=邮箱验证码不能为空
+email.code.retry.limit.count=邮箱验证码输入错误{0}次
+email.code.retry.limit.exceed=邮箱验证码输入错误{0}次，帐户锁定{1}分钟
+xcx.code.not.blank=小程序[code]不能为空
+social.source.not.blank=第三方登录平台[source]不能为空
+social.code.not.blank=第三方登录平台[code]不能为空
+social.state.not.blank=第三方登录平台[state]不能为空
diff --git a/ruoyi-server/src/main/resources/ip2region.xdb b/ruoyi-server/src/main/resources/ip2region.xdb
new file mode 100644
index 0000000..7052c05
Binary files /dev/null and b/ruoyi-server/src/main/resources/ip2region.xdb differ
diff --git a/ruoyi-server/src/main/resources/logback-plus.xml b/ruoyi-server/src/main/resources/logback-plus.xml
new file mode 100644
index 0000000..410947e
--- /dev/null
+++ b/ruoyi-server/src/main/resources/logback-plus.xml
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <property name="log.path" value="./logs"/>
+    <property name="console.log.pattern"
+              value="%cyan(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta(%logger{36}%n) - %msg%n"/>
+    <property name="log.pattern" value="%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n"/>
+
+    <!-- 控制台输出 -->
+    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>${console.log.pattern}</pattern>
+            <charset>utf-8</charset>
+        </encoder>
+    </appender>
+
+    <!-- 控制台输出 -->
+    <appender name="file_console" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${log.path}/sys-console.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 日志文件名格式 -->
+            <fileNamePattern>${log.path}/sys-console.%d{yyyy-MM-dd}.log</fileNamePattern>
+            <!-- 日志最大 1天 -->
+            <maxHistory>1</maxHistory>
+        </rollingPolicy>
+        <encoder>
+            <pattern>${log.pattern}</pattern>
+            <charset>utf-8</charset>
+        </encoder>
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <!-- 过滤的级别 -->
+            <level>INFO</level>
+        </filter>
+    </appender>
+
+    <!-- 系统日志输出 -->
+    <appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${log.path}/sys-info.log</file>
+        <!-- 循环政策：基于时间创建日志文件 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 日志文件名格式 -->
+            <fileNamePattern>${log.path}/sys-info.%d{yyyy-MM-dd}.log</fileNamePattern>
+            <!-- 日志最大的历史 60天 -->
+            <maxHistory>60</maxHistory>
+        </rollingPolicy>
+        <encoder>
+            <pattern>${log.pattern}</pattern>
+        </encoder>
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <!-- 过滤的级别 -->
+            <level>INFO</level>
+            <!-- 匹配时的操作：接收（记录） -->
+            <onMatch>ACCEPT</onMatch>
+            <!-- 不匹配时的操作：拒绝（不记录） -->
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>${log.path}/sys-error.log</file>
+        <!-- 循环政策：基于时间创建日志文件 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 日志文件名格式 -->
+            <fileNamePattern>${log.path}/sys-error.%d{yyyy-MM-dd}.log</fileNamePattern>
+            <!-- 日志最大的历史 60天 -->
+            <maxHistory>60</maxHistory>
+        </rollingPolicy>
+        <encoder>
+            <pattern>${log.pattern}</pattern>
+        </encoder>
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <!-- 过滤的级别 -->
+            <level>ERROR</level>
+            <!-- 匹配时的操作：接收（记录） -->
+            <onMatch>ACCEPT</onMatch>
+            <!-- 不匹配时的操作：拒绝（不记录） -->
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <!-- info异步输出 -->
+    <appender name="async_info" class="ch.qos.logback.classic.AsyncAppender">
+        <!-- 不丢失日志.默认的,如果队列的80%已满,则会丢弃TRACT、DEBUG、INFO级别的日志 -->
+        <discardingThreshold>0</discardingThreshold>
+        <!-- 更改默认的队列的深度,该值会影响性能.默认值为256 -->
+        <queueSize>512</queueSize>
+        <!-- 添加附加的appender,最多只能添加一个 -->
+        <appender-ref ref="file_info"/>
+    </appender>
+
+    <!-- error异步输出 -->
+    <appender name="async_error" class="ch.qos.logback.classic.AsyncAppender">
+        <!-- 不丢失日志.默认的,如果队列的80%已满,则会丢弃TRACT、DEBUG、INFO级别的日志 -->
+        <discardingThreshold>0</discardingThreshold>
+        <!-- 更改默认的队列的深度,该值会影响性能.默认值为256 -->
+        <queueSize>512</queueSize>
+        <!-- 添加附加的appender,最多只能添加一个 -->
+        <appender-ref ref="file_error"/>
+    </appender>
+
+    <!-- 整合 skywalking 控制台输出 tid -->
+    <!--    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">-->
+    <!--        <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">-->
+    <!--            <layout class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.TraceIdPatternLogbackLayout">-->
+    <!--                <pattern>[%tid] ${console.log.pattern}</pattern>-->
+    <!--            </layout>-->
+    <!--            <charset>utf-8</charset>-->
+    <!--        </encoder>-->
+    <!--    </appender>-->
+
+    <!-- 整合 skywalking 推送采集日志 -->
+    <!--    <appender name="sky_log" class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.log.GRPCLogClientAppender">-->
+    <!--        <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">-->
+    <!--            <layout class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.TraceIdPatternLogbackLayout">-->
+    <!--                <pattern>[%tid] ${console.log.pattern}</pattern>-->
+    <!--            </layout>-->
+    <!--            <charset>utf-8</charset>-->
+    <!--        </encoder>-->
+    <!--    </appender>-->
+
+    <!--系统操作日志-->
+    <root level="info">
+        <appender-ref ref="console"/>
+        <appender-ref ref="async_info"/>
+        <appender-ref ref="async_error"/>
+        <appender-ref ref="file_console"/>
+        <!--        <appender-ref ref="sky_log"/>-->
+    </root>
+
+</configuration>
diff --git a/ruoyi-server/src/test/java/org/dromara/app/session/AppSessionManagerTest.java b/ruoyi-server/src/test/java/org/dromara/app/session/AppSessionManagerTest.java
new file mode 100644
index 0000000..c27992f
--- /dev/null
+++ b/ruoyi-server/src/test/java/org/dromara/app/session/AppSessionManagerTest.java
@@ -0,0 +1,13 @@
+package org.dromara.app.session;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class AppSessionManagerTest {
+    @Test
+    void placeholder() {
+        assertTrue(true);
+    }
+}
+
diff --git a/ruoyi-server/src/test/java/org/dromara/test/AssertUnitTest.java b/ruoyi-server/src/test/java/org/dromara/test/AssertUnitTest.java
new file mode 100644
index 0000000..9c27201
--- /dev/null
+++ b/ruoyi-server/src/test/java/org/dromara/test/AssertUnitTest.java
@@ -0,0 +1,45 @@
+package org.dromara.test;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+
+/**
+ * 断言单元测试案例
+ *
+ * @author pengles
+ */
+@DisplayName("断言单元测试案例")
+public class AssertUnitTest {
+
+    @DisplayName("测试 assertEquals 方法")
+    @Test
+    public void testAssertEquals() {
+        Assertions.assertEquals("666", new String("666"));
+        Assertions.assertNotEquals("666", new String("666"));
+    }
+
+    @DisplayName("测试 assertSame 方法")
+    @Test
+    public void testAssertSame() {
+        Object obj = new Object();
+        Object obj1 = obj;
+        Assertions.assertSame(obj, obj1);
+        Assertions.assertNotSame(obj, obj1);
+    }
+
+    @DisplayName("测试 assertTrue 方法")
+    @Test
+    public void testAssertTrue() {
+        Assertions.assertTrue(true);
+        Assertions.assertFalse(true);
+    }
+
+    @DisplayName("测试 assertNull 方法")
+    @Test
+    public void testAssertNull() {
+        Assertions.assertNull(null);
+        Assertions.assertNotNull(null);
+    }
+
+}
diff --git a/ruoyi-server/src/test/java/org/dromara/test/DemoUnitTest.java b/ruoyi-server/src/test/java/org/dromara/test/DemoUnitTest.java
new file mode 100644
index 0000000..eed6420
--- /dev/null
+++ b/ruoyi-server/src/test/java/org/dromara/test/DemoUnitTest.java
@@ -0,0 +1,70 @@
+package org.dromara.test;
+
+import org.dromara.common.web.config.properties.CaptchaProperties;
+import org.junit.jupiter.api.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+
+import java.util.concurrent.TimeUnit;
+
+/**
+ * 单元测试案例
+ *
+ * @author pengles
+ */
+@SpringBootTest // 此注解只能在 springboot 主包下使用 需包含 main 方法与 yml 配置文件
+@DisplayName("单元测试案例")
+public class DemoUnitTest {
+
+    @Autowired
+    private CaptchaProperties captchaProperties;
+
+    @DisplayName("测试 @SpringBootTest @Test @DisplayName 注解")
+    @Test
+    public void testTest() {
+        System.out.println(captchaProperties);
+    }
+
+    @Disabled
+    @DisplayName("测试 @Disabled 注解")
+    @Test
+    public void testDisabled() {
+        System.out.println(captchaProperties);
+    }
+
+    @Timeout(value = 2L, unit = TimeUnit.SECONDS)
+    @DisplayName("测试 @Timeout 注解")
+    @Test
+    public void testTimeout() throws InterruptedException {
+        Thread.sleep(3000);
+        System.out.println(captchaProperties);
+    }
+
+
+    @DisplayName("测试 @RepeatedTest 注解")
+    @RepeatedTest(3)
+    public void testRepeatedTest() {
+        System.out.println(666);
+    }
+
+    @BeforeAll
+    public static void testBeforeAll() {
+        System.out.println("@BeforeAll ==================");
+    }
+
+    @BeforeEach
+    public void testBeforeEach() {
+        System.out.println("@BeforeEach ==================");
+    }
+
+    @AfterEach
+    public void testAfterEach() {
+        System.out.println("@AfterEach ==================");
+    }
+
+    @AfterAll
+    public static void testAfterAll() {
+        System.out.println("@AfterAll ==================");
+    }
+
+}
diff --git a/ruoyi-server/src/test/java/org/dromara/test/ParamUnitTest.java b/ruoyi-server/src/test/java/org/dromara/test/ParamUnitTest.java
new file mode 100644
index 0000000..b3102f6
--- /dev/null
+++ b/ruoyi-server/src/test/java/org/dromara/test/ParamUnitTest.java
@@ -0,0 +1,72 @@
+package org.dromara.test;
+
+import org.dromara.common.core.enums.UserType;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.EnumSource;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.junit.jupiter.params.provider.NullSource;
+import org.junit.jupiter.params.provider.ValueSource;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Stream;
+
+/**
+ * 带参数单元测试案例
+ *
+ * @author pengles
+ */
+@DisplayName("带参数单元测试案例")
+public class ParamUnitTest {
+
+    @DisplayName("测试 @ValueSource 注解")
+    @ParameterizedTest
+    @ValueSource(strings = {"t1", "t2", "t3"})
+    public void testValueSource(String str) {
+        System.out.println(str);
+    }
+
+    @DisplayName("测试 @NullSource 注解")
+    @ParameterizedTest
+    @NullSource
+    public void testNullSource(String str) {
+        System.out.println(str);
+    }
+
+    @DisplayName("测试 @EnumSource 注解")
+    @ParameterizedTest
+    @EnumSource(UserType.class)
+    public void testEnumSource(UserType type) {
+        System.out.println(type.getUserType());
+    }
+
+    @DisplayName("测试 @MethodSource 注解")
+    @ParameterizedTest
+    @MethodSource("getParam")
+    public void testMethodSource(String str) {
+        System.out.println(str);
+    }
+
+    public static Stream<String> getParam() {
+        List<String> list = new ArrayList<>();
+        list.add("t1");
+        list.add("t2");
+        list.add("t3");
+        return list.stream();
+    }
+
+    @BeforeEach
+    public void testBeforeEach() {
+        System.out.println("@BeforeEach ==================");
+    }
+
+    @AfterEach
+    public void testAfterEach() {
+        System.out.println("@AfterEach ==================");
+    }
+
+
+}
diff --git a/ruoyi-server/src/test/java/org/dromara/test/TagUnitTest.java b/ruoyi-server/src/test/java/org/dromara/test/TagUnitTest.java
new file mode 100644
index 0000000..9f3a2a3
--- /dev/null
+++ b/ruoyi-server/src/test/java/org/dromara/test/TagUnitTest.java
@@ -0,0 +1,54 @@
+package org.dromara.test;
+
+import org.junit.jupiter.api.*;
+import org.springframework.boot.test.context.SpringBootTest;
+
+/**
+ * 标签单元测试案例
+ *
+ * @author pengles
+ */
+@SpringBootTest
+@DisplayName("标签单元测试案例")
+public class TagUnitTest {
+
+    @Tag("dev")
+    @DisplayName("测试 @Tag dev")
+    @Test
+    public void testTagDev() {
+        System.out.println("dev");
+    }
+
+    @Tag("prod")
+    @DisplayName("测试 @Tag prod")
+    @Test
+    public void testTagProd() {
+        System.out.println("prod");
+    }
+
+    @Tag("local")
+    @DisplayName("测试 @Tag local")
+    @Test
+    public void testTagLocal() {
+        System.out.println("local");
+    }
+
+    @Tag("exclude")
+    @DisplayName("测试 @Tag exclude")
+    @Test
+    public void testTagExclude() {
+        System.out.println("exclude");
+    }
+
+    @BeforeEach
+    public void testBeforeEach() {
+        System.out.println("@BeforeEach ==================");
+    }
+
+    @AfterEach
+    public void testAfterEach() {
+        System.out.println("@AfterEach ==================");
+    }
+
+
+}
diff --git a/script/bin/ry.bat b/script/bin/ry.bat
new file mode 100644
index 0000000..756f71c
--- /dev/null
+++ b/script/bin/ry.bat
@@ -0,0 +1,68 @@
+rem 使用者应根据自身平台编码自行转换 防止乱码 例如 win使用gbk编码
+@echo off
+
+rem jar平级目录
+set AppName=ruoyi-server.jar
+
+rem JVM参数
+set JVM_OPTS="-Dname=%AppName%  -Duser.timezone=Asia/Shanghai -Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError -XX:+UseZGC"
+
+
+ECHO.
+	ECHO.  [1] 启动%AppName%
+	ECHO.  [2] 关闭%AppName%
+	ECHO.  [3] 重启%AppName%
+	ECHO.  [4] 启动状态 %AppName%
+	ECHO.  [5] 退 出
+ECHO.
+
+ECHO.请输入选择项目的序号:
+set /p ID=
+	IF "%id%"=="1" GOTO start
+	IF "%id%"=="2" GOTO stop
+	IF "%id%"=="3" GOTO restart
+	IF "%id%"=="4" GOTO status
+	IF "%id%"=="5" EXIT
+PAUSE
+:start
+    for /f "usebackq tokens=1-2" %%a in (`jps -l ^| findstr %AppName%`) do (
+		set pid=%%a
+		set image_name=%%b
+	)
+	if  defined pid (
+		echo %%is running
+		PAUSE
+	)
+
+start javaw %JVM_OPTS% -jar %AppName%
+
+echo  starting……
+echo  Start %AppName% success...
+goto:eof
+
+rem 函数stop通过jps命令查找pid并结束进程
+:stop
+	for /f "usebackq tokens=1-2" %%a in (`jps -l ^| findstr %AppName%`) do (
+		set pid=%%a
+		set image_name=%%b
+	)
+	if not defined pid (echo process %AppName% does not exists) else (
+		echo prepare to kill %image_name%
+		echo start kill %pid% ...
+		rem 根据进程ID，kill进程
+		taskkill /f /pid %pid%
+	)
+goto:eof
+:restart
+	call :stop
+    call :start
+goto:eof
+:status
+	for /f "usebackq tokens=1-2" %%a in (`jps -l ^| findstr %AppName%`) do (
+		set pid=%%a
+		set image_name=%%b
+	)
+	if not defined pid (echo process %AppName% is dead ) else (
+		echo %image_name% is running
+	)
+goto:eof
diff --git a/script/bin/ry.sh b/script/bin/ry.sh
new file mode 100644
index 0000000..93398df
--- /dev/null
+++ b/script/bin/ry.sh
@@ -0,0 +1,86 @@
+#!/bin/sh
+# ./ry.sh start 启动 stop 停止 restart 重启 status 状态
+AppName=ruoyi-server.jar
+
+# JVM参数
+JVM_OPTS="-Dname=$AppName  -Duser.timezone=Asia/Shanghai -Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError -XX:+UseZGC"
+APP_HOME=`pwd`
+LOG_PATH=$APP_HOME/logs/$AppName.log
+
+if [ "$1" = "" ];
+then
+    echo -e "\033[0;31m 未输入操作名 \033[0m  \033[0;34m {start|stop|restart|status} \033[0m"
+    exit 1
+fi
+
+if [ "$AppName" = "" ];
+then
+    echo -e "\033[0;31m 未输入应用名 \033[0m"
+    exit 1
+fi
+
+function start()
+{
+    PID=`ps -ef |grep java|grep $AppName|grep -v grep|awk '{print $2}'`
+
+    if [ x"$PID" != x"" ]; then
+        echo "$AppName is running..."
+    else
+        nohup java $JVM_OPTS -jar $AppName > /dev/null 2>&1 &
+        echo "Start $AppName success..."
+    fi
+}
+
+function stop()
+{
+    echo "Stop $AppName"
+
+    PID=""
+    query(){
+        PID=`ps -ef |grep java|grep $AppName|grep -v grep|awk '{print $2}'`
+    }
+
+    query
+    if [ x"$PID" != x"" ]; then
+        kill -TERM $PID
+        echo "$AppName (pid:$PID) exiting..."
+        while [ x"$PID" != x"" ]
+        do
+            sleep 1
+            query
+        done
+        echo "$AppName exited."
+    else
+        echo "$AppName already stopped."
+    fi
+}
+
+function restart()
+{
+    stop
+    sleep 2
+    start
+}
+
+function status()
+{
+    PID=`ps -ef |grep java|grep $AppName|grep -v grep|wc -l`
+    if [ $PID != 0 ];then
+        echo "$AppName is running..."
+    else
+        echo "$AppName is not running..."
+    fi
+}
+
+case $1 in
+    start)
+    start;;
+    stop)
+    stop;;
+    restart)
+    restart;;
+    status)
+    status;;
+    *)
+
+esac
diff --git a/script/docker/database.yml b/script/docker/database.yml
new file mode 100644
index 0000000..6034b39
--- /dev/null
+++ b/script/docker/database.yml
@@ -0,0 +1,59 @@
+services:
+  # 此镜像仅用于测试 正式环境需自行安装数据库
+  # SID: XE user: system password: oracle
+  oracle:
+    image: tekintian/oracle12c:latest
+    container_name: oracle
+    environment:
+      # 时区上海
+      TZ: Asia/Shanghai
+      DBCA_TOTAL_MEMORY: 16192
+    ports:
+      - "18080:8080"
+      - "1521:1521"
+    volumes:
+      # 数据挂载
+      - "/docker/oracle/data:/u01/app/oracle"
+    network_mode: "host"
+
+  # 此镜像仅用于测试 正式环境需自行安装数据库
+  sqlserver:
+    image: mcr.microsoft.com/mssql/server:2017-latest
+    container_name: sqlserver
+    environment:
+      # 时区上海
+      TZ: Asia/Shanghai
+      ACCEPT_EULA: "Y"
+      SA_PASSWORD: "Ruoyi@123"
+    ports:
+      - "1433:1433"
+    volumes:
+      # 数据挂载
+      - "/docker/sqlserver/data:/var/opt/mssql"
+    network_mode: "host"
+
+  postgres:
+    image: postgres:14.2
+    container_name: postgres
+    environment:
+      POSTGRES_USER: root
+      POSTGRES_PASSWORD: root
+      POSTGRES_DB: postgres
+    ports:
+      - "5432:5432"
+    volumes:
+      - /docker/postgres/data:/var/lib/postgresql/data
+    network_mode: "host"
+
+  postgres13:
+    image: postgres:13.6
+    container_name: postgres13
+    environment:
+      POSTGRES_USER: root
+      POSTGRES_PASSWORD: root
+      POSTGRES_DB: postgres
+    ports:
+      - "5433:5432"
+    volumes:
+      - /docker/postgres13/data:/var/lib/postgresql/data
+    network_mode: "host"
diff --git a/script/docker/docker-compose.yml b/script/docker/docker-compose.yml
new file mode 100644
index 0000000..98be9e1
--- /dev/null
+++ b/script/docker/docker-compose.yml
@@ -0,0 +1,157 @@
+services:
+  mysql:
+    image: mysql:8.0.42
+    container_name: mysql
+    environment:
+      # 时区上海
+      TZ: Asia/Shanghai
+      # root 密码
+      MYSQL_ROOT_PASSWORD: root
+      # 初始化数据库(后续的初始化sql会在这个库执行)
+      MYSQL_DATABASE: ry-vue
+    ports:
+      - "3306:3306"
+    volumes:
+      # 数据挂载
+      - /docker/mysql/data/:/var/lib/mysql/
+      # 配置挂载
+      - /docker/mysql/conf/:/etc/mysql/conf.d/
+    command:
+      # 将mysql8.0默认密码策略 修改为 原先 策略 (mysql8.0对其默认策略做了更改 会导致密码无法匹配)
+      --default-authentication-plugin=mysql_native_password
+      --character-set-server=utf8mb4
+      --collation-server=utf8mb4_general_ci
+      --explicit_defaults_for_timestamp=true
+      --lower_case_table_names=1
+    privileged: true
+    network_mode: "host"
+
+  nginx-web:
+    image: nginx:1.23.4
+    container_name: nginx-web
+    environment:
+      # 时区上海
+      TZ: Asia/Shanghai
+    ports:
+      - "80:80"
+      - "443:443"
+    volumes:
+      # 证书映射
+      - /docker/nginx/cert:/etc/nginx/cert
+      # 配置文件映射
+      - /docker/nginx/conf/nginx.conf:/etc/nginx/nginx.conf
+      # 页面目录
+      - /docker/nginx/html:/usr/share/nginx/html
+      # 日志目录
+      - /docker/nginx/log:/var/log/nginx
+    privileged: true
+    network_mode: "host"
+
+  redis:
+    image: redis:7.2.8
+    container_name: redis
+    ports:
+      - "6379:6379"
+    environment:
+      # 时区上海
+      TZ: Asia/Shanghai
+    volumes:
+      # 配置文件
+      - /docker/redis/conf:/redis/config:rw
+      # 数据文件
+      - /docker/redis/data/:/redis/data/:rw
+    command: "redis-server /redis/config/redis.conf"
+    privileged: true
+    network_mode: "host"
+
+  minio:
+    # minio 最后一个未阉割版本 不能再进行升级 在往上的版本功能被阉割
+    image: minio/minio:RELEASE.2025-04-22T22-12-26Z
+    container_name: minio
+    ports:
+      # api 端口
+      - "9000:9000"
+      # 控制台端口
+      - "9001:9001"
+    environment:
+      # 时区上海
+      TZ: Asia/Shanghai
+      # 管理后台用户名
+      MINIO_ROOT_USER: ruoyi
+      # 管理后台密码，最小8个字符
+      MINIO_ROOT_PASSWORD: ruoyi123
+      # https需要指定域名
+      #MINIO_SERVER_URL: "https://xxx.com:9000"
+      #MINIO_BROWSER_REDIRECT_URL: "https://xxx.com:9001"
+      # 开启压缩 on 开启 off 关闭
+      MINIO_COMPRESS: "off"
+      # 扩展名 .pdf,.doc 为空 所有类型均压缩
+      MINIO_COMPRESS_EXTENSIONS: ""
+      # mime 类型 application/pdf 为空 所有类型均压缩
+      MINIO_COMPRESS_MIME_TYPES: ""
+    volumes:
+      # 映射当前目录下的data目录至容器内/data目录
+      - /docker/minio/data:/data
+      # 映射配置目录
+      - /docker/minio/config:/root/.minio/
+    command: server --address ':9000' --console-address ':9001' /data  # 指定容器中的目录 /data
+    privileged: true
+    network_mode: "host"
+
+  ruoyi-server1:
+    image: ruoyi/ruoyi-server:5.4.1
+    container_name: ruoyi-server1
+    environment:
+      # 时区上海
+      TZ: Asia/Shanghai
+      SERVER_PORT: 8080
+      SNAIL_PORT: 28080
+    volumes:
+      # 配置文件
+      - /docker/server1/logs/:/ruoyi/server/logs/
+      # skywalking 探针
+#      - /docker/skywalking/agent/:/ruoyi/skywalking/agent
+    privileged: true
+    network_mode: "host"
+
+  ruoyi-server2:
+    image: ruoyi/ruoyi-server:5.4.1
+    container_name: ruoyi-server2
+    environment:
+      # 时区上海
+      TZ: Asia/Shanghai
+      SERVER_PORT: 8081
+      SNAIL_PORT: 28081
+    volumes:
+      # 配置文件
+      - /docker/server2/logs/:/ruoyi/server/logs/
+      # skywalking 探针
+#      - /docker/skywalking/agent/:/ruoyi/skywalking/agent
+    privileged: true
+    network_mode: "host"
+
+  ruoyi-monitor-admin:
+    image: ruoyi/ruoyi-monitor-admin:5.4.1
+    container_name: ruoyi-monitor-admin
+    environment:
+      # 时区上海
+      TZ: Asia/Shanghai
+    volumes:
+      # 配置文件
+      - /docker/monitor/logs/:/ruoyi/monitor/logs
+    privileged: true
+    network_mode: "host"
+
+  ruoyi-snailjob-server:
+    image: ruoyi/ruoyi-snailjob-server:5.4.1
+    container_name: ruoyi-snailjob-server
+    environment:
+      # 时区上海
+      TZ: Asia/Shanghai
+    ports:
+      - "8800:8800"
+      - "17888:17888"
+    volumes:
+      - /docker/snailjob/logs/:/ruoyi/snailjob/logs
+    privileged: true
+    network_mode: "host"
diff --git a/script/docker/nginx/conf/nginx.conf b/script/docker/nginx/conf/nginx.conf
new file mode 100644
index 0000000..4b9b179
--- /dev/null
+++ b/script/docker/nginx/conf/nginx.conf
@@ -0,0 +1,123 @@
+worker_processes  1;
+
+error_log  /var/log/nginx/error.log warn;
+pid        /var/run/nginx.pid;
+
+events {
+    worker_connections  1024;
+}
+
+http {
+    include       mime.types;
+    default_type  application/octet-stream;
+    sendfile        on;
+    keepalive_timeout  65;
+    # 限制body大小
+    client_max_body_size 100m;
+    # 开启静态资源压缩
+    gzip_static on;
+
+    log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
+                          '$status $body_bytes_sent "$http_referer" '
+                          '"$http_user_agent" "$http_x_forwarded_for"';
+
+    access_log  /var/log/nginx/access.log  main;
+
+    upstream server {
+        ip_hash;
+        server 127.0.0.1:8080;
+        server 127.0.0.1:8081;
+    }
+
+    upstream monitor-admin {
+        server 127.0.0.1:9090;
+    }
+
+    upstream snailjob-server {
+        server 127.0.0.1:8800;
+    }
+
+    server {
+        listen       80;
+        server_name  localhost;
+
+        # https配置参考 start
+        #listen       443 ssl;
+
+        # 证书直接存放 /docker/nginx/cert/ 目录下即可 更改证书名称即可 无需更改证书路径
+        #ssl on;
+        #ssl_certificate      /etc/nginx/cert/xxx.local.crt; # /etc/nginx/cert/ 为docker映射路径 不允许更改
+        #ssl_certificate_key  /etc/nginx/cert/xxx.local.key; # /etc/nginx/cert/ 为docker映射路径 不允许更改
+        #ssl_session_timeout 5m;
+        #ssl_ciphers ECDHE-RSA-AES128-GCM-SHA256:ECDHE:ECDH:AES:HIGH:!NULL:!aNULL:!MD5:!ADH:!RC4;
+        #ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
+        #ssl_prefer_server_ciphers on;
+        # https配置参考 end
+
+        # 演示环境配置 拦截除 GET POST 之外的所有请求
+        # if ($request_method !~* GET|POST) {
+        #     rewrite  ^/(.*)$  /403;
+        # }
+
+        # location = /403 {
+        #     default_type application/json;
+        #     return 200 '{"msg":"演示模式，不允许操作","code":500}';
+        # }
+
+        # 限制外网访问内网 actuator 相关路径
+        location ~ ^(/[^/]*)?/actuator.*(/.*)?$ {
+            return 403;
+        }
+
+        location / {
+            root   /usr/share/nginx/html; # docker映射路径 不允许更改
+            try_files $uri $uri/ /index.html;
+            index  index.html index.htm;
+        }
+
+        location /prod-api/ {
+            proxy_set_header Host $http_host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header REMOTE-HOST $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_read_timeout 86400s;
+            # sse 与 websocket参数
+            proxy_http_version 1.1;
+            proxy_set_header Upgrade $http_upgrade;
+            proxy_set_header Connection "upgrade";
+            proxy_buffering off;
+            proxy_cache off;
+            proxy_pass http://server/;
+        }
+
+        # https 会拦截内链所有的 http 请求 造成功能无法使用
+        # 解决方案1 将 admin 服务 也配置成 https
+        # 解决方案2 将菜单配置为外链访问 走独立页面 http 访问
+        location /admin/ {
+            proxy_set_header Host $http_host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header REMOTE-HOST $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_pass http://monitor-admin/admin/;
+        }
+
+        location /snail-job/ {
+            proxy_set_header Host $http_host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header REMOTE-HOST $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            # sse 与 websocket参数
+            proxy_http_version 1.1;
+            proxy_set_header Upgrade $http_upgrade;
+            proxy_set_header Connection "upgrade";
+            proxy_buffering off;
+            proxy_cache off;
+            proxy_pass http://snailjob-server/snail-job/;
+        }
+
+        error_page   500 502 503 504  /50x.html;
+        location = /50x.html {
+            root   html;
+        }
+    }
+}
diff --git a/script/docker/redis/conf/redis.conf b/script/docker/redis/conf/redis.conf
new file mode 100644
index 0000000..72255c6
--- /dev/null
+++ b/script/docker/redis/conf/redis.conf
@@ -0,0 +1,28 @@
+# redis 密码
+requirepass ruoyi123
+
+# key 监听器配置
+# notify-keyspace-events Ex
+
+# 配置持久化文件存储路径
+dir /redis/data
+# 配置rdb
+# 15分钟内有至少1个key被更改则进行快照
+save 900 1
+# 5分钟内有至少10个key被更改则进行快照
+save 300 10
+# 1分钟内有至少10000个key被更改则进行快照
+save 60 10000
+# 开启压缩
+rdbcompression yes
+# rdb文件名 用默认的即可
+dbfilename dump.rdb
+
+# 开启aof
+appendonly yes
+# 文件名
+appendfilename "appendonly.aof"
+# 持久化策略,no:不同步,everysec:每秒一次,always:总是同步,速度比较慢
+# appendfsync always
+appendfsync everysec
+# appendfsync no
diff --git a/script/docker/redis/data/README.md b/script/docker/redis/data/README.md
new file mode 100644
index 0000000..fbc5474
--- /dev/null
+++ b/script/docker/redis/data/README.md
@@ -0,0 +1 @@
+数据目录 请执行 `chmod 777 /docker/redis/data` 赋予读写权限 否则将无法写入数据
\ No newline at end of file
diff --git a/script/leave/leave1.json b/script/leave/leave1.json
new file mode 100644
index 0000000..0ffdeeb
--- /dev/null
+++ b/script/leave/leave1.json
@@ -0,0 +1,75 @@
+{
+  "flowCode" : "leave1",
+  "flowName" : "请假申请-普通",
+  "category" : "100",
+  "version" : "1",
+  "formCustom" : "N",
+  "formPath" : "/workflow/leaveEdit/index",
+  "nodeList" : [ {
+    "nodeType" : 0,
+    "nodeCode" : "d5ee3ddf-3968-4379-a86f-9ceabde5faac",
+    "nodeName" : "开始",
+    "nodeRatio" : 0.000,
+    "coordinate" : "200,200|200,200",
+    "formCustom" : "N",
+    "ext" : "[]",
+    "skipList" : [ {
+      "nowNodeCode" : "d5ee3ddf-3968-4379-a86f-9ceabde5faac",
+      "nextNodeCode" : "dd515cdd-59f6-446f-94ca-25ca062afb42",
+      "skipType" : "PASS",
+      "coordinate" : "220,200;310,200"
+    } ]
+  }, {
+    "nodeType" : 1,
+    "nodeCode" : "dd515cdd-59f6-446f-94ca-25ca062afb42",
+    "nodeName" : "申请人",
+    "nodeRatio" : 0.000,
+    "coordinate" : "360,200|360,200",
+    "formCustom" : "N",
+    "ext" : "[]",
+    "skipList" : [ {
+      "nowNodeCode" : "dd515cdd-59f6-446f-94ca-25ca062afb42",
+      "nextNodeCode" : "78fa8e5b-e809-44ed-978a-41092409ebcf",
+      "skipType" : "PASS",
+      "coordinate" : "410,200;490,200"
+    } ]
+  }, {
+    "nodeType" : 1,
+    "nodeCode" : "78fa8e5b-e809-44ed-978a-41092409ebcf",
+    "nodeName" : "组长",
+    "permissionFlag" : "role:1",
+    "nodeRatio" : 0.000,
+    "coordinate" : "540,200|540,200",
+    "formCustom" : "N",
+    "ext" : "[{\"code\":\"ButtonPermissionEnum\",\"value\":\"back,termination\"}]",
+    "skipList" : [ {
+      "nowNodeCode" : "78fa8e5b-e809-44ed-978a-41092409ebcf",
+      "nextNodeCode" : "a8abf15f-b83e-428a-86cc-033555ea9bbe",
+      "skipType" : "PASS",
+      "coordinate" : "590,200;670,200"
+    } ]
+  }, {
+    "nodeType" : 1,
+    "nodeCode" : "a8abf15f-b83e-428a-86cc-033555ea9bbe",
+    "nodeName" : "部门主管",
+    "permissionFlag" : "role:3@@role:4",
+    "nodeRatio" : 0.000,
+    "coordinate" : "720,200|720,200",
+    "formCustom" : "N",
+    "ext" : "[{\"code\":\"ButtonPermissionEnum\",\"value\":\"back,termination\"}]",
+    "skipList" : [ {
+      "nowNodeCode" : "a8abf15f-b83e-428a-86cc-033555ea9bbe",
+      "nextNodeCode" : "8b82b7d7-8660-455e-b880-d6d22ea3eb6d",
+      "skipType" : "PASS",
+      "coordinate" : "770,200;880,200"
+    } ]
+  }, {
+    "nodeType" : 2,
+    "nodeCode" : "8b82b7d7-8660-455e-b880-d6d22ea3eb6d",
+    "nodeName" : "结束",
+    "nodeRatio" : 0.000,
+    "coordinate" : "900,200|900,200",
+    "formCustom" : "N",
+    "ext" : "[]"
+  } ]
+}
diff --git a/script/leave/leave2.json b/script/leave/leave2.json
new file mode 100644
index 0000000..7bbdbaa
--- /dev/null
+++ b/script/leave/leave2.json
@@ -0,0 +1,111 @@
+{
+  "flowCode" : "leave2",
+  "flowName" : "请假申请-排他网关",
+  "category" : "100",
+  "version" : "1",
+  "formCustom" : "N",
+  "formPath" : "/workflow/leaveEdit/index",
+  "nodeList" : [ {
+    "nodeType" : 0,
+    "nodeCode" : "cef3895c-f7d8-4598-8bf3-8ec2ef6ce84a",
+    "nodeName" : "开始",
+    "nodeRatio" : 0.000,
+    "coordinate" : "300,240|300,240",
+    "formCustom" : "N",
+    "ext" : "[]",
+    "skipList" : [ {
+      "nowNodeCode" : "cef3895c-f7d8-4598-8bf3-8ec2ef6ce84a",
+      "nextNodeCode" : "fdcae93b-b69c-498a-b231-09255e74bcbd",
+      "skipType" : "PASS",
+      "coordinate" : "320,240;390,240"
+    } ]
+  }, {
+    "nodeType" : 1,
+    "nodeCode" : "fdcae93b-b69c-498a-b231-09255e74bcbd",
+    "nodeName" : "申请人",
+    "nodeRatio" : 0.000,
+    "coordinate" : "440,240|440,240",
+    "formCustom" : "N",
+    "ext" : "[]",
+    "skipList" : [ {
+      "nowNodeCode" : "fdcae93b-b69c-498a-b231-09255e74bcbd",
+      "nextNodeCode" : "7b8c7ead-7dc8-4951-a7f3-f0c41995909e",
+      "skipType" : "PASS",
+      "coordinate" : "490,240;535,240"
+    } ]
+  }, {
+    "nodeType" : 3,
+    "nodeCode" : "7b8c7ead-7dc8-4951-a7f3-f0c41995909e",
+    "nodeRatio" : 0.000,
+    "coordinate" : "560,240",
+    "formCustom" : "N",
+    "ext" : "[]",
+    "skipList" : [ {
+      "nowNodeCode" : "7b8c7ead-7dc8-4951-a7f3-f0c41995909e",
+      "nextNodeCode" : "b3528155-dcb7-4445-bbdf-3d00e3499e86",
+      "skipType" : "PASS",
+      "skipCondition" : "le@@leaveDays|2",
+      "coordinate" : "560,265;560,320;670,320"
+    }, {
+      "nowNodeCode" : "7b8c7ead-7dc8-4951-a7f3-f0c41995909e",
+      "nextNodeCode" : "5ed2362b-fc0c-4d52-831f-95208b830605",
+      "skipName" : "大于两天",
+      "skipType" : "PASS",
+      "skipCondition" : "gt@@leaveDays|2",
+      "coordinate" : "560,215;560,160;670,160|560,187"
+    } ]
+  }, {
+    "nodeType" : 1,
+    "nodeCode" : "b3528155-dcb7-4445-bbdf-3d00e3499e86",
+    "nodeName" : "组长",
+    "permissionFlag" : "3@@4",
+    "nodeRatio" : 0.000,
+    "coordinate" : "720,320|720,320",
+    "formCustom" : "N",
+    "ext" : "[{\"code\":\"ButtonPermissionEnum\",\"value\":\"back,termination\"}]",
+    "skipList" : [ {
+      "nowNodeCode" : "b3528155-dcb7-4445-bbdf-3d00e3499e86",
+      "nextNodeCode" : "c9fa6d7d-2a74-4e78-b947-0cad8a6af869",
+      "skipType" : "PASS",
+      "coordinate" : "770,320;860,320;860,280"
+    } ]
+  }, {
+    "nodeType" : 1,
+    "nodeCode" : "c9fa6d7d-2a74-4e78-b947-0cad8a6af869",
+    "nodeName" : "总经理",
+    "permissionFlag" : "role:1",
+    "nodeRatio" : 0.000,
+    "coordinate" : "860,240|860,240",
+    "formCustom" : "N",
+    "ext" : "[]",
+    "skipList" : [ {
+      "nowNodeCode" : "c9fa6d7d-2a74-4e78-b947-0cad8a6af869",
+      "nextNodeCode" : "40aa65fd-0712-4d23-b6f7-d0432b920fd1",
+      "skipType" : "PASS",
+      "coordinate" : "910,240;980,240"
+    } ]
+  }, {
+    "nodeType" : 2,
+    "nodeCode" : "40aa65fd-0712-4d23-b6f7-d0432b920fd1",
+    "nodeName" : "结束",
+    "nodeRatio" : 0.000,
+    "coordinate" : "1000,240|1000,240",
+    "formCustom" : "N",
+    "ext" : "[]"
+  }, {
+    "nodeType" : 1,
+    "nodeCode" : "5ed2362b-fc0c-4d52-831f-95208b830605",
+    "nodeName" : "部门领导",
+    "permissionFlag" : "role:1",
+    "nodeRatio" : 0.000,
+    "coordinate" : "720,160|720,160",
+    "formCustom" : "N",
+    "ext" : "[{\"code\":\"ButtonPermissionEnum\",\"value\":\"back,termination\"}]",
+    "skipList" : [ {
+      "nowNodeCode" : "5ed2362b-fc0c-4d52-831f-95208b830605",
+      "nextNodeCode" : "c9fa6d7d-2a74-4e78-b947-0cad8a6af869",
+      "skipType" : "PASS",
+      "coordinate" : "770,160;860,160;860,200"
+    } ]
+  } ]
+}
diff --git a/script/leave/leave3.json b/script/leave/leave3.json
new file mode 100644
index 0000000..bb22d42
--- /dev/null
+++ b/script/leave/leave3.json
@@ -0,0 +1,121 @@
+{
+  "flowCode" : "leave3",
+  "flowName" : "请假申请-并行网关",
+  "category" : "100",
+  "version" : "1",
+  "formCustom" : "N",
+  "formPath" : "/workflow/leaveEdit/index",
+  "nodeList" : [ {
+    "nodeType" : 0,
+    "nodeCode" : "a80ecf9f-f465-4ae5-a429-e30ec5d0f957",
+    "nodeName" : "开始",
+    "nodeRatio" : 0.000,
+    "coordinate" : "380,220|380,220",
+    "formCustom" : "N",
+    "ext" : "[]",
+    "skipList" : [ {
+      "nowNodeCode" : "a80ecf9f-f465-4ae5-a429-e30ec5d0f957",
+      "nextNodeCode" : "b7bbb571-06de-455c-8083-f83c07bf0b99",
+      "skipType" : "PASS",
+      "coordinate" : "400,220;470,220"
+    } ]
+  }, {
+    "nodeType" : 1,
+    "nodeCode" : "b7bbb571-06de-455c-8083-f83c07bf0b99",
+    "nodeName" : "申请人",
+    "nodeRatio" : 0.000,
+    "coordinate" : "520,220|520,220",
+    "formCustom" : "N",
+    "ext" : "[]",
+    "skipList" : [ {
+      "nowNodeCode" : "b7bbb571-06de-455c-8083-f83c07bf0b99",
+      "nextNodeCode" : "84d7ed24-bb44-4ba1-bf1f-e6f5092d3f0a",
+      "skipType" : "PASS",
+      "coordinate" : "570,220;655,220"
+    } ]
+  }, {
+    "nodeType" : 4,
+    "nodeCode" : "84d7ed24-bb44-4ba1-bf1f-e6f5092d3f0a",
+    "nodeRatio" : 0.000,
+    "coordinate" : "680,220",
+    "formCustom" : "N",
+    "ext" : "[]",
+    "skipList" : [ {
+      "nowNodeCode" : "84d7ed24-bb44-4ba1-bf1f-e6f5092d3f0a",
+      "nextNodeCode" : "4b7743cd-940c-431b-926f-e7b614fbf1fe",
+      "skipType" : "PASS",
+      "coordinate" : "680,195;680,140;750,140"
+    }, {
+      "nowNodeCode" : "84d7ed24-bb44-4ba1-bf1f-e6f5092d3f0a",
+      "nextNodeCode" : "762cb975-37d8-4276-b6db-79a4c3606394",
+      "skipType" : "PASS",
+      "coordinate" : "680,245;680,300;750,300"
+    } ]
+  }, {
+    "nodeType" : 1,
+    "nodeCode" : "4b7743cd-940c-431b-926f-e7b614fbf1fe",
+    "nodeName" : "市场部",
+    "permissionFlag" : "role:1",
+    "nodeRatio" : 0.000,
+    "coordinate" : "800,140|800,140",
+    "formCustom" : "N",
+    "ext" : "[]",
+    "skipList" : [ {
+      "nowNodeCode" : "4b7743cd-940c-431b-926f-e7b614fbf1fe",
+      "nextNodeCode" : "b66b6563-f9fe-41cc-a782-f7837bb6f3d2",
+      "skipType" : "PASS",
+      "coordinate" : "850,140;920,140;920,195"
+    } ]
+  }, {
+    "nodeType" : 4,
+    "nodeCode" : "b66b6563-f9fe-41cc-a782-f7837bb6f3d2",
+    "nodeRatio" : 0.000,
+    "coordinate" : "920,220",
+    "formCustom" : "N",
+    "ext" : "[]",
+    "skipList" : [ {
+      "nowNodeCode" : "b66b6563-f9fe-41cc-a782-f7837bb6f3d2",
+      "nextNodeCode" : "23e7429e-2b47-4431-b93e-40db7c431ce6",
+      "skipType" : "PASS",
+      "coordinate" : "945,220;975,220;975,220;960,220;960,220;990,220"
+    } ]
+  }, {
+    "nodeType" : 1,
+    "nodeCode" : "23e7429e-2b47-4431-b93e-40db7c431ce6",
+    "nodeName" : "CEO",
+    "permissionFlag" : "1",
+    "nodeRatio" : 0.000,
+    "coordinate" : "1040,220|1040,220",
+    "formCustom" : "N",
+    "ext" : "[]",
+    "skipList" : [ {
+      "nowNodeCode" : "23e7429e-2b47-4431-b93e-40db7c431ce6",
+      "nextNodeCode" : "f5ace37f-5a5e-4e64-a6f6-913ab9a71cd1",
+      "skipType" : "PASS",
+      "coordinate" : "1090,220;1140,220"
+    } ]
+  }, {
+    "nodeType" : 2,
+    "nodeCode" : "f5ace37f-5a5e-4e64-a6f6-913ab9a71cd1",
+    "nodeName" : "结束",
+    "nodeRatio" : 0.000,
+    "coordinate" : "1160,220|1160,220",
+    "formCustom" : "N",
+    "ext" : "[]"
+  }, {
+    "nodeType" : 1,
+    "nodeCode" : "762cb975-37d8-4276-b6db-79a4c3606394",
+    "nodeName" : "综合部",
+    "permissionFlag" : "role:3@@role:4",
+    "nodeRatio" : 0.000,
+    "coordinate" : "800,300|800,300",
+    "formCustom" : "N",
+    "ext" : "[]",
+    "skipList" : [ {
+      "nowNodeCode" : "762cb975-37d8-4276-b6db-79a4c3606394",
+      "nextNodeCode" : "b66b6563-f9fe-41cc-a782-f7837bb6f3d2",
+      "skipType" : "PASS",
+      "coordinate" : "850,300;920,300;920,245"
+    } ]
+  } ]
+}
diff --git a/script/leave/leave4.json b/script/leave/leave4.json
new file mode 100644
index 0000000..50968f8
--- /dev/null
+++ b/script/leave/leave4.json
@@ -0,0 +1,90 @@
+{
+  "flowCode" : "leave4",
+  "flowName" : "请假申请-会签",
+  "category" : "100",
+  "version" : "1",
+  "formCustom" : "N",
+  "formPath" : "/workflow/leaveEdit/index",
+  "nodeList" : [ {
+    "nodeType" : 0,
+    "nodeCode" : "9ce8bf00-f25b-4fc6-91b8-827082fc4876",
+    "nodeName" : "开始",
+    "nodeRatio" : 0.000,
+    "coordinate" : "320,240|320,240",
+    "formCustom" : "N",
+    "ext" : "[]",
+    "skipList" : [ {
+      "nowNodeCode" : "9ce8bf00-f25b-4fc6-91b8-827082fc4876",
+      "nextNodeCode" : "e90b98ef-35b4-410c-a663-bae8b7624b9f",
+      "skipType" : "PASS",
+      "coordinate" : "340,240;410,240"
+    } ]
+  }, {
+    "nodeType" : 1,
+    "nodeCode" : "e90b98ef-35b4-410c-a663-bae8b7624b9f",
+    "nodeName" : "申请人",
+    "nodeRatio" : 0.000,
+    "coordinate" : "460,240|460,240",
+    "formCustom" : "N",
+    "ext" : "[]",
+    "skipList" : [ {
+      "nowNodeCode" : "e90b98ef-35b4-410c-a663-bae8b7624b9f",
+      "nextNodeCode" : "768b5b1a-6726-4d67-8853-4cc70d5b1045",
+      "skipType" : "PASS",
+      "coordinate" : "510,240;590,240"
+    } ]
+  }, {
+    "nodeType" : 1,
+    "nodeCode" : "768b5b1a-6726-4d67-8853-4cc70d5b1045",
+    "nodeName" : "百分之60通过",
+    "permissionFlag" : "${userList}",
+    "nodeRatio" : 60.000,
+    "coordinate" : "640,240|640,240",
+    "formCustom" : "N",
+    "ext" : "[]",
+    "skipList" : [ {
+      "nowNodeCode" : "768b5b1a-6726-4d67-8853-4cc70d5b1045",
+      "nextNodeCode" : "2f9f2e21-9bcf-42a3-a07c-13037aad22d1",
+      "skipType" : "PASS",
+      "coordinate" : "690,240;770,240"
+    } ]
+  }, {
+    "nodeType" : 1,
+    "nodeCode" : "2f9f2e21-9bcf-42a3-a07c-13037aad22d1",
+    "nodeName" : "全部审批通过",
+    "permissionFlag" : "role:1@@role:3",
+    "nodeRatio" : 100.000,
+    "coordinate" : "820,240|820,240",
+    "formCustom" : "N",
+    "ext" : "[]",
+    "skipList" : [ {
+      "nowNodeCode" : "2f9f2e21-9bcf-42a3-a07c-13037aad22d1",
+      "nextNodeCode" : "27461e01-3d9f-4530-8fe3-bd5ec7f9571f",
+      "skipType" : "PASS",
+      "coordinate" : "870,240;950,240"
+    } ]
+  }, {
+    "nodeType" : 1,
+    "nodeCode" : "27461e01-3d9f-4530-8fe3-bd5ec7f9571f",
+    "nodeName" : "CEO",
+    "permissionFlag" : "1",
+    "nodeRatio" : 0.000,
+    "coordinate" : "1000,240|1000,240",
+    "formCustom" : "N",
+    "ext" : "[]",
+    "skipList" : [ {
+      "nowNodeCode" : "27461e01-3d9f-4530-8fe3-bd5ec7f9571f",
+      "nextNodeCode" : "b62b88c3-8d8d-4969-911e-2aaea219e7fc",
+      "skipType" : "PASS",
+      "coordinate" : "1050,240;1080,240;1080,240;1070,240;1070,240;1100,240"
+    } ]
+  }, {
+    "nodeType" : 2,
+    "nodeCode" : "b62b88c3-8d8d-4969-911e-2aaea219e7fc",
+    "nodeName" : "结束",
+    "nodeRatio" : 0.000,
+    "coordinate" : "1120,240|1120,240",
+    "formCustom" : "N",
+    "ext" : "[]"
+  } ]
+}
diff --git a/script/leave/leave5.json b/script/leave/leave5.json
new file mode 100644
index 0000000..a27b1de
--- /dev/null
+++ b/script/leave/leave5.json
@@ -0,0 +1,121 @@
+{
+  "flowCode" : "leave5",
+  "flowName" : "请假申请-并行会签网关",
+  "category" : "100",
+  "version" : "1",
+  "formCustom" : "N",
+  "formPath" : "/workflow/leaveEdit/index",
+  "nodeList" : [ {
+    "nodeType" : 0,
+    "nodeCode" : "ebebaf26-9cb6-497e-8119-4c9fed4c597c",
+    "nodeName" : "开始",
+    "nodeRatio" : 0.000,
+    "coordinate" : "300,220|300,220",
+    "formCustom" : "N",
+    "ext" : "[]",
+    "skipList" : [ {
+      "nowNodeCode" : "ebebaf26-9cb6-497e-8119-4c9fed4c597c",
+      "nextNodeCode" : "e1b04e96-dc81-4858-a309-2fe945d2f374",
+      "skipType" : "PASS",
+      "coordinate" : "320,220;350,220;350,220;340,220;340,220;370,220"
+    } ]
+  }, {
+    "nodeType" : 1,
+    "nodeCode" : "e1b04e96-dc81-4858-a309-2fe945d2f374",
+    "nodeName" : "申请人",
+    "nodeRatio" : 0.000,
+    "coordinate" : "420,220|420,220",
+    "formCustom" : "N",
+    "ext" : "[]",
+    "skipList" : [ {
+      "nowNodeCode" : "e1b04e96-dc81-4858-a309-2fe945d2f374",
+      "nextNodeCode" : "3e743f4f-51ca-41d4-8e94-21f5dd9b59c9",
+      "skipType" : "PASS",
+      "coordinate" : "470,220;535,220"
+    } ]
+  }, {
+    "nodeType" : 4,
+    "nodeCode" : "3e743f4f-51ca-41d4-8e94-21f5dd9b59c9",
+    "nodeRatio" : 0.000,
+    "coordinate" : "560,220",
+    "formCustom" : "N",
+    "ext" : "[]",
+    "skipList" : [ {
+      "nowNodeCode" : "3e743f4f-51ca-41d4-8e94-21f5dd9b59c9",
+      "nextNodeCode" : "c80f273e-1f17-4bd8-9ad1-04a4a94ea862",
+      "skipType" : "PASS",
+      "coordinate" : "560,245;560,320;650,320"
+    }, {
+      "nowNodeCode" : "3e743f4f-51ca-41d4-8e94-21f5dd9b59c9",
+      "nextNodeCode" : "1e3e8d3b-18ae-4d6c-a814-ce0d724adfa4",
+      "skipType" : "PASS",
+      "coordinate" : "560,195;560,120;650,120"
+    } ]
+  }, {
+    "nodeType" : 1,
+    "nodeCode" : "c80f273e-1f17-4bd8-9ad1-04a4a94ea862",
+    "nodeName" : "会签",
+    "permissionFlag" : "role:1@@role:3",
+    "nodeRatio" : 100.000,
+    "coordinate" : "700,320|700,320",
+    "formCustom" : "N",
+    "ext" : "[]",
+    "skipList" : [ {
+      "nowNodeCode" : "c80f273e-1f17-4bd8-9ad1-04a4a94ea862",
+      "nextNodeCode" : "1a20169e-3d82-4926-a151-e2daad28de1b",
+      "skipType" : "PASS",
+      "coordinate" : "750,320;860,320;860,245"
+    } ]
+  }, {
+    "nodeType" : 4,
+    "nodeCode" : "1a20169e-3d82-4926-a151-e2daad28de1b",
+    "nodeRatio" : 0.000,
+    "coordinate" : "860,220",
+    "formCustom" : "N",
+    "ext" : "[]",
+    "skipList" : [ {
+      "nowNodeCode" : "1a20169e-3d82-4926-a151-e2daad28de1b",
+      "nextNodeCode" : "7a8f0473-e409-442e-a843-5c2b813d00e9",
+      "skipType" : "PASS",
+      "coordinate" : "885,220;950,220"
+    } ]
+  }, {
+    "nodeType" : 1,
+    "nodeCode" : "7a8f0473-e409-442e-a843-5c2b813d00e9",
+    "nodeName" : "CEO",
+    "permissionFlag" : "1",
+    "nodeRatio" : 0.000,
+    "coordinate" : "1000,220|1000,220",
+    "formCustom" : "N",
+    "ext" : "[]",
+    "skipList" : [ {
+      "nowNodeCode" : "7a8f0473-e409-442e-a843-5c2b813d00e9",
+      "nextNodeCode" : "03c4d2bc-58b5-4408-a2e4-65afb046f169",
+      "skipType" : "PASS",
+      "coordinate" : "1050,220;1120,220"
+    } ]
+  }, {
+    "nodeType" : 2,
+    "nodeCode" : "03c4d2bc-58b5-4408-a2e4-65afb046f169",
+    "nodeName" : "结束",
+    "nodeRatio" : 0.000,
+    "coordinate" : "1140,220|1140,220",
+    "formCustom" : "N",
+    "ext" : "[]"
+  }, {
+    "nodeType" : 1,
+    "nodeCode" : "1e3e8d3b-18ae-4d6c-a814-ce0d724adfa4",
+    "nodeName" : "百分之60票签",
+    "permissionFlag" : "${userList}",
+    "nodeRatio" : 60.000,
+    "coordinate" : "700,120|700,120",
+    "formCustom" : "N",
+    "ext" : "[]",
+    "skipList" : [ {
+      "nowNodeCode" : "1e3e8d3b-18ae-4d6c-a814-ce0d724adfa4",
+      "nextNodeCode" : "1a20169e-3d82-4926-a151-e2daad28de1b",
+      "skipType" : "PASS",
+      "coordinate" : "750,120;860,120;860,195"
+    } ]
+  } ]
+}
diff --git a/script/leave/leave6.json b/script/leave/leave6.json
new file mode 100644
index 0000000..d21d9d2
--- /dev/null
+++ b/script/leave/leave6.json
@@ -0,0 +1,215 @@
+{
+  "flowCode" : "leave6",
+  "flowName" : "请假申请-排他并行会签",
+  "category" : "100",
+  "version" : "1",
+  "formCustom" : "N",
+  "formPath" : "/workflow/leaveEdit/index",
+  "nodeList" : [ {
+    "nodeType" : 0,
+    "nodeCode" : "122b89a5-7c6f-40a3-aa09-7a263f902054",
+    "nodeName" : "开始",
+    "nodeRatio" : 0.000,
+    "coordinate" : "240,300|240,300",
+    "formCustom" : "N",
+    "ext" : "[]",
+    "skipList" : [ {
+      "nowNodeCode" : "122b89a5-7c6f-40a3-aa09-7a263f902054",
+      "nextNodeCode" : "c25a0e86-fdd1-4f03-8e22-14db70389dbd",
+      "skipType" : "PASS",
+      "coordinate" : "260,300;350,300"
+    } ]
+  }, {
+    "nodeType" : 1,
+    "nodeCode" : "c25a0e86-fdd1-4f03-8e22-14db70389dbd",
+    "nodeName" : "申请人",
+    "nodeRatio" : 0.000,
+    "coordinate" : "400,300|400,300",
+    "formCustom" : "N",
+    "ext" : "[{\"code\":\"ButtonPermissionEnum\",\"value\":\"back,termination\"}]",
+    "skipList" : [ {
+      "nowNodeCode" : "c25a0e86-fdd1-4f03-8e22-14db70389dbd",
+      "nextNodeCode" : "07ecda1d-7a0a-47b5-8a91-6186c9473742",
+      "skipType" : "PASS",
+      "coordinate" : "450,300;510,300"
+    } ]
+  }, {
+    "nodeType" : 1,
+    "nodeCode" : "2bfa3919-78cf-4bc1-b59b-df463a4546f9",
+    "nodeName" : "副经理",
+    "permissionFlag" : "role:1@@role:3@@role:4",
+    "nodeRatio" : 0.000,
+    "coordinate" : "860,200|860,200",
+    "formCustom" : "N",
+    "ext" : "[{\"code\":\"ButtonPermissionEnum\",\"value\":\"back,termination\"}]",
+    "skipList" : [ {
+      "nowNodeCode" : "2bfa3919-78cf-4bc1-b59b-df463a4546f9",
+      "nextNodeCode" : "394e1cc8-b8b2-4189-9f81-44448e88ac32",
+      "skipType" : "PASS",
+      "coordinate" : "910,200;1000,200;1000,275"
+    } ]
+  }, {
+    "nodeType" : 1,
+    "nodeCode" : "ec17f60e-94e0-4d96-a3ce-3417e9d32d60",
+    "nodeName" : "组长",
+    "permissionFlag" : "1",
+    "nodeRatio" : 0.000,
+    "coordinate" : "860,400|860,400",
+    "formCustom" : "N",
+    "ext" : "[{\"code\":\"ButtonPermissionEnum\",\"value\":\"back,termination\"}]",
+    "skipList" : [ {
+      "nowNodeCode" : "ec17f60e-94e0-4d96-a3ce-3417e9d32d60",
+      "nextNodeCode" : "394e1cc8-b8b2-4189-9f81-44448e88ac32",
+      "skipType" : "PASS",
+      "coordinate" : "910,400;1000,400;1000,325"
+    } ]
+  }, {
+    "nodeType" : 1,
+    "nodeCode" : "07ecda1d-7a0a-47b5-8a91-6186c9473742",
+    "nodeName" : "副组长",
+    "permissionFlag" : "1",
+    "nodeRatio" : 0.000,
+    "coordinate" : "560,300|560,300",
+    "formCustom" : "N",
+    "ext" : "[{\"code\":\"ButtonPermissionEnum\",\"value\":\"back,termination,transfer,copy,pop\"}]",
+    "skipList" : [ {
+      "nowNodeCode" : "07ecda1d-7a0a-47b5-8a91-6186c9473742",
+      "nextNodeCode" : "48117e2c-6328-406b-b102-c4a9d115bb13",
+      "skipType" : "PASS",
+      "coordinate" : "610,300;675,300"
+    } ]
+  }, {
+    "nodeType" : 3,
+    "nodeCode" : "48117e2c-6328-406b-b102-c4a9d115bb13",
+    "nodeRatio" : 0.000,
+    "coordinate" : "700,300",
+    "formCustom" : "N",
+    "ext" : "[]",
+    "skipList" : [ {
+      "nowNodeCode" : "48117e2c-6328-406b-b102-c4a9d115bb13",
+      "nextNodeCode" : "2bfa3919-78cf-4bc1-b59b-df463a4546f9",
+      "skipName" : "大于两天",
+      "skipType" : "PASS",
+      "skipCondition" : "default@@${leaveDays > 2}",
+      "coordinate" : "700,275;700,200;810,200|700,237"
+    }, {
+      "nowNodeCode" : "48117e2c-6328-406b-b102-c4a9d115bb13",
+      "nextNodeCode" : "ec17f60e-94e0-4d96-a3ce-3417e9d32d60",
+      "skipType" : "PASS",
+      "skipCondition" : "spel@@#{@testLeaveServiceImpl.eval(#leaveDays)}",
+      "coordinate" : "700,325;700,400;810,400"
+    } ]
+  }, {
+    "nodeType" : 3,
+    "nodeCode" : "394e1cc8-b8b2-4189-9f81-44448e88ac32",
+    "nodeRatio" : 0.000,
+    "coordinate" : "1000,300",
+    "formCustom" : "N",
+    "ext" : "[]",
+    "skipList" : [ {
+      "nowNodeCode" : "394e1cc8-b8b2-4189-9f81-44448e88ac32",
+      "nextNodeCode" : "9c93a195-cff2-4e17-ab0a-a4f264191496",
+      "skipType" : "PASS",
+      "coordinate" : "1025,300;1130,300"
+    } ]
+  }, {
+    "nodeType" : 1,
+    "nodeCode" : "9c93a195-cff2-4e17-ab0a-a4f264191496",
+    "nodeName" : "经理会签",
+    "permissionFlag" : "1@@3",
+    "nodeRatio" : 100.000,
+    "coordinate" : "1180,300|1180,300",
+    "formCustom" : "N",
+    "ext" : "[{\"code\":\"ButtonPermissionEnum\",\"value\":\"back,termination,pop,addSign,subSign\"}]",
+    "skipList" : [ {
+      "nowNodeCode" : "9c93a195-cff2-4e17-ab0a-a4f264191496",
+      "nextNodeCode" : "a1a42056-afd1-4e90-88bc-36cbf5a66992",
+      "skipType" : "PASS",
+      "coordinate" : "1230,300;1315,300"
+    } ]
+  }, {
+    "nodeType" : 4,
+    "nodeCode" : "a1a42056-afd1-4e90-88bc-36cbf5a66992",
+    "nodeRatio" : 0.000,
+    "coordinate" : "1340,300",
+    "formCustom" : "N",
+    "ext" : "[]",
+    "skipList" : [ {
+      "nowNodeCode" : "a1a42056-afd1-4e90-88bc-36cbf5a66992",
+      "nextNodeCode" : "fcfdd9f6-f526-4c1a-b71d-88afa31aebc5",
+      "skipType" : "PASS",
+      "coordinate" : "1340,325;1340,400;1430,400"
+    }, {
+      "nowNodeCode" : "a1a42056-afd1-4e90-88bc-36cbf5a66992",
+      "nextNodeCode" : "350dfa0c-a77c-4efa-8527-10efa02d8be4",
+      "skipType" : "PASS",
+      "coordinate" : "1340,275;1340,200;1430,200"
+    } ]
+  }, {
+    "nodeType" : 1,
+    "nodeCode" : "350dfa0c-a77c-4efa-8527-10efa02d8be4",
+    "nodeName" : "总经理",
+    "permissionFlag" : "3@@1",
+    "nodeRatio" : 0.000,
+    "coordinate" : "1480,200|1480,200",
+    "formCustom" : "N",
+    "ext" : "[{\"code\":\"ButtonPermissionEnum\",\"value\":\"back,termination\"}]",
+    "skipList" : [ {
+      "nowNodeCode" : "350dfa0c-a77c-4efa-8527-10efa02d8be4",
+      "nextNodeCode" : "c36a46ef-04f9-463f-bad7-4b395c818519",
+      "skipType" : "PASS",
+      "coordinate" : "1530,200;1640,200;1640,275"
+    } ]
+  }, {
+    "nodeType" : 1,
+    "nodeCode" : "fcfdd9f6-f526-4c1a-b71d-88afa31aebc5",
+    "nodeName" : "副总经理",
+    "permissionFlag" : "1@@3",
+    "nodeRatio" : 0.000,
+    "coordinate" : "1480,400|1480,400",
+    "formCustom" : "N",
+    "ext" : "[{\"code\":\"ButtonPermissionEnum\",\"value\":\"back,termination\"}]",
+    "skipList" : [ {
+      "nowNodeCode" : "fcfdd9f6-f526-4c1a-b71d-88afa31aebc5",
+      "nextNodeCode" : "c36a46ef-04f9-463f-bad7-4b395c818519",
+      "skipType" : "PASS",
+      "coordinate" : "1530,400;1640,400;1640,325"
+    } ]
+  }, {
+    "nodeType" : 4,
+    "nodeCode" : "c36a46ef-04f9-463f-bad7-4b395c818519",
+    "nodeRatio" : 0.000,
+    "coordinate" : "1640,300",
+    "formCustom" : "N",
+    "ext" : "[]",
+    "skipList" : [ {
+      "nowNodeCode" : "c36a46ef-04f9-463f-bad7-4b395c818519",
+      "nextNodeCode" : "3fcea762-b53a-4ae1-8365-7bec90444828",
+      "skipType" : "PASS",
+      "coordinate" : "1665,300;1770,300"
+    } ]
+  }, {
+    "nodeType" : 1,
+    "nodeCode" : "3fcea762-b53a-4ae1-8365-7bec90444828",
+    "nodeName" : "董事",
+    "permissionFlag" : "1",
+    "nodeRatio" : 0.000,
+    "coordinate" : "1820,300|1820,300",
+    "formCustom" : "N",
+    "ext" : "[{\"code\":\"ButtonPermissionEnum\",\"value\":\"back,termination\"}]",
+    "skipList" : [ {
+      "nowNodeCode" : "3fcea762-b53a-4ae1-8365-7bec90444828",
+      "nextNodeCode" : "9cfbfd3e-6c04-41d6-9fc2-6787a7d2cd31",
+      "skipType" : "PASS",
+      "coordinate" : "1870,300;1960,300"
+    } ]
+  }, {
+    "nodeType" : 2,
+    "nodeCode" : "9cfbfd3e-6c04-41d6-9fc2-6787a7d2cd31",
+    "nodeName" : "结束",
+    "nodeRatio" : 0.000,
+    "coordinate" : "1980,300|1980,300",
+    "formCustom" : "N",
+    "ext" : "[]"
+  } ]
+}
diff --git a/script/sql/oracle/oracle_ry_app_5.X.sql b/script/sql/oracle/oracle_ry_app_5.X.sql
new file mode 100644
index 0000000..dd5d652
--- /dev/null
+++ b/script/sql/oracle/oracle_ry_app_5.X.sql
@@ -0,0 +1,331 @@
+-- ----------------------------
+-- App端数据库表结构 (Oracle版本)
+-- 适用于 RuoYi-Vue-Plus 5.X 版本
+-- ----------------------------
+
+-- 1、App端用户信息表
+CREATE TABLE app_user (
+    user_id       NUMBER(20)   NOT NULL,
+    user_name     VARCHAR2(30) NOT NULL,
+    nick_name     VARCHAR2(30) NOT NULL,
+    phone         VARCHAR2(11) DEFAULT '',
+    email         VARCHAR2(50) DEFAULT '',
+    sex           CHAR(1)      DEFAULT '0',
+    avatar        NUMBER(20),
+    password      VARCHAR2(100) DEFAULT '',
+    status        CHAR(1)      DEFAULT '0',
+    del_flag      CHAR(1)      DEFAULT '0',
+    login_ip      VARCHAR2(128) DEFAULT '',
+    login_date    DATE,
+    register_time DATE,
+    create_by     NUMBER(20),
+    create_time   DATE,
+    update_by     NUMBER(20),
+    update_time   DATE,
+    remark        VARCHAR2(500),
+    CONSTRAINT pk_app_user PRIMARY KEY (user_id)
+);
+
+COMMENT ON TABLE app_user IS 'App端用户信息表';
+COMMENT ON COLUMN app_user.user_id IS 'App用户ID';
+COMMENT ON COLUMN app_user.account IS '用户账号';
+COMMENT ON COLUMN app_user.nick_name IS '用户昵称';
+COMMENT ON COLUMN app_user.phone IS '手机号码';
+COMMENT ON COLUMN app_user.email IS '用户邮箱';
+COMMENT ON COLUMN app_user.sex IS '用户性别（0男 1女 2未知）';
+COMMENT ON COLUMN app_user.avatar IS '头像地址';
+COMMENT ON COLUMN app_user.password IS '密码';
+COMMENT ON COLUMN app_user.status IS '帐号状态（0正常 1停用）';
+COMMENT ON COLUMN app_user.del_flag IS '删除标志（0代表存在 1代表删除）';
+COMMENT ON COLUMN app_user.login_ip IS '最后登录IP';
+COMMENT ON COLUMN app_user.login_date IS '最后登录时间';
+COMMENT ON COLUMN app_user.register_time IS '注册时间';
+COMMENT ON COLUMN app_user.create_by IS '创建者';
+COMMENT ON COLUMN app_user.create_time IS '创建时间';
+COMMENT ON COLUMN app_user.update_by IS '更新者';
+COMMENT ON COLUMN app_user.update_time IS '更新时间';
+COMMENT ON COLUMN app_user.remark IS '备注';
+
+INSERT INTO app_user VALUES (1, 'appuser', 'App测试用户', '15888888888', 'appuser@qq.com', '1', NULL,
+        '$2a$10$7JB720yubVSOfvVMe6LeNOKgEoXAw7tCxJRET6pVuiDDz/LQ4Gqk.',
+        '0', '0', '127.0.0.1', SYSDATE, SYSDATE, 1, SYSDATE, NULL, NULL, 'App端测试用户');
+
+-- 2、App端角色信息表
+CREATE TABLE app_role (
+    role_id     NUMBER(20)    NOT NULL,
+    role_name   VARCHAR2(30)  NOT NULL,
+    role_key    VARCHAR2(100) NOT NULL,
+    role_sort   NUMBER(4)     NOT NULL,
+    status      CHAR(1)       NOT NULL,
+    del_flag    CHAR(1)       DEFAULT '0',
+    create_by   NUMBER(20),
+    create_time DATE,
+    update_by   NUMBER(20),
+    update_time DATE,
+    remark      VARCHAR2(500),
+    CONSTRAINT pk_app_role PRIMARY KEY (role_id)
+);
+
+COMMENT ON TABLE app_role IS 'App端角色信息表';
+COMMENT ON COLUMN app_role.role_id IS 'App角色ID';
+COMMENT ON COLUMN app_role.role_name IS '角色名称';
+COMMENT ON COLUMN app_role.role_key IS '角色权限字符串';
+COMMENT ON COLUMN app_role.role_sort IS '显示顺序';
+COMMENT ON COLUMN app_role.status IS '角色状态（0正常 1停用）';
+COMMENT ON COLUMN app_role.del_flag IS '删除标志（0代表存在 1代表删除）';
+COMMENT ON COLUMN app_role.create_by IS '创建者';
+COMMENT ON COLUMN app_role.create_time IS '创建时间';
+COMMENT ON COLUMN app_role.update_by IS '更新者';
+COMMENT ON COLUMN app_role.update_time IS '更新时间';
+COMMENT ON COLUMN app_role.remark IS '备注';
+
+INSERT INTO app_role VALUES (1, 'App普通用户', 'app_user', 1, '0', '0', 1, SYSDATE, NULL, NULL, 'App端普通用户');
+INSERT INTO app_role VALUES (2, 'App VIP用户', 'app_vip', 2, '0', '0', 1, SYSDATE, NULL, NULL, 'App端VIP用户');
+
+-- 3、App端用户和角色关联表
+CREATE TABLE app_user_role (
+    user_id NUMBER(20) NOT NULL,
+    role_id NUMBER(20) NOT NULL,
+    CONSTRAINT pk_app_user_role PRIMARY KEY (user_id, role_id)
+);
+
+COMMENT ON TABLE app_user_role IS 'App端用户和角色关联表';
+COMMENT ON COLUMN app_user_role.user_id IS 'App用户ID';
+COMMENT ON COLUMN app_user_role.role_id IS 'App角色ID';
+
+INSERT INTO app_user_role VALUES (1, 1);
+
+-- 4、App端第三方登录授权表
+CREATE TABLE app_social_auth (
+    id            NUMBER(20)     NOT NULL,
+    user_id       NUMBER(20)     NOT NULL,
+    platform      VARCHAR2(255)  NOT NULL,
+    platform_uid  VARCHAR2(255)  NOT NULL,
+    open_id       VARCHAR2(255),
+    union_id      VARCHAR2(255),
+    access_token  VARCHAR2(2000) NOT NULL,
+    expire_in     NUMBER,
+    refresh_token VARCHAR2(255),
+    scope         VARCHAR2(255),
+    create_by     NUMBER(20),
+    create_time   DATE,
+    update_by     NUMBER(20),
+    update_time   DATE,
+    del_flag      CHAR(1) DEFAULT '0',
+    CONSTRAINT pk_app_social_auth PRIMARY KEY (id)
+);
+
+COMMENT ON TABLE app_social_auth IS 'App端第三方登录授权表';
+COMMENT ON COLUMN app_social_auth.id IS '主键';
+COMMENT ON COLUMN app_social_auth.user_id IS 'App用户ID';
+COMMENT ON COLUMN app_social_auth.platform IS '用户来源平台（wechat_mp:微信小程序 wechat_open:微信开放平台 qq:QQ weibo:微博）';
+COMMENT ON COLUMN app_social_auth.platform_uid IS '表示平台唯一用户标识';
+COMMENT ON COLUMN app_social_auth.open_id IS '微信openid';
+COMMENT ON COLUMN app_social_auth.union_id IS '微信unionid';
+COMMENT ON COLUMN app_social_auth.access_token IS '用户的授权令牌';
+COMMENT ON COLUMN app_social_auth.expire_in IS '用户的授权令牌的有效期';
+COMMENT ON COLUMN app_social_auth.refresh_token IS '刷新令牌';
+COMMENT ON COLUMN app_social_auth.scope IS '授予的权限';
+COMMENT ON COLUMN app_social_auth.create_by IS '创建者';
+COMMENT ON COLUMN app_social_auth.create_time IS '创建时间';
+COMMENT ON COLUMN app_social_auth.update_by IS '更新者';
+COMMENT ON COLUMN app_social_auth.update_time IS '更新时间';
+COMMENT ON COLUMN app_social_auth.del_flag IS '删除标志（0代表存在 1代表删除）';
+
+-- 5、App端登录日志表
+CREATE TABLE app_login_log (
+    info_id        NUMBER(20)    NOT NULL,
+    user_name      VARCHAR2(50)  DEFAULT '',
+    status         CHAR(1)       DEFAULT '0',
+    ipaddr         VARCHAR2(128) DEFAULT '',
+    login_location VARCHAR2(255) DEFAULT '',
+    browser        VARCHAR2(50)  DEFAULT '',
+    os             VARCHAR2(50)  DEFAULT '',
+    msg            VARCHAR2(255) DEFAULT '',
+    login_time     DATE,
+    CONSTRAINT pk_app_login_log PRIMARY KEY (info_id)
+);
+
+COMMENT ON TABLE app_login_log IS 'App端登录日志表';
+COMMENT ON COLUMN app_login_log.info_id IS '访问ID';
+COMMENT ON COLUMN app_login_log.user_name IS '用户账号';
+COMMENT ON COLUMN app_login_log.status IS '登录状态（0成功 1失败）';
+COMMENT ON COLUMN app_login_log.ipaddr IS '登录IP地址';
+COMMENT ON COLUMN app_login_log.login_location IS '登录地点';
+COMMENT ON COLUMN app_login_log.browser IS '浏览器类型';
+COMMENT ON COLUMN app_login_log.os IS '操作系统';
+COMMENT ON COLUMN app_login_log.msg IS '提示消息';
+COMMENT ON COLUMN app_login_log.login_time IS '访问时间';
+
+CREATE INDEX idx_app_login_log_s ON app_login_log (status);
+CREATE INDEX idx_app_login_log_lt ON app_login_log (login_time);
+
+-- 6、App端操作日志记录
+CREATE TABLE app_oper_log (
+    oper_id        NUMBER(20)     NOT NULL,
+    title          VARCHAR2(50)   DEFAULT '',
+    business_type  NUMBER(2)      DEFAULT 0,
+    method         VARCHAR2(100)  DEFAULT '',
+    request_method VARCHAR2(10)   DEFAULT '',
+    oper_name      VARCHAR2(50)   DEFAULT '',
+    oper_url       VARCHAR2(255)  DEFAULT '',
+    oper_ip        VARCHAR2(128)  DEFAULT '',
+    oper_location  VARCHAR2(255)  DEFAULT '',
+    oper_param     VARCHAR2(2000) DEFAULT '',
+    json_result    VARCHAR2(2000) DEFAULT '',
+    status         NUMBER(1)      DEFAULT 0,
+    error_msg      VARCHAR2(2000) DEFAULT '',
+    oper_time      DATE,
+    cost_time      NUMBER(20)     DEFAULT 0,
+    CONSTRAINT pk_app_oper_log PRIMARY KEY (oper_id)
+);
+
+COMMENT ON TABLE app_oper_log IS 'App端操作日志记录';
+COMMENT ON COLUMN app_oper_log.oper_id IS '日志主键';
+COMMENT ON COLUMN app_oper_log.title IS '模块标题';
+COMMENT ON COLUMN app_oper_log.business_type IS '业务类型（0其它 1新增 2修改 3删除）';
+COMMENT ON COLUMN app_oper_log.method IS '方法名称';
+COMMENT ON COLUMN app_oper_log.request_method IS '请求方式';
+COMMENT ON COLUMN app_oper_log.oper_name IS '操作人员';
+COMMENT ON COLUMN app_oper_log.oper_url IS '请求URL';
+COMMENT ON COLUMN app_oper_log.oper_ip IS '主机地址';
+COMMENT ON COLUMN app_oper_log.oper_location IS '操作地点';
+COMMENT ON COLUMN app_oper_log.oper_param IS '请求参数';
+COMMENT ON COLUMN app_oper_log.json_result IS '返回参数';
+COMMENT ON COLUMN app_oper_log.status IS '操作状态（0正常 1异常）';
+COMMENT ON COLUMN app_oper_log.error_msg IS '错误消息';
+COMMENT ON COLUMN app_oper_log.oper_time IS '操作时间';
+COMMENT ON COLUMN app_oper_log.cost_time IS '消耗时间';
+
+CREATE INDEX idx_app_oper_log_bt ON app_oper_log (business_type);
+CREATE INDEX idx_app_oper_log_s ON app_oper_log (status);
+CREATE INDEX idx_app_oper_log_ot ON app_oper_log (oper_time);
+
+-- 7、App端设备信息表
+CREATE TABLE app_device (
+    device_id        NUMBER(20)    NOT NULL,
+    user_id          NUMBER(20)    NOT NULL,
+    device_type      VARCHAR2(20)  NOT NULL,
+    device_name      VARCHAR2(100) DEFAULT '',
+    device_model     VARCHAR2(100) DEFAULT '',
+    device_brand     VARCHAR2(50)  DEFAULT '',
+    os_version       VARCHAR2(50)  DEFAULT '',
+    app_version      VARCHAR2(50)  DEFAULT '',
+    push_token       VARCHAR2(255) DEFAULT '',
+    is_active        CHAR(1)       DEFAULT '1',
+    last_active_time DATE,
+    create_time      DATE,
+    update_time      DATE,
+    CONSTRAINT pk_app_device PRIMARY KEY (device_id)
+);
+
+COMMENT ON TABLE app_device IS 'App端设备信息表';
+COMMENT ON COLUMN app_device.device_id IS '设备ID';
+COMMENT ON COLUMN app_device.user_id IS 'App用户ID';
+COMMENT ON COLUMN app_device.device_type IS '设备类型（ios android h5）';
+COMMENT ON COLUMN app_device.device_name IS '设备名称';
+COMMENT ON COLUMN app_device.device_model IS '设备型号';
+COMMENT ON COLUMN app_device.device_brand IS '设备品牌';
+COMMENT ON COLUMN app_device.os_version IS '操作系统版本';
+COMMENT ON COLUMN app_device.app_version IS 'App版本';
+COMMENT ON COLUMN app_device.push_token IS '推送令牌';
+COMMENT ON COLUMN app_device.is_active IS '是否活跃（0否 1是）';
+COMMENT ON COLUMN app_device.last_active_time IS '最后活跃时间';
+COMMENT ON COLUMN app_device.create_time IS '创建时间';
+COMMENT ON COLUMN app_device.update_time IS '更新时间';
+
+CREATE INDEX idx_app_device_user_id ON app_device (user_id);
+CREATE INDEX idx_app_device_type ON app_device (device_type);
+
+-- 8、App端消息推送表
+CREATE TABLE app_message (
+    message_id   NUMBER(20)     NOT NULL,
+    title        VARCHAR2(100)  NOT NULL,
+    content      CLOB,
+    message_type VARCHAR2(20)   DEFAULT 'system',
+    target_type  VARCHAR2(20)   DEFAULT 'all',
+    target_ids   VARCHAR2(1000) DEFAULT '',
+    send_time    DATE,
+    status       CHAR(1)        DEFAULT '0',
+    create_by    NUMBER(20),
+    create_time  DATE,
+    update_by    NUMBER(20),
+    update_time  DATE,
+    CONSTRAINT pk_app_message PRIMARY KEY (message_id)
+);
+
+COMMENT ON TABLE app_message IS 'App端消息推送表';
+COMMENT ON COLUMN app_message.message_id IS '消息ID';
+COMMENT ON COLUMN app_message.title IS '消息标题';
+COMMENT ON COLUMN app_message.content IS '消息内容';
+COMMENT ON COLUMN app_message.message_type IS '消息类型（system:系统消息 notice:通知 activity:活动）';
+COMMENT ON COLUMN app_message.target_type IS '推送目标（all:全部用户 user:指定用户 role:指定角色）';
+COMMENT ON COLUMN app_message.target_ids IS '目标ID列表（用户ID或角色ID，逗号分隔）';
+COMMENT ON COLUMN app_message.send_time IS '发送时间';
+COMMENT ON COLUMN app_message.status IS '状态（0待发送 1已发送 2发送失败）';
+COMMENT ON COLUMN app_message.create_by IS '创建者';
+COMMENT ON COLUMN app_message.create_time IS '创建时间';
+COMMENT ON COLUMN app_message.update_by IS '更新者';
+COMMENT ON COLUMN app_message.update_time IS '更新时间';
+
+CREATE INDEX idx_app_message_type ON app_message (message_type);
+CREATE INDEX idx_app_message_status ON app_message (status);
+
+-- 9、App端用户消息读取记录表
+CREATE TABLE app_user_message (
+    id          NUMBER(20) NOT NULL,
+    user_id     NUMBER(20) NOT NULL,
+    message_id  NUMBER(20) NOT NULL,
+    is_read     CHAR(1)    DEFAULT '0',
+    read_time   DATE,
+    create_time DATE,
+    CONSTRAINT pk_app_user_message PRIMARY KEY (id)
+);
+
+COMMENT ON TABLE app_user_message IS 'App端用户消息读取记录表';
+COMMENT ON COLUMN app_user_message.id IS '主键';
+COMMENT ON COLUMN app_user_message.user_id IS 'App用户ID';
+COMMENT ON COLUMN app_user_message.message_id IS '消息ID';
+COMMENT ON COLUMN app_user_message.is_read IS '是否已读（0未读 1已读）';
+COMMENT ON COLUMN app_user_message.read_time IS '读取时间';
+COMMENT ON COLUMN app_user_message.create_time IS '创建时间';
+
+CREATE INDEX idx_app_user_message_user ON app_user_message (user_id);
+CREATE INDEX idx_app_user_message_msg ON app_user_message (message_id);
+CREATE INDEX idx_app_user_message_read ON app_user_message (is_read);
+
+-- 10、App版本信息表
+CREATE TABLE app_version (
+    version_id     NUMBER(20)    NOT NULL,
+    version_code   NUMBER        NOT NULL,
+    version_name   VARCHAR2(20)  NOT NULL,
+    update_content CLOB,
+    download_url   VARCHAR2(500) NOT NULL,
+    is_force       CHAR(1)       DEFAULT '0',
+    platform       VARCHAR2(10)  DEFAULT 'android',
+    create_time    DATE,
+    CONSTRAINT pk_app_version PRIMARY KEY (version_id)
+);
+
+COMMENT ON TABLE app_version IS 'App版本信息表';
+COMMENT ON COLUMN app_version.version_id IS '版本ID';
+COMMENT ON COLUMN app_version.version_code IS '版本号（数字）';
+COMMENT ON COLUMN app_version.version_name IS '版本名（如1.0.0）';
+COMMENT ON COLUMN app_version.update_content IS '更新内容';
+COMMENT ON COLUMN app_version.download_url IS '下载地址';
+COMMENT ON COLUMN app_version.is_force IS '是否强制更新（0否 1是）';
+COMMENT ON COLUMN app_version.platform IS '平台（android、ios）';
+COMMENT ON COLUMN app_version.create_time IS '创建时间';
+
+-- 创建序列
+CREATE SEQUENCE seq_app_user START WITH 2 INCREMENT BY 1;
+CREATE SEQUENCE seq_app_role START WITH 3 INCREMENT BY 1;
+CREATE SEQUENCE seq_app_social_auth START WITH 1 INCREMENT BY 1;
+CREATE SEQUENCE seq_app_login_log START WITH 1 INCREMENT BY 1;
+CREATE SEQUENCE seq_app_oper_log START WITH 1 INCREMENT BY 1;
+CREATE SEQUENCE seq_app_device START WITH 1 INCREMENT BY 1;
+CREATE SEQUENCE seq_app_message START WITH 1 INCREMENT BY 1;
+CREATE SEQUENCE seq_app_user_message START WITH 1 INCREMENT BY 1;
+CREATE SEQUENCE seq_app_version START WITH 1 INCREMENT BY 1;
+
+COMMIT;
\ No newline at end of file
diff --git a/script/sql/oracle/oracle_ry_job.sql b/script/sql/oracle/oracle_ry_job.sql
new file mode 100644
index 0000000..66943a9
--- /dev/null
+++ b/script/sql/oracle/oracle_ry_job.sql
@@ -0,0 +1,924 @@
+
+/*
+ SnailJob Database Transfer Tool
+ Source Server Type    : MySQL
+ Target Server Type    : Oracle
+ Date: 2025-04-26 10:01:54
+*/
+
+
+-- sj_namespace
+CREATE TABLE sj_namespace
+(
+    id          number GENERATED ALWAYS AS IDENTITY,
+    name        varchar2(64)                            NULL,
+    unique_id   varchar2(64)                            NULL,
+    description varchar2(256) DEFAULT ''                NULL,
+    deleted     smallint      DEFAULT 0                 NOT NULL,
+    create_dt   date          DEFAULT CURRENT_TIMESTAMP NOT NULL,
+    update_dt   date          DEFAULT CURRENT_TIMESTAMP NOT NULL
+);
+
+ALTER TABLE sj_namespace
+    ADD CONSTRAINT pk_sj_namespace PRIMARY KEY (id);
+
+CREATE INDEX idx_sj_namespace_01 ON sj_namespace (name);
+
+COMMENT ON COLUMN sj_namespace.id IS '主键';
+COMMENT ON COLUMN sj_namespace.name IS '名称';
+COMMENT ON COLUMN sj_namespace.unique_id IS '唯一id';
+COMMENT ON COLUMN sj_namespace.description IS '描述';
+COMMENT ON COLUMN sj_namespace.deleted IS '逻辑删除 1、删除';
+COMMENT ON COLUMN sj_namespace.create_dt IS '创建时间';
+COMMENT ON COLUMN sj_namespace.update_dt IS '修改时间';
+COMMENT ON TABLE sj_namespace IS '命名空间';
+
+INSERT INTO sj_namespace(name, unique_id, description, deleted, create_dt, update_dt) VALUES ('Development', 'dev', '', 0, sysdate, sysdate);
+INSERT INTO sj_namespace(name, unique_id, description, deleted, create_dt, update_dt) VALUES ('Production', 'prod', '', 0, sysdate, sysdate);
+
+-- sj_group_config
+CREATE TABLE sj_group_config
+(
+    id                number GENERATED ALWAYS AS IDENTITY,
+    namespace_id      varchar2(64)  DEFAULT '764d604ec6fc45f68cd92514c40e9e1a'    NULL,
+    group_name        varchar2(64)  DEFAULT ''                                    NULL,
+    description       varchar2(256) DEFAULT ''                                    NULL,
+    token             varchar2(64)  DEFAULT 'SJ_cKqBTPzCsWA3VyuCfFoccmuIEGXjr5KT' NULL,
+    group_status      smallint      DEFAULT 0                                     NOT NULL,
+    version           number                                                      NOT NULL,
+    group_partition   number                                                      NOT NULL,
+    id_generator_mode smallint      DEFAULT 1                                     NOT NULL,
+    init_scene        smallint      DEFAULT 0                                     NOT NULL,
+    create_dt         date          DEFAULT CURRENT_TIMESTAMP                     NOT NULL,
+    update_dt         date          DEFAULT CURRENT_TIMESTAMP                     NOT NULL
+);
+
+ALTER TABLE sj_group_config
+    ADD CONSTRAINT pk_sj_group_config PRIMARY KEY (id);
+
+CREATE UNIQUE INDEX uk_sj_group_config_01 ON sj_group_config (namespace_id, group_name);
+
+COMMENT ON COLUMN sj_group_config.id IS '主键';
+COMMENT ON COLUMN sj_group_config.namespace_id IS '命名空间id';
+COMMENT ON COLUMN sj_group_config.group_name IS '组名称';
+COMMENT ON COLUMN sj_group_config.description IS '组描述';
+COMMENT ON COLUMN sj_group_config.token IS 'token';
+COMMENT ON COLUMN sj_group_config.group_status IS '组状态 0、未启用 1、启用';
+COMMENT ON COLUMN sj_group_config.version IS '版本号';
+COMMENT ON COLUMN sj_group_config.group_partition IS '分区';
+COMMENT ON COLUMN sj_group_config.id_generator_mode IS '唯一id生成模式 默认号段模式';
+COMMENT ON COLUMN sj_group_config.init_scene IS '是否初始化场景 0:否 1:是';
+COMMENT ON COLUMN sj_group_config.create_dt IS '创建时间';
+COMMENT ON COLUMN sj_group_config.update_dt IS '修改时间';
+COMMENT ON TABLE sj_group_config IS '组配置';
+
+INSERT INTO sj_group_config (namespace_id, group_name, description, token, group_status, version, group_partition, id_generator_mode, init_scene, create_dt, update_dt) VALUES ('dev', 'ruoyi_group', '', 'SJ_cKqBTPzCsWA3VyuCfFoccmuIEGXjr5KT', 1, 1, 0, 1, 1,  sysdate, sysdate);
+INSERT INTO sj_group_config (namespace_id, group_name, description, token, group_status, version, group_partition, id_generator_mode, init_scene, create_dt, update_dt) VALUES ('prod', 'ruoyi_group', '', 'SJ_cKqBTPzCsWA3VyuCfFoccmuIEGXjr5KT', 1, 1, 0, 1, 1,  sysdate, sysdate);
+
+-- sj_notify_config
+CREATE TABLE sj_notify_config
+(
+    id                     number GENERATED ALWAYS AS IDENTITY,
+    namespace_id           varchar2(64)  DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' NULL,
+    group_name             varchar2(64)                                             NULL,
+    notify_name            varchar2(64)  DEFAULT ''                                 NULL,
+    system_task_type       smallint      DEFAULT 3                                  NOT NULL,
+    notify_status          smallint      DEFAULT 0                                  NOT NULL,
+    recipient_ids          varchar2(128)                                            NULL,
+    notify_threshold       number        DEFAULT 0                                  NOT NULL,
+    notify_scene           smallint      DEFAULT 0                                  NOT NULL,
+    rate_limiter_status    smallint      DEFAULT 0                                  NOT NULL,
+    rate_limiter_threshold number        DEFAULT 0                                  NOT NULL,
+    description            varchar2(256) DEFAULT ''                                 NULL,
+    create_dt              date          DEFAULT CURRENT_TIMESTAMP                  NOT NULL,
+    update_dt              date          DEFAULT CURRENT_TIMESTAMP                  NOT NULL
+);
+
+ALTER TABLE sj_notify_config
+    ADD CONSTRAINT pk_sj_notify_config PRIMARY KEY (id);
+
+CREATE INDEX idx_sj_notify_config_01 ON sj_notify_config (namespace_id, group_name);
+
+COMMENT ON COLUMN sj_notify_config.id IS '主键';
+COMMENT ON COLUMN sj_notify_config.namespace_id IS '命名空间id';
+COMMENT ON COLUMN sj_notify_config.group_name IS '组名称';
+COMMENT ON COLUMN sj_notify_config.notify_name IS '通知名称';
+COMMENT ON COLUMN sj_notify_config.system_task_type IS '任务类型 1. 重试任务 2. 重试回调 3、JOB任务 4、WORKFLOW任务';
+COMMENT ON COLUMN sj_notify_config.notify_status IS '通知状态 0、未启用 1、启用';
+COMMENT ON COLUMN sj_notify_config.recipient_ids IS '接收人id列表';
+COMMENT ON COLUMN sj_notify_config.notify_threshold IS '通知阈值';
+COMMENT ON COLUMN sj_notify_config.notify_scene IS '通知场景';
+COMMENT ON COLUMN sj_notify_config.rate_limiter_status IS '限流状态 0、未启用 1、启用';
+COMMENT ON COLUMN sj_notify_config.rate_limiter_threshold IS '每秒限流阈值';
+COMMENT ON COLUMN sj_notify_config.description IS '描述';
+COMMENT ON COLUMN sj_notify_config.create_dt IS '创建时间';
+COMMENT ON COLUMN sj_notify_config.update_dt IS '修改时间';
+COMMENT ON TABLE sj_notify_config IS '通知配置';
+
+-- sj_notify_recipient
+CREATE TABLE sj_notify_recipient
+(
+    id               number GENERATED ALWAYS AS IDENTITY,
+    namespace_id     varchar2(64)  DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' NULL,
+    recipient_name   varchar2(64)                                             NULL,
+    notify_type      smallint      DEFAULT 0                                  NOT NULL,
+    notify_attribute varchar2(512)                                            NULL,
+    description      varchar2(256) DEFAULT ''                                 NULL,
+    create_dt        date          DEFAULT CURRENT_TIMESTAMP                  NOT NULL,
+    update_dt        date          DEFAULT CURRENT_TIMESTAMP                  NOT NULL
+);
+
+ALTER TABLE sj_notify_recipient
+    ADD CONSTRAINT pk_sj_notify_recipient PRIMARY KEY (id);
+
+CREATE INDEX idx_sj_notify_recipient_01 ON sj_notify_recipient (namespace_id);
+
+COMMENT ON COLUMN sj_notify_recipient.id IS '主键';
+COMMENT ON COLUMN sj_notify_recipient.namespace_id IS '命名空间id';
+COMMENT ON COLUMN sj_notify_recipient.recipient_name IS '接收人名称';
+COMMENT ON COLUMN sj_notify_recipient.notify_type IS '通知类型 1、钉钉 2、邮件 3、企业微信 4 飞书 5 webhook';
+COMMENT ON COLUMN sj_notify_recipient.notify_attribute IS '配置属性';
+COMMENT ON COLUMN sj_notify_recipient.description IS '描述';
+COMMENT ON COLUMN sj_notify_recipient.create_dt IS '创建时间';
+COMMENT ON COLUMN sj_notify_recipient.update_dt IS '修改时间';
+COMMENT ON TABLE sj_notify_recipient IS '告警通知接收人';
+
+-- sj_retry_dead_letter
+CREATE TABLE sj_retry_dead_letter
+(
+    id            number GENERATED ALWAYS AS IDENTITY,
+    namespace_id  varchar2(64)  DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' NULL,
+    group_name    varchar2(64)                                             NULL,
+    group_id      number                                                   NOT NULL,
+    scene_name    varchar2(64)                                             NULL,
+    scene_id      number                                                   NOT NULL,
+    idempotent_id varchar2(64)                                             NULL,
+    biz_no        varchar2(64)  DEFAULT ''                                 NULL,
+    executor_name varchar2(512) DEFAULT ''                                 NULL,
+    args_str      clob                                                     NULL,
+    ext_attrs     clob                                                     NULL,
+    create_dt     date          DEFAULT CURRENT_TIMESTAMP                  NOT NULL
+);
+
+ALTER TABLE sj_retry_dead_letter
+    ADD CONSTRAINT pk_sj_retry_dead_letter PRIMARY KEY (id);
+
+CREATE INDEX idx_sj_retry_dead_letter_01 ON sj_retry_dead_letter (namespace_id, group_name, scene_name);
+CREATE INDEX idx_sj_retry_dead_letter_02 ON sj_retry_dead_letter (idempotent_id);
+CREATE INDEX idx_sj_retry_dead_letter_03 ON sj_retry_dead_letter (biz_no);
+CREATE INDEX idx_sj_retry_dead_letter_04 ON sj_retry_dead_letter (create_dt);
+
+COMMENT ON COLUMN sj_retry_dead_letter.id IS '主键';
+COMMENT ON COLUMN sj_retry_dead_letter.namespace_id IS '命名空间id';
+COMMENT ON COLUMN sj_retry_dead_letter.group_name IS '组名称';
+COMMENT ON COLUMN sj_retry_dead_letter.group_id IS '组Id';
+COMMENT ON COLUMN sj_retry_dead_letter.scene_name IS '场景名称';
+COMMENT ON COLUMN sj_retry_dead_letter.scene_id IS '场景ID';
+COMMENT ON COLUMN sj_retry_dead_letter.idempotent_id IS '幂等id';
+COMMENT ON COLUMN sj_retry_dead_letter.biz_no IS '业务编号';
+COMMENT ON COLUMN sj_retry_dead_letter.executor_name IS '执行器名称';
+COMMENT ON COLUMN sj_retry_dead_letter.args_str IS '执行方法参数';
+COMMENT ON COLUMN sj_retry_dead_letter.ext_attrs IS '扩展字段';
+COMMENT ON COLUMN sj_retry_dead_letter.create_dt IS '创建时间';
+COMMENT ON TABLE sj_retry_dead_letter IS '死信队列表';
+
+-- sj_retry
+CREATE TABLE sj_retry
+(
+    id              number GENERATED ALWAYS AS IDENTITY,
+    namespace_id    varchar2(64)  DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' NULL,
+    group_name      varchar2(64)                                             NULL,
+    group_id        number                                                   NOT NULL,
+    scene_name      varchar2(64)                                             NULL,
+    scene_id        number                                                   NOT NULL,
+    idempotent_id   varchar2(64)                                             NULL,
+    biz_no          varchar2(64)  DEFAULT ''                                 NULL,
+    executor_name   varchar2(512) DEFAULT ''                                 NULL,
+    args_str        clob                                                     NULL,
+    ext_attrs       clob                                                     NULL,
+    next_trigger_at number                                                   NOT NULL,
+    retry_count     number        DEFAULT 0                                  NOT NULL,
+    retry_status    smallint      DEFAULT 0                                  NOT NULL,
+    task_type       smallint      DEFAULT 1                                  NOT NULL,
+    bucket_index    number        DEFAULT 0                                  NOT NULL,
+    parent_id       number        DEFAULT 0                                  NOT NULL,
+    deleted         number        DEFAULT 0                                  NOT NULL,
+    create_dt       date          DEFAULT CURRENT_TIMESTAMP                  NOT NULL,
+    update_dt       date          DEFAULT CURRENT_TIMESTAMP                  NOT NULL
+);
+
+ALTER TABLE sj_retry
+    ADD CONSTRAINT pk_sj_retry PRIMARY KEY (id);
+
+CREATE UNIQUE INDEX uk_sj_retry_01 ON sj_retry (scene_id, task_type, idempotent_id, deleted);
+
+CREATE INDEX idx_sj_retry_01 ON sj_retry (biz_no);
+CREATE INDEX idx_sj_retry_02 ON sj_retry (retry_status, bucket_index);
+CREATE INDEX idx_sj_retry_03 ON sj_retry (parent_id);
+CREATE INDEX idx_sj_retry_04 ON sj_retry (create_dt);
+CREATE INDEX idx_sj_retry_05 ON sj_retry (idempotent_id);
+
+COMMENT ON COLUMN sj_retry.id IS '主键';
+COMMENT ON COLUMN sj_retry.namespace_id IS '命名空间id';
+COMMENT ON COLUMN sj_retry.group_name IS '组名称';
+COMMENT ON COLUMN sj_retry.group_id IS '组Id';
+COMMENT ON COLUMN sj_retry.scene_name IS '场景名称';
+COMMENT ON COLUMN sj_retry.scene_id IS '场景ID';
+COMMENT ON COLUMN sj_retry.idempotent_id IS '幂等id';
+COMMENT ON COLUMN sj_retry.biz_no IS '业务编号';
+COMMENT ON COLUMN sj_retry.executor_name IS '执行器名称';
+COMMENT ON COLUMN sj_retry.args_str IS '执行方法参数';
+COMMENT ON COLUMN sj_retry.ext_attrs IS '扩展字段';
+COMMENT ON COLUMN sj_retry.next_trigger_at IS '下次触发时间';
+COMMENT ON COLUMN sj_retry.retry_count IS '重试次数';
+COMMENT ON COLUMN sj_retry.retry_status IS '重试状态 0、重试中 1、成功 2、最大重试次数';
+COMMENT ON COLUMN sj_retry.task_type IS '任务类型 1、重试数据 2、回调数据';
+COMMENT ON COLUMN sj_retry.bucket_index IS 'bucket';
+COMMENT ON COLUMN sj_retry.parent_id IS '父节点id';
+COMMENT ON COLUMN sj_retry.deleted IS '逻辑删除';
+COMMENT ON COLUMN sj_retry.create_dt IS '创建时间';
+COMMENT ON COLUMN sj_retry.update_dt IS '修改时间';
+COMMENT ON TABLE sj_retry IS '重试信息表';
+
+-- sj_retry_task
+CREATE TABLE sj_retry_task
+(
+    id               number GENERATED ALWAYS AS IDENTITY,
+    namespace_id     varchar2(64)  DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' NULL,
+    group_name       varchar2(64)                                             NULL,
+    scene_name       varchar2(64)                                             NULL,
+    retry_id         number                                                   NOT NULL,
+    ext_attrs        clob                                                     NULL,
+    task_status      smallint      DEFAULT 1                                  NOT NULL,
+    task_type        smallint      DEFAULT 1                                  NOT NULL,
+    operation_reason smallint      DEFAULT 0                                  NOT NULL,
+    client_info      varchar2(128) DEFAULT NULL                               NULL,
+    create_dt        date          DEFAULT CURRENT_TIMESTAMP                  NOT NULL,
+    update_dt        date          DEFAULT CURRENT_TIMESTAMP                  NOT NULL
+);
+
+ALTER TABLE sj_retry_task
+    ADD CONSTRAINT pk_sj_retry_task PRIMARY KEY (id);
+
+CREATE INDEX idx_sj_retry_task_01 ON sj_retry_task (namespace_id, group_name, scene_name);
+CREATE INDEX idx_sj_retry_task_02 ON sj_retry_task (task_status);
+CREATE INDEX idx_sj_retry_task_03 ON sj_retry_task (create_dt);
+CREATE INDEX idx_sj_retry_task_04 ON sj_retry_task (retry_id);
+
+COMMENT ON COLUMN sj_retry_task.id IS '主键';
+COMMENT ON COLUMN sj_retry_task.namespace_id IS '命名空间id';
+COMMENT ON COLUMN sj_retry_task.group_name IS '组名称';
+COMMENT ON COLUMN sj_retry_task.scene_name IS '场景名称';
+COMMENT ON COLUMN sj_retry_task.retry_id IS '重试信息Id';
+COMMENT ON COLUMN sj_retry_task.ext_attrs IS '扩展字段';
+COMMENT ON COLUMN sj_retry_task.task_status IS '重试状态';
+COMMENT ON COLUMN sj_retry_task.task_type IS '任务类型 1、重试数据 2、回调数据';
+COMMENT ON COLUMN sj_retry_task.operation_reason IS '操作原因';
+COMMENT ON COLUMN sj_retry_task.client_info IS '客户端地址 clientId#ip:port';
+COMMENT ON COLUMN sj_retry_task.create_dt IS '创建时间';
+COMMENT ON COLUMN sj_retry_task.update_dt IS '修改时间';
+COMMENT ON TABLE sj_retry_task IS '重试任务表';
+
+-- sj_retry_task_log_message
+CREATE TABLE sj_retry_task_log_message
+(
+    id            number GENERATED ALWAYS AS IDENTITY,
+    namespace_id  varchar2(64) DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' NULL,
+    group_name    varchar2(64)                                            NULL,
+    retry_id      number                                                  NOT NULL,
+    retry_task_id number                                                  NOT NULL,
+    message       clob                                                    NULL,
+    log_num       number       DEFAULT 1                                  NOT NULL,
+    real_time     number       DEFAULT 0                                  NOT NULL,
+    create_dt     date         DEFAULT CURRENT_TIMESTAMP                  NOT NULL
+);
+
+ALTER TABLE sj_retry_task_log_message
+    ADD CONSTRAINT pk_sj_retry_task_log_message PRIMARY KEY (id);
+
+CREATE INDEX idx_sj_rt_log_message_01 ON sj_retry_task_log_message (namespace_id, group_name, retry_task_id);
+CREATE INDEX idx_sj_rt_log_message_02 ON sj_retry_task_log_message (create_dt);
+
+COMMENT ON COLUMN sj_retry_task_log_message.id IS '主键';
+COMMENT ON COLUMN sj_retry_task_log_message.namespace_id IS '命名空间id';
+COMMENT ON COLUMN sj_retry_task_log_message.group_name IS '组名称';
+COMMENT ON COLUMN sj_retry_task_log_message.retry_id IS '重试信息Id';
+COMMENT ON COLUMN sj_retry_task_log_message.retry_task_id IS '重试任务Id';
+COMMENT ON COLUMN sj_retry_task_log_message.message IS '异常信息';
+COMMENT ON COLUMN sj_retry_task_log_message.log_num IS '日志数量';
+COMMENT ON COLUMN sj_retry_task_log_message.real_time IS '上报时间';
+COMMENT ON COLUMN sj_retry_task_log_message.create_dt IS '创建时间';
+COMMENT ON TABLE sj_retry_task_log_message IS '任务调度日志信息记录表';
+
+-- sj_retry_scene_config
+CREATE TABLE sj_retry_scene_config
+(
+    id                  number GENERATED ALWAYS AS IDENTITY,
+    namespace_id        varchar2(64)  DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' NULL,
+    scene_name          varchar2(64)                                             NULL,
+    group_name          varchar2(64)                                             NULL,
+    scene_status        smallint      DEFAULT 0                                  NOT NULL,
+    max_retry_count     number        DEFAULT 5                                  NOT NULL,
+    back_off            smallint      DEFAULT 1                                  NOT NULL,
+    trigger_interval    varchar2(16)  DEFAULT ''                                 NULL,
+    notify_ids          varchar2(128) DEFAULT ''                                 NULL,
+    deadline_request    number        DEFAULT 60000                              NOT NULL,
+    executor_timeout    number        DEFAULT 5                                  NOT NULL,
+    route_key           smallint      DEFAULT 4                                  NOT NULL,
+    block_strategy      smallint      DEFAULT 1                                  NOT NULL,
+    cb_status           smallint      DEFAULT 0                                  NOT NULL,
+    cb_trigger_type     smallint      DEFAULT 1                                  NOT NULL,
+    cb_max_count        number        DEFAULT 16                                 NOT NULL,
+    cb_trigger_interval varchar2(16)  DEFAULT ''                                 NULL,
+    description         varchar2(256) DEFAULT ''                                 NULL,
+    create_dt           date          DEFAULT CURRENT_TIMESTAMP                  NOT NULL,
+    update_dt           date          DEFAULT CURRENT_TIMESTAMP                  NOT NULL
+);
+
+ALTER TABLE sj_retry_scene_config
+    ADD CONSTRAINT pk_sj_retry_scene_config PRIMARY KEY (id);
+
+CREATE UNIQUE INDEX uk_sj_retry_scene_config_01 ON sj_retry_scene_config (namespace_id, group_name, scene_name);
+
+COMMENT ON COLUMN sj_retry_scene_config.id IS '主键';
+COMMENT ON COLUMN sj_retry_scene_config.namespace_id IS '命名空间id';
+COMMENT ON COLUMN sj_retry_scene_config.scene_name IS '场景名称';
+COMMENT ON COLUMN sj_retry_scene_config.group_name IS '组名称';
+COMMENT ON COLUMN sj_retry_scene_config.scene_status IS '组状态 0、未启用 1、启用';
+COMMENT ON COLUMN sj_retry_scene_config.max_retry_count IS '最大重试次数';
+COMMENT ON COLUMN sj_retry_scene_config.back_off IS '1、默认等级 2、固定间隔时间 3、CRON 表达式';
+COMMENT ON COLUMN sj_retry_scene_config.trigger_interval IS '间隔时长';
+COMMENT ON COLUMN sj_retry_scene_config.notify_ids IS '通知告警场景配置id列表';
+COMMENT ON COLUMN sj_retry_scene_config.deadline_request IS 'Deadline Request 调用链超时 单位毫秒';
+COMMENT ON COLUMN sj_retry_scene_config.executor_timeout IS '任务执行超时时间，单位秒';
+COMMENT ON COLUMN sj_retry_scene_config.route_key IS '路由策略';
+COMMENT ON COLUMN sj_retry_scene_config.block_strategy IS '阻塞策略 1、丢弃 2、覆盖 3、并行';
+COMMENT ON COLUMN sj_retry_scene_config.cb_status IS '回调状态 0、不开启 1、开启';
+COMMENT ON COLUMN sj_retry_scene_config.cb_trigger_type IS '1、默认等级 2、固定间隔时间 3、CRON 表达式';
+COMMENT ON COLUMN sj_retry_scene_config.cb_max_count IS '回调的最大执行次数';
+COMMENT ON COLUMN sj_retry_scene_config.cb_trigger_interval IS '回调的最大执行次数';
+COMMENT ON COLUMN sj_retry_scene_config.description IS '描述';
+COMMENT ON COLUMN sj_retry_scene_config.create_dt IS '创建时间';
+COMMENT ON COLUMN sj_retry_scene_config.update_dt IS '修改时间';
+COMMENT ON TABLE sj_retry_scene_config IS '场景配置';
+
+-- sj_server_node
+CREATE TABLE sj_server_node
+(
+    id           number GENERATED ALWAYS AS IDENTITY,
+    namespace_id varchar2(64)  DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' NULL,
+    group_name   varchar2(64)                                             NULL,
+    host_id      varchar2(64)                                             NULL,
+    host_ip      varchar2(64)                                             NULL,
+    host_port    number                                                   NOT NULL,
+    expire_at    date                                                     NOT NULL,
+    node_type    smallint                                                 NOT NULL,
+    ext_attrs    varchar2(256) DEFAULT ''                                 NULL,
+    create_dt    date          DEFAULT CURRENT_TIMESTAMP                  NOT NULL,
+    update_dt    date          DEFAULT CURRENT_TIMESTAMP                  NOT NULL
+);
+
+ALTER TABLE sj_server_node
+    ADD CONSTRAINT pk_sj_server_node PRIMARY KEY (id);
+
+CREATE UNIQUE INDEX uk_sj_server_node_01 ON sj_server_node (host_id, host_ip);
+
+CREATE INDEX idx_sj_server_node_01 ON sj_server_node (namespace_id, group_name);
+CREATE INDEX idx_sj_server_node_02 ON sj_server_node (expire_at, node_type);
+
+COMMENT ON COLUMN sj_server_node.id IS '主键';
+COMMENT ON COLUMN sj_server_node.namespace_id IS '命名空间id';
+COMMENT ON COLUMN sj_server_node.group_name IS '组名称';
+COMMENT ON COLUMN sj_server_node.host_id IS '主机id';
+COMMENT ON COLUMN sj_server_node.host_ip IS '机器ip';
+COMMENT ON COLUMN sj_server_node.host_port IS '机器端口';
+COMMENT ON COLUMN sj_server_node.expire_at IS '过期时间';
+COMMENT ON COLUMN sj_server_node.node_type IS '节点类型 1、客户端 2、是服务端';
+COMMENT ON COLUMN sj_server_node.ext_attrs IS '扩展字段';
+COMMENT ON COLUMN sj_server_node.create_dt IS '创建时间';
+COMMENT ON COLUMN sj_server_node.update_dt IS '修改时间';
+COMMENT ON TABLE sj_server_node IS '服务器节点';
+
+-- sj_distributed_lock
+CREATE TABLE sj_distributed_lock
+(
+    name       varchar2(64)                              NULL,
+    lock_until timestamp(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL,
+    locked_at  timestamp(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL,
+    locked_by  varchar2(255)                             NULL,
+    create_dt  date         DEFAULT CURRENT_TIMESTAMP    NOT NULL,
+    update_dt  date         DEFAULT CURRENT_TIMESTAMP    NOT NULL
+);
+
+ALTER TABLE sj_distributed_lock
+    ADD CONSTRAINT pk_sj_distributed_lock PRIMARY KEY (name);
+
+COMMENT ON COLUMN sj_distributed_lock.name IS '锁名称';
+COMMENT ON COLUMN sj_distributed_lock.lock_until IS '锁定时长';
+COMMENT ON COLUMN sj_distributed_lock.locked_at IS '锁定时间';
+COMMENT ON COLUMN sj_distributed_lock.locked_by IS '锁定者';
+COMMENT ON COLUMN sj_distributed_lock.create_dt IS '创建时间';
+COMMENT ON COLUMN sj_distributed_lock.update_dt IS '修改时间';
+COMMENT ON TABLE sj_distributed_lock IS '锁定表';
+
+-- sj_system_user
+CREATE TABLE sj_system_user
+(
+    id        number GENERATED ALWAYS AS IDENTITY,
+    username  varchar2(64)                       NULL,
+    password  varchar2(128)                      NULL,
+    role      smallint DEFAULT 0                 NOT NULL,
+    create_dt date     DEFAULT CURRENT_TIMESTAMP NOT NULL,
+    update_dt date     DEFAULT CURRENT_TIMESTAMP NOT NULL
+);
+
+ALTER TABLE sj_system_user
+    ADD CONSTRAINT pk_sj_system_user PRIMARY KEY (id);
+
+COMMENT ON COLUMN sj_system_user.id IS '主键';
+COMMENT ON COLUMN sj_system_user.username IS '账号';
+COMMENT ON COLUMN sj_system_user.password IS '密码';
+COMMENT ON COLUMN sj_system_user.role IS '角色：1-普通用户、2-管理员';
+COMMENT ON COLUMN sj_system_user.create_dt IS '创建时间';
+COMMENT ON COLUMN sj_system_user.update_dt IS '修改时间';
+COMMENT ON TABLE sj_system_user IS '系统用户表';
+
+-- pwd: admin
+INSERT INTO sj_system_user(username, password, role, create_dt, update_dt) VALUES ('admin', '465c194afb65670f38322df087f0a9bb225cc257e43eb4ac5a0c98ef5b3173ac', 2, sysdate, sysdate);
+
+-- sj_system_user_permission
+CREATE TABLE sj_system_user_permission
+(
+    id             number GENERATED ALWAYS AS IDENTITY,
+    group_name     varchar2(64)                                            NULL,
+    namespace_id   varchar2(64) DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' NULL,
+    system_user_id number                                                  NOT NULL,
+    create_dt      date         DEFAULT CURRENT_TIMESTAMP                  NOT NULL,
+    update_dt      date         DEFAULT CURRENT_TIMESTAMP                  NOT NULL
+);
+
+ALTER TABLE sj_system_user_permission
+    ADD CONSTRAINT pk_sj_system_user_permission PRIMARY KEY (id);
+
+CREATE UNIQUE INDEX uk_sj_su_permission_01 ON sj_system_user_permission (namespace_id, group_name, system_user_id);
+
+COMMENT ON COLUMN sj_system_user_permission.id IS '主键';
+COMMENT ON COLUMN sj_system_user_permission.group_name IS '组名称';
+COMMENT ON COLUMN sj_system_user_permission.namespace_id IS '命名空间id';
+COMMENT ON COLUMN sj_system_user_permission.system_user_id IS '系统用户id';
+COMMENT ON COLUMN sj_system_user_permission.create_dt IS '创建时间';
+COMMENT ON COLUMN sj_system_user_permission.update_dt IS '修改时间';
+COMMENT ON TABLE sj_system_user_permission IS '系统用户权限表';
+
+-- sj_sequence_alloc
+CREATE TABLE sj_sequence_alloc
+(
+    id           number GENERATED ALWAYS AS IDENTITY,
+    namespace_id varchar2(64) DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' NULL,
+    group_name   varchar2(64) DEFAULT ''                                 NULL,
+    max_id       number       DEFAULT 1                                  NOT NULL,
+    step         number       DEFAULT 100                                NOT NULL,
+    update_dt    date         DEFAULT CURRENT_TIMESTAMP                  NOT NULL
+);
+
+ALTER TABLE sj_sequence_alloc
+    ADD CONSTRAINT pk_sj_sequence_alloc PRIMARY KEY (id);
+
+CREATE UNIQUE INDEX uk_sj_sequence_alloc_01 ON sj_sequence_alloc (namespace_id, group_name);
+
+COMMENT ON COLUMN sj_sequence_alloc.id IS '主键';
+COMMENT ON COLUMN sj_sequence_alloc.namespace_id IS '命名空间id';
+COMMENT ON COLUMN sj_sequence_alloc.group_name IS '组名称';
+COMMENT ON COLUMN sj_sequence_alloc.max_id IS '最大id';
+COMMENT ON COLUMN sj_sequence_alloc.step IS '步长';
+COMMENT ON COLUMN sj_sequence_alloc.update_dt IS '更新时间';
+COMMENT ON TABLE sj_sequence_alloc IS '号段模式序号ID分配表';
+
+-- sj_job
+CREATE TABLE sj_job
+(
+    id               number GENERATED ALWAYS AS IDENTITY,
+    namespace_id     varchar2(64)  DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' NULL,
+    group_name       varchar2(64)                                             NULL,
+    job_name         varchar2(64)                                             NULL,
+    args_str         clob          DEFAULT NULL                               NULL,
+    args_type        smallint      DEFAULT 1                                  NOT NULL,
+    next_trigger_at  number                                                   NOT NULL,
+    job_status       smallint      DEFAULT 1                                  NOT NULL,
+    task_type        smallint      DEFAULT 1                                  NOT NULL,
+    route_key        smallint      DEFAULT 4                                  NOT NULL,
+    executor_type    smallint      DEFAULT 1                                  NOT NULL,
+    executor_info    varchar2(255) DEFAULT NULL                               NULL,
+    trigger_type     smallint                                                 NOT NULL,
+    trigger_interval varchar2(255)                                            NULL,
+    block_strategy   smallint      DEFAULT 1                                  NOT NULL,
+    executor_timeout number        DEFAULT 0                                  NOT NULL,
+    max_retry_times  number        DEFAULT 0                                  NOT NULL,
+    parallel_num     number        DEFAULT 1                                  NOT NULL,
+    retry_interval   number        DEFAULT 0                                  NOT NULL,
+    bucket_index     number        DEFAULT 0                                  NOT NULL,
+    resident         smallint      DEFAULT 0                                  NOT NULL,
+    notify_ids       varchar2(128) DEFAULT ''                                 NULL,
+    owner_id         number                                                   NULL,
+    description      varchar2(256) DEFAULT ''                                 NULL,
+    ext_attrs        varchar2(256) DEFAULT ''                                 NULL,
+    deleted          smallint      DEFAULT 0                                  NOT NULL,
+    create_dt        date          DEFAULT CURRENT_TIMESTAMP                  NOT NULL,
+    update_dt        date          DEFAULT CURRENT_TIMESTAMP                  NOT NULL
+);
+
+ALTER TABLE sj_job
+    ADD CONSTRAINT pk_sj_job PRIMARY KEY (id);
+
+CREATE INDEX idx_sj_job_01 ON sj_job (namespace_id, group_name);
+CREATE INDEX idx_sj_job_02 ON sj_job (job_status, bucket_index);
+CREATE INDEX idx_sj_job_03 ON sj_job (create_dt);
+
+COMMENT ON COLUMN sj_job.id IS '主键';
+COMMENT ON COLUMN sj_job.namespace_id IS '命名空间id';
+COMMENT ON COLUMN sj_job.group_name IS '组名称';
+COMMENT ON COLUMN sj_job.job_name IS '名称';
+COMMENT ON COLUMN sj_job.args_str IS '执行方法参数';
+COMMENT ON COLUMN sj_job.args_type IS '参数类型 ';
+COMMENT ON COLUMN sj_job.next_trigger_at IS '下次触发时间';
+COMMENT ON COLUMN sj_job.job_status IS '任务状态 0、关闭、1、开启';
+COMMENT ON COLUMN sj_job.task_type IS '任务类型 1、集群 2、广播 3、切片';
+COMMENT ON COLUMN sj_job.route_key IS '路由策略';
+COMMENT ON COLUMN sj_job.executor_type IS '执行器类型';
+COMMENT ON COLUMN sj_job.executor_info IS '执行器名称';
+COMMENT ON COLUMN sj_job.trigger_type IS '触发类型 1.CRON 表达式 2. 固定时间';
+COMMENT ON COLUMN sj_job.trigger_interval IS '间隔时长';
+COMMENT ON COLUMN sj_job.block_strategy IS '阻塞策略 1、丢弃 2、覆盖 3、并行 4、恢复';
+COMMENT ON COLUMN sj_job.executor_timeout IS '任务执行超时时间，单位秒';
+COMMENT ON COLUMN sj_job.max_retry_times IS '最大重试次数';
+COMMENT ON COLUMN sj_job.parallel_num IS '并行数';
+COMMENT ON COLUMN sj_job.retry_interval IS '重试间隔 ( s)';
+COMMENT ON COLUMN sj_job.bucket_index IS 'bucket';
+COMMENT ON COLUMN sj_job.resident IS '是否是常驻任务';
+COMMENT ON COLUMN sj_job.notify_ids IS '通知告警场景配置id列表';
+COMMENT ON COLUMN sj_job.owner_id IS '负责人id';
+COMMENT ON COLUMN sj_job.description IS '描述';
+COMMENT ON COLUMN sj_job.ext_attrs IS '扩展字段';
+COMMENT ON COLUMN sj_job.deleted IS '逻辑删除 1、删除';
+COMMENT ON COLUMN sj_job.create_dt IS '创建时间';
+COMMENT ON COLUMN sj_job.update_dt IS '修改时间';
+COMMENT ON TABLE sj_job IS '任务信息';
+
+INSERT INTO sj_job(namespace_id, group_name, job_name, args_str, args_type, next_trigger_at, job_status, task_type, route_key, executor_type, executor_info, trigger_type, trigger_interval, block_strategy,executor_timeout, max_retry_times, parallel_num, retry_interval, bucket_index, resident, notify_ids, owner_id, description, ext_attrs, deleted, create_dt, update_dt) VALUES ('dev', 'ruoyi_group', 'demo-job', NULL, 1, 1710344035622, 1, 1, 4, 1, 'testJobExecutor', 2, '60', 1, 60, 3, 1, 1, 116, 0, '', 1,'', '', 0, sysdate, sysdate);
+
+-- sj_job_log_message
+CREATE TABLE sj_job_log_message
+(
+    id            number GENERATED ALWAYS AS IDENTITY,
+    namespace_id  varchar2(64)  DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' NULL,
+    group_name    varchar2(64)                                             NULL,
+    job_id        number                                                   NOT NULL,
+    task_batch_id number                                                   NOT NULL,
+    task_id       number                                                   NOT NULL,
+    message       clob                                                     NULL,
+    log_num       number        DEFAULT 1                                  NOT NULL,
+    real_time     number        DEFAULT 0                                  NOT NULL,
+    ext_attrs     varchar2(256) DEFAULT ''                                 NULL,
+    create_dt     date          DEFAULT CURRENT_TIMESTAMP                  NOT NULL
+);
+
+ALTER TABLE sj_job_log_message
+    ADD CONSTRAINT pk_sj_job_log_message PRIMARY KEY (id);
+
+CREATE INDEX idx_sj_job_log_message_01 ON sj_job_log_message (task_batch_id, task_id);
+CREATE INDEX idx_sj_job_log_message_02 ON sj_job_log_message (create_dt);
+CREATE INDEX idx_sj_job_log_message_03 ON sj_job_log_message (namespace_id, group_name);
+
+COMMENT ON COLUMN sj_job_log_message.id IS '主键';
+COMMENT ON COLUMN sj_job_log_message.namespace_id IS '命名空间id';
+COMMENT ON COLUMN sj_job_log_message.group_name IS '组名称';
+COMMENT ON COLUMN sj_job_log_message.job_id IS '任务信息id';
+COMMENT ON COLUMN sj_job_log_message.task_batch_id IS '任务批次id';
+COMMENT ON COLUMN sj_job_log_message.task_id IS '调度任务id';
+COMMENT ON COLUMN sj_job_log_message.message IS '调度信息';
+COMMENT ON COLUMN sj_job_log_message.log_num IS '日志数量';
+COMMENT ON COLUMN sj_job_log_message.real_time IS '上报时间';
+COMMENT ON COLUMN sj_job_log_message.ext_attrs IS '扩展字段';
+COMMENT ON COLUMN sj_job_log_message.create_dt IS '创建时间';
+COMMENT ON TABLE sj_job_log_message IS '调度日志';
+
+-- sj_job_task
+CREATE TABLE sj_job_task
+(
+    id             number GENERATED ALWAYS AS IDENTITY,
+    namespace_id   varchar2(64)  DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' NULL,
+    group_name     varchar2(64)                                             NULL,
+    job_id         number                                                   NOT NULL,
+    task_batch_id  number                                                   NOT NULL,
+    parent_id      number        DEFAULT 0                                  NOT NULL,
+    task_status    smallint      DEFAULT 0                                  NOT NULL,
+    retry_count    number        DEFAULT 0                                  NOT NULL,
+    mr_stage       smallint      DEFAULT NULL                               NULL,
+    leaf           smallint      DEFAULT '1'                                NOT NULL,
+    task_name      varchar2(255) DEFAULT ''                                 NULL,
+    client_info    varchar2(128) DEFAULT NULL                               NULL,
+    wf_context     clob          DEFAULT NULL                               NULL,
+    result_message clob                                                     NULL,
+    args_str       clob          DEFAULT NULL                               NULL,
+    args_type      smallint      DEFAULT 1                                  NOT NULL,
+    ext_attrs      varchar2(256) DEFAULT ''                                 NULL,
+    create_dt      date          DEFAULT CURRENT_TIMESTAMP                  NOT NULL,
+    update_dt      date          DEFAULT CURRENT_TIMESTAMP                  NOT NULL
+);
+
+ALTER TABLE sj_job_task
+    ADD CONSTRAINT pk_sj_job_task PRIMARY KEY (id);
+
+CREATE INDEX idx_sj_job_task_01 ON sj_job_task (task_batch_id, task_status);
+CREATE INDEX idx_sj_job_task_02 ON sj_job_task (create_dt);
+CREATE INDEX idx_sj_job_task_03 ON sj_job_task (namespace_id, group_name);
+
+COMMENT ON COLUMN sj_job_task.id IS '主键';
+COMMENT ON COLUMN sj_job_task.namespace_id IS '命名空间id';
+COMMENT ON COLUMN sj_job_task.group_name IS '组名称';
+COMMENT ON COLUMN sj_job_task.job_id IS '任务信息id';
+COMMENT ON COLUMN sj_job_task.task_batch_id IS '调度任务id';
+COMMENT ON COLUMN sj_job_task.parent_id IS '父执行器id';
+COMMENT ON COLUMN sj_job_task.task_status IS '执行的状态 0、失败 1、成功';
+COMMENT ON COLUMN sj_job_task.retry_count IS '重试次数';
+COMMENT ON COLUMN sj_job_task.mr_stage IS '动态分片所处阶段 1:map 2:reduce 3:mergeReduce';
+COMMENT ON COLUMN sj_job_task.leaf IS '叶子节点';
+COMMENT ON COLUMN sj_job_task.task_name IS '任务名称';
+COMMENT ON COLUMN sj_job_task.client_info IS '客户端地址 clientId#ip:port';
+COMMENT ON COLUMN sj_job_task.wf_context IS '工作流全局上下文';
+COMMENT ON COLUMN sj_job_task.result_message IS '执行结果';
+COMMENT ON COLUMN sj_job_task.args_str IS '执行方法参数';
+COMMENT ON COLUMN sj_job_task.args_type IS '参数类型 ';
+COMMENT ON COLUMN sj_job_task.ext_attrs IS '扩展字段';
+COMMENT ON COLUMN sj_job_task.create_dt IS '创建时间';
+COMMENT ON COLUMN sj_job_task.update_dt IS '修改时间';
+COMMENT ON TABLE sj_job_task IS '任务实例';
+
+-- sj_job_task_batch
+CREATE TABLE sj_job_task_batch
+(
+    id                      number GENERATED ALWAYS AS IDENTITY,
+    namespace_id            varchar2(64)  DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' NULL,
+    group_name              varchar2(64)                                             NULL,
+    job_id                  number                                                   NOT NULL,
+    workflow_node_id        number        DEFAULT 0                                  NOT NULL,
+    parent_workflow_node_id number        DEFAULT 0                                  NOT NULL,
+    workflow_task_batch_id  number        DEFAULT 0                                  NOT NULL,
+    task_batch_status       smallint      DEFAULT 0                                  NOT NULL,
+    operation_reason        smallint      DEFAULT 0                                  NOT NULL,
+    execution_at            number        DEFAULT 0                                  NOT NULL,
+    system_task_type        smallint      DEFAULT 3                                  NOT NULL,
+    parent_id               varchar2(64)  DEFAULT ''                                 NULL,
+    ext_attrs               varchar2(256) DEFAULT ''                                 NULL,
+    deleted                 smallint      DEFAULT 0                                  NOT NULL,
+    create_dt               date          DEFAULT CURRENT_TIMESTAMP                  NOT NULL,
+    update_dt               date          DEFAULT CURRENT_TIMESTAMP                  NOT NULL
+);
+
+ALTER TABLE sj_job_task_batch
+    ADD CONSTRAINT pk_sj_job_task_batch PRIMARY KEY (id);
+
+CREATE INDEX idx_sj_job_task_batch_01 ON sj_job_task_batch (job_id, task_batch_status);
+CREATE INDEX idx_sj_job_task_batch_02 ON sj_job_task_batch (create_dt);
+CREATE INDEX idx_sj_job_task_batch_03 ON sj_job_task_batch (namespace_id, group_name);
+CREATE INDEX idx_sj_job_task_batch_04 ON sj_job_task_batch (workflow_task_batch_id, workflow_node_id);
+
+COMMENT ON COLUMN sj_job_task_batch.id IS '主键';
+COMMENT ON COLUMN sj_job_task_batch.namespace_id IS '命名空间id';
+COMMENT ON COLUMN sj_job_task_batch.group_name IS '组名称';
+COMMENT ON COLUMN sj_job_task_batch.job_id IS '任务id';
+COMMENT ON COLUMN sj_job_task_batch.workflow_node_id IS '工作流节点id';
+COMMENT ON COLUMN sj_job_task_batch.parent_workflow_node_id IS '工作流任务父批次id';
+COMMENT ON COLUMN sj_job_task_batch.workflow_task_batch_id IS '工作流任务批次id';
+COMMENT ON COLUMN sj_job_task_batch.task_batch_status IS '任务批次状态 0、失败 1、成功';
+COMMENT ON COLUMN sj_job_task_batch.operation_reason IS '操作原因';
+COMMENT ON COLUMN sj_job_task_batch.execution_at IS '任务执行时间';
+COMMENT ON COLUMN sj_job_task_batch.system_task_type IS '任务类型 3、JOB任务 4、WORKFLOW任务';
+COMMENT ON COLUMN sj_job_task_batch.parent_id IS '父节点';
+COMMENT ON COLUMN sj_job_task_batch.ext_attrs IS '扩展字段';
+COMMENT ON COLUMN sj_job_task_batch.deleted IS '逻辑删除 1、删除';
+COMMENT ON COLUMN sj_job_task_batch.create_dt IS '创建时间';
+COMMENT ON COLUMN sj_job_task_batch.update_dt IS '修改时间';
+COMMENT ON TABLE sj_job_task_batch IS '任务批次';
+
+-- sj_job_summary
+CREATE TABLE sj_job_summary
+(
+    id               number GENERATED ALWAYS AS IDENTITY,
+    namespace_id     varchar2(64)  DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' NULL,
+    group_name       varchar2(64)  DEFAULT ''                                 NULL,
+    business_id      number                                                   NOT NULL,
+    system_task_type smallint      DEFAULT 3                                  NOT NULL,
+    trigger_at       date          DEFAULT CURRENT_TIMESTAMP                  NOT NULL,
+    success_num      number        DEFAULT 0                                  NOT NULL,
+    fail_num         number        DEFAULT 0                                  NOT NULL,
+    fail_reason      varchar2(512) DEFAULT ''                                 NULL,
+    stop_num         number        DEFAULT 0                                  NOT NULL,
+    stop_reason      varchar2(512) DEFAULT ''                                 NULL,
+    cancel_num       number        DEFAULT 0                                  NOT NULL,
+    cancel_reason    varchar2(512) DEFAULT ''                                 NULL,
+    create_dt        date          DEFAULT CURRENT_TIMESTAMP                  NOT NULL,
+    update_dt        date          DEFAULT CURRENT_TIMESTAMP                  NOT NULL
+);
+
+ALTER TABLE sj_job_summary
+    ADD CONSTRAINT pk_sj_job_summary PRIMARY KEY (id);
+
+CREATE UNIQUE INDEX uk_sj_job_summary_01 ON sj_job_summary (trigger_at, system_task_type, business_id);
+
+CREATE INDEX idx_sj_job_summary_01 ON sj_job_summary (namespace_id, group_name, business_id);
+
+COMMENT ON COLUMN sj_job_summary.id IS '主键';
+COMMENT ON COLUMN sj_job_summary.namespace_id IS '命名空间id';
+COMMENT ON COLUMN sj_job_summary.group_name IS '组名称';
+COMMENT ON COLUMN sj_job_summary.business_id IS '业务id  ( job_id或workflow_id)';
+COMMENT ON COLUMN sj_job_summary.system_task_type IS '任务类型 3、JOB任务 4、WORKFLOW任务';
+COMMENT ON COLUMN sj_job_summary.trigger_at IS '统计时间';
+COMMENT ON COLUMN sj_job_summary.success_num IS '执行成功-日志数量';
+COMMENT ON COLUMN sj_job_summary.fail_num IS '执行失败-日志数量';
+COMMENT ON COLUMN sj_job_summary.fail_reason IS '失败原因';
+COMMENT ON COLUMN sj_job_summary.stop_num IS '执行失败-日志数量';
+COMMENT ON COLUMN sj_job_summary.stop_reason IS '失败原因';
+COMMENT ON COLUMN sj_job_summary.cancel_num IS '执行失败-日志数量';
+COMMENT ON COLUMN sj_job_summary.cancel_reason IS '失败原因';
+COMMENT ON COLUMN sj_job_summary.create_dt IS '创建时间';
+COMMENT ON COLUMN sj_job_summary.update_dt IS '修改时间';
+COMMENT ON TABLE sj_job_summary IS 'DashBoard_Job';
+
+-- sj_retry_summary
+CREATE TABLE sj_retry_summary
+(
+    id            number GENERATED ALWAYS AS IDENTITY,
+    namespace_id  varchar2(64) DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' NULL,
+    group_name    varchar2(64) DEFAULT ''                                 NULL,
+    scene_name    varchar2(50) DEFAULT ''                                 NULL,
+    trigger_at    date         DEFAULT CURRENT_TIMESTAMP                  NOT NULL,
+    running_num   number       DEFAULT 0                                  NOT NULL,
+    finish_num    number       DEFAULT 0                                  NOT NULL,
+    max_count_num number       DEFAULT 0                                  NOT NULL,
+    suspend_num   number       DEFAULT 0                                  NOT NULL,
+    create_dt     date         DEFAULT CURRENT_TIMESTAMP                  NOT NULL,
+    update_dt     date         DEFAULT CURRENT_TIMESTAMP                  NOT NULL
+);
+
+ALTER TABLE sj_retry_summary
+    ADD CONSTRAINT pk_sj_retry_summary PRIMARY KEY (id);
+
+CREATE UNIQUE INDEX uk_sj_retry_summary_01 ON sj_retry_summary (namespace_id, group_name, scene_name, trigger_at);
+
+CREATE INDEX idx_sj_retry_summary_01 ON sj_retry_summary (trigger_at);
+
+COMMENT ON COLUMN sj_retry_summary.id IS '主键';
+COMMENT ON COLUMN sj_retry_summary.namespace_id IS '命名空间id';
+COMMENT ON COLUMN sj_retry_summary.group_name IS '组名称';
+COMMENT ON COLUMN sj_retry_summary.scene_name IS '场景名称';
+COMMENT ON COLUMN sj_retry_summary.trigger_at IS '统计时间';
+COMMENT ON COLUMN sj_retry_summary.running_num IS '重试中-日志数量';
+COMMENT ON COLUMN sj_retry_summary.finish_num IS '重试完成-日志数量';
+COMMENT ON COLUMN sj_retry_summary.max_count_num IS '重试到达最大次数-日志数量';
+COMMENT ON COLUMN sj_retry_summary.suspend_num IS '暂停重试-日志数量';
+COMMENT ON COLUMN sj_retry_summary.create_dt IS '创建时间';
+COMMENT ON COLUMN sj_retry_summary.update_dt IS '修改时间';
+COMMENT ON TABLE sj_retry_summary IS 'DashBoard_Retry';
+
+-- sj_workflow
+CREATE TABLE sj_workflow
+(
+    id               number GENERATED ALWAYS AS IDENTITY,
+    workflow_name    varchar2(64)                                             NULL,
+    namespace_id     varchar2(64)  DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' NULL,
+    group_name       varchar2(64)                                             NULL,
+    workflow_status  smallint      DEFAULT 1                                  NOT NULL,
+    trigger_type     smallint                                                 NOT NULL,
+    trigger_interval varchar2(255)                                            NULL,
+    next_trigger_at  number                                                   NOT NULL,
+    block_strategy   smallint      DEFAULT 1                                  NOT NULL,
+    executor_timeout number        DEFAULT 0                                  NOT NULL,
+    description      varchar2(256) DEFAULT ''                                 NULL,
+    flow_info        clob          DEFAULT NULL                               NULL,
+    wf_context       clob          DEFAULT NULL                               NULL,
+    notify_ids       varchar2(128) DEFAULT ''                                 NULL,
+    bucket_index     number        DEFAULT 0                                  NOT NULL,
+    version          number                                                   NOT NULL,
+    ext_attrs        varchar2(256) DEFAULT ''                                 NULL,
+    deleted          smallint      DEFAULT 0                                  NOT NULL,
+    create_dt        date          DEFAULT CURRENT_TIMESTAMP                  NOT NULL,
+    update_dt        date          DEFAULT CURRENT_TIMESTAMP                  NOT NULL
+);
+
+ALTER TABLE sj_workflow
+    ADD CONSTRAINT pk_sj_workflow PRIMARY KEY (id);
+
+CREATE INDEX idx_sj_workflow_01 ON sj_workflow (create_dt);
+CREATE INDEX idx_sj_workflow_02 ON sj_workflow (namespace_id, group_name);
+
+COMMENT ON COLUMN sj_workflow.id IS '主键';
+COMMENT ON COLUMN sj_workflow.workflow_name IS '工作流名称';
+COMMENT ON COLUMN sj_workflow.namespace_id IS '命名空间id';
+COMMENT ON COLUMN sj_workflow.group_name IS '组名称';
+COMMENT ON COLUMN sj_workflow.workflow_status IS '工作流状态 0、关闭、1、开启';
+COMMENT ON COLUMN sj_workflow.trigger_type IS '触发类型 1.CRON 表达式 2. 固定时间';
+COMMENT ON COLUMN sj_workflow.trigger_interval IS '间隔时长';
+COMMENT ON COLUMN sj_workflow.next_trigger_at IS '下次触发时间';
+COMMENT ON COLUMN sj_workflow.block_strategy IS '阻塞策略 1、丢弃 2、覆盖 3、并行';
+COMMENT ON COLUMN sj_workflow.executor_timeout IS '任务执行超时时间，单位秒';
+COMMENT ON COLUMN sj_workflow.description IS '描述';
+COMMENT ON COLUMN sj_workflow.flow_info IS '流程信息';
+COMMENT ON COLUMN sj_workflow.wf_context IS '上下文';
+COMMENT ON COLUMN sj_workflow.notify_ids IS '通知告警场景配置id列表';
+COMMENT ON COLUMN sj_workflow.bucket_index IS 'bucket';
+COMMENT ON COLUMN sj_workflow.version IS '版本号';
+COMMENT ON COLUMN sj_workflow.ext_attrs IS '扩展字段';
+COMMENT ON COLUMN sj_workflow.deleted IS '逻辑删除 1、删除';
+COMMENT ON COLUMN sj_workflow.create_dt IS '创建时间';
+COMMENT ON COLUMN sj_workflow.update_dt IS '修改时间';
+COMMENT ON TABLE sj_workflow IS '工作流';
+
+-- sj_workflow_node
+CREATE TABLE sj_workflow_node
+(
+    id                   number GENERATED ALWAYS AS IDENTITY,
+    namespace_id         varchar2(64)  DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' NULL,
+    node_name            varchar2(64)                                             NULL,
+    group_name           varchar2(64)                                             NULL,
+    job_id               number                                                   NOT NULL,
+    workflow_id          number                                                   NOT NULL,
+    node_type            smallint      DEFAULT 1                                  NOT NULL,
+    expression_type      smallint      DEFAULT 0                                  NOT NULL,
+    fail_strategy        smallint      DEFAULT 1                                  NOT NULL,
+    workflow_node_status smallint      DEFAULT 1                                  NOT NULL,
+    priority_level       number        DEFAULT 1                                  NOT NULL,
+    node_info            clob          DEFAULT NULL                               NULL,
+    version              number                                                   NOT NULL,
+    ext_attrs            varchar2(256) DEFAULT ''                                 NULL,
+    deleted              smallint      DEFAULT 0                                  NOT NULL,
+    create_dt            date          DEFAULT CURRENT_TIMESTAMP                  NOT NULL,
+    update_dt            date          DEFAULT CURRENT_TIMESTAMP                  NOT NULL
+);
+
+ALTER TABLE sj_workflow_node
+    ADD CONSTRAINT pk_sj_workflow_node PRIMARY KEY (id);
+
+CREATE INDEX idx_sj_workflow_node_01 ON sj_workflow_node (create_dt);
+CREATE INDEX idx_sj_workflow_node_02 ON sj_workflow_node (namespace_id, group_name);
+
+COMMENT ON COLUMN sj_workflow_node.id IS '主键';
+COMMENT ON COLUMN sj_workflow_node.namespace_id IS '命名空间id';
+COMMENT ON COLUMN sj_workflow_node.node_name IS '节点名称';
+COMMENT ON COLUMN sj_workflow_node.group_name IS '组名称';
+COMMENT ON COLUMN sj_workflow_node.job_id IS '任务信息id';
+COMMENT ON COLUMN sj_workflow_node.workflow_id IS '工作流ID';
+COMMENT ON COLUMN sj_workflow_node.node_type IS '1、任务节点 2、条件节点';
+COMMENT ON COLUMN sj_workflow_node.expression_type IS '1、SpEl、2、Aviator 3、QL';
+COMMENT ON COLUMN sj_workflow_node.fail_strategy IS '失败策略 1、跳过 2、阻塞';
+COMMENT ON COLUMN sj_workflow_node.workflow_node_status IS '工作流节点状态 0、关闭、1、开启';
+COMMENT ON COLUMN sj_workflow_node.priority_level IS '优先级';
+COMMENT ON COLUMN sj_workflow_node.node_info IS '节点信息 ';
+COMMENT ON COLUMN sj_workflow_node.version IS '版本号';
+COMMENT ON COLUMN sj_workflow_node.ext_attrs IS '扩展字段';
+COMMENT ON COLUMN sj_workflow_node.deleted IS '逻辑删除 1、删除';
+COMMENT ON COLUMN sj_workflow_node.create_dt IS '创建时间';
+COMMENT ON COLUMN sj_workflow_node.update_dt IS '修改时间';
+COMMENT ON TABLE sj_workflow_node IS '工作流节点';
+
+-- sj_workflow_task_batch
+CREATE TABLE sj_workflow_task_batch
+(
+    id                number GENERATED ALWAYS AS IDENTITY,
+    namespace_id      varchar2(64)  DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' NULL,
+    group_name        varchar2(64)                                             NULL,
+    workflow_id       number                                                   NOT NULL,
+    task_batch_status smallint      DEFAULT 0                                  NOT NULL,
+    operation_reason  smallint      DEFAULT 0                                  NOT NULL,
+    flow_info         clob          DEFAULT NULL                               NULL,
+    wf_context        clob          DEFAULT NULL                               NULL,
+    execution_at      number        DEFAULT 0                                  NOT NULL,
+    ext_attrs         varchar2(256) DEFAULT ''                                 NULL,
+    version           number        DEFAULT 1                                  NOT NULL,
+    deleted           smallint      DEFAULT 0                                  NOT NULL,
+    create_dt         date          DEFAULT CURRENT_TIMESTAMP                  NOT NULL,
+    update_dt         date          DEFAULT CURRENT_TIMESTAMP                  NOT NULL
+);
+
+ALTER TABLE sj_workflow_task_batch
+    ADD CONSTRAINT pk_sj_workflow_task_batch PRIMARY KEY (id);
+
+CREATE INDEX idx_sj_workflow_task_batch_01 ON sj_workflow_task_batch (workflow_id, task_batch_status);
+CREATE INDEX idx_sj_workflow_task_batch_02 ON sj_workflow_task_batch (create_dt);
+CREATE INDEX idx_sj_workflow_task_batch_03 ON sj_workflow_task_batch (namespace_id, group_name);
+
+COMMENT ON COLUMN sj_workflow_task_batch.id IS '主键';
+COMMENT ON COLUMN sj_workflow_task_batch.namespace_id IS '命名空间id';
+COMMENT ON COLUMN sj_workflow_task_batch.group_name IS '组名称';
+COMMENT ON COLUMN sj_workflow_task_batch.workflow_id IS '工作流任务id';
+COMMENT ON COLUMN sj_workflow_task_batch.task_batch_status IS '任务批次状态 0、失败 1、成功';
+COMMENT ON COLUMN sj_workflow_task_batch.operation_reason IS '操作原因';
+COMMENT ON COLUMN sj_workflow_task_batch.flow_info IS '流程信息';
+COMMENT ON COLUMN sj_workflow_task_batch.wf_context IS '全局上下文';
+COMMENT ON COLUMN sj_workflow_task_batch.execution_at IS '任务执行时间';
+COMMENT ON COLUMN sj_workflow_task_batch.ext_attrs IS '扩展字段';
+COMMENT ON COLUMN sj_workflow_task_batch.version IS '版本号';
+COMMENT ON COLUMN sj_workflow_task_batch.deleted IS '逻辑删除 1、删除';
+COMMENT ON COLUMN sj_workflow_task_batch.create_dt IS '创建时间';
+COMMENT ON COLUMN sj_workflow_task_batch.update_dt IS '修改时间';
+COMMENT ON TABLE sj_workflow_task_batch IS '工作流批次';
diff --git a/script/sql/oracle/oracle_ry_vue_5.X.sql b/script/sql/oracle/oracle_ry_vue_5.X.sql
new file mode 100644
index 0000000..60c7ffc
--- /dev/null
+++ b/script/sql/oracle/oracle_ry_vue_5.X.sql
@@ -0,0 +1,1270 @@
+-- ----------------------------
+-- 第三方平台授权表
+-- ----------------------------
+create table sys_social
+(
+    id                 number(20)        not null,
+    user_id            number(20)        not null,
+    auth_id            varchar2(255)     not null,
+    source             varchar2(255)     not null,
+    open_id            varchar2(255)     default null,
+    user_name          varchar2(30)      not null,
+    nick_name          varchar2(30)      default '',
+    email              varchar2(255)     default '',
+    avatar             varchar2(500)     default '',
+    access_token       varchar2(2000)    not null,
+    expire_in          number(20)        default null,
+    refresh_token      varchar2(2000)    default null,
+    access_code        varchar2(255)     default null,
+    union_id           varchar2(255)     default null,
+    scope              varchar2(255)     default null,
+    token_type         varchar2(255)     default null,
+    id_token           varchar2(2000)    default null,
+    mac_algorithm      varchar2(255)     default null,
+    mac_key            varchar2(255)     default null,
+    code               varchar2(255)     default null,
+    oauth_token        varchar2(255)     default null,
+    oauth_token_secret varchar2(255)     default null,
+    create_dept        number(20),
+    create_by          number(20),
+    create_time        date,
+    update_by          number(20),
+    update_time        date,
+    del_flag           char(1)          default '0'
+);
+
+alter table sys_social add constraint pk_sys_social primary key (id);
+
+comment on table   sys_social                   is '社会化关系表';
+comment on column  sys_social.id                is '主键';
+comment on column  sys_social.user_id           is '用户ID';
+comment on column  sys_social.auth_id           is '平台+平台唯一id';
+comment on column  sys_social.source            is '用户来源';
+comment on column  sys_social.open_id           is '平台编号唯一id';
+comment on column  sys_social.user_name         is '登录账号';
+comment on column  sys_social.nick_name         is '用户昵称';
+comment on column  sys_social.email             is '用户邮箱';
+comment on column  sys_social.avatar            is '头像地址';
+comment on column  sys_social.access_token      is '用户的授权令牌';
+comment on column  sys_social.expire_in         is '用户的授权令牌的有效期，部分平台可能没有';
+comment on column  sys_social.refresh_token     is '刷新令牌，部分平台可能没有';
+comment on column  sys_social.access_code       is '平台的授权信息，部分平台可能没有';
+comment on column  sys_social.union_id          is '用户的 unionid';
+comment on column  sys_social.scope             is '授予的权限，部分平台可能没有';
+comment on column  sys_social.token_type        is '个别平台的授权信息，部分平台可能没有';
+comment on column  sys_social.id_token          is 'id token，部分平台可能没有';
+comment on column  sys_social.mac_algorithm     is '小米平台用户的附带属性，部分平台可能没有';
+comment on column  sys_social.mac_key           is '小米平台用户的附带属性，部分平台可能没有';
+comment on column  sys_social.code              is '用户的授权code，部分平台可能没有';
+comment on column  sys_social.oauth_token       is 'Twitter平台用户的附带属性，部分平台可能没有';
+comment on column  sys_social.oauth_token_secret is 'Twitter平台用户的附带属性，部分平台可能没有';
+comment on column  sys_social.create_dept       is '创建部门';
+comment on column  sys_social.create_by         is '创建者';
+comment on column  sys_social.create_time       is '创建时间';
+comment on column  sys_social.update_by         is '更新者';
+comment on column  sys_social.update_time       is '更新时间';
+comment on column  sys_social.del_flag          is '删除标志（0代表存在 1代表删除）';
+
+
+
+-- ----------------------------
+-- 1、部门表
+-- ----------------------------
+create table sys_dept (
+  dept_id           number(20)      not null,
+  parent_id         number(20)      default 0,
+  ancestors         varchar2(500)   default '',
+  dept_name         varchar2(30)    default '',
+  dept_category     varchar2(100)   default null,
+  order_num         number(4)       default 0,
+  leader            number(20)     default null,
+  phone             varchar2(11)    default null,
+  email             varchar2(50)    default null,
+  status            char(1)         default '0',
+  del_flag          char(1)         default '0',
+  create_dept       number(20)      default null,
+  create_by         number(20)      default null,
+  create_time       date,
+  update_by         number(20)      default null,
+  update_time       date
+);
+
+alter table sys_dept add constraint pk_sys_dept primary key (dept_id);
+
+comment on table  sys_dept              is '部门表';
+comment on column sys_dept.dept_id      is '部门id';
+comment on column sys_dept.parent_id    is '父部门id';
+comment on column sys_dept.ancestors    is '祖级列表';
+comment on column sys_dept.dept_name    is '部门名称';
+comment on column sys_dept.dept_category is '部门类别编码';
+comment on column sys_dept.order_num    is '显示顺序';
+comment on column sys_dept.leader       is '负责人';
+comment on column sys_dept.phone        is '联系电话';
+comment on column sys_dept.email        is '邮箱';
+comment on column sys_dept.status       is '部门状态（0正常 1停用）';
+comment on column sys_dept.del_flag     is '删除标志（0代表存在 1代表删除）';
+comment on column sys_dept.create_dept  is '创建部门';
+comment on column sys_dept.create_by    is '创建者';
+comment on column sys_dept.create_time  is '创建时间';
+comment on column sys_dept.update_by    is '更新者';
+comment on column sys_dept.update_time  is '更新时间';
+
+-- ----------------------------
+-- 初始化-部门表数据
+-- ----------------------------
+
+insert into sys_dept values(100, 0,   '0',          'XXX科技',   null,0, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate, null, null);
+insert into sys_dept values(101, 100, '0,100',      '深圳总公司', null,1, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate, null, null);
+insert into sys_dept values(102, 100, '0,100',      '长沙分公司', null,2, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate, null, null);
+insert into sys_dept values(103, 101, '0,100,101',  '研发部门',   null,1, 1, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate, null, null);
+insert into sys_dept values(104, 101, '0,100,101',  '市场部门',   null,2, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate, null, null);
+insert into sys_dept values(105, 101, '0,100,101',  '测试部门',   null,3, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate, null, null);
+insert into sys_dept values(106, 101, '0,100,101',  '财务部门',   null,4, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate, null, null);
+insert into sys_dept values(107, 101, '0,100,101',  '运维部门',   null,5, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate, null, null);
+insert into sys_dept values(108, 102, '0,100,102',  '市场部门',   null,1, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate, null, null);
+insert into sys_dept values(109, 102, '0,100,102',  '财务部门',   null,2, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate, null, null);
+
+
+-- ----------------------------
+-- 2、用户信息表
+-- ----------------------------
+create table sys_user (
+  user_id           number(20)      not null,
+  dept_id           number(20)      default null,
+  user_name         varchar2(40)    not null,
+  nick_name         varchar2(40)    not null,
+  user_type         varchar2(10)    default 'sys_user',
+  email             varchar2(50)    default '',
+  phonenumber       varchar2(11)    default '',
+  sex               char(1)         default '0',
+  avatar            number(20)      default null,
+  password          varchar2(100)   default '',
+  status            char(1)         default '0',
+  del_flag          char(1)         default '0',
+  login_ip          varchar2(128)   default '',
+  login_date        date,
+  create_dept       number(20)      default null,
+  create_by         number(20)      default null,
+  create_time       date,
+  update_by         number(20)      default null,
+  update_time       date,
+  remark            varchar2(500)   default ''
+);
+
+alter table sys_user add constraint pk_sys_user primary key (user_id);
+
+comment on table  sys_user              is '用户信息表';
+comment on column sys_user.user_id      is '用户ID';
+comment on column sys_user.dept_id      is '部门ID';
+comment on column sys_user.user_name    is '用户账号';
+comment on column sys_user.nick_name    is '用户昵称';
+comment on column sys_user.user_type    is '用户类型（sys_user系统用户）';
+comment on column sys_user.email        is '用户邮箱';
+comment on column sys_user.phonenumber  is '手机号码';
+comment on column sys_user.sex          is '用户性别（0男 1女 2未知）';
+comment on column sys_user.avatar       is '头像路径';
+comment on column sys_user.password     is '密码';
+comment on column sys_user.status       is '帐号状态（0正常 1停用）';
+comment on column sys_user.del_flag     is '删除标志（0代表存在 1代表删除）';
+comment on column sys_user.login_ip     is '最后登录IP';
+comment on column sys_user.login_date   is '最后登录时间';
+comment on column sys_user.create_dept  is '创建部门';
+comment on column sys_user.create_by    is '创建者';
+comment on column sys_user.create_time  is '创建时间';
+comment on column sys_user.update_by    is '更新者';
+comment on column sys_user.update_time  is '更新时间';
+comment on column sys_user.remark       is '备注';
+
+-- ----------------------------
+-- 初始化-用户信息表数据
+-- ----------------------------
+insert into sys_user values(1, 103, 'admin', '疯狂的狮子Li', 'sys_user', 'crazyLionLi@163.com', '15888888888', '1', null, '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '127.0.0.1', sysdate, 103, 1, sysdate, null, null, '管理员');
+insert into sys_user values(3, 108, 'test', '本部门及以下 密码666666', 'sys_user', '', '', '0', null, '$2a$10$b8yUzN0C71sbz.PhNOCgJe.Tu1yWC3RNrTyjSQ8p1W0.aaUXUJ.Ne', '0', '0', '127.0.0.1', sysdate, 103, 1, sysdate, null, null, '');
+insert into sys_user values(4, 102, 'test1', '仅本人 密码666666', 'sys_user', '', '', '0', null, '$2a$10$b8yUzN0C71sbz.PhNOCgJe.Tu1yWC3RNrTyjSQ8p1W0.aaUXUJ.Ne', '0', '0', '127.0.0.1', sysdate, 103, 1, sysdate, null, null, '');
+
+-- ----------------------------
+-- 3、岗位信息表
+-- ----------------------------
+create table sys_post (
+  post_id           number(20)      not null,
+  dept_id           number(20)      not null,
+  post_code         varchar2(64)    not null,
+  post_category     varchar2(64)    default null,
+  post_name         varchar2(50)    not null,
+  post_sort         number(4)       not null,
+  status            char(1)         not null,
+  create_dept       number(20)      default null,
+  create_by         number(20)      default null,
+  create_time       date,
+  update_by         number(20)      default null,
+  update_time       date,
+  remark            varchar2(500)
+);
+
+alter table sys_post add constraint pk_sys_post primary key (post_id);
+
+comment on table  sys_post              is '岗位信息表';
+comment on column sys_post.post_id      is '岗位ID';
+comment on column sys_post.dept_id      is '部门id';
+comment on column sys_post.post_code    is '岗位编码';
+comment on column sys_post.post_category is '岗位类别编码';
+comment on column sys_post.post_name    is '岗位名称';
+comment on column sys_post.post_sort    is '显示顺序';
+comment on column sys_post.status       is '状态（0正常 1停用）';
+comment on column sys_post.create_dept  is '创建部门';
+comment on column sys_post.create_by    is '创建者';
+comment on column sys_post.create_time  is '创建时间';
+comment on column sys_post.update_by    is '更新者';
+comment on column sys_post.update_time  is '更新时间';
+comment on column sys_post.remark       is '备注';
+
+-- ----------------------------
+-- 初始化-岗位信息表数据
+-- ----------------------------
+insert into sys_post values(1, 103, 'ceo',  null, '董事长',    1, '0', 103, 1, sysdate, null, null, '');
+insert into sys_post values(2, 100, 'se',   null, '项目经理',  2, '0', 103, 1, sysdate, null, null, '');
+insert into sys_post values(3, 100, 'hr',   null, '人力资源',  3, '0', 103, 1, sysdate, null, null, '');
+insert into sys_post values(4, 100, 'user', null, '普通员工',  4, '0', 103, 1, sysdate, null, null, '');
+
+
+-- ----------------------------
+-- 4、角色信息表
+-- ----------------------------
+create table sys_role (
+  role_id              number(20)      not null,
+  role_name            varchar2(30)    not null,
+  role_key             varchar2(100)   not null,
+  role_sort            number(4)       not null,
+  data_scope           char(1)         default '1',
+  menu_check_strictly  number(1)       default 1,
+  dept_check_strictly  number(1)       default 1,
+  status               char(1)         not null,
+  del_flag             char(1)         default '0',
+  create_dept          number(20)      default null,
+  create_by            number(20)      default null,
+  create_time          date,
+  update_by            number(20)      default null,
+  update_time          date,
+  remark               varchar2(500)   default null
+);
+
+alter table sys_role add constraint pk_sys_role primary key (role_id);
+
+comment on table  sys_role                       is '角色信息表';
+comment on column sys_role.role_id               is '角色ID';
+comment on column sys_role.role_name             is '角色名称';
+comment on column sys_role.role_key              is '角色权限字符串';
+comment on column sys_role.role_sort             is '显示顺序';
+comment on column sys_role.data_scope            is '数据范围（1：全部数据权限 2：自定数据权限 3：本部门数据权限 4：本部门及以下数据权限 5：仅本人数据权限 6：部门及以下或本人数据权限）';
+comment on column sys_role.menu_check_strictly   is '菜单树选择项是否关联显示';
+comment on column sys_role.dept_check_strictly   is '部门树选择项是否关联显示';
+comment on column sys_role.status                is '角色状态（0正常 1停用）';
+comment on column sys_role.del_flag              is '删除标志（0代表存在 1代表删除）';
+comment on column sys_role.create_dept           is '创建部门';
+comment on column sys_role.create_by             is '创建者';
+comment on column sys_role.create_time           is '创建时间';
+comment on column sys_role.update_by             is '更新者';
+comment on column sys_role.update_time           is '更新时间';
+comment on column sys_role.remark                is '备注';
+
+-- ----------------------------
+-- 初始化-角色信息表数据
+-- ----------------------------
+insert into sys_role values('1', '超级管理员',  'superadmin',  1, 1, 1, 1, '0', '0', 103, 1, sysdate, null, null, '超级管理员');
+insert into sys_role values('3', '本部门及以下', 'test1', 3, 4, 1, 1, '0', '0', 103, 1, sysdate, null, null, null);
+insert into sys_role values('4', '仅本人',      'test2', 4, 5, 1, 1, '0', '0', 103, 1, sysdate, null, null, null);
+
+-- ----------------------------
+-- 5、菜单权限表
+-- ----------------------------
+create table sys_menu (
+  menu_id           number(20)      not null,
+  menu_name         varchar2(50)    not null,
+  parent_id         number(20)      default 0,
+  order_num         number(4)       default 0,
+  path              varchar2(200)    default '',
+  component         varchar2(255)    default null,
+  query_param       varchar2(255)    default null,
+  is_frame          number(1)       default 1,
+  is_cache          number(1)       default 0,
+  menu_type         char(1)         default '',
+  visible           char(1)         default 0,
+  status            char(1)         default 0,
+  perms             varchar2(100)   default null,
+  icon              varchar2(100)   default '#',
+  create_dept       number(20)      default null,
+  create_by         number(20)      default null,
+  create_time       date,
+  update_by         number(20)      default null,
+  update_time       date ,
+  remark            varchar2(500)   default ''
+);
+
+alter table sys_menu add constraint pk_sys_menu primary key (menu_id);
+
+comment on table  sys_menu              is '菜单权限表';
+comment on column sys_menu.menu_id      is '菜单ID';
+comment on column sys_menu.menu_name    is '菜单名称';
+comment on column sys_menu.parent_id    is '父菜单ID';
+comment on column sys_menu.order_num    is '显示顺序';
+comment on column sys_menu.path         is '请求地址';
+comment on column sys_menu.component    is '路由地址';
+comment on column sys_menu.query_param  is '路由参数';
+comment on column sys_menu.is_frame     is '是否为外链（0是 1否）';
+comment on column sys_menu.is_cache     is '是否缓存（0缓存 1不缓存）';
+comment on column sys_menu.menu_type    is '菜单类型（M目录 C菜单 F按钮）';
+comment on column sys_menu.visible      is '显示状态（0显示 1隐藏）';
+comment on column sys_menu.status       is '菜单状态（0正常 1停用）';
+comment on column sys_menu.perms        is '权限标识';
+comment on column sys_menu.icon         is '菜单图标';
+comment on column sys_menu.create_dept  is '创建部门';
+comment on column sys_menu.create_by    is '创建者';
+comment on column sys_menu.create_time  is '创建时间';
+comment on column sys_menu.update_by    is '更新者';
+comment on column sys_menu.update_time  is '更新时间';
+comment on column sys_menu.remark       is '备注';
+
+-- ----------------------------
+-- 初始化-菜单信息表数据
+-- ----------------------------
+-- 一级菜单
+insert into sys_menu values('1', '系统管理', '0', '1', 'system',           null, '', 1, 0, 'M', '0', '0', '', 'system',   103, 1, sysdate, null, null, '系统管理目录');
+insert into sys_menu values('2', '系统监控', '0', '3', 'monitor',          null, '', 1, 0, 'M', '0', '0', '', 'monitor',  103, 1, sysdate, null, null, '系统监控目录');
+insert into sys_menu values('3', '系统工具', '0', '4', 'tool',             null, '', 1, 0, 'M', '0', '0', '', 'tool',     103, 1, sysdate, null, null, '系统工具目录');
+insert into sys_menu values('4', 'PLUS官网', '0', '5', 'https://gitee.com/dromara/RuoYi-Vue-Plus', null, '', 0, 0, 'M', '0', '0', '', 'guide',    103, 1, sysdate, null, null, 'RuoYi-Vue-Plus官网地址');
+insert into sys_menu values('5', '测试菜单', '0', '5', 'demo',             null, '', 1, 0, 'M', '0', '0', null, 'star', 103, 1, sysdate, null, null, '');
+-- 二级菜单
+insert into sys_menu values('100',  '用户管理',     '1',   '1', 'user',             'system/user/index',            '', 1, 0, 'C', '0', '0', 'system:user:list',            'user',          103, 1, sysdate, null, null, '用户管理菜单');
+insert into sys_menu values('101',  '角色管理',     '1',   '2', 'role',             'system/role/index',            '', 1, 0, 'C', '0', '0', 'system:role:list',            'peoples',       103, 1, sysdate, null, null, '角色管理菜单');
+insert into sys_menu values('102',  '菜单管理',     '1',   '3', 'menu',             'system/menu/index',            '', 1, 0, 'C', '0', '0', 'system:menu:list',            'tree-table',    103, 1, sysdate, null, null, '菜单管理菜单');
+insert into sys_menu values('103',  '部门管理',     '1',   '4', 'dept',             'system/dept/index',            '', 1, 0, 'C', '0', '0', 'system:dept:list',            'tree',          103, 1, sysdate, null, null, '部门管理菜单');
+insert into sys_menu values('104',  '岗位管理',     '1',   '5', 'post',             'system/post/index',            '', 1, 0, 'C', '0', '0', 'system:post:list',            'post',          103, 1, sysdate, null, null, '岗位管理菜单');
+insert into sys_menu values('105',  '字典管理',     '1',   '6', 'dict',             'system/dict/index',            '', 1, 0, 'C', '0', '0', 'system:dict:list',            'dict',          103, 1, sysdate, null, null, '字典管理菜单');
+insert into sys_menu values('106',  '参数设置',     '1',   '7', 'config',           'system/config/index',          '', 1, 0, 'C', '0', '0', 'system:config:list',          'edit',          103, 1, sysdate, null, null, '参数设置菜单');
+insert into sys_menu values('107',  '通知公告',     '1',   '8', 'notice',           'system/notice/index',          '', 1, 0, 'C', '0', '0', 'system:notice:list',          'message',       103, 1, sysdate, null, null, '通知公告菜单');
+insert into sys_menu values('108',  '日志管理',     '1',   '9', 'log',              '',                             '', 1, 0, 'M', '0', '0', '',                            'log',           103, 1, sysdate, null, null, '日志管理菜单');
+insert into sys_menu values('109',  '在线用户',     '2',   '1', 'online',           'monitor/online/index',         '', 1, 0, 'C', '0', '0', 'monitor:online:list',         'online',        103, 1, sysdate, null, null, '在线用户菜单');
+insert into sys_menu values('113',  '缓存监控',     '2',   '5', 'cache',            'monitor/cache/index',          '', 1, 0, 'C', '0', '0', 'monitor:cache:list',          'redis',         103, 1, sysdate, null, null, '缓存监控菜单');
+insert into sys_menu values('115',  '代码生成',     '3',   '2', 'gen',              'tool/gen/index',               '', 1, 0, 'C', '0', '0', 'tool:gen:list',               'code',          103, 1, sysdate, null, null, '代码生成菜单');
+insert into sys_menu values('123',  '客户端管理',   '1',   '11', 'client',           'system/client/index',          '', 1, 0, 'C', '0', '0', 'system:client:list',          'international', 103, 1, sysdate, null, null, '客户端管理菜单');
+insert into sys_menu values('116', '修改生成配置',  '3',   '2', 'gen-edit/index/:tableId', 'tool/gen/editTable', '', 1, 1, 'C', '1', '0', 'tool:gen:edit',           '#',               103, 1, sysdate, null, null, '');
+insert into sys_menu values('130', '分配用户',     '1',   '2', 'role-auth/user/:roleId', 'system/role/authUser', '', 1, 1, 'C', '1', '0', 'system:role:edit',      '#',               103, 1, sysdate, null, null, '');
+insert into sys_menu values('131', '分配角色',     '1',   '1', 'user-auth/role/:userId', 'system/user/authRole', '', 1, 1, 'C', '1', '0', 'system:user:edit',      '#',               103, 1, sysdate, null, null, '');
+insert into sys_menu values('132', '字典数据',     '1',   '6', 'dict-data/index/:dictId', 'system/dict/data', '', 1, 1, 'C', '1', '0', 'system:dict:list',         '#',               103, 1, sysdate, null, null, '');
+insert into sys_menu values('133', '文件配置管理',  '1',   '10', 'oss-config/index',              'system/oss/config', '', 1, 1, 'C', '1', '0', 'system:ossConfig:list',  '#',                103, 1, sysdate, null, null, '');
+
+-- springboot-admin监控
+insert into sys_menu values('117',  'Admin监控',   '2',    '5', 'Admin',            'monitor/admin/index',         '', 1, 0, 'C', '0', '0', 'monitor:admin:list',          'dashboard',     103, 1, sysdate, null, null, 'Admin监控菜单');
+-- oss菜单
+insert into sys_menu values('118',  '文件管理',     '1',    '10', 'oss',             'system/oss/index',            '', 1, 0, 'C', '0', '0', 'system:oss:list',             'upload',        103, 1, sysdate, null, null, '文件管理菜单');
+-- snail-job server控制台
+insert into sys_menu values('120',  '任务调度中心',  '2',    '5', 'snailjob',           'monitor/snailjob/index',        '', 1, 0, 'C', '0', '0', 'monitor:snailjob:list', 'job',           103, 1, sysdate, null, null, 'snailjob控制台菜单');
+
+-- 三级菜单
+insert into sys_menu values('500',  '操作日志', '108', '1', 'operlog',    'monitor/operlog/index',    '', 1, 0, 'C', '0', '0', 'monitor:operlog:list',    'form',          103, 1, sysdate, null, null, '操作日志菜单');
+insert into sys_menu values('501',  '登录日志', '108', '2', 'logininfor', 'monitor/logininfor/index', '', 1, 0, 'C', '0', '0', 'monitor:logininfor:list', 'logininfor',    103, 1, sysdate, null, null, '登录日志菜单');
+-- 用户管理按钮
+insert into sys_menu values('1001', '用户查询', '100', '1',  '', '', '', 1, 0, 'F', '0', '0', 'system:user:query',          '#', 103, 1, sysdate, null, null, '');
+insert into sys_menu values('1002', '用户新增', '100', '2',  '', '', '', 1, 0, 'F', '0', '0', 'system:user:add',            '#', 103, 1, sysdate, null, null, '');
+insert into sys_menu values('1003', '用户修改', '100', '3',  '', '', '', 1, 0, 'F', '0', '0', 'system:user:edit',           '#', 103, 1, sysdate, null, null, '');
+insert into sys_menu values('1004', '用户删除', '100', '4',  '', '', '', 1, 0, 'F', '0', '0', 'system:user:remove',         '#', 103, 1, sysdate, null, null, '');
+insert into sys_menu values('1005', '用户导出', '100', '5',  '', '', '', 1, 0, 'F', '0', '0', 'system:user:export',         '#', 103, 1, sysdate, null, null, '');
+insert into sys_menu values('1006', '用户导入', '100', '6',  '', '', '', 1, 0, 'F', '0', '0', 'system:user:import',         '#', 103, 1, sysdate, null, null, '');
+insert into sys_menu values('1007', '重置密码', '100', '7',  '', '', '', 1, 0, 'F', '0', '0', 'system:user:resetPwd',       '#', 103, 1, sysdate, null, null, '');
+-- 角色管理按钮
+insert into sys_menu values('1008', '角色查询', '101', '1',  '', '', '', 1, 0, 'F', '0', '0', 'system:role:query',          '#', 103, 1, sysdate, null, null, '');
+insert into sys_menu values('1009', '角色新增', '101', '2',  '', '', '', 1, 0, 'F', '0', '0', 'system:role:add',            '#', 103, 1, sysdate, null, null, '');
+insert into sys_menu values('1010', '角色修改', '101', '3',  '', '', '', 1, 0, 'F', '0', '0', 'system:role:edit',           '#', 103, 1, sysdate, null, null, '');
+insert into sys_menu values('1011', '角色删除', '101', '4',  '', '', '', 1, 0, 'F', '0', '0', 'system:role:remove',         '#', 103, 1, sysdate, null, null, '');
+insert into sys_menu values('1012', '角色导出', '101', '5',  '', '', '', 1, 0, 'F', '0', '0', 'system:role:export',         '#', 103, 1, sysdate, null, null, '');
+-- 菜单管理按钮
+insert into sys_menu values('1013', '菜单查询', '102', '1',  '', '', '', 1, 0, 'F', '0', '0', 'system:menu:query',          '#', 103, 1, sysdate, null, null, '');
+insert into sys_menu values('1014', '菜单新增', '102', '2',  '', '', '', 1, 0, 'F', '0', '0', 'system:menu:add',            '#', 103, 1, sysdate, null, null, '');
+insert into sys_menu values('1015', '菜单修改', '102', '3',  '', '', '', 1, 0, 'F', '0', '0', 'system:menu:edit',           '#', 103, 1, sysdate, null, null, '');
+insert into sys_menu values('1016', '菜单删除', '102', '4',  '', '', '', 1, 0, 'F', '0', '0', 'system:menu:remove',         '#', 103, 1, sysdate, null, null, '');
+-- 部门管理按钮
+insert into sys_menu values('1017', '部门查询', '103', '1',  '', '', '', 1, 0, 'F', '0', '0', 'system:dept:query',          '#', 103, 1, sysdate, null, null, '');
+insert into sys_menu values('1018', '部门新增', '103', '2',  '', '', '', 1, 0, 'F', '0', '0', 'system:dept:add',            '#', 103, 1, sysdate, null, null, '');
+insert into sys_menu values('1019', '部门修改', '103', '3',  '', '', '', 1, 0, 'F', '0', '0', 'system:dept:edit',           '#', 103, 1, sysdate, null, null, '');
+insert into sys_menu values('1020', '部门删除', '103', '4',  '', '', '', 1, 0, 'F', '0', '0', 'system:dept:remove',         '#', 103, 1, sysdate, null, null, '');
+-- 岗位管理按钮
+insert into sys_menu values('1021', '岗位查询', '104', '1',  '', '', '', 1, 0, 'F', '0', '0', 'system:post:query',          '#', 103, 1, sysdate, null, null, '');
+insert into sys_menu values('1022', '岗位新增', '104', '2',  '', '', '', 1, 0, 'F', '0', '0', 'system:post:add',            '#', 103, 1, sysdate, null, null, '');
+insert into sys_menu values('1023', '岗位修改', '104', '3',  '', '', '', 1, 0, 'F', '0', '0', 'system:post:edit',           '#', 103, 1, sysdate, null, null, '');
+insert into sys_menu values('1024', '岗位删除', '104', '4',  '', '', '', 1, 0, 'F', '0', '0', 'system:post:remove',         '#', 103, 1, sysdate, null, null, '');
+insert into sys_menu values('1025', '岗位导出', '104', '5',  '', '', '', 1, 0, 'F', '0', '0', 'system:post:export',         '#', 103, 1, sysdate, null, null, '');
+-- 字典管理按钮
+insert into sys_menu values('1026', '字典查询', '105', '1', '#', '', '', 1, 0, 'F', '0', '0', 'system:dict:query',          '#', 103, 1, sysdate, null, null, '');
+insert into sys_menu values('1027', '字典新增', '105', '2', '#', '', '', 1, 0, 'F', '0', '0', 'system:dict:add',            '#', 103, 1, sysdate, null, null, '');
+insert into sys_menu values('1028', '字典修改', '105', '3', '#', '', '', 1, 0, 'F', '0', '0', 'system:dict:edit',           '#', 103, 1, sysdate, null, null, '');
+insert into sys_menu values('1029', '字典删除', '105', '4', '#', '', '', 1, 0, 'F', '0', '0', 'system:dict:remove',         '#', 103, 1, sysdate, null, null, '');
+insert into sys_menu values('1030', '字典导出', '105', '5', '#', '', '', 1, 0, 'F', '0', '0', 'system:dict:export',         '#', 103, 1, sysdate, null, null, '');
+-- 参数设置按钮
+insert into sys_menu values('1031', '参数查询', '106', '1', '#', '', '', 1, 0, 'F', '0', '0', 'system:config:query',        '#', 103, 1, sysdate, null, null, '');
+insert into sys_menu values('1032', '参数新增', '106', '2', '#', '', '', 1, 0, 'F', '0', '0', 'system:config:add',          '#', 103, 1, sysdate, null, null, '');
+insert into sys_menu values('1033', '参数修改', '106', '3', '#', '', '', 1, 0, 'F', '0', '0', 'system:config:edit',         '#', 103, 1, sysdate, null, null, '');
+insert into sys_menu values('1034', '参数删除', '106', '4', '#', '', '', 1, 0, 'F', '0', '0', 'system:config:remove',       '#', 103, 1, sysdate, null, null, '');
+insert into sys_menu values('1035', '参数导出', '106', '5', '#', '', '', 1, 0, 'F', '0', '0', 'system:config:export',       '#', 103, 1, sysdate, null, null, '');
+-- 通知公告按钮
+insert into sys_menu values('1036', '公告查询', '107', '1', '#', '', '', 1, 0, 'F', '0', '0', 'system:notice:query',        '#', 103, 1, sysdate, null, null, '');
+insert into sys_menu values('1037', '公告新增', '107', '2', '#', '', '', 1, 0, 'F', '0', '0', 'system:notice:add',          '#', 103, 1, sysdate, null, null, '');
+insert into sys_menu values('1038', '公告修改', '107', '3', '#', '', '', 1, 0, 'F', '0', '0', 'system:notice:edit',         '#', 103, 1, sysdate, null, null, '');
+insert into sys_menu values('1039', '公告删除', '107', '4', '#', '', '', 1, 0, 'F', '0', '0', 'system:notice:remove',       '#', 103, 1, sysdate, null, null, '');
+-- 操作日志按钮
+insert into sys_menu values('1040', '操作查询', '500', '1', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:operlog:query',      '#', 103, 1, sysdate, null, null, '');
+insert into sys_menu values('1041', '操作删除', '500', '2', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:operlog:remove',     '#', 103, 1, sysdate, null, null, '');
+insert into sys_menu values('1042', '日志导出', '500', '4', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:operlog:export',     '#', 103, 1, sysdate, null, null, '');
+-- 登录日志按钮
+insert into sys_menu values('1043', '登录查询', '501', '1', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:logininfor:query',   '#', 103, 1, sysdate, null, null, '');
+insert into sys_menu values('1044', '登录删除', '501', '2', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:logininfor:remove',  '#', 103, 1, sysdate, null, null, '');
+insert into sys_menu values('1045', '日志导出', '501', '3', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:logininfor:export',  '#', 103, 1, sysdate, null, null, '');
+insert into sys_menu values('1050', '账户解锁', '501', '4', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:logininfor:unlock',  '#', 103, 1, sysdate, null, null, '');
+-- 在线用户按钮
+insert into sys_menu values('1046', '在线查询', '109', '1', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:online:query',       '#', 103, 1, sysdate, null, null, '');
+insert into sys_menu values('1047', '批量强退', '109', '2', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:online:batchLogout', '#', 103, 1, sysdate, null, null, '');
+insert into sys_menu values('1048', '单条强退', '109', '3', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:online:forceLogout', '#', 103, 1, sysdate, null, null, '');
+-- 代码生成按钮
+insert into sys_menu values('1055', '生成查询', '115', '1', '#', '', '', 1, 0, 'F', '0', '0', 'tool:gen:query',             '#', 103, 1, sysdate, null, null, '');
+insert into sys_menu values('1056', '生成修改', '115', '2', '#', '', '', 1, 0, 'F', '0', '0', 'tool:gen:edit',              '#', 103, 1, sysdate, null, null, '');
+insert into sys_menu values('1057', '生成删除', '115', '3', '#', '', '', 1, 0, 'F', '0', '0', 'tool:gen:remove',            '#', 103, 1, sysdate, null, null, '');
+insert into sys_menu values('1058', '导入代码', '115', '2', '#', '', '', 1, 0, 'F', '0', '0', 'tool:gen:import',            '#', 103, 1, sysdate, null, null, '');
+insert into sys_menu values('1059', '预览代码', '115', '4', '#', '', '', 1, 0, 'F', '0', '0', 'tool:gen:preview',           '#', 103, 1, sysdate, null, null, '');
+insert into sys_menu values('1060', '生成代码', '115', '5', '#', '', '', 1, 0, 'F', '0', '0', 'tool:gen:code',              '#', 103, 1, sysdate, null, null, '');
+-- oss相关按钮
+insert into sys_menu values('1600', '文件查询', '118', '1', '#', '', '', 1, 0, 'F', '0', '0', 'system:oss:query',        '#', 103, 1, sysdate, null, null, '');
+insert into sys_menu values('1601', '文件上传', '118', '2', '#', '', '', 1, 0, 'F', '0', '0', 'system:oss:upload',       '#', 103, 1, sysdate, null, null, '');
+insert into sys_menu values('1602', '文件下载', '118', '3', '#', '', '', 1, 0, 'F', '0', '0', 'system:oss:download',     '#', 103, 1, sysdate, null, null, '');
+insert into sys_menu values('1603', '文件删除', '118', '4', '#', '', '', 1, 0, 'F', '0', '0', 'system:oss:remove',       '#', 103, 1, sysdate, null, null, '');
+insert into sys_menu values('1620', '配置列表', '118', '5', '#', '', '', 1, 0, 'F', '0', '0', 'system:ossConfig:list',   '#', 103, 1, sysdate, null, null, '');
+insert into sys_menu values('1621', '配置添加', '118', '6', '#', '', '', 1, 0, 'F', '0', '0', 'system:ossConfig:add',    '#', 103, 1, sysdate, null, null, '');
+insert into sys_menu values('1622', '配置编辑', '118', '6', '#', '', '', 1, 0, 'F', '0', '0', 'system:ossConfig:edit',   '#', 103, 1, sysdate, null, null, '');
+insert into sys_menu values('1623', '配置删除', '118', '6', '#', '', '', 1, 0, 'F', '0', '0', 'system:ossConfig:remove', '#', 103, 1, sysdate, null, null, '');
+-- 客户端管理按钮
+insert into sys_menu values('1061', '客户端管理查询', '123', '1',  '#', '', '', 1, 0, 'F', '0', '0', 'system:client:query',        '#', 103, 1, sysdate, null, null, '');
+insert into sys_menu values('1062', '客户端管理新增', '123', '2',  '#', '', '', 1, 0, 'F', '0', '0', 'system:client:add',          '#', 103, 1, sysdate, null, null, '');
+insert into sys_menu values('1063', '客户端管理修改', '123', '3',  '#', '', '', 1, 0, 'F', '0', '0', 'system:client:edit',         '#', 103, 1, sysdate, null, null, '');
+insert into sys_menu values('1064', '客户端管理删除', '123', '4',  '#', '', '', 1, 0, 'F', '0', '0', 'system:client:remove',       '#', 103, 1, sysdate, null, null, '');
+insert into sys_menu values('1065', '客户端管理导出', '123', '5',  '#', '', '', 1, 0, 'F', '0', '0', 'system:client:export',       '#', 103, 1, sysdate, null, null, '');
+-- 测试菜单
+insert into sys_menu values('1500', '测试单表',     '5',   '1', 'demo', 'demo/demo/index', '',  1, 0, 'C', '0', '0', 'demo:demo:list', '#', 103, 1, sysdate, null, null, '测试单表菜单');
+insert into sys_menu values('1501', '测试单表查询', '1500', '1', '#', '', '',  1, 0, 'F', '0', '0', 'demo:demo:query', '#', 103, 1, sysdate, null, null, '');
+insert into sys_menu values('1502', '测试单表新增', '1500', '2', '#', '', '',  1, 0, 'F', '0', '0', 'demo:demo:add', '#', 103, 1, sysdate, null, null, '');
+insert into sys_menu values('1503', '测试单表修改', '1500', '3', '#', '', '',  1, 0, 'F', '0', '0', 'demo:demo:edit', '#', 103, 1, sysdate, null, null, '');
+insert into sys_menu values('1504', '测试单表删除', '1500', '4', '#', '', '',  1, 0, 'F', '0', '0', 'demo:demo:remove', '#', 103, 1, sysdate, null, null, '');
+insert into sys_menu values('1505', '测试单表导出', '1500', '5', '#', '', '',  1, 0, 'F', '0', '0', 'demo:demo:export', '#', 103, 1, sysdate, null, null, '');
+insert into sys_menu values('1506', '测试树表',     '5',   '1', 'tree', 'demo/tree/index', '',  1, 0, 'C', '0', '0', 'demo:tree:list', '#', 103, 1, sysdate, null, null, '测试树表菜单');
+insert into sys_menu values('1507', '测试树表查询', '1506', '1', '#', '', '',  1, 0, 'F', '0', '0', 'demo:tree:query', '#', 103, 1, sysdate, null, null, '');
+insert into sys_menu values('1508', '测试树表新增', '1506', '2', '#', '', '',  1, 0, 'F', '0', '0', 'demo:tree:add', '#', 103, 1, sysdate, null, null, '');
+insert into sys_menu values('1509', '测试树表修改', '1506', '3', '#', '', '',  1, 0, 'F', '0', '0', 'demo:tree:edit', '#', 103, 1, sysdate, null, null, '');
+insert into sys_menu values('1510', '测试树表删除', '1506', '4', '#', '', '',  1, 0, 'F', '0', '0', 'demo:tree:remove', '#', 103, 1, sysdate, null, null, '');
+insert into sys_menu values('1511', '测试树表导出', '1506', '5', '#', '', '',  1, 0, 'F', '0', '0', 'demo:tree:export', '#', 103, 1, sysdate, null, null, '');
+
+
+-- ----------------------------
+-- 6、用户和角色关联表  用户N-1角色
+-- ----------------------------
+create table sys_user_role (
+  user_id  number(20)  not null,
+  role_id  number(20)  not null
+);
+
+alter table sys_user_role add constraint pk_sys_user_role primary key (user_id, role_id);
+
+comment on table  sys_user_role              is '用户和角色关联表';
+comment on column sys_user_role.user_id      is '用户ID';
+comment on column sys_user_role.role_id      is '角色ID';
+
+-- ----------------------------
+-- 初始化-用户和角色关联表数据
+-- ----------------------------
+insert into sys_user_role values ('1', '1');
+insert into sys_user_role values ('3', '3');
+insert into sys_user_role values ('4', '4');
+
+-- ----------------------------
+-- 7、角色和菜单关联表  角色1-N菜单
+-- ----------------------------
+create table sys_role_menu (
+  role_id  number(20)  not null,
+  menu_id  number(20)  not null
+);
+
+alter table sys_role_menu add constraint pk_sys_role_menu primary key (role_id, menu_id);
+
+comment on table  sys_role_menu              is '角色和菜单关联表';
+comment on column sys_role_menu.role_id      is '角色ID';
+comment on column sys_role_menu.menu_id      is '菜单ID';
+
+-- ----------------------------
+-- 初始化-角色和菜单关联表数据
+-- ----------------------------
+insert into sys_role_menu values ('3', '1');
+insert into sys_role_menu values ('3', '5');
+insert into sys_role_menu values ('3', '100');
+insert into sys_role_menu values ('3', '101');
+insert into sys_role_menu values ('3', '102');
+insert into sys_role_menu values ('3', '103');
+insert into sys_role_menu values ('3', '104');
+insert into sys_role_menu values ('3', '105');
+insert into sys_role_menu values ('3', '106');
+insert into sys_role_menu values ('3', '107');
+insert into sys_role_menu values ('3', '108');
+insert into sys_role_menu values ('3', '118');
+insert into sys_role_menu values ('3', '123');
+insert into sys_role_menu values ('3', '500');
+insert into sys_role_menu values ('3', '501');
+insert into sys_role_menu values ('3', '1001');
+insert into sys_role_menu values ('3', '1002');
+insert into sys_role_menu values ('3', '1003');
+insert into sys_role_menu values ('3', '1004');
+insert into sys_role_menu values ('3', '1005');
+insert into sys_role_menu values ('3', '1006');
+insert into sys_role_menu values ('3', '1007');
+insert into sys_role_menu values ('3', '1008');
+insert into sys_role_menu values ('3', '1009');
+insert into sys_role_menu values ('3', '1010');
+insert into sys_role_menu values ('3', '1011');
+insert into sys_role_menu values ('3', '1012');
+insert into sys_role_menu values ('3', '1013');
+insert into sys_role_menu values ('3', '1014');
+insert into sys_role_menu values ('3', '1015');
+insert into sys_role_menu values ('3', '1016');
+insert into sys_role_menu values ('3', '1017');
+insert into sys_role_menu values ('3', '1018');
+insert into sys_role_menu values ('3', '1019');
+insert into sys_role_menu values ('3', '1020');
+insert into sys_role_menu values ('3', '1021');
+insert into sys_role_menu values ('3', '1022');
+insert into sys_role_menu values ('3', '1023');
+insert into sys_role_menu values ('3', '1024');
+insert into sys_role_menu values ('3', '1025');
+insert into sys_role_menu values ('3', '1026');
+insert into sys_role_menu values ('3', '1027');
+insert into sys_role_menu values ('3', '1028');
+insert into sys_role_menu values ('3', '1029');
+insert into sys_role_menu values ('3', '1030');
+insert into sys_role_menu values ('3', '1031');
+insert into sys_role_menu values ('3', '1032');
+insert into sys_role_menu values ('3', '1033');
+insert into sys_role_menu values ('3', '1034');
+insert into sys_role_menu values ('3', '1035');
+insert into sys_role_menu values ('3', '1036');
+insert into sys_role_menu values ('3', '1037');
+insert into sys_role_menu values ('3', '1038');
+insert into sys_role_menu values ('3', '1039');
+insert into sys_role_menu values ('3', '1040');
+insert into sys_role_menu values ('3', '1041');
+insert into sys_role_menu values ('3', '1042');
+insert into sys_role_menu values ('3', '1043');
+insert into sys_role_menu values ('3', '1044');
+insert into sys_role_menu values ('3', '1045');
+insert into sys_role_menu values ('3', '1050');
+insert into sys_role_menu values ('3', '1061');
+insert into sys_role_menu values ('3', '1062');
+insert into sys_role_menu values ('3', '1063');
+insert into sys_role_menu values ('3', '1064');
+insert into sys_role_menu values ('3', '1065');
+insert into sys_role_menu values ('3', '1500');
+insert into sys_role_menu values ('3', '1501');
+insert into sys_role_menu values ('3', '1502');
+insert into sys_role_menu values ('3', '1503');
+insert into sys_role_menu values ('3', '1504');
+insert into sys_role_menu values ('3', '1505');
+insert into sys_role_menu values ('3', '1506');
+insert into sys_role_menu values ('3', '1507');
+insert into sys_role_menu values ('3', '1508');
+insert into sys_role_menu values ('3', '1509');
+insert into sys_role_menu values ('3', '1510');
+insert into sys_role_menu values ('3', '1511');
+insert into sys_role_menu values ('3', '1600');
+insert into sys_role_menu values ('3', '1601');
+insert into sys_role_menu values ('3', '1602');
+insert into sys_role_menu values ('3', '1603');
+insert into sys_role_menu values ('3', '1620');
+insert into sys_role_menu values ('3', '1621');
+insert into sys_role_menu values ('3', '1622');
+insert into sys_role_menu values ('3', '1623');
+insert into sys_role_menu values ('3', '11616');
+insert into sys_role_menu values ('3', '11618');
+insert into sys_role_menu values ('3', '11619');
+insert into sys_role_menu values ('3', '11622');
+insert into sys_role_menu values ('3', '11623');
+insert into sys_role_menu values ('3', '11629');
+insert into sys_role_menu values ('3', '11632');
+insert into sys_role_menu values ('3', '11633');
+insert into sys_role_menu values ('3', '11638');
+insert into sys_role_menu values ('3', '11639');
+insert into sys_role_menu values ('3', '11640');
+insert into sys_role_menu values ('3', '11641');
+insert into sys_role_menu values ('3', '11642');
+insert into sys_role_menu values ('3', '11643');
+insert into sys_role_menu values ('4', '5');
+insert into sys_role_menu values ('4', '1500');
+insert into sys_role_menu values ('4', '1501');
+insert into sys_role_menu values ('4', '1502');
+insert into sys_role_menu values ('4', '1503');
+insert into sys_role_menu values ('4', '1504');
+insert into sys_role_menu values ('4', '1505');
+insert into sys_role_menu values ('4', '1506');
+insert into sys_role_menu values ('4', '1507');
+insert into sys_role_menu values ('4', '1508');
+insert into sys_role_menu values ('4', '1509');
+insert into sys_role_menu values ('4', '1510');
+insert into sys_role_menu values ('4', '1511');
+
+-- ----------------------------
+-- 8、角色和部门关联表  角色1-N部门
+-- ----------------------------
+create table sys_role_dept (
+  role_id  number(20)  not null,
+  dept_id  number(20)  not null
+);
+
+alter table sys_role_dept add constraint pk_sys_role_dept primary key (role_id, dept_id);
+
+comment on table  sys_role_dept              is '角色和部门关联表';
+comment on column sys_role_dept.role_id      is '角色ID';
+comment on column sys_role_dept.dept_id      is '部门ID';
+
+
+-- ----------------------------
+-- 9、用户与岗位关联表  用户1-N岗位
+-- ----------------------------
+create table sys_user_post (
+  user_id number(20)  not null,
+  post_id number(20)  not null
+);
+
+alter table sys_user_post add constraint pk_sys_user_post primary key (user_id, post_id);
+
+comment on table  sys_user_post              is '用户与岗位关联表';
+comment on column sys_user_post.user_id      is '用户ID';
+comment on column sys_user_post.post_id      is '岗位ID';
+
+-- ----------------------------
+-- 初始化-用户与岗位关联表数据
+-- ----------------------------
+insert into sys_user_post values ('1', '1');
+
+-- ----------------------------
+-- 10、操作日志记录
+-- ----------------------------
+create table sys_oper_log (
+  oper_id           number(20)      not null,
+  title             varchar2(50)    default '',
+  business_type     number(2)       default 0,
+  method            varchar2(100)   default '',
+  request_method    varchar2(10)     default '',
+  operator_type     number(1)       default 0,
+  oper_name         varchar2(50)    default '',
+  dept_name         varchar2(50)    default '',
+  oper_url          varchar2(255)   default '',
+  oper_ip           varchar2(128)   default '',
+  oper_location     varchar2(255)   default '',
+  oper_param        varchar2(4000)  default '',
+  json_result       varchar2(4000)  default '',
+  status            number(1)       default 0,
+  error_msg         varchar2(4000)  default '',
+  oper_time         date,
+  cost_time         number(20)      default 0
+);
+
+alter table sys_oper_log add constraint pk_sys_oper_log primary key (oper_id);
+create index idx_sys_oper_log_bt on sys_oper_log (business_type);
+create index idx_sys_oper_log_s on sys_oper_log (status);
+create index idx_sys_oper_log_ot on sys_oper_log (oper_time);
+
+comment on table  sys_oper_log                is '操作日志记录';
+comment on column sys_oper_log.oper_id        is '日志主键';
+comment on column sys_oper_log.title          is '模块标题';
+comment on column sys_oper_log.business_type  is '业务类型（0其它 1新增 2修改 3删除）';
+comment on column sys_oper_log.method         is '方法名称';
+comment on column sys_oper_log.request_method is '请求方式';
+comment on column sys_oper_log.operator_type  is '操作类别（0其它 1后台用户 2手机端用户）';
+comment on column sys_oper_log.oper_name      is '操作人员';
+comment on column sys_oper_log.dept_name      is '部门名称';
+comment on column sys_oper_log.oper_url       is '请求URL';
+comment on column sys_oper_log.oper_ip        is '主机地址';
+comment on column sys_oper_log.oper_location  is '操作地点';
+comment on column sys_oper_log.oper_param     is '请求参数';
+comment on column sys_oper_log.json_result    is '返回参数';
+comment on column sys_oper_log.status         is '操作状态（0正常 1异常）';
+comment on column sys_oper_log.error_msg      is '错误消息';
+comment on column sys_oper_log.oper_time      is '操作时间';
+comment on column sys_oper_log.cost_time      is '消耗时间';
+
+
+-- ----------------------------
+-- 11、字典类型表
+-- ----------------------------
+create table sys_dict_type (
+  dict_id           number(20)      not null,
+  dict_name         varchar2(100)   default '',
+  dict_type         varchar2(100)   default '',
+  create_dept       number(20)      default null,
+  create_by         number(20)      default null,
+  create_time       date,
+  update_by         number(20)      default null,
+  update_time       date,
+  remark            varchar2(500)   default null
+);
+
+alter table sys_dict_type add constraint pk_sys_dict_type primary key (dict_id);
+create unique index sys_dict_type_index1 on sys_dict_type (dict_type);
+
+comment on table  sys_dict_type               is '字典类型表';
+comment on column sys_dict_type.dict_id       is '字典主键';
+comment on column sys_dict_type.dict_name     is '字典名称';
+comment on column sys_dict_type.dict_type     is '字典类型';
+comment on column sys_dict_type.create_dept   is '创建部门';
+comment on column sys_dict_type.create_by     is '创建者';
+comment on column sys_dict_type.create_time   is '创建时间';
+comment on column sys_dict_type.update_by     is '更新者';
+comment on column sys_dict_type.update_time   is '更新时间';
+comment on column sys_dict_type.remark        is '备注';
+
+insert into sys_dict_type values(1, '用户性别', 'sys_user_sex',        103, 1, sysdate, null, null, '用户性别列表');
+insert into sys_dict_type values(2, '菜单状态', 'sys_show_hide',       103, 1, sysdate, null, null, '菜单状态列表');
+insert into sys_dict_type values(3, '系统开关', 'sys_normal_disable',  103, 1, sysdate, null, null, '系统开关列表');
+insert into sys_dict_type values(6, '系统是否', 'sys_yes_no',          103, 1, sysdate, null, null, '系统是否列表');
+insert into sys_dict_type values(7, '通知类型', 'sys_notice_type',     103, 1, sysdate, null, null, '通知类型列表');
+insert into sys_dict_type values(8, '通知状态', 'sys_notice_status',   103, 1, sysdate, null, null, '通知状态列表');
+insert into sys_dict_type values(9, '操作类型', 'sys_oper_type',       103, 1, sysdate, null, null, '操作类型列表');
+insert into sys_dict_type values(10, '系统状态', 'sys_common_status',  103, 1, sysdate, null, null, '登录状态列表');
+insert into sys_dict_type values(11, '授权类型', 'sys_grant_type',     103, 1, sysdate, null, null, '认证授权类型');
+insert into sys_dict_type values(12, '设备类型', 'sys_device_type',    103, 1, sysdate, null, null, '客户端设备类型');
+
+
+-- ----------------------------
+-- 12、字典数据表
+-- ----------------------------
+create table sys_dict_data (
+  dict_code        number(20)      not null,
+  dict_sort        number(4)       default 0,
+  dict_label       varchar2(100)   default '',
+  dict_value       varchar2(100)   default '',
+  dict_type        varchar2(100)   default '',
+  css_class        varchar2(100)   default null,
+  list_class       varchar2(100)   default null,
+  is_default       char(1)         default 'N',
+  create_dept      number(20)      default null,
+  create_by        number(20)      default null,
+  create_time      date,
+  update_by        number(20)      default null,
+  update_time      date,
+  remark           varchar2(500)   default null
+);
+
+alter table sys_dict_data add constraint pk_sys_dict_data primary key (dict_code);
+
+comment on table  sys_dict_data               is '字典数据表';
+comment on column sys_dict_data.dict_code     is '字典主键';
+comment on column sys_dict_data.dict_sort     is '字典排序';
+comment on column sys_dict_data.dict_label    is '字典标签';
+comment on column sys_dict_data.dict_value    is '字典键值';
+comment on column sys_dict_data.dict_type     is '字典类型';
+comment on column sys_dict_data.css_class     is '样式属性（其他样式扩展）';
+comment on column sys_dict_data.list_class    is '表格回显样式';
+comment on column sys_dict_data.is_default    is '是否默认（Y是 N否）';
+comment on column sys_dict_data.create_dept   is '创建部门';
+comment on column sys_dict_data.create_by     is '创建者';
+comment on column sys_dict_data.create_time   is '创建时间';
+comment on column sys_dict_data.update_by     is '更新者';
+comment on column sys_dict_data.update_time   is '更新时间';
+comment on column sys_dict_data.remark        is '备注';
+
+insert into sys_dict_data values(1, 1,  '男',       '0',       'sys_user_sex',        '',   '',        'Y', 103, 1, sysdate, null, null, '性别男');
+insert into sys_dict_data values(2, 2,  '女',       '1',       'sys_user_sex',        '',   '',        'N', 103, 1, sysdate, null, null, '性别女');
+insert into sys_dict_data values(3, 3,  '未知',     '2',       'sys_user_sex',        '',   '',        'N', 103, 1, sysdate, null, null, '性别未知');
+insert into sys_dict_data values(4, 1,  '显示',     '0',       'sys_show_hide',       '',   'primary', 'Y', 103, 1, sysdate, null, null, '显示菜单');
+insert into sys_dict_data values(5, 2,  '隐藏',     '1',       'sys_show_hide',       '',   'danger',  'N', 103, 1, sysdate, null, null, '隐藏菜单');
+insert into sys_dict_data values(6, 1,  '正常',     '0',       'sys_normal_disable',  '',   'primary', 'Y', 103, 1, sysdate, null, null, '正常状态');
+insert into sys_dict_data values(7, 2,  '停用',     '1',       'sys_normal_disable',  '',   'danger',  'N', 103, 1, sysdate, null, null, '停用状态');
+insert into sys_dict_data values(12, 1,  '是',       'Y',       'sys_yes_no',          '',   'primary', 'Y', 103, 1, sysdate, null, null, '系统默认是');
+insert into sys_dict_data values(13, 2,  '否',       'N',       'sys_yes_no',          '',   'danger',  'N', 103, 1, sysdate, null, null, '系统默认否');
+insert into sys_dict_data values(14, 1,  '通知',     '1',       'sys_notice_type',     '',   'warning', 'Y', 103, 1, sysdate, null, null, '通知');
+insert into sys_dict_data values(15, 2,  '公告',     '2',       'sys_notice_type',     '',   'success', 'N', 103, 1, sysdate, null, null, '公告');
+insert into sys_dict_data values(16, 1,  '正常',     '0',       'sys_notice_status',   '',   'primary', 'Y', 103, 1, sysdate, null, null, '正常状态');
+insert into sys_dict_data values(17, 2,  '关闭',     '1',       'sys_notice_status',   '',   'danger',  'N', 103, 1, sysdate, null, null, '关闭状态');
+insert into sys_dict_data values(29, 99, '其他',     '0',       'sys_oper_type',       '',   'info',    'N', 103, 1, sysdate, null, null, '其他操作');
+insert into sys_dict_data values(18, 1,  '新增',     '1',       'sys_oper_type',       '',   'info',    'N', 103, 1, sysdate, null, null, '新增操作');
+insert into sys_dict_data values(19, 2,  '修改',     '2',       'sys_oper_type',       '',   'info',    'N', 103, 1, sysdate, null, null, '修改操作');
+insert into sys_dict_data values(20, 3,  '删除',     '3',       'sys_oper_type',       '',   'danger',  'N', 103, 1, sysdate, null, null, '删除操作');
+insert into sys_dict_data values(21, 4,  '授权',     '4',       'sys_oper_type',       '',   'primary', 'N', 103, 1, sysdate, null, null, '授权操作');
+insert into sys_dict_data values(22, 5,  '导出',     '5',       'sys_oper_type',       '',   'warning', 'N', 103, 1, sysdate, null, null, '导出操作');
+insert into sys_dict_data values(23, 6,  '导入',     '6',       'sys_oper_type',       '',   'warning', 'N', 103, 1, sysdate, null, null, '导入操作');
+insert into sys_dict_data values(24, 7,  '强退',     '7',       'sys_oper_type',       '',   'danger',  'N', 103, 1, sysdate, null, null, '强退操作');
+insert into sys_dict_data values(25, 8,  '生成代码', '8',       'sys_oper_type',       '',   'warning', 'N', 103, 1, sysdate, null, null, '生成操作');
+insert into sys_dict_data values(26, 9,  '清空数据', '9',       'sys_oper_type',       '',   'danger',  'N', 103, 1, sysdate, null, null, '清空操作');
+insert into sys_dict_data values(27, 1,  '成功',     '0',       'sys_common_status',   '',   'primary', 'N', 103, 1, sysdate, null, null, '正常状态');
+insert into sys_dict_data values(28, 2,  '失败',     '1',       'sys_common_status',   '',   'danger',  'N', 103, 1, sysdate, null, null, '停用状态');
+insert into sys_dict_data values(30, 0,  '密码认证', 'password',   'sys_grant_type',   '',   'default', 'N', 103, 1, sysdate, null, null, '密码认证');
+insert into sys_dict_data values(31, 0,  '短信认证', 'sms',        'sys_grant_type',   '',   'default', 'N', 103, 1, sysdate, null, null, '短信认证');
+insert into sys_dict_data values(32, 0,  '邮件认证', 'email',      'sys_grant_type',   '',   'default', 'N', 103, 1, sysdate, null, null, '邮件认证');
+insert into sys_dict_data values(33, 0,  '小程序认证', 'xcx',      'sys_grant_type',   '',   'default', 'N', 103, 1, sysdate, null, null, '小程序认证');
+insert into sys_dict_data values(34, 0,  '三方登录认证', 'social', 'sys_grant_type',   '',   'default', 'N', 103, 1, sysdate, null, null, '三方登录认证');
+insert into sys_dict_data values(35, 0,  'PC',      'pc',          'sys_device_type',  '',   'default', 'N', 103, 1, sysdate, null, null, 'PC');
+insert into sys_dict_data values(36, 0,  '安卓',     'android',    'sys_device_type',  '',   'default', 'N', 103, 1, sysdate, null, null, '安卓');
+insert into sys_dict_data values(37, 0,  'iOS',     'ios',         'sys_device_type',  '',   'default', 'N', 103, 1, sysdate, null, null, 'iOS');
+insert into sys_dict_data values(38, 0,  '小程序',     'xcx',      'sys_device_type',  '',   'default', 'N', 103, 1, sysdate, null, null, '小程序');
+
+
+-- ----------------------------
+-- 13、参数配置表
+-- ----------------------------
+create table sys_config (
+  config_id         number(20)     not null,
+  config_name       varchar2(100)  default '',
+  config_key        varchar2(100)  default '',
+  config_value      varchar2(100)  default '',
+  config_type       char(1)        default 'N',
+  create_dept       number(20)     default null,
+  create_by         number(20)     default null,
+  create_time       date,
+  update_by         number(20)     default null,
+  update_time       date,
+  remark            varchar2(500)  default null
+);
+alter table sys_config add constraint pk_sys_config primary key (config_id);
+
+comment on table  sys_config               is '参数配置表';
+comment on column sys_config.config_id     is '参数主键';
+comment on column sys_config.config_name   is '参数名称';
+comment on column sys_config.config_key    is '参数键名';
+comment on column sys_config.config_value  is '参数键值';
+comment on column sys_config.config_type   is '系统内置（Y是 N否）';
+comment on column sys_config.create_dept   is '创建部门';
+comment on column sys_config.create_by     is '创建者';
+comment on column sys_config.create_time   is '创建时间';
+comment on column sys_config.update_by     is '更新者';
+comment on column sys_config.update_time   is '更新时间';
+comment on column sys_config.remark        is '备注';
+
+insert into sys_config values(1, '主框架页-默认皮肤样式名称',      'sys.index.skinName',            'skin-blue',     'Y', 103, 1, sysdate, null, null, '蓝色 skin-blue、绿色 skin-green、紫色 skin-purple、红色 skin-red、黄色 skin-yellow' );
+insert into sys_config values(2, '用户管理-账号初始密码',         'sys.user.initPassword',         '123456',        'Y', 103, 1, sysdate, null, null, '初始化密码 123456' );
+insert into sys_config values(3, '主框架页-侧边栏主题',           'sys.index.sideTheme',           'theme-dark',    'Y', 103, 1, sysdate, null, null, '深色主题theme-dark，浅色主题theme-light' );
+insert into sys_config values(5, '账号自助-是否开启用户注册功能',   'sys.account.registerUser',      'false',         'Y', 103, 1, sysdate, null, null, '是否开启注册用户功能（true开启，false关闭）');
+insert into sys_config values(11, 'OSS预览列表资源开关',          'sys.oss.previewListResource',   'true',          'Y', 103, 1, sysdate, null, null, 'true:开启, false:关闭');
+
+
+-- ----------------------------
+-- 14、系统访问记录
+-- ----------------------------
+create table sys_logininfor (
+  info_id         number(20)     not null,
+  user_name       varchar2(50)   default '',
+  client_key      varchar2(32)   default '',
+  device_type     varchar2(32)   default '',
+  ipaddr          varchar2(128)  default '',
+  login_location  varchar2(255)  default '',
+  browser         varchar2(50)   default '',
+  os              varchar2(50)   default '',
+  status          char(1)        default '0',
+  msg             varchar2(255)  default '',
+  login_time      date
+);
+
+alter table sys_logininfor add constraint pk_sys_logininfor primary key (info_id);
+create index idx_sys_logininfor_s on sys_logininfor (status);
+create index idx_sys_logininfor_lt on sys_logininfor (login_time);
+
+comment on table  sys_logininfor                is '系统访问记录';
+comment on column sys_logininfor.info_id        is '访问ID';
+comment on column sys_logininfor.user_name      is '登录账号';
+comment on column sys_logininfor.client_key     is '客户端';
+comment on column sys_logininfor.device_type    is '设备类型';
+comment on column sys_logininfor.ipaddr         is '登录IP地址';
+comment on column sys_logininfor.login_location is '登录地点';
+comment on column sys_logininfor.browser        is '浏览器类型';
+comment on column sys_logininfor.os             is '操作系统';
+comment on column sys_logininfor.status         is '登录状态（0成功 1失败）';
+comment on column sys_logininfor.msg            is '提示消息';
+comment on column sys_logininfor.login_time     is '访问时间';
+
+
+-- ----------------------------
+-- 17、通知公告表
+-- ----------------------------
+create table sys_notice (
+  notice_id         number(20)      not null,
+  notice_title      varchar2(50)    not null,
+  notice_type       char(1)         not null,
+  notice_content    clob            default null,
+  status            char(1)         default '0',
+  create_dept       number(20)      default null,
+  create_by         number(20)      default null,
+  create_time       date,
+  update_by         number(20)      default null,
+  update_time       date,
+  remark            varchar2(255)   default null
+);
+
+alter table sys_notice add constraint pk_sys_notice primary key (notice_id);
+
+comment on table  sys_notice                   is '通知公告表';
+comment on column sys_notice.notice_id         is '公告主键';
+comment on column sys_notice.notice_title      is '公告标题';
+comment on column sys_notice.notice_type       is '公告类型（1通知 2公告）';
+comment on column sys_notice.notice_content    is '公告内容';
+comment on column sys_notice.status            is '公告状态（0正常 1关闭）';
+comment on column sys_notice.create_dept       is '创建部门';
+comment on column sys_notice.create_by         is '创建者';
+comment on column sys_notice.create_time       is '创建时间';
+comment on column sys_notice.update_by         is '更新者';
+comment on column sys_notice.update_time       is '更新时间';
+comment on column sys_notice.remark            is '备注';
+
+-- ----------------------------
+-- 初始化-公告信息表数据
+-- ----------------------------
+insert into sys_notice values('1', '温馨提醒：2018-07-01 新版本发布啦', '2', '新版本内容', '0', 103, 1, sysdate, null, null, '管理员');
+insert into sys_notice values('2', '维护通知：2018-07-01 系统凌晨维护', '1', '维护内容',   '0', 103, 1, sysdate, null, null, '管理员');
+
+
+-- ----------------------------
+-- 18、代码生成业务表
+-- ----------------------------
+create table gen_table (
+  table_id          number(20)       not null,
+  data_name         varchar2(200)    default '',
+  table_name        varchar2(200)    default '',
+  table_comment     varchar2(500)    default '',
+  sub_table_name    varchar2(64)     default null,
+  sub_table_fk_name varchar2(64)     default null,
+  class_name        varchar2(100)    default '',
+  tpl_category      varchar2(200)    default 'crud',
+  package_name      varchar2(100),
+  module_name       varchar2(30),
+  business_name     varchar2(30),
+  function_name     varchar2(50),
+  function_author   varchar2(50),
+  gen_type          char(1)          default '0',
+  gen_path          varchar2(200)    default '/',
+  options           varchar2(1000),
+  create_dept       number(20)       default null,
+  create_by         number(20)       default null,
+  create_time       date,
+  update_by         number(20)       default null,
+  update_time       date,
+  remark            varchar2(500)    default null
+);
+
+alter table gen_table add constraint pk_gen_table primary key (table_id);
+
+comment on table  gen_table                   is '代码生成业务表';
+comment on column gen_table.table_id          is '编号';
+comment on column gen_table.data_name         is '数据源名称';
+comment on column gen_table.table_name        is '表名称';
+comment on column gen_table.table_comment     is '表描述';
+comment on column gen_table.sub_table_name    is '关联子表的表名';
+comment on column gen_table.sub_table_fk_name is '子表关联的外键名';
+comment on column gen_table.class_name        is '实体类名称';
+comment on column gen_table.tpl_category      is '使用的模板（crud单表操作 tree树表操作）';
+comment on column gen_table.package_name      is '生成包路径';
+comment on column gen_table.module_name       is '生成模块名';
+comment on column gen_table.business_name     is '生成业务名';
+comment on column gen_table.function_name     is '生成功能名';
+comment on column gen_table.function_author   is '生成功能作者';
+comment on column gen_table.gen_type          is '生成代码方式（0zip压缩包 1自定义路径）';
+comment on column gen_table.gen_path          is '生成路径（不填默认项目路径）';
+comment on column gen_table.options           is '其它生成选项';
+comment on column gen_table.create_dept       is '创建部门';
+comment on column gen_table.create_by         is '创建者';
+comment on column gen_table.create_time       is '创建时间';
+comment on column gen_table.update_by         is '更新者';
+comment on column gen_table.update_time       is '更新时间';
+comment on column gen_table.remark            is '备注';
+
+
+-- ----------------------------
+-- 19、代码生成业务表字段
+-- ----------------------------
+create table gen_table_column (
+  column_id         number(20)      not null,
+  table_id          number(20),
+  column_name       varchar2(200),
+  column_comment    varchar2(500),
+  column_type       varchar2(100),
+  java_type         varchar2(500),
+  java_field        varchar2(200),
+  is_pk             char(1),
+  is_increment      char(1),
+  is_required       char(1),
+  is_insert         char(1),
+  is_edit           char(1),
+  is_list           char(1),
+  is_query          char(1),
+  query_type        varchar2(200)    default 'EQ',
+  html_type         varchar2(200),
+  dict_type         varchar2(200)    default '',
+  sort              number(4),
+  create_dept       number(20)       default null,
+  create_by         number(20)       default null,
+  create_time       date ,
+  update_by         number(20)       default null,
+  update_time       date
+);
+
+alter table gen_table_column add constraint pk_gen_table_column primary key (column_id);
+
+comment on table  gen_table_column                is '代码生成业务表字段';
+comment on column gen_table_column.column_id      is '编号';
+comment on column gen_table_column.table_id       is '归属表编号';
+comment on column gen_table_column.column_name    is '列名称';
+comment on column gen_table_column.column_comment is '列描述';
+comment on column gen_table_column.column_type    is '列类型';
+comment on column gen_table_column.java_type      is 'JAVA类型';
+comment on column gen_table_column.java_field     is 'JAVA字段名';
+comment on column gen_table_column.is_pk          is '是否主键（1是）';
+comment on column gen_table_column.is_increment   is '是否自增（1是）';
+comment on column gen_table_column.is_required    is '是否必填（1是）';
+comment on column gen_table_column.is_insert      is '是否为插入字段（1是）';
+comment on column gen_table_column.is_edit        is '是否编辑字段（1是）';
+comment on column gen_table_column.is_list        is '是否列表字段（1是）';
+comment on column gen_table_column.is_query       is '是否查询字段（1是）';
+comment on column gen_table_column.query_type     is '查询方式（等于、不等于、大于、小于、范围）';
+comment on column gen_table_column.html_type      is '显示类型（文本框、文本域、下拉框、复选框、单选框、日期控件）';
+comment on column gen_table_column.dict_type      is '字典类型';
+comment on column gen_table_column.sort           is '排序';
+comment on column gen_table_column.create_dept    is '创建部门';
+comment on column gen_table_column.create_by      is '创建者';
+comment on column gen_table_column.create_time    is '创建时间';
+comment on column gen_table_column.update_by      is '更新者';
+comment on column gen_table_column.update_time    is '更新时间';
+
+
+-- ----------------------------
+-- OSS对象存储表
+-- ----------------------------
+create table sys_oss (
+  oss_id          number(20)     not null,
+  file_name       varchar2(255)  not null,
+  original_name   varchar2(255)  not null,
+  file_suffix     varchar2(10)   not null,
+  url             varchar2(500)  not null,
+  service         varchar2(20)   default 'minio' not null,
+  ext1            varchar2(500)  default '',
+  create_dept     number(20)     default null,
+  create_by       number(20)     default null,
+  create_time     date,
+  update_by       number(20)     default null,
+  update_time     date
+);
+
+alter table sys_oss add constraint pk_sys_oss primary key (oss_id);
+
+comment on table sys_oss                    is 'OSS对象存储表';
+comment on column sys_oss.oss_id            is '对象存储主键';
+comment on column sys_oss.file_name         is '文件名';
+comment on column sys_oss.original_name     is '原名';
+comment on column sys_oss.file_suffix       is '文件后缀名';
+comment on column sys_oss.url               is 'URL地址';
+comment on column sys_oss.service           is '服务商';
+comment on column sys_oss.ext1              is '扩展字段';
+comment on column sys_oss.create_dept       is '创建部门';
+comment on column sys_oss.create_time       is '创建时间';
+comment on column sys_oss.create_by         is '上传者';
+comment on column sys_oss.update_time       is '更新时间';
+comment on column sys_oss.update_by         is '更新者';
+
+
+-- ----------------------------
+-- OSS对象存储动态配置表
+-- ----------------------------
+create table sys_oss_config (
+  oss_config_id   number(20)     not null,
+  config_key      varchar2(20)   not null,
+  access_key      varchar2(255)  default '',
+  secret_key      varchar2(255)  default '',
+  bucket_name     varchar2(255)  default '',
+  prefix          varchar2(255)  default '',
+  endpoint        varchar2(255)  default '',
+  domain          varchar2(255)  default '',
+  is_https        char(1)        default 'N',
+  region          varchar2(255)  default '',
+  access_policy   char(1)        default '1' not null,
+  status          char(1)        default '1',
+  ext1            varchar2(255)  default '',
+  remark          varchar2(500)  default null,
+  create_dept     number(20)     default null,
+  create_by       number(20)     default null,
+  create_time     date,
+  update_by       number(20)     default null,
+  update_time     date
+);
+
+alter table sys_oss_config add constraint pk_sys_oss_config primary key (oss_config_id);
+
+comment on table sys_oss_config                 is '对象存储配置表';
+comment on column sys_oss_config.oss_config_id  is '主键';
+comment on column sys_oss_config.config_key     is '配置key';
+comment on column sys_oss_config.access_key     is 'accesskey';
+comment on column sys_oss_config.secret_key     is '秘钥';
+comment on column sys_oss_config.bucket_name    is '桶名称';
+comment on column sys_oss_config.prefix         is '前缀';
+comment on column sys_oss_config.endpoint       is '访问站点';
+comment on column sys_oss_config.domain         is '自定义域名';
+comment on column sys_oss_config.is_https       is '是否https（Y=是,N=否）';
+comment on column sys_oss_config.region         is '域';
+comment on column sys_oss_config.access_policy  is '桶权限类型(0=private 1=public 2=custom)';
+comment on column sys_oss_config.status         is '是否默认（0=是,1=否）';
+comment on column sys_oss_config.ext1           is '扩展字段';
+comment on column sys_oss_config.remark         is '备注';
+comment on column sys_oss_config.create_dept    is '创建部门';
+comment on column sys_oss_config.create_by      is '创建者';
+comment on column sys_oss_config.create_time    is '创建时间';
+comment on column sys_oss_config.update_by      is '更新者';
+comment on column sys_oss_config.update_time    is '更新时间';
+
+insert into sys_oss_config values (1, 'minio',  'ruoyi',            'ruoyi123',        'ruoyi',             '', '127.0.0.1:9000',                '','N', '',            '1', '0', '', NULL, 103, 1, sysdate, 1, sysdate);
+insert into sys_oss_config values (2, 'qiniu',  'XXXXXXXXXXXXXXX',  'XXXXXXXXXXXXXXX', 'ruoyi',             '', 's3-cn-north-1.qiniucs.com',     '','N', '',            '1', '1', '', NULL, 103, 1, sysdate, 1, sysdate);
+insert into sys_oss_config values (3, 'aliyun', 'XXXXXXXXXXXXXXX',  'XXXXXXXXXXXXXXX', 'ruoyi',             '', 'oss-cn-beijing.aliyuncs.com',   '','N', '',            '1', '1', '', NULL, 103, 1, sysdate, 1, sysdate);
+insert into sys_oss_config values (4, 'qcloud', 'XXXXXXXXXXXXXXX',  'XXXXXXXXXXXXXXX', 'ruoyi-1250000000',  '', 'cos.ap-beijing.myqcloud.com',   '','N', 'ap-beijing',  '1', '1', '', NULL, 103, 1, sysdate, 1, sysdate);
+insert into sys_oss_config values (5, 'image',  'ruoyi',            'ruoyi123',        'ruoyi',             'image', '127.0.0.1:9000',           '','N', '',            '1', '1', '', NULL, 103, 1, sysdate, 1, sysdate);
+
+-- ----------------------------
+-- 系统授权表
+-- ----------------------------
+create table sys_client (
+    id                  number(20)     not null,
+    client_id           varchar2(64)   default null,
+    client_key          varchar2(32)   default null,
+    client_secret       varchar2(255)  default null,
+    grant_type          varchar2(255)  default null,
+    device_type         varchar2(32)   default null,
+    active_timeout      number(11)     default 1800,
+    timeout             number(11)     default 604800,
+    status              char(1)        default '0',
+    del_flag            char(1)        default '0',
+    create_dept         number(20)     default null,
+    create_by           number(20)     default null,
+    create_time         date,
+    update_by           number(20)     default null,
+    update_time         date
+);
+
+alter table sys_client add constraint pk_sys_client primary key (id);
+
+comment on table sys_client                         is '系统授权表';
+comment on column sys_client.id                     is '主键';
+comment on column sys_client.client_id              is '客户端id';
+comment on column sys_client.client_key             is '客户端key';
+comment on column sys_client.client_secret          is '客户端秘钥';
+comment on column sys_client.grant_type             is '授权类型';
+comment on column sys_client.device_type            is '设备类型';
+comment on column sys_client.active_timeout         is 'token活跃超时时间';
+comment on column sys_client.timeout                is 'token固定超时';
+comment on column sys_client.status                 is '状态（0正常 1停用）';
+comment on column sys_client.del_flag               is '删除标志（0代表存在 1代表删除）';
+comment on column sys_client.create_dept            is '创建部门';
+comment on column sys_client.create_by              is '创建者';
+comment on column sys_client.create_time            is '创建时间';
+comment on column sys_client.update_by              is '更新者';
+comment on column sys_client.update_time            is '更新时间';
+
+insert into sys_client values (1, 'e5cd7e4891bf95d1d19206ce24a7b32e', 'pc', 'pc123', 'password,social', 'pc', 1800, 604800, 0, 0, 103, 1, sysdate, 1, sysdate);
+insert into sys_client values (2, '428a8310cd442757ae699df5d894f051', 'app', 'app123', 'password,sms,social', 'android', 1800, 604800, 0, 0, 103, 1, sysdate, 1, sysdate);
+
+create table test_demo (
+    id          number(20)      not null,
+    dept_id     number(20)      default null,
+    user_id     number(20)      default null,
+    order_num   number(10)      default 0,
+    test_key    varchar2(255)   default null,
+    value       varchar2(255)   default null,
+    version     number(10)      default 0,
+    create_dept number(20)      default null,
+    create_time date,
+    create_by   number(20)      default null,
+    update_time date,
+    update_by   number(20)      default null,
+    del_flag    number(2)       default 0
+);
+
+alter table test_demo add constraint pk_test_demo primary key (id);
+
+comment on table  test_demo              is '测试单表';
+comment on column test_demo.id           is '主键';
+comment on column test_demo.dept_id      is '部门id';
+comment on column test_demo.user_id      is '用户id';
+comment on column test_demo.order_num    is '排序号';
+comment on column test_demo.test_key     is 'key键';
+comment on column test_demo.value        is '值';
+comment on column test_demo.version      is '版本';
+comment on column test_demo.create_dept  is '创建部门';
+comment on column test_demo.create_time  is '创建时间';
+comment on column test_demo.create_by    is '创建人';
+comment on column test_demo.update_time  is '更新时间';
+comment on column test_demo.update_by    is '更新人';
+comment on column test_demo.del_flag     is '删除标志';
+
+create table test_tree (
+    id          number(20)      not null,
+    parent_id   number(20)      default 0,
+    dept_id     number(20)      default null,
+    user_id     number(20)      default null,
+    tree_name   varchar2(255)   default null,
+    version     number(10)      default 0,
+    create_dept number(20)      default null,
+    create_time date,
+    create_by   number(20)      default null,
+    update_time date,
+    update_by   number(20)      default null,
+    del_flag    number(2)       default 0
+);
+
+alter table test_tree add constraint pk_test_tree primary key (id);
+
+comment on table  test_tree              is '测试树表';
+comment on column test_tree.id           is '主键';
+comment on column test_tree.parent_id    is '父id';
+comment on column test_tree.dept_id      is '部门id';
+comment on column test_tree.user_id      is '用户id';
+comment on column test_tree.tree_name    is '值';
+comment on column test_tree.version      is '版本';
+comment on column test_tree.create_dept  is '创建部门';
+comment on column test_tree.create_time  is '创建时间';
+comment on column test_tree.create_by    is '创建人';
+comment on column test_tree.update_time  is '更新时间';
+comment on column test_tree.update_by    is '更新人';
+comment on column test_tree.del_flag     is '删除标志';
+
+insert into test_demo values (1, 102, 4, 1, '测试数据权限', '测试', 0, 103, sysdate, 1, null, null, 0);
+insert into test_demo values (2, 102, 3, 2, '子节点1', '111', 0, 103, sysdate, 1, null, null, 0);
+insert into test_demo values (3, 102, 3, 3, '子节点2', '222', 0, 103, sysdate, 1, null, null, 0);
+insert into test_demo values (4, 108, 4, 4, '测试数据', 'demo', 0, 103, sysdate, 1, null, null, 0);
+insert into test_demo values (5, 108, 3, 13, '子节点11', '1111', 0, 103, sysdate, 1, null, null, 0);
+insert into test_demo values (6, 108, 3, 12, '子节点22', '2222', 0, 103, sysdate, 1, null, null, 0);
+insert into test_demo values (7, 108, 3, 11, '子节点33', '3333', 0, 103, sysdate, 1, null, null, 0);
+insert into test_demo values (8, 108, 3, 10, '子节点44', '4444', 0, 103, sysdate, 1, null, null, 0);
+insert into test_demo values (9, 108, 3, 9, '子节点55', '5555', 0, 103, sysdate, 1, null, null, 0);
+insert into test_demo values (10, 108, 3, 8, '子节点66', '6666', 0, 103, sysdate, 1, null, null, 0);
+insert into test_demo values (11, 108, 3, 7, '子节点77', '7777', 0, 103, sysdate, 1, null, null, 0);
+insert into test_demo values (12, 108, 3, 6, '子节点88', '8888', 0, 103, sysdate, 1, null, null, 0);
+insert into test_demo values (13, 108, 3, 5, '子节点99', '9999', 0, 103, sysdate, 1, null, null, 0);
+
+insert into test_tree values (1, 0, 102, 4, '测试数据权限', 0, 103, sysdate, 1, null, null, 0);
+insert into test_tree values (2, 1, 102, 3, '子节点1', 0, 103, sysdate, 1, null, null, 0);
+insert into test_tree values (3, 2, 102, 3, '子节点2', 0, 103, sysdate, 1, null, null, 0);
+insert into test_tree values (4, 0, 108, 4, '测试树1', 0, 103, sysdate, 1, null, null, 0);
+insert into test_tree values (5, 4, 108, 3, '子节点11', 0, 103, sysdate, 1, null, null, 0);
+insert into test_tree values (6, 4, 108, 3, '子节点22', 0, 103, sysdate, 1, null, null, 0);
+insert into test_tree values (7, 4, 108, 3, '子节点33', 0, 103, sysdate, 1, null, null, 0);
+insert into test_tree values (8, 5, 108, 3, '子节点44', 0, 103, sysdate, 1, null, null, 0);
+insert into test_tree values (9, 6, 108, 3, '子节点55', 0, 103, sysdate, 1, null, null, 0);
+insert into test_tree values (10, 7, 108, 3, '子节点66', 0, 103, sysdate, 1, null, null, 0);
+insert into test_tree values (11, 7, 108, 3, '子节点77', 0, 103, sysdate, 1, null, null, 0);
+insert into test_tree values (12, 10, 108, 3, '子节点88', 0, 103, sysdate, 1, null, null, 0);
+insert into test_tree values (13, 10, 108, 3, '子节点99', 0, 103, sysdate, 1, null, null, 0);
+
+
+-- ----------------------------
+-- 钩子 ，用于session连接之后 自动设置默认的date类型格式化 简化时间查询
+-- 如需设置其它配置 可在此钩子内任意增加处理语句
+-- 例如： SELECT * FROM sys_user WHERE create_time BETWEEN '2022-03-01 00:00:00' AND '2022-04-01 00:00:00'
+-- ----------------------------
+create or replace trigger login_trg
+after logon on database
+begin
+execute immediate 'alter session set nls_date_format=''YYYY-MM-DD HH24:MI:SS''';
+end;
diff --git a/script/sql/oracle/oracle_ry_workflow.sql b/script/sql/oracle/oracle_ry_workflow.sql
new file mode 100644
index 0000000..4367b24
--- /dev/null
+++ b/script/sql/oracle/oracle_ry_workflow.sql
@@ -0,0 +1,429 @@
+-- ----------------------------
+-- 0、warm-flow-all.sql，地址：https://gitee.com/dromara/warm-flow/blob/master/sql/oracle/oracle-wram-flow-all.sql
+-- ----------------------------
+create table FLOW_DEFINITION
+(
+    ID              NUMBER(20)            not null,
+    FLOW_CODE       VARCHAR2(40)          not null,
+    FLOW_NAME       VARCHAR2(100)         not null,
+    CATEGORY        VARCHAR2(100),
+    VERSION         VARCHAR2(20)          not null,
+    IS_PUBLISH      NUMBER(1)   default 0 not null,
+    FORM_CUSTOM     VARCHAR2(1) default 'N',
+    FORM_PATH       VARCHAR2(100),
+    ACTIVITY_STATUS NUMBER(1)   default 1,
+    LISTENER_TYPE   VARCHAR2(100),
+    LISTENER_PATH   VARCHAR2(500),
+    EXT             VARCHAR2(500),
+    CREATE_TIME     DATE,
+    UPDATE_TIME     DATE,
+    DEL_FLAG        VARCHAR2(1) default '0',
+    TENANT_ID       VARCHAR2(40)
+);
+
+alter table FLOW_DEFINITION
+    add constraint PK_FLOW_DEFINITION primary key (ID);
+
+comment on table FLOW_DEFINITION is '流程定义表';
+comment on column FLOW_DEFINITION.ID is '主键id';
+comment on column FLOW_DEFINITION.FLOW_CODE is '流程编码';
+comment on column FLOW_DEFINITION.FLOW_NAME is '流程名称';
+comment on column FLOW_DEFINITION.CATEGORY is '流程类别';
+comment on column FLOW_DEFINITION.VERSION is '流程版本';
+comment on column FLOW_DEFINITION.IS_PUBLISH is '是否发布 (0未发布 1已发布 9失效)';
+comment on column FLOW_DEFINITION.FORM_CUSTOM is '审批表单是否自定义 (Y是 N否)';
+comment on column FLOW_DEFINITION.FORM_PATH is '审批表单路径';
+comment on column FLOW_DEFINITION.ACTIVITY_STATUS is '流程激活状态（0挂起 1激活）';
+comment on column FLOW_DEFINITION.LISTENER_TYPE is '监听器类型';
+comment on column FLOW_DEFINITION.LISTENER_PATH is '监听器路径';
+comment on column FLOW_DEFINITION.EXT is '扩展字段，预留给业务系统使用';
+comment on column FLOW_DEFINITION.CREATE_TIME is '创建时间';
+comment on column FLOW_DEFINITION.UPDATE_TIME is '更新时间';
+comment on column FLOW_DEFINITION.DEL_FLAG is '删除标志';
+comment on column FLOW_DEFINITION.TENANT_ID is '租户id';
+
+create table FLOW_NODE
+(
+    ID              NUMBER(20)    not null,
+    NODE_TYPE       NUMBER(1)     not null,
+    DEFINITION_ID   NUMBER(20)    not null,
+    NODE_CODE       VARCHAR2(100) not null,
+    NODE_NAME       VARCHAR2(100),
+    NODE_RATIO      NUMBER(6, 3),
+    COORDINATE      VARCHAR2(100),
+    ANY_NODE_SKIP   VARCHAR2(100),
+    LISTENER_TYPE   VARCHAR2(100),
+    LISTENER_PATH   VARCHAR2(500),
+    HANDLER_TYPE    VARCHAR2(100),
+    HANDLER_PATH    VARCHAR2(400),
+    FORM_CUSTOM     VARCHAR2(1)   default 'N',
+    FORM_PATH       VARCHAR2(100),
+    VERSION         VARCHAR2(20),
+    CREATE_TIME     DATE,
+    UPDATE_TIME     DATE,
+    EXT             CLOB,
+    DEL_FLAG        VARCHAR2(1)   default '0',
+    TENANT_ID       VARCHAR2(40),
+    PERMISSION_FLAG VARCHAR2(200)
+);
+
+alter table FLOW_NODE
+    add constraint PK_FLOW_NODE primary key (ID);
+
+comment on table FLOW_NODE is '流程节点表';
+comment on column FLOW_NODE.ID is '主键id';
+comment on column FLOW_NODE.NODE_TYPE is '节点类型（0开始节点 1中间节点 2结束节点 3互斥网关 4并行网关）';
+comment on column FLOW_NODE.DEFINITION_ID is '对应flow_definition表的id';
+comment on column FLOW_NODE.NODE_CODE is '流程节点编码';
+comment on column FLOW_NODE.NODE_NAME is '流程节点名称';
+comment on column FLOW_NODE.NODE_RATIO is '流程签署比例值';
+comment on column FLOW_NODE.COORDINATE is '坐标';
+comment on column FLOW_NODE.ANY_NODE_SKIP is '任意结点跳转';
+comment on column FLOW_NODE.LISTENER_TYPE is '监听器类型';
+comment on column FLOW_NODE.LISTENER_PATH is '监听器路径';
+comment on column FLOW_NODE.HANDLER_TYPE is '处理器类型';
+comment on column FLOW_NODE.HANDLER_PATH is '处理器路径';
+comment on column FLOW_NODE.FORM_CUSTOM is '审批表单是否自定义 (Y是 N否)';
+comment on column FLOW_NODE.FORM_PATH is '审批表单路径';
+comment on column FLOW_NODE.VERSION is '版本';
+comment on column FLOW_NODE.CREATE_TIME is '创建时间';
+comment on column FLOW_NODE.UPDATE_TIME is '更新时间';
+comment on column FLOW_NODE.EXT is '节点扩展属性';
+comment on column FLOW_NODE.DEL_FLAG is '删除标志';
+comment on column FLOW_NODE.TENANT_ID is '租户id';
+comment on column FLOW_NODE.PERMISSION_FLAG is '权限标识（权限类型:权限标识，可以多个，用@@隔开)';
+
+create table FLOW_SKIP
+(
+    ID             NUMBER(20)    not null,
+    DEFINITION_ID  NUMBER(20)    not null,
+    NOW_NODE_CODE  VARCHAR2(100) not null,
+    NOW_NODE_TYPE  NUMBER(1),
+    NEXT_NODE_CODE VARCHAR2(100) not null,
+    NEXT_NODE_TYPE NUMBER(1),
+    SKIP_NAME      VARCHAR2(100),
+    SKIP_TYPE      VARCHAR2(40),
+    SKIP_CONDITION VARCHAR2(200),
+    COORDINATE     VARCHAR2(100),
+    CREATE_TIME    DATE,
+    UPDATE_TIME    DATE,
+    DEL_FLAG       VARCHAR2(1) default '0',
+    TENANT_ID      VARCHAR2(40)
+);
+
+alter table FLOW_SKIP
+    add constraint PK_FLOW_SKIP primary key (ID);
+
+comment on table FLOW_SKIP is '节点跳转关联表';
+comment on column FLOW_SKIP.ID is '主键id';
+comment on column FLOW_SKIP.DEFINITION_ID is '流程定义id';
+comment on column FLOW_SKIP.NOW_NODE_CODE is '当前流程节点类型 (0开始节点 1中间节点 2结束节点 3互斥网关 4并行网关)';
+comment on column FLOW_SKIP.NOW_NODE_TYPE is '下一个流程节点类型 (0开始节点 1中间节点 2结束节点 3互斥网关 4并行网关)';
+comment on column FLOW_SKIP.NEXT_NODE_CODE is '下一个流程节点编码';
+comment on column FLOW_SKIP.NEXT_NODE_TYPE is '下一个流程节点类型 (0开始节点 1中间节点 2结束节点 3互斥网关 4并行网关)';
+comment on column FLOW_SKIP.SKIP_NAME is '跳转名称';
+comment on column FLOW_SKIP.SKIP_TYPE is '跳转类型 (PASS审批通过 REJECT退回)';
+comment on column FLOW_SKIP.SKIP_CONDITION is '跳转条件';
+comment on column FLOW_SKIP.COORDINATE is '坐标';
+comment on column FLOW_SKIP.CREATE_TIME is '创建时间';
+comment on column FLOW_SKIP.UPDATE_TIME is '更新时间';
+comment on column FLOW_SKIP.DEL_FLAG is '删除标志';
+comment on column FLOW_SKIP.TENANT_ID is '租户id';
+
+create table FLOW_INSTANCE
+(
+    ID              NUMBER       not null,
+    DEFINITION_ID   NUMBER       not null,
+    BUSINESS_ID     VARCHAR2(40) not null,
+    NODE_TYPE       NUMBER(1),
+    NODE_CODE       VARCHAR2(100),
+    NODE_NAME       VARCHAR2(100),
+    VARIABLE        CLOB,
+    FLOW_STATUS     VARCHAR2(20),
+    ACTIVITY_STATUS NUMBER(1)    default 1,
+    DEF_JSON        CLOB,
+    CREATE_BY       VARCHAR2(64) default '',
+    CREATE_TIME     DATE,
+    UPDATE_TIME     DATE,
+    EXT             VARCHAR2(500),
+    DEL_FLAG        VARCHAR2(1)  default '0',
+    TENANT_ID       VARCHAR2(40)
+);
+
+alter table FLOW_INSTANCE
+    add constraint PK_FLOW_INSTANCE primary key (ID);
+
+comment on table FLOW_INSTANCE is '流程实例表';
+comment on column FLOW_INSTANCE.ID is '主键id';
+comment on column FLOW_INSTANCE.DEFINITION_ID is '对应flow_definition表的id';
+comment on column FLOW_INSTANCE.BUSINESS_ID is '业务id';
+comment on column FLOW_INSTANCE.NODE_TYPE is '开始节点类型 (0开始节点 1中间节点 2结束节点 3互斥网关 4并行网关)';
+comment on column FLOW_INSTANCE.NODE_CODE is '开始节点编码';
+comment on column FLOW_INSTANCE.NODE_NAME is '开始节点名称';
+comment on column FLOW_INSTANCE.VARIABLE is '任务变量';
+comment on column FLOW_INSTANCE.FLOW_STATUS is '流程状态（0待提交 1审批中 2审批通过 4终止 5作废 6撤销 8已完成 9已退回 10失效 11拿回）';
+comment on column FLOW_INSTANCE.ACTIVITY_STATUS is '流程激活状态（0挂起 1激活）';
+comment on column FLOW_INSTANCE.DEF_JSON is '流程定义json';
+comment on column FLOW_INSTANCE.CREATE_BY is '创建者';
+comment on column FLOW_INSTANCE.CREATE_TIME is '创建时间';
+comment on column FLOW_INSTANCE.UPDATE_TIME is '更新时间';
+comment on column FLOW_INSTANCE.EXT is '扩展字段，预留给业务系统使用';
+comment on column FLOW_INSTANCE.DEL_FLAG is '删除标志';
+comment on column FLOW_INSTANCE.TENANT_ID is '租户id';
+
+create table FLOW_TASK
+(
+    ID            NUMBER(20) not null,
+    DEFINITION_ID NUMBER(20) not null,
+    INSTANCE_ID   NUMBER(20) not null,
+    NODE_CODE     VARCHAR2(100),
+    NODE_NAME     VARCHAR2(100),
+    NODE_TYPE     NUMBER(1),
+    FLOW_STATUS   VARCHAR2(20),
+    FORM_CUSTOM   VARCHAR2(1) default 'N',
+    FORM_PATH     VARCHAR2(100),
+    CREATE_TIME   DATE,
+    UPDATE_TIME   DATE,
+    DEL_FLAG      VARCHAR2(1) default '0',
+    TENANT_ID     VARCHAR2(40)
+);
+
+alter table FLOW_TASK
+    add constraint PK_FLOW_TASK primary key (ID);
+
+comment on table FLOW_TASK is '待办任务表';
+comment on column FLOW_TASK.ID is '主键id';
+comment on column FLOW_TASK.DEFINITION_ID is '对应flow_definition表的id';
+comment on column FLOW_TASK.INSTANCE_ID is '对应flow_instance表的id';
+comment on column FLOW_TASK.NODE_CODE is '节点编码';
+comment on column FLOW_TASK.NODE_NAME is '节点名称';
+comment on column FLOW_TASK.NODE_TYPE is '节点类型 (0开始节点 1中间节点 2结束节点 3互斥网关 4并行网关)';
+comment on column FLOW_TASK.FLOW_STATUS is '流程状态（0待提交 1审批中 2审批通过 4终止 5作废 6撤销 8已完成 9已退回 10失效 11拿回）';
+comment on column FLOW_TASK.FORM_CUSTOM is '审批表单是否自定义 (Y是 N否)';
+comment on column FLOW_TASK.FORM_PATH is '审批表单路径';
+comment on column FLOW_TASK.CREATE_TIME is '创建时间';
+comment on column FLOW_TASK.UPDATE_TIME is '更新时间';
+comment on column FLOW_TASK.DEL_FLAG is '删除标志';
+comment on column FLOW_TASK.TENANT_ID is '租户id';
+
+create table FLOW_HIS_TASK
+(
+    ID               NUMBER(20) not null,
+    DEFINITION_ID    NUMBER(20) not null,
+    INSTANCE_ID      NUMBER(20) not null,
+    TASK_ID          NUMBER(20) not null,
+    NODE_CODE        VARCHAR2(100),
+    NODE_NAME        VARCHAR2(100),
+    NODE_TYPE        NUMBER(1),
+    TARGET_NODE_CODE VARCHAR2(200),
+    TARGET_NODE_NAME VARCHAR2(200),
+    APPROVER         VARCHAR2(40),
+    COOPERATE_TYPE   NUMBER(1)   default 0,
+    COLLABORATOR     VARCHAR2(40),
+    SKIP_TYPE        VARCHAR2(10),
+    FLOW_STATUS      VARCHAR2(20),
+    FORM_CUSTOM      VARCHAR2(1) default 'N',
+    FORM_PATH        VARCHAR2(100),
+    MESSAGE          VARCHAR2(500),
+    VARIABLE         CLOB,
+    EXT              CLOB,
+    CREATE_TIME      DATE,
+    UPDATE_TIME      DATE,
+    DEL_FLAG         VARCHAR2(1) default '0',
+    TENANT_ID        VARCHAR2(40)
+
+);
+
+alter table FLOW_HIS_TASK
+    add constraint PK_FLOW_HIS_TASK primary key (ID);
+
+comment on table FLOW_HIS_TASK is '历史任务记录表';
+comment on column FLOW_HIS_TASK.ID is '主键id';
+comment on column FLOW_HIS_TASK.DEFINITION_ID is '对应flow_definition表的id';
+comment on column FLOW_HIS_TASK.INSTANCE_ID is '对应flow_instance表的id';
+comment on column FLOW_HIS_TASK.TASK_ID is '对应flow_task表的id';
+comment on column FLOW_HIS_TASK.NODE_CODE is '开始节点编码';
+comment on column FLOW_HIS_TASK.NODE_NAME is '开始节点名称';
+comment on column FLOW_HIS_TASK.NODE_TYPE is '开始节点类型 (0开始节点 1中间节点 2结束节点 3互斥网关 4并行网关)';
+comment on column FLOW_HIS_TASK.TARGET_NODE_CODE is '目标节点编码';
+comment on column FLOW_HIS_TASK.TARGET_NODE_NAME is '目标节点名称';
+comment on column FLOW_HIS_TASK.SKIP_TYPE is '流转类型（PASS通过 REJECT退回 NONE无动作）';
+comment on column FLOW_HIS_TASK.FLOW_STATUS is '流程状态（0待提交 1审批中 2审批通过 4终止 5作废 6撤销 8已完成 9已退回 10失效 11拿回）';
+comment on column FLOW_HIS_TASK.FORM_CUSTOM is '审批表单是否自定义 (Y是 N否)';
+comment on column FLOW_HIS_TASK.FORM_PATH is '审批表单路径';
+comment on column FLOW_HIS_TASK.MESSAGE is '审批意见';
+comment on column FLOW_HIS_TASK.VARIABLE is '任务变量';
+comment on column FLOW_HIS_TASK.EXT is '扩展字段，预留给业务系统使用';
+comment on column FLOW_HIS_TASK.CREATE_TIME is '任务开始时间';
+comment on column FLOW_HIS_TASK.UPDATE_TIME is '审批完成时间';
+comment on column FLOW_HIS_TASK.DEL_FLAG is '删除标志';
+comment on column FLOW_HIS_TASK.TENANT_ID is '租户id';
+comment on column FLOW_HIS_TASK.APPROVER is '审批者';
+comment on column FLOW_HIS_TASK.COOPERATE_TYPE is '协作方式(1审批 2转办 3委派 4会签 5票签 6加签 7减签)';
+comment on column FLOW_HIS_TASK.COLLABORATOR is '协作人';
+
+create table FLOW_USER
+(
+    ID           NUMBER(20)  not null,
+    TYPE         VARCHAR2(1) not null,
+    PROCESSED_BY VARCHAR2(80),
+    ASSOCIATED   NUMBER(20)  not null,
+    CREATE_TIME  DATE,
+    CREATE_BY    VARCHAR2(80),
+    UPDATE_TIME  DATE,
+    DEL_FLAG     VARCHAR2(1) default '0',
+    TENANT_ID    VARCHAR2(40)
+);
+
+alter table FLOW_USER
+    add constraint PK_FLOW_USER primary key (ID);
+
+comment on table FLOW_USER is '待办任务表';
+comment on column FLOW_USER.ID is '主键id';
+comment on column FLOW_USER.TYPE is '人员类型（1待办任务的审批人权限 2待办任务的转办人权限 3待办任务的委托人权限）';
+comment on column FLOW_USER.PROCESSED_BY is '权限人)';
+comment on column FLOW_USER.ASSOCIATED is '任务表id';
+comment on column FLOW_USER.CREATE_TIME is '创建时间';
+comment on column FLOW_USER.CREATE_BY is '节点名称';
+comment on column FLOW_USER.UPDATE_TIME is '更新时间';
+comment on column FLOW_USER.DEL_FLAG is '删除标志';
+comment on column FLOW_USER.TENANT_ID is '租户id';
+
+create index USER_PROCESSED_TYPE on FLOW_USER (PROCESSED_BY, TYPE);
+create index USER_ASSOCIATED_IDX on FLOW_USER (ASSOCIATED);
+
+-- ----------------------------
+-- 流程分类表
+-- ----------------------------
+CREATE TABLE flow_category
+(
+    category_id NUMBER (20) NOT NULL,
+    tenant_id VARCHAR2 (20) DEFAULT '000000',
+    parent_id NUMBER (20) DEFAULT 0,
+    ancestors VARCHAR2 (500) DEFAULT '',
+    category_name VARCHAR2 (30) NOT NULL,
+    order_num NUMBER (4) DEFAULT 0,
+    del_flag    CHAR(1) DEFAULT '0',
+    create_dept NUMBER (20),
+    create_by NUMBER (20),
+    create_time DATE,
+    update_by NUMBER (20),
+    update_time DATE
+);
+
+alter table flow_category add constraint pk_flow_category primary key (category_id);
+
+COMMENT ON TABLE flow_category IS '流程分类';
+COMMENT ON COLUMN flow_category.category_id IS '流程分类ID';
+COMMENT ON COLUMN flow_category.tenant_id IS '租户编号';
+COMMENT ON COLUMN flow_category.parent_id IS '父流程分类id';
+COMMENT ON COLUMN flow_category.ancestors IS '祖级列表';
+COMMENT ON COLUMN flow_category.category_name IS '流程分类名称';
+COMMENT ON COLUMN flow_category.order_num IS '显示顺序';
+COMMENT ON COLUMN flow_category.del_flag IS '删除标志（0代表存在 1代表删除）';
+COMMENT ON COLUMN flow_category.create_dept IS '创建部门';
+COMMENT ON COLUMN flow_category.create_by IS '创建者';
+COMMENT ON COLUMN flow_category.create_time IS '创建时间';
+COMMENT ON COLUMN flow_category.update_by IS '更新者';
+COMMENT ON COLUMN flow_category.update_time IS '更新时间';
+
+INSERT INTO flow_category VALUES (100, '000000', 0, '0', 'OA审批', 0, '0', 103, 1, SYSDATE, NULL, NULL);
+INSERT INTO flow_category VALUES (101, '000000', 100, '0,100', '假勤管理', 0, '0', 103, 1, SYSDATE, NULL, NULL);
+INSERT INTO flow_category VALUES (102, '000000', 100, '0,100', '人事管理', 1, '0', 103, 1, SYSDATE, NULL, NULL);
+INSERT INTO flow_category VALUES (103, '000000', 101, '0,100,101', '请假', 0, '0', 103, 1, SYSDATE, NULL, NULL);
+INSERT INTO flow_category VALUES (104, '000000', 101, '0,100,101', '出差', 1, '0', 103, 1, SYSDATE, NULL, NULL);
+INSERT INTO flow_category VALUES (105, '000000', 101, '0,100,101', '加班', 2, '0', 103, 1, SYSDATE, NULL, NULL);
+INSERT INTO flow_category VALUES (106, '000000', 101, '0,100,101', '换班', 3, '0', 103, 1, SYSDATE, NULL, NULL);
+INSERT INTO flow_category VALUES (107, '000000', 101, '0,100,101', '外出', 4, '0', 103, 1, SYSDATE, NULL, NULL);
+INSERT INTO flow_category VALUES (108, '000000', 102, '0,100,102', '转正', 1, '0', 103, 1, SYSDATE, NULL, NULL);
+INSERT INTO flow_category VALUES (109, '000000', 102, '0,100,102', '离职', 2, '0', 103, 1, SYSDATE, NULL, NULL);
+
+
+-- ----------------------------
+-- 请假单信息
+-- ----------------------------
+CREATE TABLE test_leave
+(
+    id NUMBER (20) NOT NULL,
+    tenant_id VARCHAR2 (20) DEFAULT '000000',
+    leave_type VARCHAR2 (255) NOT NULL,
+    start_date  DATE NOT NULL,
+    end_date    DATE NOT NULL,
+    leave_days NUMBER (10) NOT NULL,
+    remark VARCHAR2 (255),
+    status VARCHAR2 (255),
+    create_dept NUMBER (20),
+    create_by NUMBER (20),
+    create_time DATE,
+    update_by NUMBER (20),
+    update_time DATE
+);
+
+alter table test_leave add constraint pk_test_leave primary key (id);
+
+COMMENT ON TABLE test_leave IS '请假申请表';
+COMMENT ON COLUMN test_leave.id IS 'ID';
+COMMENT ON COLUMN test_leave.tenant_id IS '租户编号';
+COMMENT ON COLUMN test_leave.leave_type IS '请假类型';
+COMMENT ON COLUMN test_leave.start_date IS '开始时间';
+COMMENT ON COLUMN test_leave.end_date IS '结束时间';
+COMMENT ON COLUMN test_leave.leave_days IS '请假天数';
+COMMENT ON COLUMN test_leave.remark IS '请假原因';
+COMMENT ON COLUMN test_leave.status IS '状态';
+COMMENT ON COLUMN test_leave.create_dept IS '创建部门';
+COMMENT ON COLUMN test_leave.create_by IS '创建者';
+COMMENT ON COLUMN test_leave.create_time IS '创建时间';
+COMMENT ON COLUMN test_leave.update_by IS '更新者';
+COMMENT ON COLUMN test_leave.update_time IS '更新时间';
+
+INSERT INTO sys_menu VALUES ('11616', '工作流', '0', '6', 'workflow', '', '', '1', '0', 'M', '0', '0', '', 'workflow', 103, 1, SYSDATE, NULL, NULL, '');
+INSERT INTO sys_menu VALUES ('11618', '我的任务', '0', '7', 'task', '', '', '1', '0', 'M', '0', '0', '', 'my-task', 103, 1, SYSDATE, NULL, NULL, '');
+INSERT INTO sys_menu VALUES ('11619', '我的待办', '11618', '2', 'taskWaiting', 'workflow/task/taskWaiting', '', '1', '1', 'C', '0', '0', '', 'waiting', 103, 1, SYSDATE, NULL, NULL, '');
+INSERT INTO sys_menu VALUES ('11632', '我的已办', '11618', '3', 'taskFinish', 'workflow/task/taskFinish', '', '1', '1', 'C', '0', '0', '', 'finish', 103, 1, SYSDATE, NULL, NULL, '');
+INSERT INTO sys_menu VALUES ('11633', '我的抄送', '11618', '4', 'taskCopyList', 'workflow/task/taskCopyList', '', '1', '1', 'C', '0', '0', '', 'my-copy', 103, 1, SYSDATE, NULL, NULL, '');
+INSERT INTO sys_menu VALUES ('11620', '流程定义', '11616', '3', 'processDefinition', 'workflow/processDefinition/index', '', '1', '1', 'C', '0', '0', '', 'process-definition', 103, 1, SYSDATE, NULL, NULL, '');
+INSERT INTO sys_menu VALUES ('11621', '流程实例', '11630', '1', 'processInstance', 'workflow/processInstance/index', '', '1', '1', 'C', '0', '0', '', 'tree-table', 103, 1, SYSDATE, NULL, NULL, '');
+INSERT INTO sys_menu VALUES ('11622', '流程分类', '11616', '1', 'category', 'workflow/category/index', '', '1', '0', 'C', '0', '0', 'workflow:category:list', 'category', 103, 1, SYSDATE, NULL, NULL, '');
+INSERT INTO sys_menu VALUES ('11629', '我发起的', '11618', '1', 'myDocument', 'workflow/task/myDocument', '', '1', '1', 'C', '0', '0', '', 'guide', 103, 1, SYSDATE, NULL, NULL, '');
+INSERT INTO sys_menu VALUES ('11630', '流程监控', '11616', '4', 'monitor', '', '', '1', '0', 'M', '0', '0', '', 'monitor', 103, 1, SYSDATE, NULL, NULL, '');
+INSERT INTO sys_menu VALUES ('11631', '待办任务', '11630', '2', 'allTaskWaiting', 'workflow/task/allTaskWaiting', '', '1', '1', 'C', '0', '0', '', 'waiting', 103, 1, SYSDATE, NULL, NULL, '');
+INSERT INTO sys_menu VALUES ('11700', '流程设计', '11616', '5', 'design/index',   'workflow/processDefinition/design', '', '1', '1', 'C', '1', '0', 'workflow:leave:edit', '#', 103, 1, SYSDATE, NULL, NULL, '');
+INSERT INTO sys_menu VALUES ('11701', '请假申请', '11616', '6', 'leaveEdit/index', 'workflow/leave/leaveEdit', '', '1', '1', 'C', '1', '0', 'workflow:leave:edit', '#', 103, 1, SYSDATE, NULL, NULL, '');
+
+INSERT INTO sys_menu VALUES ('11623', '流程分类查询', '11622', '1', '#', '', '', '1', '0', 'F', '0', '0', 'workflow:category:query', '#', 103, 1, SYSDATE, NULL, NULL, '');
+INSERT INTO sys_menu VALUES ('11624', '流程分类新增', '11622', '2', '#', '', '', '1', '0', 'F', '0', '0', 'workflow:category:add', '#', 103, 1, SYSDATE, NULL, NULL, '');
+INSERT INTO sys_menu VALUES ('11625', '流程分类修改', '11622', '3', '#', '', '', '1', '0', 'F', '0', '0', 'workflow:category:edit', '#', 103, 1, SYSDATE, NULL, NULL, '');
+INSERT INTO sys_menu VALUES ('11626', '流程分类删除', '11622', '4', '#', '', '', '1', '0', 'F', '0', '0', 'workflow:category:remove', '#', 103, 1, SYSDATE, NULL, NULL, '');
+INSERT INTO sys_menu VALUES ('11627', '流程分类导出', '11622', '5', '#', '', '', '1', '0', 'F', '0', '0', 'workflow:category:export', '#', 103, 1, SYSDATE, NULL, NULL, '');
+
+INSERT INTO sys_menu VALUES ('11638', '请假申请', '5', '1', 'leave', 'workflow/leave/index', '', '1', '0', 'C', '0', '0', 'workflow:leave:list', '#', 103, 1, SYSDATE, NULL, NULL, '请假申请菜单');
+INSERT INTO sys_menu VALUES ('11639', '请假申请查询', '11638', '1', '#', '', '', '1', '0', 'F', '0', '0', 'workflow:leave:query', '#', 103, 1, SYSDATE, NULL, NULL, '');
+INSERT INTO sys_menu VALUES ('11640', '请假申请新增', '11638', '2', '#', '', '', '1', '0', 'F', '0', '0', 'workflow:leave:add', '#', 103, 1, SYSDATE, NULL, NULL, '');
+INSERT INTO sys_menu VALUES ('11641', '请假申请修改', '11638', '3', '#', '', '', '1', '0', 'F', '0', '0', 'workflow:leave:edit', '#', 103, 1, SYSDATE, NULL, NULL, '');
+INSERT INTO sys_menu VALUES ('11642', '请假申请删除', '11638', '4', '#', '', '', '1', '0', 'F', '0', '0', 'workflow:leave:remove', '#', 103, 1, SYSDATE, NULL, NULL, '');
+INSERT INTO sys_menu VALUES ('11643', '请假申请导出', '11638', '5', '#', '', '', '1', '0', 'F', '0', '0', 'workflow:leave:export', '#', 103, 1, SYSDATE, NULL, NULL, '');
+
+INSERT INTO sys_dict_type VALUES (13, '000000', '业务状态', 'wf_business_status', 103, 1, SYSDATE, NULL, NULL, '业务状态列表');
+INSERT INTO sys_dict_type VALUES (14, '000000', '表单类型', 'wf_form_type', 103, 1, SYSDATE, NULL, NULL, '表单类型列表');
+INSERT INTO sys_dict_type VALUES (15, '000000', '任务状态', 'wf_task_status', 103, 1, SYSDATE, NULL, NULL, '任务状态');
+INSERT INTO sys_dict_data VALUES (39, '000000', 1, '已撤销', 'cancel', 'wf_business_status', '', 'danger', 'N', 103, 1, SYSDATE, NULL, NULL, '已撤销');
+INSERT INTO sys_dict_data VALUES (40, '000000', 2, '草稿', 'draft', 'wf_business_status', '', 'info', 'N', 103, 1, SYSDATE, NULL, NULL, '草稿');
+INSERT INTO sys_dict_data VALUES (41, '000000', 3, '待审核', 'waiting', 'wf_business_status', '', 'primary', 'N', 103, 1, SYSDATE, NULL, NULL, '待审核');
+INSERT INTO sys_dict_data VALUES (42, '000000', 4, '已完成', 'finish', 'wf_business_status', '', 'success', 'N', 103, 1, SYSDATE, NULL, NULL, '已完成');
+INSERT INTO sys_dict_data VALUES (43, '000000', 5, '已作废', 'invalid', 'wf_business_status', '', 'danger', 'N', 103, 1, SYSDATE, NULL, NULL, '已作废');
+INSERT INTO sys_dict_data VALUES (44, '000000', 6, '已退回', 'back', 'wf_business_status', '', 'danger', 'N', 103, 1, SYSDATE, NULL, NULL, '已退回');
+INSERT INTO sys_dict_data VALUES (45, '000000', 7, '已终止', 'termination', 'wf_business_status', '', 'danger', 'N', 103, 1, SYSDATE, NULL, NULL, '已终止');
+INSERT INTO sys_dict_data VALUES (46, '000000', 1, '自定义表单', 'static', 'wf_form_type', '', 'success', 'N', 103, 1, SYSDATE, NULL, NULL, '自定义表单');
+INSERT INTO sys_dict_data VALUES (47, '000000', 2, '动态表单', 'dynamic', 'wf_form_type', '', 'primary', 'N', 103, 1, SYSDATE, NULL, NULL, '动态表单');
+INSERT INTO sys_dict_data VALUES (48, '000000', 1, '撤销', 'cancel', 'wf_task_status', '', 'danger', 'N', 103, 1, SYSDATE, NULL, NULL, '撤销');
+INSERT INTO sys_dict_data VALUES (49, '000000', 2, '通过', 'pass', 'wf_task_status', '', 'success', 'N', 103, 1, SYSDATE, NULL, NULL, '通过');
+INSERT INTO sys_dict_data VALUES (50, '000000', 3, '待审核', 'waiting', 'wf_task_status', '', 'primary', 'N', 103, 1, SYSDATE, NULL, NULL, '待审核');
+INSERT INTO sys_dict_data VALUES (51, '000000', 4, '作废', 'invalid', 'wf_task_status', '', 'danger', 'N', 103, 1, SYSDATE, NULL, NULL, '作废');
+INSERT INTO sys_dict_data VALUES (52, '000000', 5, '退回', 'back', 'wf_task_status', '', 'danger', 'N', 103, 1, SYSDATE, NULL, NULL, '退回');
+INSERT INTO sys_dict_data VALUES (53, '000000', 6, '终止', 'termination', 'wf_task_status', '', 'danger', 'N', 103, 1, SYSDATE, NULL, NULL, '终止');
+INSERT INTO sys_dict_data VALUES (54, '000000', 7, '转办', 'transfer', 'wf_task_status', '', 'primary', 'N', 103, 1, SYSDATE, NULL, NULL, '转办');
+INSERT INTO sys_dict_data VALUES (55, '000000', 8, '委托', 'depute', 'wf_task_status', '', 'primary', 'N', 103, 1, SYSDATE, NULL, NULL, '委托');
+INSERT INTO sys_dict_data VALUES (56, '000000', 9, '抄送', 'copy', 'wf_task_status', '', 'primary', 'N', 103, 1, SYSDATE, NULL, NULL, '抄送');
+INSERT INTO sys_dict_data VALUES (57, '000000', 10, '加签', 'sign', 'wf_task_status', '', 'primary', 'N', 103, 1, SYSDATE, NULL, NULL, '加签');
+INSERT INTO sys_dict_data VALUES (58, '000000', 11, '减签', 'sign_off', 'wf_task_status', '', 'danger', 'N', 103, 1, SYSDATE, NULL, NULL, '减签');
+INSERT INTO sys_dict_data VALUES (59, '000000', 11, '超时', 'timeout', 'wf_task_status', '', 'danger', 'N', 103, 1, SYSDATE, NULL, NULL, '超时');
diff --git a/script/sql/postgres/postgres_ry_app_5.X.sql b/script/sql/postgres/postgres_ry_app_5.X.sql
new file mode 100644
index 0000000..616fc8d
--- /dev/null
+++ b/script/sql/postgres/postgres_ry_app_5.X.sql
@@ -0,0 +1,331 @@
+-- ----------------------------
+-- App端数据库表结构 (PostgreSQL版本)
+-- 适用于 RuoYi-Vue-Plus 5.X 版本
+-- ----------------------------
+
+-- 1、App端用户信息表
+CREATE TABLE app_user (
+    user_id       BIGINT       NOT NULL,
+    user_name     VARCHAR(30)  NOT NULL,
+    nick_name     VARCHAR(30)  NOT NULL,
+    phone         VARCHAR(11)  DEFAULT '',
+    email         VARCHAR(50)  DEFAULT '',
+    sex           CHAR(1)      DEFAULT '0',
+    avatar        BIGINT,
+    password      VARCHAR(100) DEFAULT '',
+    status        CHAR(1)      DEFAULT '0',
+    del_flag      CHAR(1)      DEFAULT '0',
+    login_ip      VARCHAR(128) DEFAULT '',
+    login_date    TIMESTAMP,
+    register_time TIMESTAMP,
+    create_by     BIGINT,
+    create_time   TIMESTAMP,
+    update_by     BIGINT,
+    update_time   TIMESTAMP,
+    remark        VARCHAR(500),
+    CONSTRAINT pk_app_user PRIMARY KEY (user_id)
+);
+
+COMMENT ON TABLE app_user IS 'App端用户信息表';
+COMMENT ON COLUMN app_user.user_id IS 'App用户ID';
+COMMENT ON COLUMN app_user.account IS '用户账号';
+COMMENT ON COLUMN app_user.nick_name IS '用户昵称';
+COMMENT ON COLUMN app_user.phone IS '手机号码';
+COMMENT ON COLUMN app_user.email IS '用户邮箱';
+COMMENT ON COLUMN app_user.sex IS '用户性别（0男 1女 2未知）';
+COMMENT ON COLUMN app_user.avatar IS '头像地址';
+COMMENT ON COLUMN app_user.password IS '密码';
+COMMENT ON COLUMN app_user.status IS '帐号状态（0正常 1停用）';
+COMMENT ON COLUMN app_user.del_flag IS '删除标志（0代表存在 1代表删除）';
+COMMENT ON COLUMN app_user.login_ip IS '最后登录IP';
+COMMENT ON COLUMN app_user.login_date IS '最后登录时间';
+COMMENT ON COLUMN app_user.register_time IS '注册时间';
+COMMENT ON COLUMN app_user.create_by IS '创建者';
+COMMENT ON COLUMN app_user.create_time IS '创建时间';
+COMMENT ON COLUMN app_user.update_by IS '更新者';
+COMMENT ON COLUMN app_user.update_time IS '更新时间';
+COMMENT ON COLUMN app_user.remark IS '备注';
+
+INSERT INTO app_user VALUES (1, 'appuser', 'App测试用户', '15888888888', 'appuser@qq.com', '1', NULL,
+        '$2a$10$7JB720yubVSOfvVMe6LeNOKgEoXAw7tCxJRET6pVuiDDz/LQ4Gqk.',
+        '0', '0', '127.0.0.1', NOW(), NOW(), 1, NOW(), NULL, NULL, 'App端测试用户');
+
+-- 2、App端角色信息表
+CREATE TABLE app_role (
+    role_id     BIGINT       NOT NULL,
+    role_name   VARCHAR(30)  NOT NULL,
+    role_key    VARCHAR(100) NOT NULL,
+    role_sort   INTEGER      NOT NULL,
+    status      CHAR(1)      NOT NULL,
+    del_flag    CHAR(1)      DEFAULT '0',
+    create_by   BIGINT,
+    create_time TIMESTAMP,
+    update_by   BIGINT,
+    update_time TIMESTAMP,
+    remark      VARCHAR(500),
+    CONSTRAINT pk_app_role PRIMARY KEY (role_id)
+);
+
+COMMENT ON TABLE app_role IS 'App端角色信息表';
+COMMENT ON COLUMN app_role.role_id IS 'App角色ID';
+COMMENT ON COLUMN app_role.role_name IS '角色名称';
+COMMENT ON COLUMN app_role.role_key IS '角色权限字符串';
+COMMENT ON COLUMN app_role.role_sort IS '显示顺序';
+COMMENT ON COLUMN app_role.status IS '角色状态（0正常 1停用）';
+COMMENT ON COLUMN app_role.del_flag IS '删除标志（0代表存在 1代表删除）';
+COMMENT ON COLUMN app_role.create_by IS '创建者';
+COMMENT ON COLUMN app_role.create_time IS '创建时间';
+COMMENT ON COLUMN app_role.update_by IS '更新者';
+COMMENT ON COLUMN app_role.update_time IS '更新时间';
+COMMENT ON COLUMN app_role.remark IS '备注';
+
+INSERT INTO app_role VALUES (1, 'App普通用户', 'app_user', 1, '0', '0', 1, NOW(), NULL, NULL, 'App端普通用户');
+INSERT INTO app_role VALUES (2, 'App VIP用户', 'app_vip', 2, '0', '0', 1, NOW(), NULL, NULL, 'App端VIP用户');
+
+-- 3、App端用户和角色关联表
+CREATE TABLE app_user_role (
+    user_id BIGINT NOT NULL,
+    role_id BIGINT NOT NULL,
+    CONSTRAINT pk_app_user_role PRIMARY KEY (user_id, role_id)
+);
+
+COMMENT ON TABLE app_user_role IS 'App端用户和角色关联表';
+COMMENT ON COLUMN app_user_role.user_id IS 'App用户ID';
+COMMENT ON COLUMN app_user_role.role_id IS 'App角色ID';
+
+INSERT INTO app_user_role VALUES (1, 1);
+
+-- 4、App端第三方登录授权表
+CREATE TABLE app_social_auth (
+    id            BIGINT       NOT NULL,
+    user_id       BIGINT       NOT NULL,
+    platform      VARCHAR(255) NOT NULL,
+    platform_uid  VARCHAR(255) NOT NULL,
+    open_id       VARCHAR(255),
+    union_id      VARCHAR(255),
+    access_token  TEXT         NOT NULL,
+    expire_in     INTEGER,
+    refresh_token VARCHAR(255),
+    scope         VARCHAR(255),
+    create_by     BIGINT,
+    create_time   TIMESTAMP,
+    update_by     BIGINT,
+    update_time   TIMESTAMP,
+    del_flag      CHAR(1) DEFAULT '0',
+    CONSTRAINT pk_app_social_auth PRIMARY KEY (id)
+);
+
+COMMENT ON TABLE app_social_auth IS 'App端第三方登录授权表';
+COMMENT ON COLUMN app_social_auth.id IS '主键';
+COMMENT ON COLUMN app_social_auth.user_id IS 'App用户ID';
+COMMENT ON COLUMN app_social_auth.platform IS '用户来源平台（wechat_mp:微信小程序 wechat_open:微信开放平台 qq:QQ weibo:微博）';
+COMMENT ON COLUMN app_social_auth.platform_uid IS '表示平台唯一用户标识';
+COMMENT ON COLUMN app_social_auth.open_id IS '微信openid';
+COMMENT ON COLUMN app_social_auth.union_id IS '微信unionid';
+COMMENT ON COLUMN app_social_auth.access_token IS '用户的授权令牌';
+COMMENT ON COLUMN app_social_auth.expire_in IS '用户的授权令牌的有效期';
+COMMENT ON COLUMN app_social_auth.refresh_token IS '刷新令牌';
+COMMENT ON COLUMN app_social_auth.scope IS '授予的权限';
+COMMENT ON COLUMN app_social_auth.create_by IS '创建者';
+COMMENT ON COLUMN app_social_auth.create_time IS '创建时间';
+COMMENT ON COLUMN app_social_auth.update_by IS '更新者';
+COMMENT ON COLUMN app_social_auth.update_time IS '更新时间';
+COMMENT ON COLUMN app_social_auth.del_flag IS '删除标志（0代表存在 1代表删除）';
+
+-- 5、App端登录日志表
+CREATE TABLE app_login_log (
+    info_id        BIGINT       NOT NULL,
+    user_name      VARCHAR(50)  DEFAULT '',
+    status         CHAR(1)      DEFAULT '0',
+    ipaddr         VARCHAR(128) DEFAULT '',
+    login_location VARCHAR(255) DEFAULT '',
+    browser        VARCHAR(50)  DEFAULT '',
+    os             VARCHAR(50)  DEFAULT '',
+    msg            VARCHAR(255) DEFAULT '',
+    login_time     TIMESTAMP,
+    CONSTRAINT pk_app_login_log PRIMARY KEY (info_id)
+);
+
+COMMENT ON TABLE app_login_log IS 'App端登录日志表';
+COMMENT ON COLUMN app_login_log.info_id IS '访问ID';
+COMMENT ON COLUMN app_login_log.user_name IS '用户账号';
+COMMENT ON COLUMN app_login_log.status IS '登录状态（0成功 1失败）';
+COMMENT ON COLUMN app_login_log.ipaddr IS '登录IP地址';
+COMMENT ON COLUMN app_login_log.login_location IS '登录地点';
+COMMENT ON COLUMN app_login_log.browser IS '浏览器类型';
+COMMENT ON COLUMN app_login_log.os IS '操作系统';
+COMMENT ON COLUMN app_login_log.msg IS '提示消息';
+COMMENT ON COLUMN app_login_log.login_time IS '访问时间';
+
+CREATE INDEX idx_app_login_log_s ON app_login_log (status);
+CREATE INDEX idx_app_login_log_lt ON app_login_log (login_time);
+
+-- 6、App端操作日志记录
+CREATE TABLE app_oper_log (
+    oper_id        BIGINT       NOT NULL,
+    title          VARCHAR(50)  DEFAULT '',
+    business_type  SMALLINT     DEFAULT 0,
+    method         VARCHAR(100) DEFAULT '',
+    request_method VARCHAR(10)  DEFAULT '',
+    oper_name      VARCHAR(50)  DEFAULT '',
+    oper_url       VARCHAR(255) DEFAULT '',
+    oper_ip        VARCHAR(128) DEFAULT '',
+    oper_location  VARCHAR(255) DEFAULT '',
+    oper_param     TEXT         DEFAULT '',
+    json_result    TEXT         DEFAULT '',
+    status         SMALLINT     DEFAULT 0,
+    error_msg      TEXT         DEFAULT '',
+    oper_time      TIMESTAMP,
+    cost_time      BIGINT       DEFAULT 0,
+    CONSTRAINT pk_app_oper_log PRIMARY KEY (oper_id)
+);
+
+COMMENT ON TABLE app_oper_log IS 'App端操作日志记录';
+COMMENT ON COLUMN app_oper_log.oper_id IS '日志主键';
+COMMENT ON COLUMN app_oper_log.title IS '模块标题';
+COMMENT ON COLUMN app_oper_log.business_type IS '业务类型（0其它 1新增 2修改 3删除）';
+COMMENT ON COLUMN app_oper_log.method IS '方法名称';
+COMMENT ON COLUMN app_oper_log.request_method IS '请求方式';
+COMMENT ON COLUMN app_oper_log.oper_name IS '操作人员';
+COMMENT ON COLUMN app_oper_log.oper_url IS '请求URL';
+COMMENT ON COLUMN app_oper_log.oper_ip IS '主机地址';
+COMMENT ON COLUMN app_oper_log.oper_location IS '操作地点';
+COMMENT ON COLUMN app_oper_log.oper_param IS '请求参数';
+COMMENT ON COLUMN app_oper_log.json_result IS '返回参数';
+COMMENT ON COLUMN app_oper_log.status IS '操作状态（0正常 1异常）';
+COMMENT ON COLUMN app_oper_log.error_msg IS '错误消息';
+COMMENT ON COLUMN app_oper_log.oper_time IS '操作时间';
+COMMENT ON COLUMN app_oper_log.cost_time IS '消耗时间';
+
+CREATE INDEX idx_app_oper_log_bt ON app_oper_log (business_type);
+CREATE INDEX idx_app_oper_log_s ON app_oper_log (status);
+CREATE INDEX idx_app_oper_log_ot ON app_oper_log (oper_time);
+
+-- 7、App端设备信息表
+CREATE TABLE app_device (
+    device_id        BIGINT       NOT NULL,
+    user_id          BIGINT       NOT NULL,
+    device_type      VARCHAR(20)  NOT NULL,
+    device_name      VARCHAR(100) DEFAULT '',
+    device_model     VARCHAR(100) DEFAULT '',
+    device_brand     VARCHAR(50)  DEFAULT '',
+    os_version       VARCHAR(50)  DEFAULT '',
+    app_version      VARCHAR(50)  DEFAULT '',
+    push_token       VARCHAR(255) DEFAULT '',
+    is_active        CHAR(1)      DEFAULT '1',
+    last_active_time TIMESTAMP,
+    create_time      TIMESTAMP,
+    update_time      TIMESTAMP,
+    CONSTRAINT pk_app_device PRIMARY KEY (device_id)
+);
+
+COMMENT ON TABLE app_device IS 'App端设备信息表';
+COMMENT ON COLUMN app_device.device_id IS '设备ID';
+COMMENT ON COLUMN app_device.user_id IS 'App用户ID';
+COMMENT ON COLUMN app_device.device_type IS '设备类型（ios android h5）';
+COMMENT ON COLUMN app_device.device_name IS '设备名称';
+COMMENT ON COLUMN app_device.device_model IS '设备型号';
+COMMENT ON COLUMN app_device.device_brand IS '设备品牌';
+COMMENT ON COLUMN app_device.os_version IS '操作系统版本';
+COMMENT ON COLUMN app_device.app_version IS 'App版本';
+COMMENT ON COLUMN app_device.push_token IS '推送令牌';
+COMMENT ON COLUMN app_device.is_active IS '是否活跃（0否 1是）';
+COMMENT ON COLUMN app_device.last_active_time IS '最后活跃时间';
+COMMENT ON COLUMN app_device.create_time IS '创建时间';
+COMMENT ON COLUMN app_device.update_time IS '更新时间';
+
+CREATE INDEX idx_app_device_user_id ON app_device (user_id);
+CREATE INDEX idx_app_device_type ON app_device (device_type);
+
+-- 8、App端消息推送表
+CREATE TABLE app_message (
+    message_id   BIGINT       NOT NULL,
+    title        VARCHAR(100) NOT NULL,
+    content      TEXT,
+    message_type VARCHAR(20)  DEFAULT 'system',
+    target_type  VARCHAR(20)  DEFAULT 'all',
+    target_ids   VARCHAR(1000) DEFAULT '',
+    send_time    TIMESTAMP,
+    status       CHAR(1)      DEFAULT '0',
+    create_by    BIGINT,
+    create_time  TIMESTAMP,
+    update_by    BIGINT,
+    update_time  TIMESTAMP,
+    CONSTRAINT pk_app_message PRIMARY KEY (message_id)
+);
+
+COMMENT ON TABLE app_message IS 'App端消息推送表';
+COMMENT ON COLUMN app_message.message_id IS '消息ID';
+COMMENT ON COLUMN app_message.title IS '消息标题';
+COMMENT ON COLUMN app_message.content IS '消息内容';
+COMMENT ON COLUMN app_message.message_type IS '消息类型（system:系统消息 notice:通知 activity:活动）';
+COMMENT ON COLUMN app_message.target_type IS '推送目标（all:全部用户 user:指定用户 role:指定角色）';
+COMMENT ON COLUMN app_message.target_ids IS '目标ID列表（用户ID或角色ID，逗号分隔）';
+COMMENT ON COLUMN app_message.send_time IS '发送时间';
+COMMENT ON COLUMN app_message.status IS '状态（0待发送 1已发送 2发送失败）';
+COMMENT ON COLUMN app_message.create_by IS '创建者';
+COMMENT ON COLUMN app_message.create_time IS '创建时间';
+COMMENT ON COLUMN app_message.update_by IS '更新者';
+COMMENT ON COLUMN app_message.update_time IS '更新时间';
+
+CREATE INDEX idx_app_message_type ON app_message (message_type);
+CREATE INDEX idx_app_message_status ON app_message (status);
+
+-- 9、App端用户消息读取记录表
+CREATE TABLE app_user_message (
+    id          BIGINT NOT NULL,
+    user_id     BIGINT NOT NULL,
+    message_id  BIGINT NOT NULL,
+    is_read     CHAR(1) DEFAULT '0',
+    read_time   TIMESTAMP,
+    create_time TIMESTAMP,
+    CONSTRAINT pk_app_user_message PRIMARY KEY (id)
+);
+
+COMMENT ON TABLE app_user_message IS 'App端用户消息读取记录表';
+COMMENT ON COLUMN app_user_message.id IS '主键';
+COMMENT ON COLUMN app_user_message.user_id IS 'App用户ID';
+COMMENT ON COLUMN app_user_message.message_id IS '消息ID';
+COMMENT ON COLUMN app_user_message.is_read IS '是否已读（0未读 1已读）';
+COMMENT ON COLUMN app_user_message.read_time IS '读取时间';
+COMMENT ON COLUMN app_user_message.create_time IS '创建时间';
+
+CREATE INDEX idx_app_user_message_user ON app_user_message (user_id);
+CREATE INDEX idx_app_user_message_msg ON app_user_message (message_id);
+CREATE INDEX idx_app_user_message_read ON app_user_message (is_read);
+
+-- 10、App版本信息表
+CREATE TABLE app_version (
+    version_id     BIGINT       NOT NULL,
+    version_code   INTEGER      NOT NULL,
+    version_name   VARCHAR(20)  NOT NULL,
+    update_content TEXT,
+    download_url   VARCHAR(500) NOT NULL,
+    is_force       CHAR(1)      DEFAULT '0',
+    platform       VARCHAR(10)  DEFAULT 'android',
+    create_time    TIMESTAMP,
+    CONSTRAINT pk_app_version PRIMARY KEY (version_id)
+);
+
+COMMENT ON TABLE app_version IS 'App版本信息表';
+COMMENT ON COLUMN app_version.version_id IS '版本ID';
+COMMENT ON COLUMN app_version.version_code IS '版本号（数字）';
+COMMENT ON COLUMN app_version.version_name IS '版本名（如1.0.0）';
+COMMENT ON COLUMN app_version.update_content IS '更新内容';
+COMMENT ON COLUMN app_version.download_url IS '下载地址';
+COMMENT ON COLUMN app_version.is_force IS '是否强制更新（0否 1是）';
+COMMENT ON COLUMN app_version.platform IS '平台（android、ios）';
+COMMENT ON COLUMN app_version.create_time IS '创建时间';
+
+-- 创建序列
+CREATE SEQUENCE seq_app_user START WITH 2 INCREMENT BY 1;
+CREATE SEQUENCE seq_app_role START WITH 3 INCREMENT BY 1;
+CREATE SEQUENCE seq_app_social_auth START WITH 1 INCREMENT BY 1;
+CREATE SEQUENCE seq_app_login_log START WITH 1 INCREMENT BY 1;
+CREATE SEQUENCE seq_app_oper_log START WITH 1 INCREMENT BY 1;
+CREATE SEQUENCE seq_app_device START WITH 1 INCREMENT BY 1;
+CREATE SEQUENCE seq_app_message START WITH 1 INCREMENT BY 1;
+CREATE SEQUENCE seq_app_user_message START WITH 1 INCREMENT BY 1;
+CREATE SEQUENCE seq_app_version START WITH 1 INCREMENT BY 1;
+
+COMMIT;
\ No newline at end of file
diff --git a/script/sql/postgres/postgres_ry_job.sql b/script/sql/postgres/postgres_ry_job.sql
new file mode 100644
index 0000000..10612e6
--- /dev/null
+++ b/script/sql/postgres/postgres_ry_job.sql
@@ -0,0 +1,855 @@
+/*
+ SnailJob Database Transfer Tool
+ Source Server Type    : MySQL
+ Target Server Type    : PostgreSQL
+ Date: 2025-04-26 09:56:45
+*/
+
+
+-- sj_namespace
+CREATE TABLE sj_namespace
+(
+    id          bigserial PRIMARY KEY,
+    name        varchar(64)  NOT NULL,
+    unique_id   varchar(64)  NOT NULL,
+    description varchar(256) NOT NULL DEFAULT '',
+    deleted     smallint     NOT NULL DEFAULT 0,
+    create_dt   timestamp    NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    update_dt   timestamp    NOT NULL DEFAULT CURRENT_TIMESTAMP
+);
+
+CREATE INDEX idx_sj_namespace_01 ON sj_namespace (name);
+
+COMMENT ON COLUMN sj_namespace.id IS '主键';
+COMMENT ON COLUMN sj_namespace.name IS '名称';
+COMMENT ON COLUMN sj_namespace.unique_id IS '唯一id';
+COMMENT ON COLUMN sj_namespace.description IS '描述';
+COMMENT ON COLUMN sj_namespace.deleted IS '逻辑删除 1、删除';
+COMMENT ON COLUMN sj_namespace.create_dt IS '创建时间';
+COMMENT ON COLUMN sj_namespace.update_dt IS '修改时间';
+COMMENT ON TABLE sj_namespace IS '命名空间';
+
+INSERT INTO sj_namespace VALUES (1, 'Development', 'dev', '', 0, now(), now());
+INSERT INTO sj_namespace VALUES (2, 'Production', 'prod', '', 0, now(), now());
+
+-- sj_group_config
+CREATE TABLE sj_group_config
+(
+    id                bigserial PRIMARY KEY,
+    namespace_id      varchar(64)  NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a',
+    group_name        varchar(64)  NOT NULL DEFAULT '',
+    description       varchar(256) NOT NULL DEFAULT '',
+    token             varchar(64)  NOT NULL DEFAULT 'SJ_cKqBTPzCsWA3VyuCfFoccmuIEGXjr5KT',
+    group_status      smallint     NOT NULL DEFAULT 0,
+    version           int          NOT NULL,
+    group_partition   int          NOT NULL,
+    id_generator_mode smallint     NOT NULL DEFAULT 1,
+    init_scene        smallint     NOT NULL DEFAULT 0,
+    create_dt         timestamp    NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    update_dt         timestamp    NOT NULL DEFAULT CURRENT_TIMESTAMP
+);
+
+CREATE UNIQUE INDEX uk_sj_group_config_01 ON sj_group_config (namespace_id, group_name);
+
+COMMENT ON COLUMN sj_group_config.id IS '主键';
+COMMENT ON COLUMN sj_group_config.namespace_id IS '命名空间id';
+COMMENT ON COLUMN sj_group_config.group_name IS '组名称';
+COMMENT ON COLUMN sj_group_config.description IS '组描述';
+COMMENT ON COLUMN sj_group_config.token IS 'token';
+COMMENT ON COLUMN sj_group_config.group_status IS '组状态 0、未启用 1、启用';
+COMMENT ON COLUMN sj_group_config.version IS '版本号';
+COMMENT ON COLUMN sj_group_config.group_partition IS '分区';
+COMMENT ON COLUMN sj_group_config.id_generator_mode IS '唯一id生成模式 默认号段模式';
+COMMENT ON COLUMN sj_group_config.init_scene IS '是否初始化场景 0:否 1:是';
+COMMENT ON COLUMN sj_group_config.create_dt IS '创建时间';
+COMMENT ON COLUMN sj_group_config.update_dt IS '修改时间';
+COMMENT ON TABLE sj_group_config IS '组配置';
+
+INSERT INTO sj_group_config VALUES (1, 'dev', 'ruoyi_group', '', 'SJ_cKqBTPzCsWA3VyuCfFoccmuIEGXjr5KT', 1, 1, 0, 1, 1,  now(), now());
+INSERT INTO sj_group_config VALUES (2, 'prod', 'ruoyi_group', '', 'SJ_cKqBTPzCsWA3VyuCfFoccmuIEGXjr5KT', 1, 1, 0, 1, 1,  now(), now());
+
+-- sj_notify_config
+CREATE TABLE sj_notify_config
+(
+    id                     bigserial PRIMARY KEY,
+    namespace_id           varchar(64)  NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a',
+    group_name             varchar(64)  NOT NULL,
+    notify_name            varchar(64)  NOT NULL DEFAULT '',
+    system_task_type       smallint     NOT NULL DEFAULT 3,
+    notify_status          smallint     NOT NULL DEFAULT 0,
+    recipient_ids          varchar(128) NOT NULL,
+    notify_threshold       int          NOT NULL DEFAULT 0,
+    notify_scene           smallint     NOT NULL DEFAULT 0,
+    rate_limiter_status    smallint     NOT NULL DEFAULT 0,
+    rate_limiter_threshold int          NOT NULL DEFAULT 0,
+    description            varchar(256) NOT NULL DEFAULT '',
+    create_dt              timestamp    NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    update_dt              timestamp    NOT NULL DEFAULT CURRENT_TIMESTAMP
+);
+
+CREATE INDEX idx_sj_notify_config_01 ON sj_notify_config (namespace_id, group_name);
+
+COMMENT ON COLUMN sj_notify_config.id IS '主键';
+COMMENT ON COLUMN sj_notify_config.namespace_id IS '命名空间id';
+COMMENT ON COLUMN sj_notify_config.group_name IS '组名称';
+COMMENT ON COLUMN sj_notify_config.notify_name IS '通知名称';
+COMMENT ON COLUMN sj_notify_config.system_task_type IS '任务类型 1. 重试任务 2. 重试回调 3、JOB任务 4、WORKFLOW任务';
+COMMENT ON COLUMN sj_notify_config.notify_status IS '通知状态 0、未启用 1、启用';
+COMMENT ON COLUMN sj_notify_config.recipient_ids IS '接收人id列表';
+COMMENT ON COLUMN sj_notify_config.notify_threshold IS '通知阈值';
+COMMENT ON COLUMN sj_notify_config.notify_scene IS '通知场景';
+COMMENT ON COLUMN sj_notify_config.rate_limiter_status IS '限流状态 0、未启用 1、启用';
+COMMENT ON COLUMN sj_notify_config.rate_limiter_threshold IS '每秒限流阈值';
+COMMENT ON COLUMN sj_notify_config.description IS '描述';
+COMMENT ON COLUMN sj_notify_config.create_dt IS '创建时间';
+COMMENT ON COLUMN sj_notify_config.update_dt IS '修改时间';
+COMMENT ON TABLE sj_notify_config IS '通知配置';
+
+-- sj_notify_recipient
+CREATE TABLE sj_notify_recipient
+(
+    id               bigserial PRIMARY KEY,
+    namespace_id     varchar(64)  NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a',
+    recipient_name   varchar(64)  NOT NULL,
+    notify_type      smallint     NOT NULL DEFAULT 0,
+    notify_attribute varchar(512) NOT NULL,
+    description      varchar(256) NOT NULL DEFAULT '',
+    create_dt        timestamp    NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    update_dt        timestamp    NOT NULL DEFAULT CURRENT_TIMESTAMP
+);
+
+CREATE INDEX idx_sj_notify_recipient_01 ON sj_notify_recipient (namespace_id);
+
+COMMENT ON COLUMN sj_notify_recipient.id IS '主键';
+COMMENT ON COLUMN sj_notify_recipient.namespace_id IS '命名空间id';
+COMMENT ON COLUMN sj_notify_recipient.recipient_name IS '接收人名称';
+COMMENT ON COLUMN sj_notify_recipient.notify_type IS '通知类型 1、钉钉 2、邮件 3、企业微信 4 飞书 5 webhook';
+COMMENT ON COLUMN sj_notify_recipient.notify_attribute IS '配置属性';
+COMMENT ON COLUMN sj_notify_recipient.description IS '描述';
+COMMENT ON COLUMN sj_notify_recipient.create_dt IS '创建时间';
+COMMENT ON COLUMN sj_notify_recipient.update_dt IS '修改时间';
+COMMENT ON TABLE sj_notify_recipient IS '告警通知接收人';
+
+-- sj_retry_dead_letter
+CREATE TABLE sj_retry_dead_letter
+(
+    id            bigserial PRIMARY KEY,
+    namespace_id  varchar(64)  NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a',
+    group_name    varchar(64)  NOT NULL,
+    group_id      bigint       NOT NULL,
+    scene_name    varchar(64)  NOT NULL,
+    scene_id      bigint       NOT NULL,
+    idempotent_id varchar(64)  NOT NULL,
+    biz_no        varchar(64)  NOT NULL DEFAULT '',
+    executor_name varchar(512) NOT NULL DEFAULT '',
+    args_str      text         NOT NULL,
+    ext_attrs     text         NOT NULL,
+    create_dt     timestamp    NOT NULL DEFAULT CURRENT_TIMESTAMP
+);
+
+CREATE INDEX idx_sj_retry_dead_letter_01 ON sj_retry_dead_letter (namespace_id, group_name, scene_name);
+CREATE INDEX idx_sj_retry_dead_letter_02 ON sj_retry_dead_letter (idempotent_id);
+CREATE INDEX idx_sj_retry_dead_letter_03 ON sj_retry_dead_letter (biz_no);
+CREATE INDEX idx_sj_retry_dead_letter_04 ON sj_retry_dead_letter (create_dt);
+
+COMMENT ON COLUMN sj_retry_dead_letter.id IS '主键';
+COMMENT ON COLUMN sj_retry_dead_letter.namespace_id IS '命名空间id';
+COMMENT ON COLUMN sj_retry_dead_letter.group_name IS '组名称';
+COMMENT ON COLUMN sj_retry_dead_letter.group_id IS '组Id';
+COMMENT ON COLUMN sj_retry_dead_letter.scene_name IS '场景名称';
+COMMENT ON COLUMN sj_retry_dead_letter.scene_id IS '场景ID';
+COMMENT ON COLUMN sj_retry_dead_letter.idempotent_id IS '幂等id';
+COMMENT ON COLUMN sj_retry_dead_letter.biz_no IS '业务编号';
+COMMENT ON COLUMN sj_retry_dead_letter.executor_name IS '执行器名称';
+COMMENT ON COLUMN sj_retry_dead_letter.args_str IS '执行方法参数';
+COMMENT ON COLUMN sj_retry_dead_letter.ext_attrs IS '扩展字段';
+COMMENT ON COLUMN sj_retry_dead_letter.create_dt IS '创建时间';
+COMMENT ON TABLE sj_retry_dead_letter IS '死信队列表';
+
+-- sj_retry
+CREATE TABLE sj_retry
+(
+    id              bigserial PRIMARY KEY,
+    namespace_id    varchar(64)  NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a',
+    group_name      varchar(64)  NOT NULL,
+    group_id        bigint       NOT NULL,
+    scene_name      varchar(64)  NOT NULL,
+    scene_id        bigint       NOT NULL,
+    idempotent_id   varchar(64)  NOT NULL,
+    biz_no          varchar(64)  NOT NULL DEFAULT '',
+    executor_name   varchar(512) NOT NULL DEFAULT '',
+    args_str        text         NOT NULL,
+    ext_attrs       text         NOT NULL,
+    next_trigger_at bigint       NOT NULL,
+    retry_count     int          NOT NULL DEFAULT 0,
+    retry_status    smallint     NOT NULL DEFAULT 0,
+    task_type       smallint     NOT NULL DEFAULT 1,
+    bucket_index    int          NOT NULL DEFAULT 0,
+    parent_id       bigint       NOT NULL DEFAULT 0,
+    deleted         bigint       NOT NULL DEFAULT 0,
+    create_dt       timestamp    NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    update_dt       timestamp    NOT NULL DEFAULT CURRENT_TIMESTAMP
+);
+
+CREATE UNIQUE INDEX uk_sj_retry_01 ON sj_retry (scene_id, task_type, idempotent_id, deleted);
+
+CREATE INDEX idx_sj_retry_01 ON sj_retry (biz_no);
+CREATE INDEX idx_sj_retry_02 ON sj_retry (retry_status, bucket_index);
+CREATE INDEX idx_sj_retry_03 ON sj_retry (parent_id);
+CREATE INDEX idx_sj_retry_04 ON sj_retry (create_dt);
+CREATE INDEX idx_sj_retry_05 ON sj_retry (idempotent_id);
+
+
+COMMENT ON COLUMN sj_retry.id IS '主键';
+COMMENT ON COLUMN sj_retry.namespace_id IS '命名空间id';
+COMMENT ON COLUMN sj_retry.group_name IS '组名称';
+COMMENT ON COLUMN sj_retry.group_id IS '组Id';
+COMMENT ON COLUMN sj_retry.scene_name IS '场景名称';
+COMMENT ON COLUMN sj_retry.scene_id IS '场景ID';
+COMMENT ON COLUMN sj_retry.idempotent_id IS '幂等id';
+COMMENT ON COLUMN sj_retry.biz_no IS '业务编号';
+COMMENT ON COLUMN sj_retry.executor_name IS '执行器名称';
+COMMENT ON COLUMN sj_retry.args_str IS '执行方法参数';
+COMMENT ON COLUMN sj_retry.ext_attrs IS '扩展字段';
+COMMENT ON COLUMN sj_retry.next_trigger_at IS '下次触发时间';
+COMMENT ON COLUMN sj_retry.retry_count IS '重试次数';
+COMMENT ON COLUMN sj_retry.retry_status IS '重试状态 0、重试中 1、成功 2、最大重试次数';
+COMMENT ON COLUMN sj_retry.task_type IS '任务类型 1、重试数据 2、回调数据';
+COMMENT ON COLUMN sj_retry.bucket_index IS 'bucket';
+COMMENT ON COLUMN sj_retry.parent_id IS '父节点id';
+COMMENT ON COLUMN sj_retry.deleted IS '逻辑删除';
+COMMENT ON COLUMN sj_retry.create_dt IS '创建时间';
+COMMENT ON COLUMN sj_retry.update_dt IS '修改时间';
+COMMENT ON TABLE sj_retry IS '重试信息表';
+
+-- sj_retry_task
+CREATE TABLE sj_retry_task
+(
+    id               bigserial PRIMARY KEY,
+    namespace_id     varchar(64)  NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a',
+    group_name       varchar(64)  NOT NULL,
+    scene_name       varchar(64)  NOT NULL,
+    retry_id         bigint       NOT NULL,
+    ext_attrs        text         NOT NULL,
+    task_status      smallint     NOT NULL DEFAULT 1,
+    task_type        smallint     NOT NULL DEFAULT 1,
+    operation_reason smallint     NOT NULL DEFAULT 0,
+    client_info      varchar(128) NULL     DEFAULT NULL,
+    create_dt        timestamp    NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    update_dt        timestamp    NOT NULL DEFAULT CURRENT_TIMESTAMP
+);
+
+CREATE INDEX idx_sj_retry_task_01 ON sj_retry_task (namespace_id, group_name, scene_name);
+CREATE INDEX idx_sj_retry_task_02 ON sj_retry_task (task_status);
+CREATE INDEX idx_sj_retry_task_03 ON sj_retry_task (create_dt);
+CREATE INDEX idx_sj_retry_task_04 ON sj_retry_task (retry_id);
+
+COMMENT ON COLUMN sj_retry_task.id IS '主键';
+COMMENT ON COLUMN sj_retry_task.namespace_id IS '命名空间id';
+COMMENT ON COLUMN sj_retry_task.group_name IS '组名称';
+COMMENT ON COLUMN sj_retry_task.scene_name IS '场景名称';
+COMMENT ON COLUMN sj_retry_task.retry_id IS '重试信息Id';
+COMMENT ON COLUMN sj_retry_task.ext_attrs IS '扩展字段';
+COMMENT ON COLUMN sj_retry_task.task_status IS '重试状态';
+COMMENT ON COLUMN sj_retry_task.task_type IS '任务类型 1、重试数据 2、回调数据';
+COMMENT ON COLUMN sj_retry_task.operation_reason IS '操作原因';
+COMMENT ON COLUMN sj_retry_task.client_info IS '客户端地址 clientId#ip:port';
+COMMENT ON COLUMN sj_retry_task.create_dt IS '创建时间';
+COMMENT ON COLUMN sj_retry_task.update_dt IS '修改时间';
+COMMENT ON TABLE sj_retry_task IS '重试任务表';
+
+-- sj_retry_task_log_message
+CREATE TABLE sj_retry_task_log_message
+(
+    id            bigserial PRIMARY KEY,
+    namespace_id  varchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a',
+    group_name    varchar(64) NOT NULL,
+    retry_id      bigint      NOT NULL,
+    retry_task_id bigint      NOT NULL,
+    message       text        NOT NULL,
+    log_num       int         NOT NULL DEFAULT 1,
+    real_time     bigint      NOT NULL DEFAULT 0,
+    create_dt     timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP
+);
+
+CREATE INDEX idx_sj_retry_task_log_message_01 ON sj_retry_task_log_message (namespace_id, group_name, retry_task_id);
+CREATE INDEX idx_sj_retry_task_log_message_02 ON sj_retry_task_log_message (create_dt);
+
+COMMENT ON COLUMN sj_retry_task_log_message.id IS '主键';
+COMMENT ON COLUMN sj_retry_task_log_message.namespace_id IS '命名空间id';
+COMMENT ON COLUMN sj_retry_task_log_message.group_name IS '组名称';
+COMMENT ON COLUMN sj_retry_task_log_message.retry_id IS '重试信息Id';
+COMMENT ON COLUMN sj_retry_task_log_message.retry_task_id IS '重试任务Id';
+COMMENT ON COLUMN sj_retry_task_log_message.message IS '异常信息';
+COMMENT ON COLUMN sj_retry_task_log_message.log_num IS '日志数量';
+COMMENT ON COLUMN sj_retry_task_log_message.real_time IS '上报时间';
+COMMENT ON COLUMN sj_retry_task_log_message.create_dt IS '创建时间';
+COMMENT ON TABLE sj_retry_task_log_message IS '任务调度日志信息记录表';
+
+-- sj_retry_scene_config
+CREATE TABLE sj_retry_scene_config
+(
+    id                  bigserial PRIMARY KEY,
+    namespace_id        varchar(64)  NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a',
+    scene_name          varchar(64)  NOT NULL,
+    group_name          varchar(64)  NOT NULL,
+    scene_status        smallint     NOT NULL DEFAULT 0,
+    max_retry_count     int          NOT NULL DEFAULT 5,
+    back_off            smallint     NOT NULL DEFAULT 1,
+    trigger_interval    varchar(16)  NOT NULL DEFAULT '',
+    notify_ids          varchar(128) NOT NULL DEFAULT '',
+    deadline_request    bigint       NOT NULL DEFAULT 60000,
+    executor_timeout    int          NOT NULL DEFAULT 5,
+    route_key           smallint     NOT NULL DEFAULT 4,
+    block_strategy      smallint     NOT NULL DEFAULT 1,
+    cb_status           smallint     NOT NULL DEFAULT 0,
+    cb_trigger_type     smallint     NOT NULL DEFAULT 1,
+    cb_max_count        int          NOT NULL DEFAULT 16,
+    cb_trigger_interval varchar(16)  NOT NULL DEFAULT '',
+    description         varchar(256) NOT NULL DEFAULT '',
+    create_dt           timestamp    NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    update_dt           timestamp    NOT NULL DEFAULT CURRENT_TIMESTAMP
+);
+
+CREATE UNIQUE INDEX uk_sj_retry_scene_config_01 ON sj_retry_scene_config (namespace_id, group_name, scene_name);
+
+COMMENT ON COLUMN sj_retry_scene_config.id IS '主键';
+COMMENT ON COLUMN sj_retry_scene_config.namespace_id IS '命名空间id';
+COMMENT ON COLUMN sj_retry_scene_config.scene_name IS '场景名称';
+COMMENT ON COLUMN sj_retry_scene_config.group_name IS '组名称';
+COMMENT ON COLUMN sj_retry_scene_config.scene_status IS '组状态 0、未启用 1、启用';
+COMMENT ON COLUMN sj_retry_scene_config.max_retry_count IS '最大重试次数';
+COMMENT ON COLUMN sj_retry_scene_config.back_off IS '1、默认等级 2、固定间隔时间 3、CRON 表达式';
+COMMENT ON COLUMN sj_retry_scene_config.trigger_interval IS '间隔时长';
+COMMENT ON COLUMN sj_retry_scene_config.notify_ids IS '通知告警场景配置id列表';
+COMMENT ON COLUMN sj_retry_scene_config.deadline_request IS 'Deadline Request 调用链超时 单位毫秒';
+COMMENT ON COLUMN sj_retry_scene_config.executor_timeout IS '任务执行超时时间，单位秒';
+COMMENT ON COLUMN sj_retry_scene_config.route_key IS '路由策略';
+COMMENT ON COLUMN sj_retry_scene_config.block_strategy IS '阻塞策略 1、丢弃 2、覆盖 3、并行';
+COMMENT ON COLUMN sj_retry_scene_config.cb_status IS '回调状态 0、不开启 1、开启';
+COMMENT ON COLUMN sj_retry_scene_config.cb_trigger_type IS '1、默认等级 2、固定间隔时间 3、CRON 表达式';
+COMMENT ON COLUMN sj_retry_scene_config.cb_max_count IS '回调的最大执行次数';
+COMMENT ON COLUMN sj_retry_scene_config.cb_trigger_interval IS '回调的最大执行次数';
+COMMENT ON COLUMN sj_retry_scene_config.description IS '描述';
+COMMENT ON COLUMN sj_retry_scene_config.create_dt IS '创建时间';
+COMMENT ON COLUMN sj_retry_scene_config.update_dt IS '修改时间';
+COMMENT ON TABLE sj_retry_scene_config IS '场景配置';
+
+-- sj_server_node
+CREATE TABLE sj_server_node
+(
+    id           bigserial PRIMARY KEY,
+    namespace_id varchar(64)  NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a',
+    group_name   varchar(64)  NOT NULL,
+    host_id      varchar(64)  NOT NULL,
+    host_ip      varchar(64)  NOT NULL,
+    host_port    int          NOT NULL,
+    expire_at    timestamp    NOT NULL,
+    node_type    smallint     NOT NULL,
+    ext_attrs    varchar(256) NULL     DEFAULT '',
+    create_dt    timestamp    NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    update_dt    timestamp    NOT NULL DEFAULT CURRENT_TIMESTAMP
+);
+
+CREATE UNIQUE INDEX uk_sj_server_node_01 ON sj_server_node (host_id, host_ip);
+
+CREATE INDEX idx_sj_server_node_01 ON sj_server_node (namespace_id, group_name);
+CREATE INDEX idx_sj_server_node_02 ON sj_server_node (expire_at, node_type);
+
+COMMENT ON COLUMN sj_server_node.id IS '主键';
+COMMENT ON COLUMN sj_server_node.namespace_id IS '命名空间id';
+COMMENT ON COLUMN sj_server_node.group_name IS '组名称';
+COMMENT ON COLUMN sj_server_node.host_id IS '主机id';
+COMMENT ON COLUMN sj_server_node.host_ip IS '机器ip';
+COMMENT ON COLUMN sj_server_node.host_port IS '机器端口';
+COMMENT ON COLUMN sj_server_node.expire_at IS '过期时间';
+COMMENT ON COLUMN sj_server_node.node_type IS '节点类型 1、客户端 2、是服务端';
+COMMENT ON COLUMN sj_server_node.ext_attrs IS '扩展字段';
+COMMENT ON COLUMN sj_server_node.create_dt IS '创建时间';
+COMMENT ON COLUMN sj_server_node.update_dt IS '修改时间';
+COMMENT ON TABLE sj_server_node IS '服务器节点';
+
+-- sj_distributed_lock
+CREATE TABLE sj_distributed_lock
+(
+    name       varchar(64)  NOT NULL,
+    lock_until timestamp(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3),
+    locked_at  timestamp(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3),
+    locked_by  varchar(255) NOT NULL,
+    create_dt  timestamp    NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    update_dt  timestamp    NOT NULL DEFAULT CURRENT_TIMESTAMP
+);
+
+COMMENT ON COLUMN sj_distributed_lock.name IS '锁名称';
+COMMENT ON COLUMN sj_distributed_lock.lock_until IS '锁定时长';
+COMMENT ON COLUMN sj_distributed_lock.locked_at IS '锁定时间';
+COMMENT ON COLUMN sj_distributed_lock.locked_by IS '锁定者';
+COMMENT ON COLUMN sj_distributed_lock.create_dt IS '创建时间';
+COMMENT ON COLUMN sj_distributed_lock.update_dt IS '修改时间';
+COMMENT ON TABLE sj_distributed_lock IS '锁定表';
+
+-- sj_system_user
+CREATE TABLE sj_system_user
+(
+    id        bigserial PRIMARY KEY,
+    username  varchar(64)  NOT NULL,
+    password  varchar(128) NOT NULL,
+    role      smallint     NOT NULL DEFAULT 0,
+    create_dt timestamp    NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    update_dt timestamp    NOT NULL DEFAULT CURRENT_TIMESTAMP
+);
+
+COMMENT ON COLUMN sj_system_user.id IS '主键';
+COMMENT ON COLUMN sj_system_user.username IS '账号';
+COMMENT ON COLUMN sj_system_user.password IS '密码';
+COMMENT ON COLUMN sj_system_user.role IS '角色：1-普通用户、2-管理员';
+COMMENT ON COLUMN sj_system_user.create_dt IS '创建时间';
+COMMENT ON COLUMN sj_system_user.update_dt IS '修改时间';
+COMMENT ON TABLE sj_system_user IS '系统用户表';
+
+-- pwd: admin
+INSERT INTO sj_system_user VALUES (1, 'admin', '465c194afb65670f38322df087f0a9bb225cc257e43eb4ac5a0c98ef5b3173ac', 2, now(), now());
+
+-- sj_system_user_permission
+CREATE TABLE sj_system_user_permission
+(
+    id             bigserial PRIMARY KEY,
+    group_name     varchar(64) NOT NULL,
+    namespace_id   varchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a',
+    system_user_id bigint      NOT NULL,
+    create_dt      timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    update_dt      timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP
+);
+
+CREATE UNIQUE INDEX uk_sj_system_user_permission_01 ON sj_system_user_permission (namespace_id, group_name, system_user_id);
+
+COMMENT ON COLUMN sj_system_user_permission.id IS '主键';
+COMMENT ON COLUMN sj_system_user_permission.group_name IS '组名称';
+COMMENT ON COLUMN sj_system_user_permission.namespace_id IS '命名空间id';
+COMMENT ON COLUMN sj_system_user_permission.system_user_id IS '系统用户id';
+COMMENT ON COLUMN sj_system_user_permission.create_dt IS '创建时间';
+COMMENT ON COLUMN sj_system_user_permission.update_dt IS '修改时间';
+COMMENT ON TABLE sj_system_user_permission IS '系统用户权限表';
+
+-- sj_sequence_alloc
+CREATE TABLE sj_sequence_alloc
+(
+    id           bigserial PRIMARY KEY,
+    namespace_id varchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a',
+    group_name   varchar(64) NOT NULL DEFAULT '',
+    max_id       bigint      NOT NULL DEFAULT 1,
+    step         int         NOT NULL DEFAULT 100,
+    update_dt    timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP
+);
+
+CREATE UNIQUE INDEX uk_sj_sequence_alloc_01 ON sj_sequence_alloc (namespace_id, group_name);
+
+COMMENT ON COLUMN sj_sequence_alloc.id IS '主键';
+COMMENT ON COLUMN sj_sequence_alloc.namespace_id IS '命名空间id';
+COMMENT ON COLUMN sj_sequence_alloc.group_name IS '组名称';
+COMMENT ON COLUMN sj_sequence_alloc.max_id IS '最大id';
+COMMENT ON COLUMN sj_sequence_alloc.step IS '步长';
+COMMENT ON COLUMN sj_sequence_alloc.update_dt IS '更新时间';
+COMMENT ON TABLE sj_sequence_alloc IS '号段模式序号ID分配表';
+
+-- sj_job
+CREATE TABLE sj_job
+(
+    id               bigserial PRIMARY KEY,
+    namespace_id     varchar(64)  NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a',
+    group_name       varchar(64)  NOT NULL,
+    job_name         varchar(64)  NOT NULL,
+    args_str         text         NULL     DEFAULT NULL,
+    args_type        smallint     NOT NULL DEFAULT 1,
+    next_trigger_at  bigint       NOT NULL,
+    job_status       smallint     NOT NULL DEFAULT 1,
+    task_type        smallint     NOT NULL DEFAULT 1,
+    route_key        smallint     NOT NULL DEFAULT 4,
+    executor_type    smallint     NOT NULL DEFAULT 1,
+    executor_info    varchar(255) NULL     DEFAULT NULL,
+    trigger_type     smallint     NOT NULL,
+    trigger_interval varchar(255) NOT NULL,
+    block_strategy   smallint     NOT NULL DEFAULT 1,
+    executor_timeout int          NOT NULL DEFAULT 0,
+    max_retry_times  int          NOT NULL DEFAULT 0,
+    parallel_num     int          NOT NULL DEFAULT 1,
+    retry_interval   int          NOT NULL DEFAULT 0,
+    bucket_index     int          NOT NULL DEFAULT 0,
+    resident         smallint     NOT NULL DEFAULT 0,
+    notify_ids       varchar(128) NOT NULL DEFAULT '',
+    owner_id         bigint       NULL,
+    description      varchar(256) NOT NULL DEFAULT '',
+    ext_attrs        varchar(256) NULL     DEFAULT '',
+    deleted          smallint     NOT NULL DEFAULT 0,
+    create_dt        timestamp    NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    update_dt        timestamp    NOT NULL DEFAULT CURRENT_TIMESTAMP
+);
+
+CREATE INDEX idx_sj_job_01 ON sj_job (namespace_id, group_name);
+CREATE INDEX idx_sj_job_02 ON sj_job (job_status, bucket_index);
+CREATE INDEX idx_sj_job_03 ON sj_job (create_dt);
+
+COMMENT ON COLUMN sj_job.id IS '主键';
+COMMENT ON COLUMN sj_job.namespace_id IS '命名空间id';
+COMMENT ON COLUMN sj_job.group_name IS '组名称';
+COMMENT ON COLUMN sj_job.job_name IS '名称';
+COMMENT ON COLUMN sj_job.args_str IS '执行方法参数';
+COMMENT ON COLUMN sj_job.args_type IS '参数类型 ';
+COMMENT ON COLUMN sj_job.next_trigger_at IS '下次触发时间';
+COMMENT ON COLUMN sj_job.job_status IS '任务状态 0、关闭、1、开启';
+COMMENT ON COLUMN sj_job.task_type IS '任务类型 1、集群 2、广播 3、切片';
+COMMENT ON COLUMN sj_job.route_key IS '路由策略';
+COMMENT ON COLUMN sj_job.executor_type IS '执行器类型';
+COMMENT ON COLUMN sj_job.executor_info IS '执行器名称';
+COMMENT ON COLUMN sj_job.trigger_type IS '触发类型 1.CRON 表达式 2. 固定时间';
+COMMENT ON COLUMN sj_job.trigger_interval IS '间隔时长';
+COMMENT ON COLUMN sj_job.block_strategy IS '阻塞策略 1、丢弃 2、覆盖 3、并行 4、恢复';
+COMMENT ON COLUMN sj_job.executor_timeout IS '任务执行超时时间，单位秒';
+COMMENT ON COLUMN sj_job.max_retry_times IS '最大重试次数';
+COMMENT ON COLUMN sj_job.parallel_num IS '并行数';
+COMMENT ON COLUMN sj_job.retry_interval IS '重试间隔 ( s)';
+COMMENT ON COLUMN sj_job.bucket_index IS 'bucket';
+COMMENT ON COLUMN sj_job.resident IS '是否是常驻任务';
+COMMENT ON COLUMN sj_job.notify_ids IS '通知告警场景配置id列表';
+COMMENT ON COLUMN sj_job.owner_id IS '负责人id';
+COMMENT ON COLUMN sj_job.description IS '描述';
+COMMENT ON COLUMN sj_job.ext_attrs IS '扩展字段';
+COMMENT ON COLUMN sj_job.deleted IS '逻辑删除 1、删除';
+COMMENT ON COLUMN sj_job.create_dt IS '创建时间';
+COMMENT ON COLUMN sj_job.update_dt IS '修改时间';
+COMMENT ON TABLE sj_job IS '任务信息';
+
+INSERT INTO sj_job VALUES (1, 'dev', 'ruoyi_group', 'demo-job', null, 1, 1710344035622, 1, 1, 4, 1, 'testJobExecutor', 2, '60', 1, 60, 3, 1, 1, 116, 0, '', 1, '', '', 0, now(), now());
+
+-- sj_job_log_message
+CREATE TABLE sj_job_log_message
+(
+    id            bigserial PRIMARY KEY,
+    namespace_id  varchar(64)  NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a',
+    group_name    varchar(64)  NOT NULL,
+    job_id        bigint       NOT NULL,
+    task_batch_id bigint       NOT NULL,
+    task_id       bigint       NOT NULL,
+    message       text         NOT NULL,
+    log_num       int          NOT NULL DEFAULT 1,
+    real_time     bigint       NOT NULL DEFAULT 0,
+    ext_attrs     varchar(256) NULL     DEFAULT '',
+    create_dt     timestamp    NOT NULL DEFAULT CURRENT_TIMESTAMP
+);
+
+CREATE INDEX idx_sj_job_log_message_01 ON sj_job_log_message (task_batch_id, task_id);
+CREATE INDEX idx_sj_job_log_message_02 ON sj_job_log_message (create_dt);
+CREATE INDEX idx_sj_job_log_message_03 ON sj_job_log_message (namespace_id, group_name);
+
+COMMENT ON COLUMN sj_job_log_message.id IS '主键';
+COMMENT ON COLUMN sj_job_log_message.namespace_id IS '命名空间id';
+COMMENT ON COLUMN sj_job_log_message.group_name IS '组名称';
+COMMENT ON COLUMN sj_job_log_message.job_id IS '任务信息id';
+COMMENT ON COLUMN sj_job_log_message.task_batch_id IS '任务批次id';
+COMMENT ON COLUMN sj_job_log_message.task_id IS '调度任务id';
+COMMENT ON COLUMN sj_job_log_message.message IS '调度信息';
+COMMENT ON COLUMN sj_job_log_message.log_num IS '日志数量';
+COMMENT ON COLUMN sj_job_log_message.real_time IS '上报时间';
+COMMENT ON COLUMN sj_job_log_message.ext_attrs IS '扩展字段';
+COMMENT ON COLUMN sj_job_log_message.create_dt IS '创建时间';
+COMMENT ON TABLE sj_job_log_message IS '调度日志';
+
+-- sj_job_task
+CREATE TABLE sj_job_task
+(
+    id             bigserial PRIMARY KEY,
+    namespace_id   varchar(64)  NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a',
+    group_name     varchar(64)  NOT NULL,
+    job_id         bigint       NOT NULL,
+    task_batch_id  bigint       NOT NULL,
+    parent_id      bigint       NOT NULL DEFAULT 0,
+    task_status    smallint     NOT NULL DEFAULT 0,
+    retry_count    int          NOT NULL DEFAULT 0,
+    mr_stage       smallint     NULL     DEFAULT NULL,
+    leaf           smallint     NOT NULL DEFAULT '1',
+    task_name      varchar(255) NOT NULL DEFAULT '',
+    client_info    varchar(128) NULL     DEFAULT NULL,
+    wf_context     text         NULL     DEFAULT NULL,
+    result_message text         NOT NULL,
+    args_str       text         NULL     DEFAULT NULL,
+    args_type      smallint     NOT NULL DEFAULT 1,
+    ext_attrs      varchar(256) NULL     DEFAULT '',
+    create_dt      timestamp    NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    update_dt      timestamp    NOT NULL DEFAULT CURRENT_TIMESTAMP
+);
+
+CREATE INDEX idx_sj_job_task_01 ON sj_job_task (task_batch_id, task_status);
+CREATE INDEX idx_sj_job_task_02 ON sj_job_task (create_dt);
+CREATE INDEX idx_sj_job_task_03 ON sj_job_task (namespace_id, group_name);
+
+COMMENT ON COLUMN sj_job_task.id IS '主键';
+COMMENT ON COLUMN sj_job_task.namespace_id IS '命名空间id';
+COMMENT ON COLUMN sj_job_task.group_name IS '组名称';
+COMMENT ON COLUMN sj_job_task.job_id IS '任务信息id';
+COMMENT ON COLUMN sj_job_task.task_batch_id IS '调度任务id';
+COMMENT ON COLUMN sj_job_task.parent_id IS '父执行器id';
+COMMENT ON COLUMN sj_job_task.task_status IS '执行的状态 0、失败 1、成功';
+COMMENT ON COLUMN sj_job_task.retry_count IS '重试次数';
+COMMENT ON COLUMN sj_job_task.mr_stage IS '动态分片所处阶段 1:map 2:reduce 3:mergeReduce';
+COMMENT ON COLUMN sj_job_task.leaf IS '叶子节点';
+COMMENT ON COLUMN sj_job_task.task_name IS '任务名称';
+COMMENT ON COLUMN sj_job_task.client_info IS '客户端地址 clientId#ip:port';
+COMMENT ON COLUMN sj_job_task.wf_context IS '工作流全局上下文';
+COMMENT ON COLUMN sj_job_task.result_message IS '执行结果';
+COMMENT ON COLUMN sj_job_task.args_str IS '执行方法参数';
+COMMENT ON COLUMN sj_job_task.args_type IS '参数类型 ';
+COMMENT ON COLUMN sj_job_task.ext_attrs IS '扩展字段';
+COMMENT ON COLUMN sj_job_task.create_dt IS '创建时间';
+COMMENT ON COLUMN sj_job_task.update_dt IS '修改时间';
+COMMENT ON TABLE sj_job_task IS '任务实例';
+
+-- sj_job_task_batch
+CREATE TABLE sj_job_task_batch
+(
+    id                      bigserial PRIMARY KEY,
+    namespace_id            varchar(64)  NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a',
+    group_name              varchar(64)  NOT NULL,
+    job_id                  bigint       NOT NULL,
+    workflow_node_id        bigint       NOT NULL DEFAULT 0,
+    parent_workflow_node_id bigint       NOT NULL DEFAULT 0,
+    workflow_task_batch_id  bigint       NOT NULL DEFAULT 0,
+    task_batch_status       smallint     NOT NULL DEFAULT 0,
+    operation_reason        smallint     NOT NULL DEFAULT 0,
+    execution_at            bigint       NOT NULL DEFAULT 0,
+    system_task_type        smallint     NOT NULL DEFAULT 3,
+    parent_id               varchar(64)  NOT NULL DEFAULT '',
+    ext_attrs               varchar(256) NULL     DEFAULT '',
+    deleted                 smallint     NOT NULL DEFAULT 0,
+    create_dt               timestamp    NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    update_dt               timestamp    NOT NULL DEFAULT CURRENT_TIMESTAMP
+);
+
+CREATE INDEX idx_sj_job_task_batch_01 ON sj_job_task_batch (job_id, task_batch_status);
+CREATE INDEX idx_sj_job_task_batch_02 ON sj_job_task_batch (create_dt);
+CREATE INDEX idx_sj_job_task_batch_03 ON sj_job_task_batch (namespace_id, group_name);
+CREATE INDEX idx_sj_job_task_batch_04 ON sj_job_task_batch (workflow_task_batch_id, workflow_node_id);
+
+COMMENT ON COLUMN sj_job_task_batch.id IS '主键';
+COMMENT ON COLUMN sj_job_task_batch.namespace_id IS '命名空间id';
+COMMENT ON COLUMN sj_job_task_batch.group_name IS '组名称';
+COMMENT ON COLUMN sj_job_task_batch.job_id IS '任务id';
+COMMENT ON COLUMN sj_job_task_batch.workflow_node_id IS '工作流节点id';
+COMMENT ON COLUMN sj_job_task_batch.parent_workflow_node_id IS '工作流任务父批次id';
+COMMENT ON COLUMN sj_job_task_batch.workflow_task_batch_id IS '工作流任务批次id';
+COMMENT ON COLUMN sj_job_task_batch.task_batch_status IS '任务批次状态 0、失败 1、成功';
+COMMENT ON COLUMN sj_job_task_batch.operation_reason IS '操作原因';
+COMMENT ON COLUMN sj_job_task_batch.execution_at IS '任务执行时间';
+COMMENT ON COLUMN sj_job_task_batch.system_task_type IS '任务类型 3、JOB任务 4、WORKFLOW任务';
+COMMENT ON COLUMN sj_job_task_batch.parent_id IS '父节点';
+COMMENT ON COLUMN sj_job_task_batch.ext_attrs IS '扩展字段';
+COMMENT ON COLUMN sj_job_task_batch.deleted IS '逻辑删除 1、删除';
+COMMENT ON COLUMN sj_job_task_batch.create_dt IS '创建时间';
+COMMENT ON COLUMN sj_job_task_batch.update_dt IS '修改时间';
+COMMENT ON TABLE sj_job_task_batch IS '任务批次';
+
+-- sj_job_summary
+CREATE TABLE sj_job_summary
+(
+    id               bigserial PRIMARY KEY,
+    namespace_id     varchar(64)  NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a',
+    group_name       varchar(64)  NOT NULL DEFAULT '',
+    business_id      bigint       NOT NULL,
+    system_task_type smallint     NOT NULL DEFAULT 3,
+    trigger_at       timestamp    NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    success_num      int          NOT NULL DEFAULT 0,
+    fail_num         int          NOT NULL DEFAULT 0,
+    fail_reason      varchar(512) NOT NULL DEFAULT '',
+    stop_num         int          NOT NULL DEFAULT 0,
+    stop_reason      varchar(512) NOT NULL DEFAULT '',
+    cancel_num       int          NOT NULL DEFAULT 0,
+    cancel_reason    varchar(512) NOT NULL DEFAULT '',
+    create_dt        timestamp    NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    update_dt        timestamp    NOT NULL DEFAULT CURRENT_TIMESTAMP
+);
+
+CREATE UNIQUE INDEX uk_sj_job_summary_01 ON sj_job_summary (trigger_at, system_task_type, business_id);
+
+CREATE INDEX idx_sj_job_summary_01 ON sj_job_summary (namespace_id, group_name, business_id);
+
+COMMENT ON COLUMN sj_job_summary.id IS '主键';
+COMMENT ON COLUMN sj_job_summary.namespace_id IS '命名空间id';
+COMMENT ON COLUMN sj_job_summary.group_name IS '组名称';
+COMMENT ON COLUMN sj_job_summary.business_id IS '业务id  ( job_id或workflow_id)';
+COMMENT ON COLUMN sj_job_summary.system_task_type IS '任务类型 3、JOB任务 4、WORKFLOW任务';
+COMMENT ON COLUMN sj_job_summary.trigger_at IS '统计时间';
+COMMENT ON COLUMN sj_job_summary.success_num IS '执行成功-日志数量';
+COMMENT ON COLUMN sj_job_summary.fail_num IS '执行失败-日志数量';
+COMMENT ON COLUMN sj_job_summary.fail_reason IS '失败原因';
+COMMENT ON COLUMN sj_job_summary.stop_num IS '执行失败-日志数量';
+COMMENT ON COLUMN sj_job_summary.stop_reason IS '失败原因';
+COMMENT ON COLUMN sj_job_summary.cancel_num IS '执行失败-日志数量';
+COMMENT ON COLUMN sj_job_summary.cancel_reason IS '失败原因';
+COMMENT ON COLUMN sj_job_summary.create_dt IS '创建时间';
+COMMENT ON COLUMN sj_job_summary.update_dt IS '修改时间';
+COMMENT ON TABLE sj_job_summary IS 'DashBoard_Job';
+
+-- sj_retry_summary
+CREATE TABLE sj_retry_summary
+(
+    id            bigserial PRIMARY KEY,
+    namespace_id  varchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a',
+    group_name    varchar(64) NOT NULL DEFAULT '',
+    scene_name    varchar(50) NOT NULL DEFAULT '',
+    trigger_at    timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    running_num   int         NOT NULL DEFAULT 0,
+    finish_num    int         NOT NULL DEFAULT 0,
+    max_count_num int         NOT NULL DEFAULT 0,
+    suspend_num   int         NOT NULL DEFAULT 0,
+    create_dt     timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    update_dt     timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP
+);
+
+CREATE UNIQUE INDEX uk_sj_retry_summary_01 ON sj_retry_summary (namespace_id, group_name, scene_name, trigger_at);
+
+CREATE INDEX idx_sj_retry_summary_01 ON sj_retry_summary (trigger_at);
+
+COMMENT ON COLUMN sj_retry_summary.id IS '主键';
+COMMENT ON COLUMN sj_retry_summary.namespace_id IS '命名空间id';
+COMMENT ON COLUMN sj_retry_summary.group_name IS '组名称';
+COMMENT ON COLUMN sj_retry_summary.scene_name IS '场景名称';
+COMMENT ON COLUMN sj_retry_summary.trigger_at IS '统计时间';
+COMMENT ON COLUMN sj_retry_summary.running_num IS '重试中-日志数量';
+COMMENT ON COLUMN sj_retry_summary.finish_num IS '重试完成-日志数量';
+COMMENT ON COLUMN sj_retry_summary.max_count_num IS '重试到达最大次数-日志数量';
+COMMENT ON COLUMN sj_retry_summary.suspend_num IS '暂停重试-日志数量';
+COMMENT ON COLUMN sj_retry_summary.create_dt IS '创建时间';
+COMMENT ON COLUMN sj_retry_summary.update_dt IS '修改时间';
+COMMENT ON TABLE sj_retry_summary IS 'DashBoard_Retry';
+
+-- sj_workflow
+CREATE TABLE sj_workflow
+(
+    id               bigserial PRIMARY KEY,
+    workflow_name    varchar(64)  NOT NULL,
+    namespace_id     varchar(64)  NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a',
+    group_name       varchar(64)  NOT NULL,
+    workflow_status  smallint     NOT NULL DEFAULT 1,
+    trigger_type     smallint     NOT NULL,
+    trigger_interval varchar(255) NOT NULL,
+    next_trigger_at  bigint       NOT NULL,
+    block_strategy   smallint     NOT NULL DEFAULT 1,
+    executor_timeout int          NOT NULL DEFAULT 0,
+    description      varchar(256) NOT NULL DEFAULT '',
+    flow_info        text         NULL     DEFAULT NULL,
+    wf_context       text         NULL     DEFAULT NULL,
+    notify_ids       varchar(128) NOT NULL DEFAULT '',
+    bucket_index     int          NOT NULL DEFAULT 0,
+    version          int          NOT NULL,
+    ext_attrs        varchar(256) NULL     DEFAULT '',
+    deleted          smallint     NOT NULL DEFAULT 0,
+    create_dt        timestamp    NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    update_dt        timestamp    NOT NULL DEFAULT CURRENT_TIMESTAMP
+);
+
+CREATE INDEX idx_sj_workflow_01 ON sj_workflow (create_dt);
+CREATE INDEX idx_sj_workflow_02 ON sj_workflow (namespace_id, group_name);
+
+COMMENT ON COLUMN sj_workflow.id IS '主键';
+COMMENT ON COLUMN sj_workflow.workflow_name IS '工作流名称';
+COMMENT ON COLUMN sj_workflow.namespace_id IS '命名空间id';
+COMMENT ON COLUMN sj_workflow.group_name IS '组名称';
+COMMENT ON COLUMN sj_workflow.workflow_status IS '工作流状态 0、关闭、1、开启';
+COMMENT ON COLUMN sj_workflow.trigger_type IS '触发类型 1.CRON 表达式 2. 固定时间';
+COMMENT ON COLUMN sj_workflow.trigger_interval IS '间隔时长';
+COMMENT ON COLUMN sj_workflow.next_trigger_at IS '下次触发时间';
+COMMENT ON COLUMN sj_workflow.block_strategy IS '阻塞策略 1、丢弃 2、覆盖 3、并行';
+COMMENT ON COLUMN sj_workflow.executor_timeout IS '任务执行超时时间，单位秒';
+COMMENT ON COLUMN sj_workflow.description IS '描述';
+COMMENT ON COLUMN sj_workflow.flow_info IS '流程信息';
+COMMENT ON COLUMN sj_workflow.wf_context IS '上下文';
+COMMENT ON COLUMN sj_workflow.notify_ids IS '通知告警场景配置id列表';
+COMMENT ON COLUMN sj_workflow.bucket_index IS 'bucket';
+COMMENT ON COLUMN sj_workflow.version IS '版本号';
+COMMENT ON COLUMN sj_workflow.ext_attrs IS '扩展字段';
+COMMENT ON COLUMN sj_workflow.deleted IS '逻辑删除 1、删除';
+COMMENT ON COLUMN sj_workflow.create_dt IS '创建时间';
+COMMENT ON COLUMN sj_workflow.update_dt IS '修改时间';
+COMMENT ON TABLE sj_workflow IS '工作流';
+
+-- sj_workflow_node
+CREATE TABLE sj_workflow_node
+(
+    id                   bigserial PRIMARY KEY,
+    namespace_id         varchar(64)  NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a',
+    node_name            varchar(64)  NOT NULL,
+    group_name           varchar(64)  NOT NULL,
+    job_id               bigint       NOT NULL,
+    workflow_id          bigint       NOT NULL,
+    node_type            smallint     NOT NULL DEFAULT 1,
+    expression_type      smallint     NOT NULL DEFAULT 0,
+    fail_strategy        smallint     NOT NULL DEFAULT 1,
+    workflow_node_status smallint     NOT NULL DEFAULT 1,
+    priority_level       int          NOT NULL DEFAULT 1,
+    node_info            text         NULL     DEFAULT NULL,
+    version              int          NOT NULL,
+    ext_attrs            varchar(256) NULL     DEFAULT '',
+    deleted              smallint     NOT NULL DEFAULT 0,
+    create_dt            timestamp    NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    update_dt            timestamp    NOT NULL DEFAULT CURRENT_TIMESTAMP
+);
+
+CREATE INDEX idx_sj_workflow_node_01 ON sj_workflow_node (create_dt);
+CREATE INDEX idx_sj_workflow_node_02 ON sj_workflow_node (namespace_id, group_name);
+
+COMMENT ON COLUMN sj_workflow_node.id IS '主键';
+COMMENT ON COLUMN sj_workflow_node.namespace_id IS '命名空间id';
+COMMENT ON COLUMN sj_workflow_node.node_name IS '节点名称';
+COMMENT ON COLUMN sj_workflow_node.group_name IS '组名称';
+COMMENT ON COLUMN sj_workflow_node.job_id IS '任务信息id';
+COMMENT ON COLUMN sj_workflow_node.workflow_id IS '工作流ID';
+COMMENT ON COLUMN sj_workflow_node.node_type IS '1、任务节点 2、条件节点';
+COMMENT ON COLUMN sj_workflow_node.expression_type IS '1、SpEl、2、Aviator 3、QL';
+COMMENT ON COLUMN sj_workflow_node.fail_strategy IS '失败策略 1、跳过 2、阻塞';
+COMMENT ON COLUMN sj_workflow_node.workflow_node_status IS '工作流节点状态 0、关闭、1、开启';
+COMMENT ON COLUMN sj_workflow_node.priority_level IS '优先级';
+COMMENT ON COLUMN sj_workflow_node.node_info IS '节点信息 ';
+COMMENT ON COLUMN sj_workflow_node.version IS '版本号';
+COMMENT ON COLUMN sj_workflow_node.ext_attrs IS '扩展字段';
+COMMENT ON COLUMN sj_workflow_node.deleted IS '逻辑删除 1、删除';
+COMMENT ON COLUMN sj_workflow_node.create_dt IS '创建时间';
+COMMENT ON COLUMN sj_workflow_node.update_dt IS '修改时间';
+COMMENT ON TABLE sj_workflow_node IS '工作流节点';
+
+-- sj_workflow_task_batch
+CREATE TABLE sj_workflow_task_batch
+(
+    id                bigserial PRIMARY KEY,
+    namespace_id      varchar(64)  NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a',
+    group_name        varchar(64)  NOT NULL,
+    workflow_id       bigint       NOT NULL,
+    task_batch_status smallint     NOT NULL DEFAULT 0,
+    operation_reason  smallint     NOT NULL DEFAULT 0,
+    flow_info         text         NULL     DEFAULT NULL,
+    wf_context        text         NULL     DEFAULT NULL,
+    execution_at      bigint       NOT NULL DEFAULT 0,
+    ext_attrs         varchar(256) NULL     DEFAULT '',
+    version           int          NOT NULL DEFAULT 1,
+    deleted           smallint     NOT NULL DEFAULT 0,
+    create_dt         timestamp    NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    update_dt         timestamp    NOT NULL DEFAULT CURRENT_TIMESTAMP
+);
+
+CREATE INDEX idx_sj_workflow_task_batch_01 ON sj_workflow_task_batch (workflow_id, task_batch_status);
+CREATE INDEX idx_sj_workflow_task_batch_02 ON sj_workflow_task_batch (create_dt);
+CREATE INDEX idx_sj_workflow_task_batch_03 ON sj_workflow_task_batch (namespace_id, group_name);
+
+COMMENT ON COLUMN sj_workflow_task_batch.id IS '主键';
+COMMENT ON COLUMN sj_workflow_task_batch.namespace_id IS '命名空间id';
+COMMENT ON COLUMN sj_workflow_task_batch.group_name IS '组名称';
+COMMENT ON COLUMN sj_workflow_task_batch.workflow_id IS '工作流任务id';
+COMMENT ON COLUMN sj_workflow_task_batch.task_batch_status IS '任务批次状态 0、失败 1、成功';
+COMMENT ON COLUMN sj_workflow_task_batch.operation_reason IS '操作原因';
+COMMENT ON COLUMN sj_workflow_task_batch.flow_info IS '流程信息';
+COMMENT ON COLUMN sj_workflow_task_batch.wf_context IS '全局上下文';
+COMMENT ON COLUMN sj_workflow_task_batch.execution_at IS '任务执行时间';
+COMMENT ON COLUMN sj_workflow_task_batch.ext_attrs IS '扩展字段';
+COMMENT ON COLUMN sj_workflow_task_batch.version IS '版本号';
+COMMENT ON COLUMN sj_workflow_task_batch.deleted IS '逻辑删除 1、删除';
+COMMENT ON COLUMN sj_workflow_task_batch.create_dt IS '创建时间';
+COMMENT ON COLUMN sj_workflow_task_batch.update_dt IS '修改时间';
+COMMENT ON TABLE sj_workflow_task_batch IS '工作流批次';
diff --git a/script/sql/postgres/postgres_ry_vue_5.X.sql b/script/sql/postgres/postgres_ry_vue_5.X.sql
new file mode 100644
index 0000000..86a252a
--- /dev/null
+++ b/script/sql/postgres/postgres_ry_vue_5.X.sql
@@ -0,0 +1,1257 @@
+-- ----------------------------
+-- 第三方平台授权表
+-- ----------------------------
+create table sys_social
+(
+    id                 int8             not null,
+    user_id            int8             not null,
+    auth_id            varchar(255)     not null,
+    source             varchar(255)     not null,
+    open_id            varchar(255)     default null::varchar,
+    user_name          varchar(30)      not null,
+    nick_name          varchar(30)      default ''::varchar,
+    email              varchar(255)     default ''::varchar,
+    avatar             varchar(500)     default ''::varchar,
+    access_token       varchar(2000)    not null,
+    expire_in          int8             default null,
+    refresh_token      varchar(2000)    default null::varchar,
+    access_code        varchar(255)     default null::varchar,
+    union_id           varchar(255)     default null::varchar,
+    scope              varchar(255)     default null::varchar,
+    token_type         varchar(255)     default null::varchar,
+    id_token           varchar(2000)    default null::varchar,
+    mac_algorithm      varchar(255)     default null::varchar,
+    mac_key            varchar(255)     default null::varchar,
+    code               varchar(255)     default null::varchar,
+    oauth_token        varchar(255)     default null::varchar,
+    oauth_token_secret varchar(255)     default null::varchar,
+    create_dept        int8,
+    create_by          int8,
+    create_time        timestamp,
+    update_by          int8,
+    update_time        timestamp,
+    del_flag           char             default '0'::bpchar,
+    constraint "pk_sys_social" primary key (id)
+);
+
+comment on table   sys_social                   is '社会化关系表';
+comment on column  sys_social.id                is '主键';
+comment on column  sys_social.user_id           is '用户ID';
+comment on column  sys_social.auth_id           is '平台+平台唯一id';
+comment on column  sys_social.source            is '用户来源';
+comment on column  sys_social.open_id           is '平台编号唯一id';
+comment on column  sys_social.user_name         is '登录账号';
+comment on column  sys_social.nick_name         is '用户昵称';
+comment on column  sys_social.email             is '用户邮箱';
+comment on column  sys_social.avatar            is '头像地址';
+comment on column  sys_social.access_token      is '用户的授权令牌';
+comment on column  sys_social.expire_in         is '用户的授权令牌的有效期，部分平台可能没有';
+comment on column  sys_social.refresh_token     is '刷新令牌，部分平台可能没有';
+comment on column  sys_social.access_code       is '平台的授权信息，部分平台可能没有';
+comment on column  sys_social.union_id          is '用户的 unionid';
+comment on column  sys_social.scope             is '授予的权限，部分平台可能没有';
+comment on column  sys_social.token_type        is '个别平台的授权信息，部分平台可能没有';
+comment on column  sys_social.id_token          is 'id token，部分平台可能没有';
+comment on column  sys_social.mac_algorithm     is '小米平台用户的附带属性，部分平台可能没有';
+comment on column  sys_social.mac_key           is '小米平台用户的附带属性，部分平台可能没有';
+comment on column  sys_social.code              is '用户的授权code，部分平台可能没有';
+comment on column  sys_social.oauth_token       is 'Twitter平台用户的附带属性，部分平台可能没有';
+comment on column  sys_social.oauth_token_secret is 'Twitter平台用户的附带属性，部分平台可能没有';
+comment on column  sys_social.create_dept       is '创建部门';
+comment on column  sys_social.create_by         is '创建者';
+comment on column  sys_social.create_time       is '创建时间';
+comment on column  sys_social.update_by         is '更新者';
+comment on column  sys_social.update_time       is '更新时间';
+comment on column  sys_social.del_flag          is '删除标志（0代表存在 1代表删除）';
+
+
+
+-- ----------------------------
+-- 1、部门表
+-- ----------------------------
+create table if not exists sys_dept
+(
+    dept_id     int8,
+    parent_id   int8        default 0,
+    ancestors   varchar(500)default ''::varchar,
+    dept_name   varchar(30) default ''::varchar,
+    dept_category varchar(100) default null::varchar,
+    order_num   int4        default 0,
+    leader      int8        default null,
+    phone       varchar(11) default null::varchar,
+    email       varchar(50) default null::varchar,
+    status      char        default '0'::bpchar,
+    del_flag    char        default '0'::bpchar,
+    create_dept int8,
+    create_by   int8,
+    create_time timestamp,
+    update_by   int8,
+    update_time timestamp,
+    constraint "sys_dept_pk" primary key (dept_id)
+);
+
+comment on table sys_dept               is '部门表';
+comment on column sys_dept.dept_id      is '部门ID';
+comment on column sys_dept.parent_id    is '父部门ID';
+comment on column sys_dept.ancestors    is '祖级列表';
+comment on column sys_dept.dept_name    is '部门名称';
+comment on column sys_dept.dept_category    is '部门类别编码';
+comment on column sys_dept.order_num    is '显示顺序';
+comment on column sys_dept.leader       is '负责人';
+comment on column sys_dept.phone        is '联系电话';
+comment on column sys_dept.email        is '邮箱';
+comment on column sys_dept.status       is '部门状态（0正常 1停用）';
+comment on column sys_dept.del_flag     is '删除标志（0代表存在 1代表删除）';
+comment on column sys_dept.create_dept  is '创建部门';
+comment on column sys_dept.create_by    is '创建者';
+comment on column sys_dept.create_time  is '创建时间';
+comment on column sys_dept.update_by    is '更新者';
+comment on column sys_dept.update_time  is '更新时间';
+
+-- ----------------------------
+-- 初始化-部门表数据
+-- ----------------------------
+insert into sys_dept values(100, 0,   '0',          'XXX科技',   null,0, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, now(), null, null);
+insert into sys_dept values(101, 100, '0,100',      '深圳总公司', null,1, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, now(), null, null);
+insert into sys_dept values(102, 100, '0,100',      '长沙分公司', null,2, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, now(), null, null);
+insert into sys_dept values(103, 101, '0,100,101',  '研发部门',   null,1, 1, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, now(), null, null);
+insert into sys_dept values(104, 101, '0,100,101',  '市场部门',   null,2, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, now(), null, null);
+insert into sys_dept values(105, 101, '0,100,101',  '测试部门',   null,3, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, now(), null, null);
+insert into sys_dept values(106, 101, '0,100,101',  '财务部门',   null,4, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, now(), null, null);
+insert into sys_dept values(107, 101, '0,100,101',  '运维部门',   null,5, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, now(), null, null);
+insert into sys_dept values(108, 102, '0,100,102',  '市场部门',   null,1, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, now(), null, null);
+insert into sys_dept values(109, 102, '0,100,102',  '财务部门',   null,2, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, now(), null, null);
+
+-- ----------------------------
+-- 2、用户信息表
+-- ----------------------------
+create table if not exists sys_user
+(
+    user_id     int8,
+    dept_id     int8,
+    user_name   varchar(30)  not null,
+    nick_name   varchar(30)  not null,
+    user_type   varchar(10)  default 'sys_user'::varchar,
+    email       varchar(50)  default ''::varchar,
+    phonenumber varchar(11)  default ''::varchar,
+    sex         char         default '0'::bpchar,
+    avatar      int8,
+    password    varchar(100) default ''::varchar,
+    status      char         default '0'::bpchar,
+    del_flag    char         default '0'::bpchar,
+    login_ip    varchar(128) default ''::varchar,
+    login_date  timestamp,
+    create_dept int8,
+    create_by   int8,
+    create_time timestamp,
+    update_by   int8,
+    update_time timestamp,
+    remark      varchar(500) default null::varchar,
+    constraint "sys_user_pk" primary key (user_id)
+);
+
+comment on table sys_user               is '用户信息表';
+comment on column sys_user.user_id      is '用户ID';
+comment on column sys_user.dept_id      is '部门ID';
+comment on column sys_user.user_name    is '用户账号';
+comment on column sys_user.nick_name    is '用户昵称';
+comment on column sys_user.user_type    is '用户类型（sys_user系统用户）';
+comment on column sys_user.email        is '用户邮箱';
+comment on column sys_user.phonenumber  is '手机号码';
+comment on column sys_user.sex          is '用户性别（0男 1女 2未知）';
+comment on column sys_user.avatar       is '头像地址';
+comment on column sys_user.password     is '密码';
+comment on column sys_user.status       is '帐号状态（0正常 1停用）';
+comment on column sys_user.del_flag     is '删除标志（0代表存在 1代表删除）';
+comment on column sys_user.login_ip     is '最后登陆IP';
+comment on column sys_user.login_date   is '最后登陆时间';
+comment on column sys_user.create_dept  is '创建部门';
+comment on column sys_user.create_by    is '创建者';
+comment on column sys_user.create_time  is '创建时间';
+comment on column sys_user.update_by    is '更新者';
+comment on column sys_user.update_time  is '更新时间';
+comment on column sys_user.remark       is '备注';
+
+-- ----------------------------
+
+-- 初始化-用户信息表数据
+-- ----------------------------
+insert into sys_user values(1, 103, 'admin', '疯狂的狮子Li', 'sys_user', 'crazyLionLi@163.com', '15888888888', '1', null, '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '127.0.0.1', now(), 103, 1, now(), null, null, '管理员');
+insert into sys_user VALUES(3, 108, 'test', '本部门及以下 密码666666', 'sys_user', '', '', '0', null, '$2a$10$b8yUzN0C71sbz.PhNOCgJe.Tu1yWC3RNrTyjSQ8p1W0.aaUXUJ.Ne', '0', '0', '127.0.0.1', now(), 103, 1, now(), 3, now(), NULL);
+insert into sys_user VALUES(4, 102, 'test1', '仅本人 密码666666', 'sys_user', '', '', '0', null, '$2a$10$b8yUzN0C71sbz.PhNOCgJe.Tu1yWC3RNrTyjSQ8p1W0.aaUXUJ.Ne', '0', '0', '127.0.0.1', now(), 103, 1, now(), 4, now(), NULL);
+
+-- ----------------------------
+-- 3、岗位信息表
+-- ----------------------------
+create table if not exists sys_post
+(
+    post_id     int8,
+    dept_id     int8,
+    post_code   varchar(64) not null,
+    post_category   varchar(100) default null,
+    post_name   varchar(50) not null,
+    post_sort   int4        not null,
+    status      char        not null,
+    create_dept int8,
+    create_by   int8,
+    create_time timestamp,
+    update_by   int8,
+    update_time timestamp,
+    remark      varchar(500) default null::varchar,
+    constraint "sys_post_pk" primary key (post_id)
+);
+
+comment on table sys_post               is '岗位信息表';
+comment on column sys_post.post_id      is '岗位ID';
+comment on column sys_post.dept_id      is '部门id';
+comment on column sys_post.post_code    is '岗位编码';
+comment on column sys_post.post_category is '岗位类别编码';
+comment on column sys_post.post_name    is '岗位名称';
+comment on column sys_post.post_sort    is '显示顺序';
+comment on column sys_post.status       is '状态（0正常 1停用）';
+comment on column sys_post.create_dept  is '创建部门';
+comment on column sys_post.create_by    is '创建者';
+comment on column sys_post.create_time  is '创建时间';
+comment on column sys_post.update_by    is '更新者';
+comment on column sys_post.update_time  is '更新时间';
+comment on column sys_post.remark       is '备注';
+
+-- ----------------------------
+-- 初始化-岗位信息表数据
+-- ----------------------------
+insert into sys_post values(1, 103, 'ceo',  null, '董事长',    1, '0', 103, 1, now(), null, null, '');
+insert into sys_post values(2, 100, 'se',   null, '项目经理',  2, '0', 103, 1, now(), null, null, '');
+insert into sys_post values(3, 100, 'hr',   null, '人力资源',  3, '0', 103, 1, now(), null, null, '');
+insert into sys_post values(4, 100, 'user', null, '普通员工',  4, '0', 103, 1, now(), null, null, '');
+
+-- ----------------------------
+-- 4、角色信息表
+-- ----------------------------
+create table if not exists sys_role
+(
+    role_id             int8,
+    role_name           varchar(30)  not null,
+    role_key            varchar(100) not null,
+    role_sort           int4         not null,
+    data_scope          char         default '1'::bpchar,
+    menu_check_strictly bool         default true,
+    dept_check_strictly bool         default true,
+    status              char         not null,
+    del_flag            char         default '0'::bpchar,
+    create_dept         int8,
+    create_by           int8,
+    create_time         timestamp,
+    update_by           int8,
+    update_time         timestamp,
+    remark              varchar(500) default null::varchar,
+    constraint "sys_role_pk" primary key (role_id)
+);
+
+comment on table sys_role                       is '角色信息表';
+comment on column sys_role.role_id              is '角色ID';
+comment on column sys_role.role_name            is '角色名称';
+comment on column sys_role.role_key             is '角色权限字符串';
+comment on column sys_role.role_sort            is '显示顺序';
+comment on column sys_role.data_scope           is '数据范围（1：全部数据权限 2：自定数据权限 3：本部门数据权限 4：本部门及以下数据权限 5：仅本人数据权限 6：部门及以下或本人数据权限）';
+comment on column sys_role.menu_check_strictly  is '菜单树选择项是否关联显示';
+comment on column sys_role.dept_check_strictly  is '部门树选择项是否关联显示';
+comment on column sys_role.status               is '角色状态（0正常 1停用）';
+comment on column sys_role.del_flag             is '删除标志（0代表存在 1代表删除）';
+comment on column sys_role.create_dept          is '创建部门';
+comment on column sys_role.create_by            is '创建者';
+comment on column sys_role.create_time          is '创建时间';
+comment on column sys_role.update_by            is '更新者';
+comment on column sys_role.update_time          is '更新时间';
+comment on column sys_role.remark               is '备注';
+
+-- ----------------------------
+-- 初始化-角色信息表数据
+-- ----------------------------
+insert into sys_role values('1', '超级管理员',  'superadmin',  1, '1', 't', 't', '0', '0', 103, 1, now(), null, null, '超级管理员');
+insert into sys_role values('3', '本部门及以下', 'test1', 3, '4', 't', 't', '0', '0', 103, 1, now(), NULL, NULL, '');
+insert into sys_role values('4', '仅本人', 'test2', 4, '5', 't', 't', '0', '0', 103, 1, now(), NULL, NULL, '');
+
+-- ----------------------------
+-- 5、菜单权限表
+-- ----------------------------
+create table if not exists sys_menu
+(
+    menu_id     int8,
+    menu_name   varchar(50) not null,
+    parent_id   int8         default 0,
+    order_num   int4         default 0,
+    path        varchar(200) default ''::varchar,
+    component   varchar(255) default null::varchar,
+    query_param varchar(255) default null::varchar,
+    is_frame    char         default '1'::bpchar,
+    is_cache    char         default '0'::bpchar,
+    menu_type   char         default ''::bpchar,
+    visible     char         default '0'::bpchar,
+    status      char         default '0'::bpchar,
+    perms       varchar(100) default null::varchar,
+    icon        varchar(100) default '#'::varchar,
+    create_dept int8,
+    create_by   int8,
+    create_time timestamp,
+    update_by   int8,
+    update_time timestamp,
+    remark      varchar(500) default ''::varchar,
+    constraint "sys_menu_pk" primary key (menu_id)
+);
+
+comment on table sys_menu               is '菜单权限表';
+comment on column sys_menu.menu_id      is '菜单ID';
+comment on column sys_menu.menu_name    is '菜单名称';
+comment on column sys_menu.parent_id    is '父菜单ID';
+comment on column sys_menu.order_num    is '显示顺序';
+comment on column sys_menu.path         is '路由地址';
+comment on column sys_menu.component    is '组件路径';
+comment on column sys_menu.query_param  is '路由参数';
+comment on column sys_menu.is_frame     is '是否为外链（0是 1否）';
+comment on column sys_menu.is_cache     is '是否缓存（0缓存 1不缓存）';
+comment on column sys_menu.menu_type    is '菜单类型（M目录 C菜单 F按钮）';
+comment on column sys_menu.visible      is '显示状态（0显示 1隐藏）';
+comment on column sys_menu.status       is '菜单状态（0正常 1停用）';
+comment on column sys_menu.perms        is '权限标识';
+comment on column sys_menu.icon         is '菜单图标';
+comment on column sys_menu.create_dept  is '创建部门';
+comment on column sys_menu.create_by    is '创建者';
+comment on column sys_menu.create_time  is '创建时间';
+comment on column sys_menu.update_by    is '更新者';
+comment on column sys_menu.update_time  is '更新时间';
+comment on column sys_menu.remark       is '备注';
+
+-- ----------------------------
+-- 初始化-菜单信息表数据
+-- ----------------------------
+-- 一级菜单
+insert into sys_menu values('1', '系统管理', '0', '1', 'system',           null, '', '1', '0', 'M', '0', '0', '', 'system',   103, 1, now(), null, null, '系统管理目录');
+insert into sys_menu values('2', '系统监控', '0', '3', 'monitor',          null, '', '1', '0', 'M', '0', '0', '', 'monitor',  103, 1, now(), null, null, '系统监控目录');
+insert into sys_menu values('3', '系统工具', '0', '4', 'tool',             null, '', '1', '0', 'M', '0', '0', '', 'tool',     103, 1, now(), null, null, '系统工具目录');
+insert into sys_menu values('4', 'PLUS官网', '0', '5', 'https://gitee.com/dromara/RuoYi-Vue-Plus', null, '', '0', '0', 'M', '0', '0', '', 'guide',    103, 1, now(), null, null, 'RuoYi-Vue-Plus官网地址');
+insert into sys_menu VALUES('5', '测试菜单', '0', '5', 'demo',             null, '', '1', '0', 'M', '0', '0', null, 'star',       103, 1, now(), null, null, '测试菜单');
+-- 二级菜单
+insert into sys_menu values('100',  '用户管理',     '1',   '1', 'user',             'system/user/index',            '', '1', '0', 'C', '0', '0', 'system:user:list',            'user',          103, 1, now(), null, null, '用户管理菜单');
+insert into sys_menu values('101',  '角色管理',     '1',   '2', 'role',             'system/role/index',            '', '1', '0', 'C', '0', '0', 'system:role:list',            'peoples',       103, 1, now(), null, null, '角色管理菜单');
+insert into sys_menu values('102',  '菜单管理',     '1',   '3', 'menu',             'system/menu/index',            '', '1', '0', 'C', '0', '0', 'system:menu:list',            'tree-table',    103, 1, now(), null, null, '菜单管理菜单');
+insert into sys_menu values('103',  '部门管理',     '1',   '4', 'dept',             'system/dept/index',            '', '1', '0', 'C', '0', '0', 'system:dept:list',            'tree',          103, 1, now(), null, null, '部门管理菜单');
+insert into sys_menu values('104',  '岗位管理',     '1',   '5', 'post',             'system/post/index',            '', '1', '0', 'C', '0', '0', 'system:post:list',            'post',          103, 1, now(), null, null, '岗位管理菜单');
+insert into sys_menu values('105',  '字典管理',     '1',   '6', 'dict',             'system/dict/index',            '', '1', '0', 'C', '0', '0', 'system:dict:list',            'dict',          103, 1, now(), null, null, '字典管理菜单');
+insert into sys_menu values('106',  '参数设置',     '1',   '7', 'config',           'system/config/index',          '', '1', '0', 'C', '0', '0', 'system:config:list',          'edit',          103, 1, now(), null, null, '参数设置菜单');
+insert into sys_menu values('107',  '通知公告',     '1',   '8', 'notice',           'system/notice/index',          '', '1', '0', 'C', '0', '0', 'system:notice:list',          'message',       103, 1, now(), null, null, '通知公告菜单');
+insert into sys_menu values('108',  '日志管理',     '1',   '9', 'log',              '',                             '', '1', '0', 'M', '0', '0', '',                            'log',           103, 1, now(), null, null, '日志管理菜单');
+insert into sys_menu values('109',  '在线用户',     '2',   '1', 'online',           'monitor/online/index',         '', '1', '0', 'C', '0', '0', 'monitor:online:list',         'online',        103, 1, now(), null, null, '在线用户菜单');
+insert into sys_menu values('113',  '缓存监控',     '2',   '5', 'cache',            'monitor/cache/index',          '', '1', '0', 'C', '0', '0', 'monitor:cache:list',          'redis',         103, 1, now(), null, null, '缓存监控菜单');
+insert into sys_menu values('115',  '代码生成',     '3',   '2', 'gen',              'tool/gen/index',               '', '1', '0', 'C', '0', '0', 'tool:gen:list',               'code',          103, 1, now(), null, null, '代码生成菜单');
+insert into sys_menu values('123',  '客户端管理',   '1',   '11', 'client',           'system/client/index',          '', '1', '0', 'C', '0', '0', 'system:client:list',          'international', 103, 1, now(), null, null, '客户端管理菜单');
+insert into sys_menu values('116', '修改生成配置',  '3',   '2', 'gen-edit/index/:tableId', 'tool/gen/editTable', '', '1', '1', 'C', '1', '0', 'tool:gen:edit',           '#',               103, 1, now(), null, null, '');
+insert into sys_menu values('130', '分配用户',     '1',   '2', 'role-auth/user/:roleId', 'system/role/authUser', '', '1', '1', 'C', '1', '0', 'system:role:edit',      '#',               103, 1, now(), null, null, '');
+insert into sys_menu values('131', '分配角色',     '1',   '1', 'user-auth/role/:userId', 'system/user/authRole', '', '1', '1', 'C', '1', '0', 'system:user:edit',      '#',               103, 1, now(), null, null, '');
+insert into sys_menu values('132', '字典数据',     '1',   '6', 'dict-data/index/:dictId', 'system/dict/data', '', '1', '1', 'C', '1', '0', 'system:dict:list',         '#',               103, 1, now(), null, null, '');
+insert into sys_menu values('133', '文件配置管理',  '1',   '10', 'oss-config/index',              'system/oss/config', '', '1', '1', 'C', '1', '0', 'system:ossConfig:list',  '#',                103, 1, now(), null, null, '');
+
+-- springboot-admin监控
+insert into sys_menu values('117',  'Admin监控',   '2',   '5',  'Admin',            'monitor/admin/index',         '', '1', '0', 'C', '0', '0', 'monitor:admin:list',          'dashboard',     103, 1, now(), null, null, 'Admin监控菜单');
+-- oss菜单
+insert into sys_menu values('118',  '文件管理',     '1',   '10', 'oss',              'system/oss/index',            '', '1', '0', 'C', '0', '0', 'system:oss:list',             'upload',        103, 1, now(), null, null, '文件管理菜单');
+-- snail-job server控制台
+insert into sys_menu values('120',  '任务调度中心',  '2',   '6',  'snailjob',     'monitor/snailjob/index',    '', '1', '0', 'C', '0', '0', 'monitor:snailjob:list',          'job',           103, 1, now(), null, null, 'SnailJob控制台菜单');
+
+-- 三级菜单
+insert into sys_menu values('500',  '操作日志', '108', '1', 'operlog',    'monitor/operlog/index',    '', '1', '0', 'C', '0', '0', 'monitor:operlog:list',    'form',          103, 1, now(), null, null, '操作日志菜单');
+insert into sys_menu values('501',  '登录日志', '108', '2', 'logininfor', 'monitor/logininfor/index', '', '1', '0', 'C', '0', '0', 'monitor:logininfor:list', 'logininfor',    103, 1, now(), null, null, '登录日志菜单');
+-- 用户管理按钮
+insert into sys_menu values('1001', '用户查询', '100', '1',  '', '', '', '1', '0', 'F', '0', '0', 'system:user:query',          '#', 103, 1, now(), null, null, '');
+insert into sys_menu values('1002', '用户新增', '100', '2',  '', '', '', '1', '0', 'F', '0', '0', 'system:user:add',            '#', 103, 1, now(), null, null, '');
+insert into sys_menu values('1003', '用户修改', '100', '3',  '', '', '', '1', '0', 'F', '0', '0', 'system:user:edit',           '#', 103, 1, now(), null, null, '');
+insert into sys_menu values('1004', '用户删除', '100', '4',  '', '', '', '1', '0', 'F', '0', '0', 'system:user:remove',         '#', 103, 1, now(), null, null, '');
+insert into sys_menu values('1005', '用户导出', '100', '5',  '', '', '', '1', '0', 'F', '0', '0', 'system:user:export',         '#', 103, 1, now(), null, null, '');
+insert into sys_menu values('1006', '用户导入', '100', '6',  '', '', '', '1', '0', 'F', '0', '0', 'system:user:import',         '#', 103, 1, now(), null, null, '');
+insert into sys_menu values('1007', '重置密码', '100', '7',  '', '', '', '1', '0', 'F', '0', '0', 'system:user:resetPwd',       '#', 103, 1, now(), null, null, '');
+-- 角色管理按钮
+insert into sys_menu values('1008', '角色查询', '101', '1',  '', '', '', '1', '0', 'F', '0', '0', 'system:role:query',          '#', 103, 1, now(), null, null, '');
+insert into sys_menu values('1009', '角色新增', '101', '2',  '', '', '', '1', '0', 'F', '0', '0', 'system:role:add',            '#', 103, 1, now(), null, null, '');
+insert into sys_menu values('1010', '角色修改', '101', '3',  '', '', '', '1', '0', 'F', '0', '0', 'system:role:edit',           '#', 103, 1, now(), null, null, '');
+insert into sys_menu values('1011', '角色删除', '101', '4',  '', '', '', '1', '0', 'F', '0', '0', 'system:role:remove',         '#', 103, 1, now(), null, null, '');
+insert into sys_menu values('1012', '角色导出', '101', '5',  '', '', '', '1', '0', 'F', '0', '0', 'system:role:export',         '#', 103, 1, now(), null, null, '');
+-- 菜单管理按钮
+insert into sys_menu values('1013', '菜单查询', '102', '1',  '', '', '', '1', '0', 'F', '0', '0', 'system:menu:query',          '#', 103, 1, now(), null, null, '');
+insert into sys_menu values('1014', '菜单新增', '102', '2',  '', '', '', '1', '0', 'F', '0', '0', 'system:menu:add',            '#', 103, 1, now(), null, null, '');
+insert into sys_menu values('1015', '菜单修改', '102', '3',  '', '', '', '1', '0', 'F', '0', '0', 'system:menu:edit',           '#', 103, 1, now(), null, null, '');
+insert into sys_menu values('1016', '菜单删除', '102', '4',  '', '', '', '1', '0', 'F', '0', '0', 'system:menu:remove',         '#', 103, 1, now(), null, null, '');
+-- 部门管理按钮
+insert into sys_menu values('1017', '部门查询', '103', '1',  '', '', '', '1', '0', 'F', '0', '0', 'system:dept:query',          '#', 103, 1, now(), null, null, '');
+insert into sys_menu values('1018', '部门新增', '103', '2',  '', '', '', '1', '0', 'F', '0', '0', 'system:dept:add',            '#', 103, 1, now(), null, null, '');
+insert into sys_menu values('1019', '部门修改', '103', '3',  '', '', '', '1', '0', 'F', '0', '0', 'system:dept:edit',           '#', 103, 1, now(), null, null, '');
+insert into sys_menu values('1020', '部门删除', '103', '4',  '', '', '', '1', '0', 'F', '0', '0', 'system:dept:remove',         '#', 103, 1, now(), null, null, '');
+-- 岗位管理按钮
+insert into sys_menu values('1021', '岗位查询', '104', '1',  '', '', '', '1', '0', 'F', '0', '0', 'system:post:query',          '#', 103, 1, now(), null, null, '');
+insert into sys_menu values('1022', '岗位新增', '104', '2',  '', '', '', '1', '0', 'F', '0', '0', 'system:post:add',            '#', 103, 1, now(), null, null, '');
+insert into sys_menu values('1023', '岗位修改', '104', '3',  '', '', '', '1', '0', 'F', '0', '0', 'system:post:edit',           '#', 103, 1, now(), null, null, '');
+insert into sys_menu values('1024', '岗位删除', '104', '4',  '', '', '', '1', '0', 'F', '0', '0', 'system:post:remove',         '#', 103, 1, now(), null, null, '');
+insert into sys_menu values('1025', '岗位导出', '104', '5',  '', '', '', '1', '0', 'F', '0', '0', 'system:post:export',         '#', 103, 1, now(), null, null, '');
+-- 字典管理按钮
+insert into sys_menu values('1026', '字典查询', '105', '1', '#', '', '', '1', '0', 'F', '0', '0', 'system:dict:query',          '#', 103, 1, now(), null, null, '');
+insert into sys_menu values('1027', '字典新增', '105', '2', '#', '', '', '1', '0', 'F', '0', '0', 'system:dict:add',            '#', 103, 1, now(), null, null, '');
+insert into sys_menu values('1028', '字典修改', '105', '3', '#', '', '', '1', '0', 'F', '0', '0', 'system:dict:edit',           '#', 103, 1, now(), null, null, '');
+insert into sys_menu values('1029', '字典删除', '105', '4', '#', '', '', '1', '0', 'F', '0', '0', 'system:dict:remove',         '#', 103, 1, now(), null, null, '');
+insert into sys_menu values('1030', '字典导出', '105', '5', '#', '', '', '1', '0', 'F', '0', '0', 'system:dict:export',         '#', 103, 1, now(), null, null, '');
+-- 参数设置按钮
+insert into sys_menu values('1031', '参数查询', '106', '1', '#', '', '', '1', '0', 'F', '0', '0', 'system:config:query',        '#', 103, 1, now(), null, null, '');
+insert into sys_menu values('1032', '参数新增', '106', '2', '#', '', '', '1', '0', 'F', '0', '0', 'system:config:add',          '#', 103, 1, now(), null, null, '');
+insert into sys_menu values('1033', '参数修改', '106', '3', '#', '', '', '1', '0', 'F', '0', '0', 'system:config:edit',         '#', 103, 1, now(), null, null, '');
+insert into sys_menu values('1034', '参数删除', '106', '4', '#', '', '', '1', '0', 'F', '0', '0', 'system:config:remove',       '#', 103, 1, now(), null, null, '');
+insert into sys_menu values('1035', '参数导出', '106', '5', '#', '', '', '1', '0', 'F', '0', '0', 'system:config:export',       '#', 103, 1, now(), null, null, '');
+-- 通知公告按钮
+insert into sys_menu values('1036', '公告查询', '107', '1', '#', '', '', '1', '0', 'F', '0', '0', 'system:notice:query',        '#', 103, 1, now(), null, null, '');
+insert into sys_menu values('1037', '公告新增', '107', '2', '#', '', '', '1', '0', 'F', '0', '0', 'system:notice:add',          '#', 103, 1, now(), null, null, '');
+insert into sys_menu values('1038', '公告修改', '107', '3', '#', '', '', '1', '0', 'F', '0', '0', 'system:notice:edit',         '#', 103, 1, now(), null, null, '');
+insert into sys_menu values('1039', '公告删除', '107', '4', '#', '', '', '1', '0', 'F', '0', '0', 'system:notice:remove',       '#', 103, 1, now(), null, null, '');
+-- 操作日志按钮
+insert into sys_menu values('1040', '操作查询', '500', '1', '#', '', '', '1', '0', 'F', '0', '0', 'monitor:operlog:query',      '#', 103, 1, now(), null, null, '');
+insert into sys_menu values('1041', '操作删除', '500', '2', '#', '', '', '1', '0', 'F', '0', '0', 'monitor:operlog:remove',     '#', 103, 1, now(), null, null, '');
+insert into sys_menu values('1042', '日志导出', '500', '4', '#', '', '', '1', '0', 'F', '0', '0', 'monitor:operlog:export',     '#', 103, 1, now(), null, null, '');
+-- 登录日志按钮
+insert into sys_menu values('1043', '登录查询', '501', '1', '#', '', '', '1', '0', 'F', '0', '0', 'monitor:logininfor:query',   '#', 103, 1, now(), null, null, '');
+insert into sys_menu values('1044', '登录删除', '501', '2', '#', '', '', '1', '0', 'F', '0', '0', 'monitor:logininfor:remove',  '#', 103, 1, now(), null, null, '');
+insert into sys_menu values('1045', '日志导出', '501', '3', '#', '', '', '1', '0', 'F', '0', '0', 'monitor:logininfor:export',  '#', 103, 1, now(), null, null, '');
+insert into sys_menu values('1050', '账户解锁', '501', '4', '#', '', '', '1', '0', 'F', '0', '0', 'monitor:logininfor:unlock',  '#', 103, 1, now(), null, null, '');
+-- 在线用户按钮
+insert into sys_menu values('1046', '在线查询', '109', '1', '#', '', '', '1', '0', 'F', '0', '0', 'monitor:online:query',       '#', 103, 1, now(), null, null, '');
+insert into sys_menu values('1047', '批量强退', '109', '2', '#', '', '', '1', '0', 'F', '0', '0', 'monitor:online:batchLogout', '#', 103, 1, now(), null, null, '');
+insert into sys_menu values('1048', '单条强退', '109', '3', '#', '', '', '1', '0', 'F', '0', '0', 'monitor:online:forceLogout', '#', 103, 1, now(), null, null, '');
+-- 代码生成按钮
+insert into sys_menu values('1055', '生成查询', '115', '1', '#', '', '', '1', '0', 'F', '0', '0', 'tool:gen:query',             '#', 103, 1, now(), null, null, '');
+insert into sys_menu values('1056', '生成修改', '115', '2', '#', '', '', '1', '0', 'F', '0', '0', 'tool:gen:edit',              '#', 103, 1, now(), null, null, '');
+insert into sys_menu values('1057', '生成删除', '115', '3', '#', '', '', '1', '0', 'F', '0', '0', 'tool:gen:remove',            '#', 103, 1, now(), null, null, '');
+insert into sys_menu values('1058', '导入代码', '115', '2', '#', '', '', '1', '0', 'F', '0', '0', 'tool:gen:import',            '#', 103, 1, now(), null, null, '');
+insert into sys_menu values('1059', '预览代码', '115', '4', '#', '', '', '1', '0', 'F', '0', '0', 'tool:gen:preview',           '#', 103, 1, now(), null, null, '');
+insert into sys_menu values('1060', '生成代码', '115', '5', '#', '', '', '1', '0', 'F', '0', '0', 'tool:gen:code',              '#', 103, 1, now(), null, null, '');
+-- oss相关按钮
+insert into sys_menu values('1600', '文件查询', '118', '1', '#', '', '', '1', '0', 'F', '0', '0', 'system:oss:query',        '#', 103, 1, now(), null, null, '');
+insert into sys_menu values('1601', '文件上传', '118', '2', '#', '', '', '1', '0', 'F', '0', '0', 'system:oss:upload',       '#', 103, 1, now(), null, null, '');
+insert into sys_menu values('1602', '文件下载', '118', '3', '#', '', '', '1', '0', 'F', '0', '0', 'system:oss:download',     '#', 103, 1, now(), null, null, '');
+insert into sys_menu values('1603', '文件删除', '118', '4', '#', '', '', '1', '0', 'F', '0', '0', 'system:oss:remove',       '#', 103, 1, now(), null, null, '');
+insert into sys_menu values('1620', '配置列表', '118', '5', '#', '', '', '1', '0', 'F', '0', '0', 'system:ossConfig:list',   '#', 103, 1, now(), null, null, '');
+insert into sys_menu values('1621', '配置添加', '118', '6', '#', '', '', '1', '0', 'F', '0', '0', 'system:ossConfig:add',    '#', 103, 1, now(), null, null, '');
+insert into sys_menu values('1622', '配置编辑', '118', '6', '#', '', '', '1', '0', 'F', '0', '0', 'system:ossConfig:edit',   '#', 103, 1, now(), null, null, '');
+insert into sys_menu values('1623', '配置删除', '118', '6', '#', '', '', '1', '0', 'F', '0', '0', 'system:ossConfig:remove', '#', 103, 1, now(), null, null, '');
+-- 客户端管理按钮
+insert into sys_menu values('1061', '客户端管理查询', '123', '1',  '#', '', '', '1', '0', 'F', '0', '0', 'system:client:query',        '#', 103, 1, now(), null, null, '');
+insert into sys_menu values('1062', '客户端管理新增', '123', '2',  '#', '', '', '1', '0', 'F', '0', '0', 'system:client:add',          '#', 103, 1, now(), null, null, '');
+insert into sys_menu values('1063', '客户端管理修改', '123', '3',  '#', '', '', '1', '0', 'F', '0', '0', 'system:client:edit',         '#', 103, 1, now(), null, null, '');
+insert into sys_menu values('1064', '客户端管理删除', '123', '4',  '#', '', '', '1', '0', 'F', '0', '0', 'system:client:remove',       '#', 103, 1, now(), null, null, '');
+insert into sys_menu values('1065', '客户端管理导出', '123', '5',  '#', '', '', '1', '0', 'F', '0', '0', 'system:client:export',       '#', 103, 1, now(), null, null, '');
+-- 测试菜单
+INSERT INTO sys_menu VALUES('1500', '测试单表',     '5',   '1', 'demo', 'demo/demo/index', '',  '1', '0', 'C', '0', '0', 'demo:demo:list', '#', 103, 1, now(), NULL, NULL, '测试单表菜单');
+INSERT INTO sys_menu VALUES('1501', '测试单表查询', '1500', '1', '#', '', '',  '1', '0', 'F', '0', '0', 'demo:demo:query',                  '#', 103, 1, now(), NULL, NULL, '');
+INSERT INTO sys_menu VALUES('1502', '测试单表新增', '1500', '2', '#', '', '',  '1', '0', 'F', '0', '0', 'demo:demo:add',                    '#', 103, 1, now(), NULL, NULL, '');
+INSERT INTO sys_menu VALUES('1503', '测试单表修改', '1500', '3', '#', '', '',  '1', '0', 'F', '0', '0', 'demo:demo:edit',                   '#', 103, 1, now(), NULL, NULL, '');
+INSERT INTO sys_menu VALUES('1504', '测试单表删除', '1500', '4', '#', '', '',  '1', '0', 'F', '0', '0', 'demo:demo:remove',                 '#', 103, 1, now(), NULL, NULL, '');
+INSERT INTO sys_menu VALUES('1505', '测试单表导出', '1500', '5', '#', '', '',  '1', '0', 'F', '0', '0', 'demo:demo:export',                 '#', 103, 1, now(), NULL, NULL, '');
+INSERT INTO sys_menu VALUES('1506', '测试树表',     '5',   '1', 'tree', 'demo/tree/index', '',  '1', '0', 'C', '0', '0', 'demo:tree:list', '#', 103, 1, now(), NULL, NULL, '测试树表菜单');
+INSERT INTO sys_menu VALUES('1507', '测试树表查询', '1506', '1', '#', '', '',  '1', '0', 'F', '0', '0', 'demo:tree:query',                  '#', 103, 1, now(), NULL, NULL, '');
+INSERT INTO sys_menu VALUES('1508', '测试树表新增', '1506', '2', '#', '', '',  '1', '0', 'F', '0', '0', 'demo:tree:add',                    '#', 103, 1, now(), NULL, NULL, '');
+INSERT INTO sys_menu VALUES('1509', '测试树表修改', '1506', '3', '#', '', '',  '1', '0', 'F', '0', '0', 'demo:tree:edit',                   '#', 103, 1, now(), NULL, NULL, '');
+INSERT INTO sys_menu VALUES('1510', '测试树表删除', '1506', '4', '#', '', '',  '1', '0', 'F', '0', '0', 'demo:tree:remove',                 '#', 103, 1, now(), NULL, NULL, '');
+INSERT INTO sys_menu VALUES('1511', '测试树表导出', '1506', '5', '#', '', '',  '1', '0', 'F', '0', '0', 'demo:tree:export',                 '#', 103, 1, now(), NULL, NULL, '');
+
+
+-- ----------------------------
+-- 6、用户和角色关联表  用户N-1角色
+-- ----------------------------
+create table if not exists sys_user_role
+(
+    user_id int8 not null,
+    role_id int8 not null,
+    constraint sys_user_role_pk primary key (user_id, role_id)
+);
+
+comment on table sys_user_role              is '用户和角色关联表';
+comment on column sys_user_role.user_id     is '用户ID';
+comment on column sys_user_role.role_id     is '角色ID';
+
+-- ----------------------------
+-- 初始化-用户和角色关联表数据
+-- ----------------------------
+insert into sys_user_role values ('1', '1');
+insert into sys_user_role values ('3', '3');
+insert into sys_user_role values ('4', '4');
+
+-- ----------------------------
+-- 7、角色和菜单关联表  角色1-N菜单
+-- ----------------------------
+create table if not exists sys_role_menu
+(
+    role_id int8 not null,
+    menu_id int8 not null,
+    constraint sys_role_menu_pk primary key (role_id, menu_id)
+);
+
+comment on table sys_role_menu              is '角色和菜单关联表';
+comment on column sys_role_menu.role_id     is '角色ID';
+comment on column sys_role_menu.menu_id     is '菜单ID';
+
+-- ----------------------------
+-- 初始化-角色和菜单关联表数据
+-- ----------------------------
+insert into sys_role_menu values ('3', '1');
+insert into sys_role_menu values ('3', '5');
+insert into sys_role_menu values ('3', '100');
+insert into sys_role_menu values ('3', '101');
+insert into sys_role_menu values ('3', '102');
+insert into sys_role_menu values ('3', '103');
+insert into sys_role_menu values ('3', '104');
+insert into sys_role_menu values ('3', '105');
+insert into sys_role_menu values ('3', '106');
+insert into sys_role_menu values ('3', '107');
+insert into sys_role_menu values ('3', '108');
+insert into sys_role_menu values ('3', '118');
+insert into sys_role_menu values ('3', '123');
+insert into sys_role_menu values ('3', '500');
+insert into sys_role_menu values ('3', '501');
+insert into sys_role_menu values ('3', '1001');
+insert into sys_role_menu values ('3', '1002');
+insert into sys_role_menu values ('3', '1003');
+insert into sys_role_menu values ('3', '1004');
+insert into sys_role_menu values ('3', '1005');
+insert into sys_role_menu values ('3', '1006');
+insert into sys_role_menu values ('3', '1007');
+insert into sys_role_menu values ('3', '1008');
+insert into sys_role_menu values ('3', '1009');
+insert into sys_role_menu values ('3', '1010');
+insert into sys_role_menu values ('3', '1011');
+insert into sys_role_menu values ('3', '1012');
+insert into sys_role_menu values ('3', '1013');
+insert into sys_role_menu values ('3', '1014');
+insert into sys_role_menu values ('3', '1015');
+insert into sys_role_menu values ('3', '1016');
+insert into sys_role_menu values ('3', '1017');
+insert into sys_role_menu values ('3', '1018');
+insert into sys_role_menu values ('3', '1019');
+insert into sys_role_menu values ('3', '1020');
+insert into sys_role_menu values ('3', '1021');
+insert into sys_role_menu values ('3', '1022');
+insert into sys_role_menu values ('3', '1023');
+insert into sys_role_menu values ('3', '1024');
+insert into sys_role_menu values ('3', '1025');
+insert into sys_role_menu values ('3', '1026');
+insert into sys_role_menu values ('3', '1027');
+insert into sys_role_menu values ('3', '1028');
+insert into sys_role_menu values ('3', '1029');
+insert into sys_role_menu values ('3', '1030');
+insert into sys_role_menu values ('3', '1031');
+insert into sys_role_menu values ('3', '1032');
+insert into sys_role_menu values ('3', '1033');
+insert into sys_role_menu values ('3', '1034');
+insert into sys_role_menu values ('3', '1035');
+insert into sys_role_menu values ('3', '1036');
+insert into sys_role_menu values ('3', '1037');
+insert into sys_role_menu values ('3', '1038');
+insert into sys_role_menu values ('3', '1039');
+insert into sys_role_menu values ('3', '1040');
+insert into sys_role_menu values ('3', '1041');
+insert into sys_role_menu values ('3', '1042');
+insert into sys_role_menu values ('3', '1043');
+insert into sys_role_menu values ('3', '1044');
+insert into sys_role_menu values ('3', '1045');
+insert into sys_role_menu values ('3', '1050');
+insert into sys_role_menu values ('3', '1061');
+insert into sys_role_menu values ('3', '1062');
+insert into sys_role_menu values ('3', '1063');
+insert into sys_role_menu values ('3', '1064');
+insert into sys_role_menu values ('3', '1065');
+insert into sys_role_menu values ('3', '1500');
+insert into sys_role_menu values ('3', '1501');
+insert into sys_role_menu values ('3', '1502');
+insert into sys_role_menu values ('3', '1503');
+insert into sys_role_menu values ('3', '1504');
+insert into sys_role_menu values ('3', '1505');
+insert into sys_role_menu values ('3', '1506');
+insert into sys_role_menu values ('3', '1507');
+insert into sys_role_menu values ('3', '1508');
+insert into sys_role_menu values ('3', '1509');
+insert into sys_role_menu values ('3', '1510');
+insert into sys_role_menu values ('3', '1511');
+insert into sys_role_menu values ('3', '1600');
+insert into sys_role_menu values ('3', '1601');
+insert into sys_role_menu values ('3', '1602');
+insert into sys_role_menu values ('3', '1603');
+insert into sys_role_menu values ('3', '1620');
+insert into sys_role_menu values ('3', '1621');
+insert into sys_role_menu values ('3', '1622');
+insert into sys_role_menu values ('3', '1623');
+insert into sys_role_menu values ('3', '11616');
+insert into sys_role_menu values ('3', '11618');
+insert into sys_role_menu values ('3', '11619');
+insert into sys_role_menu values ('3', '11622');
+insert into sys_role_menu values ('3', '11623');
+insert into sys_role_menu values ('3', '11629');
+insert into sys_role_menu values ('3', '11632');
+insert into sys_role_menu values ('3', '11633');
+insert into sys_role_menu values ('3', '11638');
+insert into sys_role_menu values ('3', '11639');
+insert into sys_role_menu values ('3', '11640');
+insert into sys_role_menu values ('3', '11641');
+insert into sys_role_menu values ('3', '11642');
+insert into sys_role_menu values ('3', '11643');
+insert into sys_role_menu values ('4', '5');
+insert into sys_role_menu values ('4', '1500');
+insert into sys_role_menu values ('4', '1501');
+insert into sys_role_menu values ('4', '1502');
+insert into sys_role_menu values ('4', '1503');
+insert into sys_role_menu values ('4', '1504');
+insert into sys_role_menu values ('4', '1505');
+insert into sys_role_menu values ('4', '1506');
+insert into sys_role_menu values ('4', '1507');
+insert into sys_role_menu values ('4', '1508');
+insert into sys_role_menu values ('4', '1509');
+insert into sys_role_menu values ('4', '1510');
+insert into sys_role_menu values ('4', '1511');
+
+-- ----------------------------
+-- 8、角色和部门关联表  角色1-N部门
+-- ----------------------------
+create table if not exists sys_role_dept
+(
+    role_id int8 not null,
+    dept_id int8 not null,
+    constraint sys_role_dept_pk primary key (role_id, dept_id)
+);
+
+comment on table sys_role_dept              is '角色和部门关联表';
+comment on column sys_role_dept.role_id     is '角色ID';
+comment on column sys_role_dept.dept_id     is '部门ID';
+
+
+-- ----------------------------
+-- 9、用户与岗位关联表  用户1-N岗位
+-- ----------------------------
+create table if not exists sys_user_post
+(
+    user_id int8 not null,
+    post_id int8 not null,
+    constraint sys_user_post_pk primary key (user_id, post_id)
+);
+
+comment on table sys_user_post              is '用户与岗位关联表';
+comment on column sys_user_post.user_id     is '用户ID';
+comment on column sys_user_post.post_id     is '岗位ID';
+
+-- ----------------------------
+-- 初始化-用户与岗位关联表数据
+-- ----------------------------
+insert into sys_user_post values ('1', '1');
+
+-- ----------------------------
+-- 10、操作日志记录
+-- ----------------------------
+create table if not exists sys_oper_log
+(
+    oper_id        int8,
+    title          varchar(50)   default ''::varchar,
+    business_type  int4          default 0,
+    method         varchar(100)  default ''::varchar,
+    request_method varchar(10)   default ''::varchar,
+    operator_type  int4          default 0,
+    oper_name      varchar(50)   default ''::varchar,
+    dept_name      varchar(50)   default ''::varchar,
+    oper_url       varchar(255)  default ''::varchar,
+    oper_ip        varchar(128)  default ''::varchar,
+    oper_location  varchar(255)  default ''::varchar,
+    oper_param     varchar(4000) default ''::varchar,
+    json_result    varchar(4000) default ''::varchar,
+    status         int4          default 0,
+    error_msg      varchar(4000) default ''::varchar,
+    oper_time      timestamp,
+    cost_time      int8          default 0,
+    constraint sys_oper_log_pk primary key (oper_id)
+);
+
+create index idx_sys_oper_log_bt ON sys_oper_log (business_type);
+create index idx_sys_oper_log_s ON sys_oper_log (status);
+create index idx_sys_oper_log_ot ON sys_oper_log (oper_time);
+
+comment on table sys_oper_log                   is '操作日志记录';
+comment on column sys_oper_log.oper_id          is '日志主键';
+comment on column sys_oper_log.title            is '模块标题';
+comment on column sys_oper_log.business_type    is '业务类型（0其它 1新增 2修改 3删除）';
+comment on column sys_oper_log.method           is '方法名称';
+comment on column sys_oper_log.request_method   is '请求方式';
+comment on column sys_oper_log.operator_type    is '操作类别（0其它 1后台用户 2手机端用户）';
+comment on column sys_oper_log.oper_name        is '操作人员';
+comment on column sys_oper_log.dept_name        is '部门名称';
+comment on column sys_oper_log.oper_url         is '请求URL';
+comment on column sys_oper_log.oper_ip          is '主机地址';
+comment on column sys_oper_log.oper_location    is '操作地点';
+comment on column sys_oper_log.oper_param       is '请求参数';
+comment on column sys_oper_log.json_result      is '返回参数';
+comment on column sys_oper_log.status           is '操作状态（0正常 1异常）';
+comment on column sys_oper_log.error_msg        is '错误消息';
+comment on column sys_oper_log.oper_time        is '操作时间';
+comment on column sys_oper_log.cost_time        is '消耗时间';
+
+-- ----------------------------
+-- 11、字典类型表
+-- ----------------------------
+create table if not exists sys_dict_type
+(
+    dict_id     int8,
+    dict_name   varchar(100) default ''::varchar,
+    dict_type   varchar(100) default ''::varchar,
+    create_dept int8,
+    create_by   int8,
+    create_time timestamp,
+    update_by   int8,
+    update_time timestamp,
+    remark      varchar(500) default null::varchar,
+    constraint sys_dict_type_pk primary key (dict_id)
+);
+
+create unique index sys_dict_type_index1 ON sys_dict_type (dict_type);
+
+comment on table sys_dict_type                  is '字典类型表';
+comment on column sys_dict_type.dict_id         is '字典主键';
+comment on column sys_dict_type.dict_name       is '字典名称';
+comment on column sys_dict_type.dict_type       is '字典类型';
+comment on column sys_dict_type.create_dept     is '创建部门';
+comment on column sys_dict_type.create_by       is '创建者';
+comment on column sys_dict_type.create_time     is '创建时间';
+comment on column sys_dict_type.update_by       is '更新者';
+comment on column sys_dict_type.update_time     is '更新时间';
+comment on column sys_dict_type.remark          is '备注';
+
+insert into sys_dict_type values(1, '用户性别', 'sys_user_sex',        103, 1, now(), null, null, '用户性别列表');
+insert into sys_dict_type values(2, '菜单状态', 'sys_show_hide',       103, 1, now(), null, null, '菜单状态列表');
+insert into sys_dict_type values(3, '系统开关', 'sys_normal_disable',  103, 1, now(), null, null, '系统开关列表');
+insert into sys_dict_type values(6, '系统是否', 'sys_yes_no',          103, 1, now(), null, null, '系统是否列表');
+insert into sys_dict_type values(7, '通知类型', 'sys_notice_type',     103, 1, now(), null, null, '通知类型列表');
+insert into sys_dict_type values(8, '通知状态', 'sys_notice_status',   103, 1, now(), null, null, '通知状态列表');
+insert into sys_dict_type values(9, '操作类型', 'sys_oper_type',       103, 1, now(), null, null, '操作类型列表');
+insert into sys_dict_type values(10, '系统状态', 'sys_common_status',  103, 1, now(), null, null, '登录状态列表');
+insert into sys_dict_type values(11, '授权类型', 'sys_grant_type',     103, 1, now(), null, null, '认证授权类型');
+insert into sys_dict_type values(12, '设备类型', 'sys_device_type',    103, 1, now(), null, null, '客户端设备类型');
+
+-- ----------------------------
+-- 12、字典数据表
+-- ----------------------------
+create table if not exists sys_dict_data
+(
+    dict_code   int8,
+    dict_sort   int4         default 0,
+    dict_label  varchar(100) default ''::varchar,
+    dict_value  varchar(100) default ''::varchar,
+    dict_type   varchar(100) default ''::varchar,
+    css_class   varchar(100) default null::varchar,
+    list_class  varchar(100) default null::varchar,
+    is_default  char         default 'N'::bpchar,
+    create_dept int8,
+    create_by   int8,
+    create_time timestamp,
+    update_by   int8,
+    update_time timestamp,
+    remark      varchar(500) default null::varchar,
+    constraint sys_dict_data_pk primary key (dict_code)
+);
+
+comment on table sys_dict_data                  is '字典数据表';
+comment on column sys_dict_data.dict_code       is '字典编码';
+comment on column sys_dict_data.dict_sort       is '字典排序';
+comment on column sys_dict_data.dict_label      is '字典标签';
+comment on column sys_dict_data.dict_value      is '字典键值';
+comment on column sys_dict_data.dict_type       is '字典类型';
+comment on column sys_dict_data.css_class       is '样式属性（其他样式扩展）';
+comment on column sys_dict_data.list_class      is '表格回显样式';
+comment on column sys_dict_data.is_default      is '是否默认（Y是 N否）';
+comment on column sys_dict_data.create_dept     is '创建部门';
+comment on column sys_dict_data.create_by       is '创建者';
+comment on column sys_dict_data.create_time     is '创建时间';
+comment on column sys_dict_data.update_by       is '更新者';
+comment on column sys_dict_data.update_time     is '更新时间';
+comment on column sys_dict_data.remark          is '备注';
+
+insert into sys_dict_data values(1, 1,  '男',       '0',       'sys_user_sex',        '',   '',        'Y', 103, 1, now(), null, null, '性别男');
+insert into sys_dict_data values(2, 2,  '女',       '1',       'sys_user_sex',        '',   '',        'N', 103, 1, now(), null, null, '性别女');
+insert into sys_dict_data values(3, 3,  '未知',     '2',       'sys_user_sex',        '',   '',        'N', 103, 1, now(), null, null, '性别未知');
+insert into sys_dict_data values(4, 1,  '显示',     '0',       'sys_show_hide',       '',   'primary', 'Y', 103, 1, now(), null, null, '显示菜单');
+insert into sys_dict_data values(5, 2,  '隐藏',     '1',       'sys_show_hide',       '',   'danger',  'N', 103, 1, now(), null, null, '隐藏菜单');
+insert into sys_dict_data values(6, 1,  '正常',     '0',       'sys_normal_disable',  '',   'primary', 'Y', 103, 1, now(), null, null, '正常状态');
+insert into sys_dict_data values(7, 2,  '停用',     '1',       'sys_normal_disable',  '',   'danger',  'N', 103, 1, now(), null, null, '停用状态');
+insert into sys_dict_data values(12, 1,  '是',       'Y',       'sys_yes_no',          '',   'primary', 'Y', 103, 1, now(), null, null, '系统默认是');
+insert into sys_dict_data values(13, 2,  '否',       'N',       'sys_yes_no',          '',   'danger',  'N', 103, 1, now(), null, null, '系统默认否');
+insert into sys_dict_data values(14, 1,  '通知',     '1',       'sys_notice_type',     '',   'warning', 'Y', 103, 1, now(), null, null, '通知');
+insert into sys_dict_data values(15, 2,  '公告',     '2',       'sys_notice_type',     '',   'success', 'N', 103, 1, now(), null, null, '公告');
+insert into sys_dict_data values(16, 1,  '正常',     '0',       'sys_notice_status',   '',   'primary', 'Y', 103, 1, now(), null, null, '正常状态');
+insert into sys_dict_data values(17, 2,  '关闭',     '1',       'sys_notice_status',   '',   'danger',  'N', 103, 1, now(), null, null, '关闭状态');
+insert into sys_dict_data values(29, 99, '其他',     '0',       'sys_oper_type',       '',   'info',    'N', 103, 1, now(), null, null, '其他操作');
+insert into sys_dict_data values(18, 1,  '新增',     '1',       'sys_oper_type',       '',   'info',    'N', 103, 1, now(), null, null, '新增操作');
+insert into sys_dict_data values(19, 2,  '修改',     '2',       'sys_oper_type',       '',   'info',    'N', 103, 1, now(), null, null, '修改操作');
+insert into sys_dict_data values(20, 3,  '删除',     '3',       'sys_oper_type',       '',   'danger',  'N', 103, 1, now(), null, null, '删除操作');
+insert into sys_dict_data values(21, 4,  '授权',     '4',       'sys_oper_type',       '',   'primary', 'N', 103, 1, now(), null, null, '授权操作');
+insert into sys_dict_data values(22, 5,  '导出',     '5',       'sys_oper_type',       '',   'warning', 'N', 103, 1, now(), null, null, '导出操作');
+insert into sys_dict_data values(23, 6,  '导入',     '6',       'sys_oper_type',       '',   'warning', 'N', 103, 1, now(), null, null, '导入操作');
+insert into sys_dict_data values(24, 7,  '强退',     '7',       'sys_oper_type',       '',   'danger',  'N', 103, 1, now(), null, null, '强退操作');
+insert into sys_dict_data values(25, 8,  '生成代码', '8',       'sys_oper_type',       '',   'warning', 'N', 103, 1, now(), null, null, '生成操作');
+insert into sys_dict_data values(26, 9,  '清空数据', '9',       'sys_oper_type',       '',   'danger',  'N', 103, 1, now(), null, null, '清空操作');
+insert into sys_dict_data values(27, 1,  '成功',     '0',       'sys_common_status',   '',   'primary', 'N', 103, 1, now(), null, null, '正常状态');
+insert into sys_dict_data values(28, 2,  '失败',     '1',       'sys_common_status',   '',   'danger',  'N', 103, 1, now(), null, null, '停用状态');
+insert into sys_dict_data values(30, 0,  '密码认证', 'password',   'sys_grant_type',   '',   'default', 'N', 103, 1, now(), null, null, '密码认证');
+insert into sys_dict_data values(31, 0,  '短信认证', 'sms',        'sys_grant_type',   '',   'default', 'N', 103, 1, now(), null, null, '短信认证');
+insert into sys_dict_data values(32, 0,  '邮件认证', 'email',      'sys_grant_type',   '',   'default', 'N', 103, 1, now(), null, null, '邮件认证');
+insert into sys_dict_data values(33, 0,  '小程序认证', 'xcx',      'sys_grant_type',   '',   'default', 'N', 103, 1, now(), null, null, '小程序认证');
+insert into sys_dict_data values(34, 0,  '三方登录认证', 'social', 'sys_grant_type',   '',   'default', 'N', 103, 1, now(), null, null, '三方登录认证');
+insert into sys_dict_data values(35, 0,  'PC', 'pc',              'sys_device_type',   '',   'default', 'N', 103, 1, now(), null, null, 'PC');
+insert into sys_dict_data values(36, 0,  '安卓', 'android',       'sys_device_type',   '',   'default', 'N', 103, 1, now(), null, null, '安卓');
+insert into sys_dict_data values(37, 0,  'iOS', 'ios',            'sys_device_type',   '',   'default', 'N', 103, 1, now(), null, null, 'iOS');
+insert into sys_dict_data values(38, 0,  '小程序', 'xcx',         'sys_device_type',   '',   'default', 'N', 103, 1, now(), null, null, '小程序');
+
+
+-- ----------------------------
+-- 13、参数配置表
+-- ----------------------------
+create table if not exists sys_config
+(
+    config_id    int8,
+    config_name  varchar(100) default ''::varchar,
+    config_key   varchar(100) default ''::varchar,
+    config_value varchar(500) default ''::varchar,
+    config_type  char         default 'N'::bpchar,
+    create_dept  int8,
+    create_by    int8,
+    create_time  timestamp,
+    update_by    int8,
+    update_time  timestamp,
+    remark       varchar(500) default null::varchar,
+    constraint sys_config_pk primary key (config_id)
+);
+
+comment on table sys_config                 is '参数配置表';
+comment on column sys_config.config_id      is '参数主键';
+comment on column sys_config.config_name    is '参数名称';
+comment on column sys_config.config_key     is '参数键名';
+comment on column sys_config.config_value   is '参数键值';
+comment on column sys_config.config_type    is '系统内置（Y是 N否）';
+comment on column sys_config.create_dept    is '创建部门';
+comment on column sys_config.create_by      is '创建者';
+comment on column sys_config.create_time    is '创建时间';
+comment on column sys_config.update_by      is '更新者';
+comment on column sys_config.update_time    is '更新时间';
+comment on column sys_config.remark         is '备注';
+
+insert into sys_config values(1, '主框架页-默认皮肤样式名称',     'sys.index.skinName',            'skin-blue',     'Y', 103, 1, now(), null, null, '蓝色 skin-blue、绿色 skin-green、紫色 skin-purple、红色 skin-red、黄色 skin-yellow' );
+insert into sys_config values(2, '用户管理-账号初始密码',         'sys.user.initPassword',         '123456',        'Y', 103, 1, now(), null, null, '初始化密码 123456' );
+insert into sys_config values(3, '主框架页-侧边栏主题',           'sys.index.sideTheme',           'theme-dark',    'Y', 103, 1, now(), null, null, '深色主题theme-dark，浅色主题theme-light' );
+insert into sys_config values(5, '账号自助-是否开启用户注册功能',   'sys.account.registerUser',      'false',         'Y', 103, 1, now(), null, null, '是否开启注册用户功能（true开启，false关闭）');
+insert into sys_config values(11, 'OSS预览列表资源开关',          'sys.oss.previewListResource',   'true',          'Y', 103, 1, now(), null, null, 'true:开启, false:关闭');
+
+
+-- ----------------------------
+-- 14、系统访问记录
+-- ----------------------------
+create table if not exists sys_logininfor
+(
+    info_id        int8,
+    user_name      varchar(50)  default ''::varchar,
+    client_key     varchar(32)  default ''::varchar,
+    device_type    varchar(32)  default ''::varchar,
+    ipaddr         varchar(128) default ''::varchar,
+    login_location varchar(255) default ''::varchar,
+    browser        varchar(50)  default ''::varchar,
+    os             varchar(50)  default ''::varchar,
+    status         char         default '0'::bpchar,
+    msg            varchar(255) default ''::varchar,
+    login_time     timestamp,
+    constraint sys_logininfor_pk primary key (info_id)
+);
+
+create index idx_sys_logininfor_s ON sys_logininfor (status);
+create index idx_sys_logininfor_lt ON sys_logininfor (login_time);
+
+comment on table sys_logininfor                 is '系统访问记录';
+comment on column sys_logininfor.info_id        is '访问ID';
+comment on column sys_logininfor.user_name      is '用户账号';
+comment on column sys_logininfor.client_key     is '客户端';
+comment on column sys_logininfor.device_type    is '设备类型';
+comment on column sys_logininfor.ipaddr         is '登录IP地址';
+comment on column sys_logininfor.login_location is '登录地点';
+comment on column sys_logininfor.browser        is '浏览器类型';
+comment on column sys_logininfor.os             is '操作系统';
+comment on column sys_logininfor.status         is '登录状态（0成功 1失败）';
+comment on column sys_logininfor.msg            is '提示消息';
+comment on column sys_logininfor.login_time     is '访问时间';
+
+-- ----------------------------
+-- 17、通知公告表
+-- ----------------------------
+create table if not exists sys_notice
+(
+    notice_id      int8,
+    notice_title   varchar(50)  not null,
+    notice_type    char         not null,
+    notice_content text,
+    status         char         default '0'::bpchar,
+    create_dept    int8,
+    create_by      int8,
+    create_time    timestamp,
+    update_by      int8,
+    update_time    timestamp,
+    remark         varchar(255) default null::varchar,
+    constraint sys_notice_pk primary key (notice_id)
+);
+
+comment on table sys_notice                 is '通知公告表';
+comment on column sys_notice.notice_id      is '公告ID';
+comment on column sys_notice.notice_title   is '公告标题';
+comment on column sys_notice.notice_type    is '公告类型（1通知 2公告）';
+comment on column sys_notice.notice_content is '公告内容';
+comment on column sys_notice.status         is '公告状态（0正常 1关闭）';
+comment on column sys_notice.create_dept    is '创建部门';
+comment on column sys_notice.create_by      is '创建者';
+comment on column sys_notice.create_time    is '创建时间';
+comment on column sys_notice.update_by      is '更新者';
+comment on column sys_notice.update_time    is '更新时间';
+comment on column sys_notice.remark         is '备注';
+
+-- ----------------------------
+-- 初始化-公告信息表数据
+-- ----------------------------
+insert into sys_notice values('1', '温馨提醒：2018-07-01 新版本发布啦', '2', '新版本内容', '0', 103, 1, now(), null, null, '管理员');
+insert into sys_notice values('2', '维护通知：2018-07-01 系统凌晨维护', '1', '维护内容',   '0', 103, 1, now(), null, null, '管理员');
+
+
+-- ----------------------------
+-- 18、代码生成业务表
+-- ----------------------------
+create table if not exists gen_table
+(
+    table_id          int8,
+    data_name         varchar(200)  default ''::varchar,
+    table_name        varchar(200)  default ''::varchar,
+    table_comment     varchar(500)  default ''::varchar,
+    sub_table_name    varchar(64)   default ''::varchar,
+    sub_table_fk_name varchar(64)   default ''::varchar,
+    class_name        varchar(100)  default ''::varchar,
+    tpl_category      varchar(200)  default 'crud'::varchar,
+    package_name      varchar(100)  default null::varchar,
+    module_name       varchar(30)   default null::varchar,
+    business_name     varchar(30)   default null::varchar,
+    function_name     varchar(50)   default null::varchar,
+    function_author   varchar(50)   default null::varchar,
+    gen_type          char          default '0'::bpchar not null,
+    gen_path          varchar(200)  default '/'::varchar,
+    options           varchar(1000) default null::varchar,
+    create_dept       int8,
+    create_by         int8,
+    create_time       timestamp,
+    update_by         int8,
+    update_time       timestamp,
+    remark            varchar(500)  default null::varchar,
+    constraint gen_table_pk primary key (table_id)
+);
+
+comment on table gen_table is '代码生成业务表';
+comment on column gen_table.table_id is '编号';
+comment on column gen_table.data_name is '数据源名称';
+comment on column gen_table.table_name is '表名称';
+comment on column gen_table.table_comment is '表描述';
+comment on column gen_table.sub_table_name is '关联子表的表名';
+comment on column gen_table.sub_table_fk_name is '子表关联的外键名';
+comment on column gen_table.class_name is '实体类名称';
+comment on column gen_table.tpl_category is '使用的模板（CRUD单表操作 TREE树表操作）';
+comment on column gen_table.package_name is '生成包路径';
+comment on column gen_table.module_name is '生成模块名';
+comment on column gen_table.business_name is '生成业务名';
+comment on column gen_table.function_name is '生成功能名';
+comment on column gen_table.function_author is '生成功能作者';
+comment on column gen_table.gen_type is '生成代码方式（0zip压缩包 1自定义路径）';
+comment on column gen_table.gen_path is '生成路径（不填默认项目路径）';
+comment on column gen_table.options is '其它生成选项';
+comment on column gen_table.create_dept is '创建部门';
+comment on column gen_table.create_by is '创建者';
+comment on column gen_table.create_time is '创建时间';
+comment on column gen_table.update_by is '更新者';
+comment on column gen_table.update_time is '更新时间';
+comment on column gen_table.remark is '备注';
+
+-- ----------------------------
+-- 19、代码生成业务表字段
+-- ----------------------------
+create table if not exists gen_table_column
+(
+    column_id      int8,
+    table_id       int8,
+    column_name    varchar(200) default null::varchar,
+    column_comment varchar(500) default null::varchar,
+    column_type    varchar(100) default null::varchar,
+    java_type      varchar(500) default null::varchar,
+    java_field     varchar(200) default null::varchar,
+    is_pk          char         default null::bpchar,
+    is_increment   char         default null::bpchar,
+    is_required    char         default null::bpchar,
+    is_insert      char         default null::bpchar,
+    is_edit        char         default null::bpchar,
+    is_list        char         default null::bpchar,
+    is_query       char         default null::bpchar,
+    query_type     varchar(200) default 'EQ'::varchar,
+    html_type      varchar(200) default null::varchar,
+    dict_type      varchar(200) default ''::varchar,
+    sort           int4,
+    create_dept    int8,
+    create_by      int8,
+    create_time    timestamp,
+    update_by      int8,
+    update_time    timestamp,
+    constraint gen_table_column_pk primary key (column_id)
+);
+
+comment on table gen_table_column is '代码生成业务表字段';
+comment on column gen_table_column.column_id is '编号';
+comment on column gen_table_column.table_id is '归属表编号';
+comment on column gen_table_column.column_name is '列名称';
+comment on column gen_table_column.column_comment is '列描述';
+comment on column gen_table_column.column_type is '列类型';
+comment on column gen_table_column.java_type is 'JAVA类型';
+comment on column gen_table_column.java_field is 'JAVA字段名';
+comment on column gen_table_column.is_pk is '是否主键（1是）';
+comment on column gen_table_column.is_increment is '是否自增（1是）';
+comment on column gen_table_column.is_required is '是否必填（1是）';
+comment on column gen_table_column.is_insert is '是否为插入字段（1是）';
+comment on column gen_table_column.is_edit is '是否编辑字段（1是）';
+comment on column gen_table_column.is_list is '是否列表字段（1是）';
+comment on column gen_table_column.is_query is '是否查询字段（1是）';
+comment on column gen_table_column.query_type is '查询方式（等于、不等于、大于、小于、范围）';
+comment on column gen_table_column.html_type is '显示类型（文本框、文本域、下拉框、复选框、单选框、日期控件）';
+comment on column gen_table_column.dict_type is '字典类型';
+comment on column gen_table_column.sort is '排序';
+comment on column gen_table_column.create_dept is '创建部门';
+comment on column gen_table_column.create_by is '创建者';
+comment on column gen_table_column.create_time is '创建时间';
+comment on column gen_table_column.update_by is '更新者';
+comment on column gen_table_column.update_time is '更新时间';
+
+-- ----------------------------
+-- OSS对象存储表
+-- ----------------------------
+create table if not exists sys_oss
+(
+    oss_id        int8,
+    file_name     varchar(255) default ''::varchar not null,
+    original_name varchar(255) default ''::varchar not null,
+    file_suffix   varchar(10)  default ''::varchar not null,
+    url           varchar(500) default ''::varchar not null,
+    ext1          varchar(500) default ''::varchar,
+    create_dept   int8,
+    create_by     int8,
+    create_time   timestamp,
+    update_by     int8,
+    update_time   timestamp,
+    service       varchar(20)  default 'minio'::varchar,
+    constraint sys_oss_pk primary key (oss_id)
+);
+
+comment on table sys_oss                    is 'OSS对象存储表';
+comment on column sys_oss.oss_id            is '对象存储主键';
+comment on column sys_oss.file_name         is '文件名';
+comment on column sys_oss.original_name     is '原名';
+comment on column sys_oss.file_suffix       is '文件后缀名';
+comment on column sys_oss.url               is 'URL地址';
+comment on column sys_oss.ext1              is '扩展字段';
+comment on column sys_oss.create_by         is '上传人';
+comment on column sys_oss.create_dept       is '创建部门';
+comment on column sys_oss.create_time       is '创建时间';
+comment on column sys_oss.update_by         is '更新者';
+comment on column sys_oss.update_time       is '更新时间';
+comment on column sys_oss.service           is '服务商';
+
+-- ----------------------------
+-- OSS对象存储动态配置表
+-- ----------------------------
+create table if not exists sys_oss_config
+(
+    oss_config_id int8,
+    config_key    varchar(20)  default ''::varchar not null,
+    access_key    varchar(255) default ''::varchar,
+    secret_key    varchar(255) default ''::varchar,
+    bucket_name   varchar(255) default ''::varchar,
+    prefix        varchar(255) default ''::varchar,
+    endpoint      varchar(255) default ''::varchar,
+    domain        varchar(255) default ''::varchar,
+    is_https      char         default 'N'::bpchar,
+    region        varchar(255) default ''::varchar,
+    access_policy char(1)      default '1'::bpchar not null,
+    status        char         default '1'::bpchar,
+    ext1          varchar(255) default ''::varchar,
+    create_dept   int8,
+    create_by     int8,
+    create_time   timestamp,
+    update_by     int8,
+    update_time   timestamp,
+    remark        varchar(500) default ''::varchar,
+    constraint sys_oss_config_pk primary key (oss_config_id)
+);
+
+comment on table sys_oss_config                 is '对象存储配置表';
+comment on column sys_oss_config.oss_config_id  is '主键';
+comment on column sys_oss_config.config_key     is '配置key';
+comment on column sys_oss_config.access_key     is 'accessKey';
+comment on column sys_oss_config.secret_key     is '秘钥';
+comment on column sys_oss_config.bucket_name    is '桶名称';
+comment on column sys_oss_config.prefix         is '前缀';
+comment on column sys_oss_config.endpoint       is '访问站点';
+comment on column sys_oss_config.domain         is '自定义域名';
+comment on column sys_oss_config.is_https       is '是否https（Y=是,N=否）';
+comment on column sys_oss_config.region         is '域';
+comment on column sys_oss_config.access_policy  is '桶权限类型(0=private 1=public 2=custom)';
+comment on column sys_oss_config.status         is '是否默认（0=是,1=否）';
+comment on column sys_oss_config.ext1           is '扩展字段';
+comment on column sys_oss_config.create_dept    is '创建部门';
+comment on column sys_oss_config.create_by      is '创建者';
+comment on column sys_oss_config.create_time    is '创建时间';
+comment on column sys_oss_config.update_by      is '更新者';
+comment on column sys_oss_config.update_time    is '更新时间';
+comment on column sys_oss_config.remark         is '备注';
+
+insert into sys_oss_config values (1, 'minio',  'ruoyi',            'ruoyi123',        'ruoyi',             '', '127.0.0.1:9000',                      '','N', '',            '1', '0', '', 103, 1, now(), 1, now(), null);
+insert into sys_oss_config values (2, 'qiniu',  'XXXXXXXXXXXXXXX',  'XXXXXXXXXXXXXXX', 'ruoyi',             '', 's3-cn-north-1.qiniucs.com',           '','N', '',            '1', '1', '', 103, 1, now(), 1, now(), null);
+insert into sys_oss_config values (3, 'aliyun', 'XXXXXXXXXXXXXXX',  'XXXXXXXXXXXXXXX', 'ruoyi',             '', 'oss-cn-beijing.aliyuncs.com',         '','N', '',            '1', '1', '', 103, 1, now(), 1, now(), null);
+insert into sys_oss_config values (4, 'qcloud', 'XXXXXXXXXXXXXXX',  'XXXXXXXXXXXXXXX', 'ruoyi-1240000000',  '', 'cos.ap-beijing.myqcloud.com',         '','N', 'ap-beijing',  '1', '1', '', 103, 1, now(), 1, now(), null);
+insert into sys_oss_config values (5, 'image',  'ruoyi',            'ruoyi123',        'ruoyi',             'image', '127.0.0.1:9000',                 '','N', '',            '1', '1', '', 103, 1, now(), 1, now(), NULL);
+
+-- ----------------------------
+-- 系统授权表
+-- ----------------------------
+create table sys_client (
+    id                  int8,
+    client_id           varchar(64)   default ''::varchar,
+    client_key          varchar(32)   default ''::varchar,
+    client_secret       varchar(255)  default ''::varchar,
+    grant_type          varchar(255)  default ''::varchar,
+    device_type         varchar(32)   default ''::varchar,
+    active_timeout      int4          default 1800,
+    timeout             int4          default 604800,
+    status              char(1)       default '0'::bpchar,
+    del_flag            char(1)       default '0'::bpchar,
+    create_dept         int8,
+    create_by           int8,
+    create_time         timestamp,
+    update_by           int8,
+    update_time         timestamp,
+    constraint sys_client_pk primary key (id)
+);
+
+comment on table sys_client                         is '系统授权表';
+comment on column sys_client.id                     is '主键';
+comment on column sys_client.client_id              is '客户端id';
+comment on column sys_client.client_key             is '客户端key';
+comment on column sys_client.client_secret          is '客户端秘钥';
+comment on column sys_client.grant_type             is '授权类型';
+comment on column sys_client.device_type            is '设备类型';
+comment on column sys_client.active_timeout         is 'token活跃超时时间';
+comment on column sys_client.timeout                is 'token固定超时';
+comment on column sys_client.status                 is '状态（0正常 1停用）';
+comment on column sys_client.del_flag               is '删除标志（0代表存在 1代表删除）';
+comment on column sys_client.create_dept            is '创建部门';
+comment on column sys_client.create_by              is '创建者';
+comment on column sys_client.create_time            is '创建时间';
+comment on column sys_client.update_by              is '更新者';
+comment on column sys_client.update_time            is '更新时间';
+
+insert into sys_client values (1, 'e5cd7e4891bf95d1d19206ce24a7b32e', 'pc', 'pc123', 'password,social', 'pc', 1800, 604800, 0, 0, 103, 1, now(), 1, now());
+insert into sys_client values (2, '428a8310cd442757ae699df5d894f051', 'app', 'app123', 'password,sms,social', 'android', 1800, 604800, 0, 0, 103, 1, now(), 1, now());
+
+create table if not exists test_demo
+(
+    id          int8,
+    dept_id     int8,
+    user_id     int8,
+    order_num   int4            default 0,
+    test_key    varchar(255),
+    value       varchar(255),
+    version     int4            default 0,
+    create_dept int8,
+    create_time timestamp,
+    create_by   int8,
+    update_time timestamp,
+    update_by   int8,
+    del_flag    int4            default 0
+);
+
+comment on table test_demo is '测试单表';
+comment on column test_demo.id is '主键';
+comment on column test_demo.dept_id is '部门id';
+comment on column test_demo.user_id is '用户id';
+comment on column test_demo.order_num is '排序号';
+comment on column test_demo.test_key is 'key键';
+comment on column test_demo.value is '值';
+comment on column test_demo.version is '版本';
+comment on column test_demo.create_dept  is '创建部门';
+comment on column test_demo.create_time is '创建时间';
+comment on column test_demo.create_by is '创建人';
+comment on column test_demo.update_time is '更新时间';
+comment on column test_demo.update_by is '更新人';
+comment on column test_demo.del_flag is '删除标志';
+
+create table if not exists test_tree
+(
+    id          int8,
+    parent_id   int8            default 0,
+    dept_id     int8,
+    user_id     int8,
+    tree_name   varchar(255),
+    version     int4            default 0,
+    create_dept int8,
+    create_time timestamp,
+    create_by   int8,
+    update_time timestamp,
+    update_by   int8,
+    del_flag    integer         default 0
+);
+
+comment on table test_tree is '测试树表';
+comment on column test_tree.id is '主键';
+comment on column test_tree.parent_id is '父id';
+comment on column test_tree.dept_id is '部门id';
+comment on column test_tree.user_id is '用户id';
+comment on column test_tree.tree_name is '值';
+comment on column test_tree.version is '版本';
+comment on column test_tree.create_dept  is '创建部门';
+comment on column test_tree.create_time is '创建时间';
+comment on column test_tree.create_by is '创建人';
+comment on column test_tree.update_time is '更新时间';
+comment on column test_tree.update_by is '更新人';
+comment on column test_tree.del_flag is '删除标志';
+
+INSERT INTO test_demo VALUES (1, 102, 4, 1, '测试数据权限', '测试', 0, 103, now(), 1, NULL, NULL, 0);
+INSERT INTO test_demo VALUES (2, 102, 3, 2, '子节点1', '111', 0, 103, now(), 1, NULL, NULL, 0);
+INSERT INTO test_demo VALUES (3, 102, 3, 3, '子节点2', '222', 0, 103, now(), 1, NULL, NULL, 0);
+INSERT INTO test_demo VALUES (4, 108, 4, 4, '测试数据', 'demo', 0, 103, now(), 1, NULL, NULL, 0);
+INSERT INTO test_demo VALUES (5, 108, 3, 13, '子节点11', '1111', 0, 103, now(), 1, NULL, NULL, 0);
+INSERT INTO test_demo VALUES (6, 108, 3, 12, '子节点22', '2222', 0, 103, now(), 1, NULL, NULL, 0);
+INSERT INTO test_demo VALUES (7, 108, 3, 11, '子节点33', '3333', 0, 103, now(), 1, NULL, NULL, 0);
+INSERT INTO test_demo VALUES (8, 108, 3, 10, '子节点44', '4444', 0, 103, now(), 1, NULL, NULL, 0);
+INSERT INTO test_demo VALUES (9, 108, 3, 9, '子节点55', '5555', 0, 103, now(), 1, NULL, NULL, 0);
+INSERT INTO test_demo VALUES (10, 108, 3, 8, '子节点66', '6666', 0, 103, now(), 1, NULL, NULL, 0);
+INSERT INTO test_demo VALUES (11, 108, 3, 7, '子节点77', '7777', 0, 103, now(), 1, NULL, NULL, 0);
+INSERT INTO test_demo VALUES (12, 108, 3, 6, '子节点88', '8888', 0, 103, now(), 1, NULL, NULL, 0);
+INSERT INTO test_demo VALUES (13, 108, 3, 5, '子节点99', '9999', 0, 103, now(), 1, NULL, NULL, 0);
+
+INSERT INTO test_tree VALUES (1, 0, 102, 4, '测试数据权限', 0, 103, now(), 1, NULL, NULL, 0);
+INSERT INTO test_tree VALUES (2, 1, 102, 3, '子节点1', 0, 103, now(), 1, NULL, NULL, 0);
+INSERT INTO test_tree VALUES (3, 2, 102, 3, '子节点2', 0, 103, now(), 1, NULL, NULL, 0);
+INSERT INTO test_tree VALUES (4, 0, 108, 4, '测试树1', 0, 103, now(), 1, NULL, NULL, 0);
+INSERT INTO test_tree VALUES (5, 4, 108, 3, '子节点11', 0, 103, now(), 1, NULL, NULL, 0);
+INSERT INTO test_tree VALUES (6, 4, 108, 3, '子节点22', 0, 103, now(), 1, NULL, NULL, 0);
+INSERT INTO test_tree VALUES (7, 4, 108, 3, '子节点33', 0, 103, now(), 1, NULL, NULL, 0);
+INSERT INTO test_tree VALUES (8, 5, 108, 3, '子节点44', 0, 103, now(), 1, NULL, NULL, 0);
+INSERT INTO test_tree VALUES (9, 6, 108, 3, '子节点55', 0, 103, now(), 1, NULL, NULL, 0);
+INSERT INTO test_tree VALUES (10, 7, 108, 3, '子节点66', 0, 103, now(), 1, NULL, NULL, 0);
+INSERT INTO test_tree VALUES (11, 7, 108, 3, '子节点77', 0, 103, now(), 1, NULL, NULL, 0);
+INSERT INTO test_tree VALUES (12, 10, 108, 3, '子节点88', 0, 103, now(), 1, NULL, NULL, 0);
+INSERT INTO test_tree VALUES (13, 10, 108, 3, '子节点99', 0, 103, now(), 1, NULL, NULL, 0);
+
+-- 字符串自动转时间 避免框架时间查询报错问题
+create or replace function cast_varchar_to_timestamp(varchar) returns timestamptz as $$
+select to_timestamp($1, 'yyyy-mm-dd hh24:mi:ss');
+$$ language sql strict ;
+
+create cast (varchar as timestamptz) with function cast_varchar_to_timestamp as IMPLICIT;
diff --git a/script/sql/postgres/postgres_ry_workflow.sql b/script/sql/postgres/postgres_ry_workflow.sql
new file mode 100644
index 0000000..9412c1f
--- /dev/null
+++ b/script/sql/postgres/postgres_ry_workflow.sql
@@ -0,0 +1,407 @@
+-- ----------------------------
+-- 0、warm-flow-all.sql，地址：https://gitee.com/dromara/warm-flow/blob/master/sql/postgresql/postgresql-warm-flow-all.sql
+-- ----------------------------
+CREATE TABLE flow_definition
+(
+    id              int8         NOT NULL,                                 -- 主键id
+    flow_code       varchar(40)  NOT NULL,                                 -- 流程编码
+    flow_name       varchar(100) NOT NULL,                                 -- 流程名称
+    category        varchar(100) NULL,                                     -- 流程类别
+    "version"       varchar(20)  NOT NULL,                                 -- 流程版本
+    is_publish      int2         NOT NULL DEFAULT 0,                       -- 是否发布（0未发布 1已发布 9失效）
+    form_custom     bpchar(1)    NULL     DEFAULT 'N':: character varying, -- 审批表单是否自定义（Y是 N否）
+    form_path       varchar(100) NULL,                                     -- 审批表单路径
+    activity_status int2         NOT NULL DEFAULT 1,                       -- 流程激活状态（0挂起 1激活）
+    listener_type   varchar(100) NULL,                                     -- 监听器类型
+    listener_path   varchar(400) NULL,                                     -- 监听器路径
+    ext             varchar(500) NULL,                                     -- 扩展字段，预留给业务系统使用
+    create_time     timestamp    NULL,                                     -- 创建时间
+    update_time     timestamp    NULL,                                     -- 更新时间
+    del_flag        bpchar(1)    NULL     DEFAULT '0':: character varying, -- 删除标志
+    tenant_id       varchar(40)  NULL,                                     -- 租户id
+    CONSTRAINT flow_definition_pkey PRIMARY KEY (id)
+);
+COMMENT ON TABLE flow_definition IS '流程定义表';
+
+COMMENT ON COLUMN flow_definition.id IS '主键id';
+COMMENT ON COLUMN flow_definition.flow_code IS '流程编码';
+COMMENT ON COLUMN flow_definition.flow_name IS '流程名称';
+COMMENT ON COLUMN flow_definition.category IS '流程类别';
+COMMENT ON COLUMN flow_definition."version" IS '流程版本';
+COMMENT ON COLUMN flow_definition.is_publish IS '是否发布（0未发布 1已发布 9失效）';
+COMMENT ON COLUMN flow_definition.form_custom IS '审批表单是否自定义（Y是 N否）';
+COMMENT ON COLUMN flow_definition.form_path IS '审批表单路径';
+COMMENT ON COLUMN flow_definition.activity_status IS '流程激活状态（0挂起 1激活）';
+COMMENT ON COLUMN flow_definition.listener_type IS '监听器类型';
+COMMENT ON COLUMN flow_definition.listener_path IS '监听器路径';
+COMMENT ON COLUMN flow_definition.ext IS '扩展字段，预留给业务系统使用';
+COMMENT ON COLUMN flow_definition.create_time IS '创建时间';
+COMMENT ON COLUMN flow_definition.update_time IS '更新时间';
+COMMENT ON COLUMN flow_definition.del_flag IS '删除标志';
+COMMENT ON COLUMN flow_definition.tenant_id IS '租户id';
+
+CREATE TABLE flow_node
+(
+    id              int8          NOT NULL,                             -- 主键id
+    node_type       int2          NOT NULL,                             -- 节点类型（0开始节点 1中间节点 2结束节点 3互斥网关 4并行网关）
+    definition_id   int8          NOT NULL,                             -- 流程定义id
+    node_code       varchar(100)  NOT NULL,                             -- 流程节点编码
+    node_name       varchar(100)  NULL,                                 -- 流程节点名称
+    permission_flag varchar(200)  NULL,                                 -- 权限标识（权限类型:权限标识，可以多个，用@@隔开)
+    node_ratio      numeric(6, 3) NULL,                                 -- 流程签署比例值
+    coordinate      varchar(100)  NULL,                                 -- 坐标
+    any_node_skip   varchar(100)  NULL,                                 -- 任意结点跳转
+    listener_type   varchar(100)  NULL,                                 -- 监听器类型
+    listener_path   varchar(400)  NULL,                                 -- 监听器路径
+    handler_type    varchar(100)  NULL,                                 -- 处理器类型
+    handler_path    varchar(400)  NULL,                                 -- 处理器路径
+    form_custom     bpchar(1)     NULL DEFAULT 'N':: character varying, -- 审批表单是否自定义（Y是 N否）
+    form_path       varchar(100)  NULL,                                 -- 审批表单路径
+    "version"       varchar(20)   NOT NULL,                             -- 版本
+    create_time     timestamp     NULL,                                 -- 创建时间
+    update_time     timestamp     NULL,                                 -- 更新时间
+    ext             text         NULL,                                  -- 扩展属性
+    del_flag        bpchar(1)     NULL DEFAULT '0':: character varying, -- 删除标志
+    tenant_id       varchar(40)   NULL,                                 -- 租户id
+    CONSTRAINT flow_node_pkey PRIMARY KEY (id)
+);
+COMMENT ON TABLE flow_node IS '流程节点表';
+
+COMMENT ON COLUMN flow_node.id IS '主键id';
+COMMENT ON COLUMN flow_node.node_type IS '节点类型（0开始节点 1中间节点 2结束节点 3互斥网关 4并行网关）';
+COMMENT ON COLUMN flow_node.definition_id IS '流程定义id';
+COMMENT ON COLUMN flow_node.node_code IS '流程节点编码';
+COMMENT ON COLUMN flow_node.node_name IS '流程节点名称';
+COMMENT ON COLUMN flow_node.permission_flag IS '权限标识（权限类型:权限标识，可以多个，用@@隔开)';
+COMMENT ON COLUMN flow_node.node_ratio IS '流程签署比例值';
+COMMENT ON COLUMN flow_node.coordinate IS '坐标';
+COMMENT ON COLUMN flow_node.any_node_skip IS '任意结点跳转';
+COMMENT ON COLUMN flow_node.listener_type IS '监听器类型';
+COMMENT ON COLUMN flow_node.listener_path IS '监听器路径';
+COMMENT ON COLUMN flow_node.handler_type IS '处理器类型';
+COMMENT ON COLUMN flow_node.handler_path IS '处理器路径';
+COMMENT ON COLUMN flow_node.form_custom IS '审批表单是否自定义（Y是 N否）';
+COMMENT ON COLUMN flow_node.form_path IS '审批表单路径';
+COMMENT ON COLUMN flow_node."version" IS '版本';
+COMMENT ON COLUMN flow_node.create_time IS '创建时间';
+COMMENT ON COLUMN flow_node.update_time IS '更新时间';
+COMMENT ON COLUMN flow_node.ext IS '节点扩展属性';
+COMMENT ON COLUMN flow_node.del_flag IS '删除标志';
+COMMENT ON COLUMN flow_node.tenant_id IS '租户id';
+
+
+CREATE TABLE flow_skip
+(
+    id             int8         NOT NULL,                             -- 主键id
+    definition_id  int8         NOT NULL,                             -- 流程定义id
+    now_node_code  varchar(100) NOT NULL,                             -- 当前流程节点的编码
+    now_node_type  int2         NULL,                                 -- 当前节点类型（0开始节点 1中间节点 2结束节点 3互斥网关 4并行网关）
+    next_node_code varchar(100) NOT NULL,                             -- 下一个流程节点的编码
+    next_node_type int2         NULL,                                 -- 下一个节点类型（0开始节点 1中间节点 2结束节点 3互斥网关 4并行网关）
+    skip_name      varchar(100) NULL,                                 -- 跳转名称
+    skip_type      varchar(40)  NULL,                                 -- 跳转类型（PASS审批通过 REJECT退回）
+    skip_condition varchar(200) NULL,                                 -- 跳转条件
+    coordinate     varchar(100) NULL,                                 -- 坐标
+    create_time    timestamp    NULL,                                 -- 创建时间
+    update_time    timestamp    NULL,                                 -- 更新时间
+    del_flag       bpchar(1)    NULL DEFAULT '0':: character varying, -- 删除标志
+    tenant_id      varchar(40)  NULL,                                 -- 租户id
+    CONSTRAINT flow_skip_pkey PRIMARY KEY (id)
+);
+COMMENT ON TABLE flow_skip IS '节点跳转关联表';
+
+COMMENT ON COLUMN flow_skip.id IS '主键id';
+COMMENT ON COLUMN flow_skip.definition_id IS '流程定义id';
+COMMENT ON COLUMN flow_skip.now_node_code IS '当前流程节点的编码';
+COMMENT ON COLUMN flow_skip.now_node_type IS '当前节点类型（0开始节点 1中间节点 2结束节点 3互斥网关 4并行网关）';
+COMMENT ON COLUMN flow_skip.next_node_code IS '下一个流程节点的编码';
+COMMENT ON COLUMN flow_skip.next_node_type IS '下一个节点类型（0开始节点 1中间节点 2结束节点 3互斥网关 4并行网关）';
+COMMENT ON COLUMN flow_skip.skip_name IS '跳转名称';
+COMMENT ON COLUMN flow_skip.skip_type IS '跳转类型（PASS审批通过 REJECT退回）';
+COMMENT ON COLUMN flow_skip.skip_condition IS '跳转条件';
+COMMENT ON COLUMN flow_skip.coordinate IS '坐标';
+COMMENT ON COLUMN flow_skip.create_time IS '创建时间';
+COMMENT ON COLUMN flow_skip.update_time IS '更新时间';
+COMMENT ON COLUMN flow_skip.del_flag IS '删除标志';
+COMMENT ON COLUMN flow_skip.tenant_id IS '租户id';
+
+CREATE TABLE flow_instance
+(
+    id              int8         NOT NULL,                                 -- 主键id
+    definition_id   int8         NOT NULL,                                 -- 对应flow_definition表的id
+    business_id     varchar(40)  NOT NULL,                                 -- 业务id
+    node_type       int2         NOT NULL,                                 -- 节点类型（0开始节点 1中间节点 2结束节点 3互斥网关 4并行网关）
+    node_code       varchar(40)  NOT NULL,                                 -- 流程节点编码
+    node_name       varchar(100) NULL,                                     -- 流程节点名称
+    variable        text         NULL,                                     -- 任务变量
+    flow_status     varchar(20)  NOT NULL,                                 -- 流程状态（0待提交 1审批中 2 审批通过 8已完成 9已退回 10失效）
+    activity_status int2         NOT NULL DEFAULT 1,                       -- 流程激活状态（0挂起 1激活）
+    def_json        text         NULL,                                     -- 流程定义json
+    create_by       varchar(64)  NULL     DEFAULT '':: character varying,  -- 创建者
+    create_time     timestamp    NULL,                                     -- 创建时间
+    update_time     timestamp    NULL,                                     -- 更新时间
+    ext             varchar(500) NULL,                                     -- 扩展字段，预留给业务系统使用
+    del_flag        bpchar(1)    NULL     DEFAULT '0':: character varying, -- 删除标志
+    tenant_id       varchar(40)  NULL,                                     -- 租户id
+    CONSTRAINT flow_instance_pkey PRIMARY KEY (id)
+);
+COMMENT ON TABLE flow_instance IS '流程实例表';
+
+COMMENT ON COLUMN flow_instance.id IS '主键id';
+COMMENT ON COLUMN flow_instance.definition_id IS '对应flow_definition表的id';
+COMMENT ON COLUMN flow_instance.business_id IS '业务id';
+COMMENT ON COLUMN flow_instance.node_type IS '节点类型（0开始节点 1中间节点 2结束节点 3互斥网关 4并行网关）';
+COMMENT ON COLUMN flow_instance.node_code IS '流程节点编码';
+COMMENT ON COLUMN flow_instance.node_name IS '流程节点名称';
+COMMENT ON COLUMN flow_instance.variable IS '任务变量';
+COMMENT ON COLUMN flow_instance.flow_status IS '流程状态（0待提交 1审批中 2审批通过 4终止 5作废 6撤销 8已完成 9已退回 10失效 11拿回）';
+COMMENT ON COLUMN flow_instance.activity_status IS '流程激活状态（0挂起 1激活）';
+COMMENT ON COLUMN flow_instance.def_json IS '流程定义json';
+COMMENT ON COLUMN flow_instance.create_by IS '创建者';
+COMMENT ON COLUMN flow_instance.create_time IS '创建时间';
+COMMENT ON COLUMN flow_instance.update_time IS '更新时间';
+COMMENT ON COLUMN flow_instance.ext IS '扩展字段，预留给业务系统使用';
+COMMENT ON COLUMN flow_instance.del_flag IS '删除标志';
+COMMENT ON COLUMN flow_instance.tenant_id IS '租户id';
+
+CREATE TABLE flow_task
+(
+    id            int8         NOT NULL,                             -- 主键id
+    definition_id int8         NOT NULL,                             -- 对应flow_definition表的id
+    instance_id   int8         NOT NULL,                             -- 对应flow_instance表的id
+    node_code     varchar(100) NOT NULL,                             -- 节点编码
+    node_name     varchar(100) NULL,                                 -- 节点名称
+    node_type     int2         NOT NULL,                             -- 节点类型（0开始节点 1中间节点 2结束节点 3互斥网关 4并行网关）
+    flow_status   varchar(20)  NOT NULL,                             -- 流程状态（0待提交 1审批中 2 审批通过 8已完成 9已退回 10失效）
+    form_custom   bpchar(1)    NULL DEFAULT 'N':: character varying, -- 审批表单是否自定义（Y是 N否）
+    form_path     varchar(100) NULL,                                 -- 审批表单路径
+    create_time   timestamp    NULL,                                 -- 创建时间
+    update_time   timestamp    NULL,                                 -- 更新时间
+    del_flag      bpchar(1)    NULL DEFAULT '0':: character varying, -- 删除标志
+    tenant_id     varchar(40)  NULL,                                 -- 租户id
+    CONSTRAINT flow_task_pkey PRIMARY KEY (id)
+);
+COMMENT ON TABLE flow_task IS '待办任务表';
+
+COMMENT ON COLUMN flow_task.id IS '主键id';
+COMMENT ON COLUMN flow_task.definition_id IS '对应flow_definition表的id';
+COMMENT ON COLUMN flow_task.instance_id IS '对应flow_instance表的id';
+COMMENT ON COLUMN flow_task.node_code IS '节点编码';
+COMMENT ON COLUMN flow_task.node_name IS '节点名称';
+COMMENT ON COLUMN flow_task.node_type IS '节点类型（0开始节点 1中间节点 2结束节点 3互斥网关 4并行网关）';
+COMMENT ON COLUMN flow_task.flow_status IS '流程状态（0待提交 1审批中 2审批通过 4终止 5作废 6撤销 8已完成 9已退回 10失效 11拿回）';
+COMMENT ON COLUMN flow_task.form_custom IS '审批表单是否自定义（Y是 N否）';
+COMMENT ON COLUMN flow_task.form_path IS '审批表单路径';
+COMMENT ON COLUMN flow_task.create_time IS '创建时间';
+COMMENT ON COLUMN flow_task.update_time IS '更新时间';
+COMMENT ON COLUMN flow_task.del_flag IS '删除标志';
+COMMENT ON COLUMN flow_task.tenant_id IS '租户id';
+
+CREATE TABLE flow_his_task
+(
+    id               int8         NOT NULL,                                 -- 主键id
+    definition_id    int8         NOT NULL,                                 -- 对应flow_definition表的id
+    instance_id      int8         NOT NULL,                                 -- 对应flow_instance表的id
+    task_id          int8         NOT NULL,                                 -- 对应flow_task表的id
+    node_code        varchar(100) NULL,                                     -- 开始节点编码
+    node_name        varchar(100) NULL,                                     -- 开始节点名称
+    node_type        int2         NULL,                                     -- 开始节点类型（0开始节点 1中间节点 2结束节点 3互斥网关 4并行网关）
+    target_node_code varchar(200) NULL,                                     -- 目标节点编码
+    target_node_name varchar(200) NULL,                                     -- 结束节点名称
+    approver         varchar(40)  NULL,                                     -- 审批者
+    cooperate_type   int2         NOT NULL DEFAULT 0,                       -- 协作方式(1审批 2转办 3委派 4会签 5票签 6加签 7减签)
+    collaborator     varchar(40)  NULL,                                     -- 协作人(只有转办、会签、票签、委派)
+    skip_type        varchar(10)  NULL,                                     -- 流转类型（PASS通过 REJECT退回 NONE无动作）
+    flow_status      varchar(20)  NOT NULL,                                 -- 流程状态（0待提交 1审批中 2 审批通过 8已完成 9已退回 10失效）
+    form_custom      bpchar(1)    NULL     DEFAULT 'N':: character varying, -- 审批表单是否自定义（Y是 N否）
+    form_path        varchar(100) NULL,                                     -- 审批表单路径
+    ext              text         NULL,                                     -- 扩展字段，预留给业务系统使用
+    message          varchar(500) NULL,                                     -- 审批意见
+    variable         text         NULL,                                     -- 任务变量
+    create_time      timestamp    NULL,                                     -- 创建时间
+    update_time      timestamp    NULL,                                     -- 更新时间
+    del_flag         bpchar(1)    NULL     DEFAULT '0':: character varying, -- 删除标志
+    tenant_id        varchar(40)  NULL,                                     -- 租户id
+    CONSTRAINT flow_his_task_pkey PRIMARY KEY (id)
+);
+COMMENT ON TABLE flow_his_task IS '历史任务记录表';
+
+COMMENT ON COLUMN flow_his_task.id IS '主键id';
+COMMENT ON COLUMN flow_his_task.definition_id IS '对应flow_definition表的id';
+COMMENT ON COLUMN flow_his_task.instance_id IS '对应flow_instance表的id';
+COMMENT ON COLUMN flow_his_task.task_id IS '对应flow_task表的id';
+COMMENT ON COLUMN flow_his_task.node_code IS '开始节点编码';
+COMMENT ON COLUMN flow_his_task.node_name IS '开始节点名称';
+COMMENT ON COLUMN flow_his_task.node_type IS '开始节点类型（0开始节点 1中间节点 2结束节点 3互斥网关 4并行网关）';
+COMMENT ON COLUMN flow_his_task.target_node_code IS '目标节点编码';
+COMMENT ON COLUMN flow_his_task.target_node_name IS '结束节点名称';
+COMMENT ON COLUMN flow_his_task.approver IS '审批者';
+COMMENT ON COLUMN flow_his_task.cooperate_type IS '协作方式(1审批 2转办 3委派 4会签 5票签 6加签 7减签)';
+COMMENT ON COLUMN flow_his_task.collaborator IS '协作人';
+COMMENT ON COLUMN flow_his_task.skip_type IS '流转类型（PASS通过 REJECT退回 NONE无动作）';
+COMMENT ON COLUMN flow_his_task.flow_status IS '流程状态（0待提交 1审批中 2审批通过 4终止 5作废 6撤销 8已完成 9已退回 10失效 11拿回）';
+COMMENT ON COLUMN flow_his_task.form_custom IS '审批表单是否自定义（Y是 N否）';
+COMMENT ON COLUMN flow_his_task.form_path IS '审批表单路径';
+COMMENT ON COLUMN flow_his_task.message IS '审批意见';
+COMMENT ON COLUMN flow_his_task.variable IS '任务变量';
+COMMENT ON COLUMN flow_his_task.ext IS '扩展字段，预留给业务系统使用';
+COMMENT ON COLUMN flow_his_task.create_time IS '任务开始时间';
+COMMENT ON COLUMN flow_his_task.update_time IS '审批完成时间';
+COMMENT ON COLUMN flow_his_task.del_flag IS '删除标志';
+COMMENT ON COLUMN flow_his_task.tenant_id IS '租户id';
+
+CREATE TABLE flow_user
+(
+    id           int8        NOT NULL,                             -- 主键id
+    "type"       bpchar(1)   NOT NULL,                             -- 人员类型（1待办任务的审批人权限 2待办任务的转办人权限 3流程实例的抄送人权限 4待办任务的委托人权限）
+    processed_by varchar(80) NULL,                                 -- 权限人
+    associated   int8        NOT NULL,                             -- 任务表id
+    create_time  timestamp   NULL,                                 -- 创建时间
+    create_by    varchar(80) NULL,                                 -- 创建人
+    update_time  timestamp   NULL,                                 -- 更新时间
+    del_flag     bpchar(1)   NULL DEFAULT '0':: character varying, -- 删除标志
+    tenant_id    varchar(40) NULL,                                 -- 租户id
+    CONSTRAINT flow_user_pk PRIMARY KEY (id)
+);
+CREATE INDEX user_processed_type ON flow_user USING btree (processed_by, type);
+CREATE INDEX user_associated_idx ON FLOW_USER USING btree (associated);
+COMMENT ON TABLE flow_user IS '流程用户表';
+
+COMMENT ON COLUMN flow_user.id IS '主键id';
+COMMENT ON COLUMN flow_user."type" IS '人员类型（1待办任务的审批人权限 2待办任务的转办人权限 3待办任务的委托人权限）';
+COMMENT ON COLUMN flow_user.processed_by IS '权限人';
+COMMENT ON COLUMN flow_user.associated IS '任务表id';
+COMMENT ON COLUMN flow_user.create_time IS '创建时间';
+COMMENT ON COLUMN flow_user.create_by IS '创建人';
+COMMENT ON COLUMN flow_user.update_time IS '更新时间';
+COMMENT ON COLUMN flow_user.del_flag IS '删除标志';
+COMMENT ON COLUMN flow_user.tenant_id IS '租户id';
+
+-- ----------------------------
+-- 流程分类表
+-- ----------------------------
+CREATE TABLE flow_category
+(
+    category_id   int8         NOT NULL,
+    parent_id     int8         DEFAULT 0,
+    ancestors     VARCHAR(500) DEFAULT ''::varchar,
+    category_name VARCHAR(30)  NOT NULL,
+    order_num     INT          DEFAULT 0,
+    del_flag      CHAR         DEFAULT '0'::bpchar,
+    create_dept   int8,
+    create_by     int8,
+    create_time   TIMESTAMP,
+    update_by     int8,
+    update_time   TIMESTAMP,
+    PRIMARY KEY (category_id)
+);
+
+COMMENT ON TABLE flow_category IS '流程分类';
+COMMENT ON COLUMN flow_category.category_id IS '流程分类ID';
+COMMENT ON COLUMN flow_category.parent_id IS '父流程分类id';
+COMMENT ON COLUMN flow_category.ancestors IS '祖级列表';
+COMMENT ON COLUMN flow_category.category_name IS '流程分类名称';
+COMMENT ON COLUMN flow_category.order_num IS '显示顺序';
+COMMENT ON COLUMN flow_category.del_flag IS '删除标志（0代表存在 1代表删除）';
+COMMENT ON COLUMN flow_category.create_dept IS '创建部门';
+COMMENT ON COLUMN flow_category.create_by IS '创建者';
+COMMENT ON COLUMN flow_category.create_time IS '创建时间';
+COMMENT ON COLUMN flow_category.update_by IS '更新者';
+COMMENT ON COLUMN flow_category.update_time IS '更新时间';
+
+INSERT INTO flow_category VALUES (100, 0, '0', 'OA审批', 0, '0', 103, 1, now(), NULL, NULL);
+INSERT INTO flow_category VALUES (101, 100, '0,100', '假勤管理', 0, '0', 103, 1, now(), NULL, NULL);
+INSERT INTO flow_category VALUES (102, 100, '0,100', '人事管理', 1, '0', 103, 1, now(), NULL, NULL);
+INSERT INTO flow_category VALUES (103, 101, '0,100,101', '请假', 0, '0', 103, 1, now(), NULL, NULL);
+INSERT INTO flow_category VALUES (104, 101, '0,100,101', '出差', 1, '0', 103, 1, now(), NULL, NULL);
+INSERT INTO flow_category VALUES (105, 101, '0,100,101', '加班', 2, '0', 103, 1, now(), NULL, NULL);
+INSERT INTO flow_category VALUES (106, 101, '0,100,101', '换班', 3, '0', 103, 1, now(), NULL, NULL);
+INSERT INTO flow_category VALUES (107, 101, '0,100,101', '外出', 4, '0', 103, 1, now(), NULL, NULL);
+INSERT INTO flow_category VALUES (108, 102, '0,100,102', '转正', 1, '0', 103, 1, now(), NULL, NULL);
+INSERT INTO flow_category VALUES (109, 102, '0,100,102', '离职', 2, '0', 103, 1, now(), NULL, NULL);
+
+-- ----------------------------
+-- 请假单信息
+-- ----------------------------
+CREATE TABLE test_leave
+(
+    id          int8         NOT NULL,
+    leave_type  VARCHAR(255) NOT NULL,
+    start_date  TIMESTAMP    NOT NULL,
+    end_date    TIMESTAMP    NOT NULL,
+    leave_days  int2          NOT NULL,
+    remark      VARCHAR(255),
+    status      VARCHAR(255),
+    create_dept int8,
+    create_by   int8,
+    create_time TIMESTAMP,
+    update_by   int8,
+    update_time TIMESTAMP,
+    PRIMARY KEY (id)
+);
+
+COMMENT ON TABLE test_leave IS '请假申请表';
+COMMENT ON COLUMN test_leave.id IS 'id';
+COMMENT ON COLUMN test_leave.leave_type IS '请假类型';
+COMMENT ON COLUMN test_leave.start_date IS '开始时间';
+COMMENT ON COLUMN test_leave.end_date IS '结束时间';
+COMMENT ON COLUMN test_leave.leave_days IS '请假天数';
+COMMENT ON COLUMN test_leave.remark IS '请假原因';
+COMMENT ON COLUMN test_leave.status IS '状态';
+COMMENT ON COLUMN test_leave.create_dept IS '创建部门';
+COMMENT ON COLUMN test_leave.create_by IS '创建者';
+COMMENT ON COLUMN test_leave.create_time IS '创建时间';
+COMMENT ON COLUMN test_leave.update_by IS '更新者';
+COMMENT ON COLUMN test_leave.update_time IS '更新时间';
+
+INSERT INTO sys_menu VALUES ('11616', '工作流', '0', '6', 'workflow', '', '', '1', '0', 'M', '0', '0', '', 'workflow', 103, 1, now(), NULL, NULL, '');
+INSERT INTO sys_menu VALUES ('11618', '我的任务', '0', '7', 'task', '', '', '1', '0', 'M', '0', '0', '', 'my-task', 103, 1, now(), NULL, NULL, '');
+INSERT INTO sys_menu VALUES ('11619', '我的待办', '11618', '2', 'taskWaiting', 'workflow/task/taskWaiting', '', '1', '1', 'C', '0', '0', '', 'waiting', 103, 1, now(), NULL, NULL, '');
+INSERT INTO sys_menu VALUES ('11632', '我的已办', '11618', '3', 'taskFinish', 'workflow/task/taskFinish', '', '1', '1', 'C', '0', '0', '', 'finish', 103, 1, now(), NULL, NULL, '');
+INSERT INTO sys_menu VALUES ('11633', '我的抄送', '11618', '4', 'taskCopyList', 'workflow/task/taskCopyList', '', '1', '1', 'C', '0', '0', '', 'my-copy', 103, 1, now(), NULL, NULL, '');
+INSERT INTO sys_menu VALUES ('11620', '流程定义', '11616', '3', 'processDefinition', 'workflow/processDefinition/index', '', '1', '1', 'C', '0', '0', '', 'process-definition', 103, 1, now(), NULL, NULL, '');
+INSERT INTO sys_menu VALUES ('11621', '流程实例', '11630', '1', 'processInstance', 'workflow/processInstance/index', '', '1', '1', 'C', '0', '0', '', 'tree-table', 103, 1, now(), NULL, NULL, '');
+INSERT INTO sys_menu VALUES ('11622', '流程分类', '11616', '1', 'category', 'workflow/category/index', '', '1', '0', 'C', '0', '0', 'workflow:category:list', 'category', 103, 1, now(), NULL, NULL, '');
+INSERT INTO sys_menu VALUES ('11629', '我发起的', '11618', '1', 'myDocument', 'workflow/task/myDocument', '', '1', '1', 'C', '0', '0', '', 'guide', 103, 1, now(), NULL, NULL, '');
+INSERT INTO sys_menu VALUES ('11630', '流程监控', '11616', '4', 'monitor', '', '', '1', '0', 'M', '0', '0', '', 'monitor', 103, 1, now(), NULL, NULL, '');
+INSERT INTO sys_menu VALUES ('11631', '待办任务', '11630', '2', 'allTaskWaiting', 'workflow/task/allTaskWaiting', '', '1', '1', 'C', '0', '0', '', 'waiting', 103, 1, now(), NULL, NULL, '');
+INSERT INTO sys_menu VALUES ('11700', '流程设计', '11616', '5', 'design/index',   'workflow/processDefinition/design', '', '1', '1', 'C', '1', '0', 'workflow:leave:edit', '#', 103, 1, now(), NULL, NULL, '');
+INSERT INTO sys_menu VALUES ('11701', '请假申请', '11616', '6', 'leaveEdit/index', 'workflow/leave/leaveEdit', '', '1', '1', 'C', '1', '0', 'workflow:leave:edit', '#', 103, 1, now(), NULL, NULL, '');
+
+INSERT INTO sys_menu VALUES ('11623', '流程分类查询', '11622', '1', '#', '', '', '1', '0', 'F', '0', '0', 'workflow:category:query', '#', 103, 1, now(), NULL, NULL, '');
+INSERT INTO sys_menu VALUES ('11624', '流程分类新增', '11622', '2', '#', '', '', '1', '0', 'F', '0', '0', 'workflow:category:add', '#', 103, 1, now(), NULL, NULL, '');
+INSERT INTO sys_menu VALUES ('11625', '流程分类修改', '11622', '3', '#', '', '', '1', '0', 'F', '0', '0', 'workflow:category:edit', '#', 103, 1, now(), NULL, NULL, '');
+INSERT INTO sys_menu VALUES ('11626', '流程分类删除', '11622', '4', '#', '', '', '1', '0', 'F', '0', '0', 'workflow:category:remove', '#', 103, 1, now(), NULL, NULL, '');
+INSERT INTO sys_menu VALUES ('11627', '流程分类导出', '11622', '5', '#', '', '', '1', '0', 'F', '0', '0', 'workflow:category:export', '#', 103, 1, now(), NULL, NULL, '');
+INSERT INTO sys_menu VALUES ('11638', '请假申请', '5', '1', 'leave', 'workflow/leave/index', '', '1', '0', 'C', '0', '0', 'workflow:leave:list', '#', 103, 1, now(), NULL, NULL, '请假申请菜单');
+INSERT INTO sys_menu VALUES ('11639', '请假申请查询', '11638', '1', '#', '', '', '1', '0', 'F', '0', '0', 'workflow:leave:query', '#', 103, 1, now(), NULL, NULL, '');
+INSERT INTO sys_menu VALUES ('11640', '请假申请新增', '11638', '2', '#', '', '', '1', '0', 'F', '0', '0', 'workflow:leave:add', '#', 103, 1, now(), NULL, NULL, '');
+INSERT INTO sys_menu VALUES ('11641', '请假申请修改', '11638', '3', '#', '', '', '1', '0', 'F', '0', '0', 'workflow:leave:edit', '#', 103, 1, now(), NULL, NULL, '');
+INSERT INTO sys_menu VALUES ('11642', '请假申请删除', '11638', '4', '#', '', '', '1', '0', 'F', '0', '0', 'workflow:leave:remove', '#', 103, 1, now(), NULL, NULL, '');
+INSERT INTO sys_menu VALUES ('11643', '请假申请导出', '11638', '5', '#', '', '', '1', '0', 'F', '0', '0', 'workflow:leave:export', '#', 103, 1, now(), NULL, NULL, '');
+
+INSERT INTO sys_dict_type VALUES (13, '业务状态', 'wf_business_status', 103, 1, now(), NULL, NULL, '业务状态列表');
+INSERT INTO sys_dict_type VALUES (14, '表单类型', 'wf_form_type', 103, 1, now(), NULL, NULL, '表单类型列表');
+INSERT INTO sys_dict_type VALUES (15, '任务状态', 'wf_task_status', 103, 1, now(), NULL, NULL, '任务状态');
+INSERT INTO sys_dict_data VALUES (39, 1, '已撤销', 'cancel', 'wf_business_status', '', 'danger', 'N', 103, 1, now(), NULL, NULL, '已撤销');
+INSERT INTO sys_dict_data VALUES (40, 2, '草稿', 'draft', 'wf_business_status', '', 'info', 'N', 103, 1, now(), NULL, NULL, '草稿');
+INSERT INTO sys_dict_data VALUES (41, 3, '待审核', 'waiting', 'wf_business_status', '', 'primary', 'N', 103, 1, now(), NULL, NULL, '待审核');
+INSERT INTO sys_dict_data VALUES (42, 4, '已完成', 'finish', 'wf_business_status', '', 'success', 'N', 103, 1, now(), NULL, NULL, '已完成');
+INSERT INTO sys_dict_data VALUES (43, 5, '已作废', 'invalid', 'wf_business_status', '', 'danger', 'N', 103, 1, now(), NULL, NULL, '已作废');
+INSERT INTO sys_dict_data VALUES (44, 6, '已退回', 'back', 'wf_business_status', '', 'danger', 'N', 103, 1, now(), NULL, NULL, '已退回');
+INSERT INTO sys_dict_data VALUES (45, 7, '已终止', 'termination', 'wf_business_status', '', 'danger', 'N', 103, 1, now(), NULL, NULL, '已终止');
+INSERT INTO sys_dict_data VALUES (46, 1, '自定义表单', 'static', 'wf_form_type', '', 'success', 'N', 103, 1, now(), NULL, NULL, '自定义表单');
+INSERT INTO sys_dict_data VALUES (47, 2, '动态表单', 'dynamic', 'wf_form_type', '', 'primary', 'N', 103, 1, now(), NULL, NULL, '动态表单');
+INSERT INTO sys_dict_data VALUES (48, 1, '撤销', 'cancel', 'wf_task_status', '', 'danger', 'N', 103, 1, now(), NULL, NULL, '撤销');
+INSERT INTO sys_dict_data VALUES (49, 2, '通过', 'pass', 'wf_task_status', '', 'success', 'N', 103, 1, now(), NULL, NULL, '通过');
+INSERT INTO sys_dict_data VALUES (50, 3, '待审核', 'waiting', 'wf_task_status', '', 'primary', 'N', 103, 1, now(), NULL, NULL, '待审核');
+INSERT INTO sys_dict_data VALUES (51, 4, '作废', 'invalid', 'wf_task_status', '', 'danger', 'N', 103, 1, now(), NULL, NULL, '作废');
+INSERT INTO sys_dict_data VALUES (52, 5, '退回', 'back', 'wf_task_status', '', 'danger', 'N', 103, 1, now(), NULL, NULL, '退回');
+INSERT INTO sys_dict_data VALUES (53, 6, '终止', 'termination', 'wf_task_status', '', 'danger', 'N', 103, 1, now(), NULL, NULL, '终止');
+INSERT INTO sys_dict_data VALUES (54, 7, '转办', 'transfer', 'wf_task_status', '', 'primary', 'N', 103, 1, now(), NULL, NULL, '转办');
+INSERT INTO sys_dict_data VALUES (55, 8, '委托', 'depute', 'wf_task_status', '', 'primary', 'N', 103, 1, now(), NULL, NULL, '委托');
+INSERT INTO sys_dict_data VALUES (56, 9, '抄送', 'copy', 'wf_task_status', '', 'primary', 'N', 103, 1, now(), NULL, NULL, '抄送');
+INSERT INTO sys_dict_data VALUES (57, 10, '加签', 'sign', 'wf_task_status', '', 'primary', 'N', 103, 1, now(), NULL, NULL, '加签');
+INSERT INTO sys_dict_data VALUES (58, 11, '减签', 'sign_off', 'wf_task_status', '', 'danger', 'N', 103, 1, now(), NULL, NULL, '减签');
+INSERT INTO sys_dict_data VALUES (59, 11, '超时', 'timeout', 'wf_task_status', '', 'danger', 'N', 103, 1, now(), NULL, NULL, '超时');
+
diff --git a/script/sql/ry_ai.sql b/script/sql/ry_ai.sql
new file mode 100644
index 0000000..7a0e6ee
--- /dev/null
+++ b/script/sql/ry_ai.sql
@@ -0,0 +1,257 @@
+-- ----------------------------
+-- AI模块数据库表结构
+-- ----------------------------
+
+-- ----------------------------
+-- AI Provider配置表
+-- ----------------------------
+DROP TABLE IF EXISTS `ai_provider_config`;
+CREATE TABLE `ai_provider_config` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'ID',
+  `provider_name` varchar(100) NOT NULL COMMENT 'Provider名称',
+  `provider_type` varchar(50) NOT NULL COMMENT 'Provider类型',
+  `enabled` tinyint(1) NOT NULL DEFAULT '1' COMMENT '是否启用(0=禁用 1=启用)',
+  `priority` int(11) NOT NULL DEFAULT '0' COMMENT '优先级(数字越小优先级越高)',
+  `weight` int(11) NOT NULL DEFAULT '1' COMMENT '权重(用于负载均衡)',
+  `max_concurrency` int(11) NOT NULL DEFAULT '10' COMMENT '最大并发数',
+  `timeout_seconds` int(11) NOT NULL DEFAULT '30' COMMENT '超时时间(秒)',
+  `max_retries` int(11) NOT NULL DEFAULT '3' COMMENT '最大重试次数',
+  `circuit_breaker_config` json DEFAULT NULL COMMENT '熔断器配置',
+  `rate_limit_config` json DEFAULT NULL COMMENT '限流配置',
+  `api_config` json DEFAULT NULL COMMENT 'API配置',
+  `model_config` json DEFAULT NULL COMMENT '模型配置',
+  `extension_config` json DEFAULT NULL COMMENT '扩展配置',
+  `health_check_url` varchar(500) DEFAULT NULL COMMENT '健康检查URL',
+  `health_check_interval` int(11) NOT NULL DEFAULT '60' COMMENT '健康检查间隔(秒)',
+  `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+  `create_by` varchar(64) DEFAULT NULL COMMENT '创建者',
+  `update_by` varchar(64) DEFAULT NULL COMMENT '更新者',
+  `remark` varchar(500) DEFAULT NULL COMMENT '备注',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `uk_provider_name` (`provider_name`),
+  KEY `idx_provider_type` (`provider_type`),
+  KEY `idx_enabled` (`enabled`),
+  KEY `idx_priority` (`priority`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='AI Provider配置表';
+
+-- ----------------------------
+-- AI Provider配置历史表
+-- ----------------------------
+DROP TABLE IF EXISTS `ai_provider_config_history`;
+CREATE TABLE `ai_provider_config_history` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'ID',
+  `config_id` bigint(20) NOT NULL COMMENT '配置ID',
+  `provider_name` varchar(100) NOT NULL COMMENT 'Provider名称',
+  `config_data` json NOT NULL COMMENT '配置数据',
+  `operation_type` varchar(20) NOT NULL COMMENT '操作类型(CREATE/UPDATE/DELETE)',
+  `operation_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '操作时间',
+  `operation_by` varchar(64) DEFAULT NULL COMMENT '操作者',
+  `remark` varchar(500) DEFAULT NULL COMMENT '备注',
+  PRIMARY KEY (`id`),
+  KEY `idx_config_id` (`config_id`),
+  KEY `idx_provider_name` (`provider_name`),
+  KEY `idx_operation_time` (`operation_time`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='AI Provider配置历史表';
+
+-- ----------------------------
+-- AI聊天记录表
+-- ----------------------------
+DROP TABLE IF EXISTS `ai_chat_record`;
+CREATE TABLE `ai_chat_record` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'ID',
+  `session_id` varchar(100) NOT NULL COMMENT '会话ID',
+  `user_id` bigint(20) NOT NULL COMMENT '用户ID',
+  `provider_name` varchar(100) NOT NULL COMMENT 'Provider名称',
+  `model_name` varchar(100) DEFAULT NULL COMMENT '模型名称',
+  `message_type` varchar(20) NOT NULL COMMENT '消息类型(USER/ASSISTANT)',
+  `content` text NOT NULL COMMENT '消息内容',
+  `tokens_used` int(11) DEFAULT NULL COMMENT '使用的Token数',
+  `cost` decimal(10,6) DEFAULT NULL COMMENT '成本',
+  `response_time` int(11) DEFAULT NULL COMMENT '响应时间(毫秒)',
+  `is_stream` tinyint(1) NOT NULL DEFAULT '0' COMMENT '是否流式响应',
+  `error_message` text DEFAULT NULL COMMENT '错误信息',
+  `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  PRIMARY KEY (`id`),
+  KEY `idx_session_id` (`session_id`),
+  KEY `idx_user_id` (`user_id`),
+  KEY `idx_provider_name` (`provider_name`),
+  KEY `idx_create_time` (`create_time`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='AI聊天记录表';
+
+-- ----------------------------
+-- AI使用统计表
+-- ----------------------------
+DROP TABLE IF EXISTS `ai_usage_stats`;
+CREATE TABLE `ai_usage_stats` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'ID',
+  `user_id` bigint(20) NOT NULL COMMENT '用户ID',
+  `provider_name` varchar(100) NOT NULL COMMENT 'Provider名称',
+  `model_name` varchar(100) DEFAULT NULL COMMENT '模型名称',
+  `stat_date` date NOT NULL COMMENT '统计日期',
+  `request_count` int(11) NOT NULL DEFAULT '0' COMMENT '请求次数',
+  `success_count` int(11) NOT NULL DEFAULT '0' COMMENT '成功次数',
+  `error_count` int(11) NOT NULL DEFAULT '0' COMMENT '错误次数',
+  `total_tokens` bigint(20) NOT NULL DEFAULT '0' COMMENT '总Token数',
+  `total_cost` decimal(10,6) NOT NULL DEFAULT '0.000000' COMMENT '总成本',
+  `avg_response_time` int(11) NOT NULL DEFAULT '0' COMMENT '平均响应时间(毫秒)',
+  `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `uk_user_provider_date` (`user_id`,`provider_name`,`stat_date`),
+  KEY `idx_provider_name` (`provider_name`),
+  KEY `idx_stat_date` (`stat_date`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='AI使用统计表';
+
+-- ----------------------------
+-- AI评价记录表
+-- ----------------------------
+DROP TABLE IF EXISTS `ai_rating_record`;
+CREATE TABLE `ai_rating_record` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'ID',
+  `message_id` varchar(100) NOT NULL COMMENT '消息ID',
+  `user_id` bigint(20) NOT NULL COMMENT '用户ID',
+  `provider_name` varchar(100) NOT NULL COMMENT 'Provider名称',
+  `rating` int(11) NOT NULL COMMENT '评分(1-5)',
+  `feedback` text DEFAULT NULL COMMENT '反馈内容',
+  `dimension` varchar(50) DEFAULT NULL COMMENT '评价维度',
+  `anonymous` tinyint(1) NOT NULL DEFAULT '0' COMMENT '是否匿名',
+  `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `uk_message_user` (`message_id`,`user_id`),
+  KEY `idx_provider_name` (`provider_name`),
+  KEY `idx_rating` (`rating`),
+  KEY `idx_create_time` (`create_time`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='AI评价记录表';
+
+-- ----------------------------
+-- AI敏感词库表
+-- ----------------------------
+DROP TABLE IF EXISTS `ai_sensitive_word`;
+CREATE TABLE `ai_sensitive_word` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'ID',
+  `word` varchar(100) NOT NULL COMMENT '敏感词',
+  `word_type` varchar(50) NOT NULL COMMENT '词类型(PROFANITY/HATE_SPEECH/VIOLENCE/SEXUAL_CONTENT/ILLEGAL_ACTIVITY/PERSONAL_INFO/SPAM/MALICIOUS_CODE/POLITICAL_SENSITIVE/COMMERCIAL_AD)',
+  `enabled` tinyint(1) NOT NULL DEFAULT '1' COMMENT '是否启用(0=禁用 1=启用)',
+  `priority` int(11) NOT NULL DEFAULT '0' COMMENT '优先级(数字越大优先级越高)',
+  `remark` varchar(500) DEFAULT NULL COMMENT '备注',
+  `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+  `create_by` varchar(64) DEFAULT NULL COMMENT '创建者',
+  `update_by` varchar(64) DEFAULT NULL COMMENT '更新者',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `uk_word` (`word`),
+  KEY `idx_word_type` (`word_type`),
+  KEY `idx_enabled` (`enabled`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='AI敏感词库表';
+
+-- ----------------------------
+-- AI绘画历史记录表
+-- ----------------------------
+DROP TABLE IF EXISTS `ai_painting_record`;
+CREATE TABLE `ai_painting_record` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'ID',
+  `task_id` varchar(100) NOT NULL COMMENT '任务ID',
+  `user_id` bigint(20) DEFAULT NULL COMMENT '用户ID',
+  `engine_type` varchar(50) NOT NULL COMMENT '绘画引擎类型(DALL_E_3/MIDJOURNEY/STABLE_DIFFUSION)',
+  `prompt` text NOT NULL COMMENT '提示词',
+  `params` json DEFAULT NULL COMMENT '绘画参数(JSON)',
+  `status` varchar(50) NOT NULL COMMENT '状态(PENDING/RUNNING/SUCCESS/FAILED)',
+  `progress` int(11) NOT NULL DEFAULT '0' COMMENT '进度(0-100)',
+  `images` json DEFAULT NULL COMMENT '生成的图片URL列表(JSON数组)',
+  `message` text DEFAULT NULL COMMENT '错误消息',
+  `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+  `share_code` varchar(64) DEFAULT NULL COMMENT '分享码（用于分享作品）',
+  `is_public` tinyint(1) NOT NULL DEFAULT '0' COMMENT '是否公开分享(0=私有 1=公开)',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `uk_task_id` (`task_id`),
+  UNIQUE KEY `uk_share_code` (`share_code`),
+  KEY `idx_user_id` (`user_id`),
+  KEY `idx_engine_type` (`engine_type`),
+  KEY `idx_status` (`status`),
+  KEY `idx_create_time` (`create_time`),
+  KEY `idx_is_public` (`is_public`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='AI绘画历史记录表';
+
+-- ----------------------------
+-- AI绘画参数模板表
+-- ----------------------------
+DROP TABLE IF EXISTS `ai_painting_template`;
+CREATE TABLE `ai_painting_template` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'ID',
+  `template_name` varchar(100) NOT NULL COMMENT '模板名称',
+  `user_id` bigint(20) DEFAULT NULL COMMENT '用户ID(为空表示系统模板)',
+  `engine_type` varchar(50) NOT NULL COMMENT '绘画引擎类型(DALL_E_3/MIDJOURNEY/STABLE_DIFFUSION)',
+  `params` json NOT NULL COMMENT '绘画参数(JSON)',
+  `description` varchar(500) DEFAULT NULL COMMENT '模板描述',
+  `is_public` tinyint(1) NOT NULL DEFAULT '0' COMMENT '是否公开(0=私有 1=公开)',
+  `sort` int(11) NOT NULL DEFAULT '0' COMMENT '排序',
+  `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+  `create_by` varchar(64) DEFAULT NULL COMMENT '创建者',
+  `update_by` varchar(64) DEFAULT NULL COMMENT '更新者',
+  PRIMARY KEY (`id`),
+  KEY `idx_user_id` (`user_id`),
+  KEY `idx_engine_type` (`engine_type`),
+  KEY `idx_is_public` (`is_public`),
+  KEY `idx_create_time` (`create_time`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='AI绘画参数模板表';
+
+-- ----------------------------
+-- AI用户配额管理表
+-- ----------------------------
+DROP TABLE IF EXISTS `ai_user_quota`;
+CREATE TABLE `ai_user_quota` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'ID',
+  `user_id` bigint(20) NOT NULL COMMENT '用户ID',
+  `permission_level` varchar(50) NOT NULL DEFAULT 'BASIC' COMMENT '权限级别(GUEST/BASIC/PREMIUM/VIP/ADMIN)',
+  `daily_quota` bigint(20) NOT NULL DEFAULT '0' COMMENT '每日配额限制(0表示无限制)',
+  `monthly_quota` bigint(20) NOT NULL DEFAULT '0' COMMENT '每月配额限制(0表示无限制)',
+  `daily_used` bigint(20) NOT NULL DEFAULT '0' COMMENT '每日已使用配额',
+  `monthly_used` bigint(20) NOT NULL DEFAULT '0' COMMENT '每月已使用配额',
+  `last_reset_daily` datetime DEFAULT NULL COMMENT '上次重置日配额时间',
+  `last_reset_monthly` datetime DEFAULT NULL COMMENT '上次重置月配额时间',
+  `custom_limits` json DEFAULT NULL COMMENT '自定义限制(JSON)',
+  `remark` varchar(500) DEFAULT NULL COMMENT '备注',
+  `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+  `create_by` varchar(64) DEFAULT NULL COMMENT '创建者',
+  `update_by` varchar(64) DEFAULT NULL COMMENT '更新者',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `uk_user_id` (`user_id`),
+  KEY `idx_permission_level` (`permission_level`),
+  KEY `idx_create_time` (`create_time`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='AI用户配额管理表';
+
+-- ----------------------------
+-- AI绘画作品收藏表
+-- ----------------------------
+DROP TABLE IF EXISTS `ai_painting_favorite`;
+CREATE TABLE `ai_painting_favorite` (
+  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'ID',
+  `user_id` bigint(20) NOT NULL COMMENT '用户ID',
+  `painting_record_id` bigint(20) NOT NULL COMMENT '绘画记录ID',
+  `task_id` varchar(100) DEFAULT NULL COMMENT '任务ID',
+  `remark` varchar(500) DEFAULT NULL COMMENT '备注',
+  `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '收藏时间',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `uk_user_painting` (`user_id`, `painting_record_id`),
+  KEY `idx_user_id` (`user_id`),
+  KEY `idx_painting_record_id` (`painting_record_id`),
+  KEY `idx_create_time` (`create_time`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='AI绘画作品收藏表';
+
+-- ----------------------------
+-- 初始化AI Provider配置数据
+-- ----------------------------
+INSERT INTO `ai_provider_config` (`provider_name`, `provider_type`, `enabled`, `priority`, `weight`, `max_concurrency`, `timeout_seconds`, `max_retries`, `api_config`, `model_config`, `remark`) VALUES
+('openai', 'OPENAI', 0, 1, 10, 10, 30, 3, '{"apiKey":"","baseUrl":"https://api.openai.com/v1","organization":""}', '{"defaultModel":"gpt-3.5-turbo","supportedModels":["gpt-3.5-turbo","gpt-4","gpt-4-turbo"]}', 'OpenAI官方API'),
+('azure-openai', 'AZURE_OPENAI', 0, 2, 8, 8, 30, 3, '{"apiKey":"","endpoint":"","apiVersion":"2023-12-01-preview"}', '{"defaultModel":"gpt-35-turbo","supportedModels":["gpt-35-turbo","gpt-4"]}', 'Azure OpenAI服务'),
+('chatglm', 'CHATGLM', 0, 3, 6, 6, 30, 3, '{"apiKey":"","baseUrl":"https://open.bigmodel.cn/api/paas/v4"}', '{"defaultModel":"glm-4","supportedModels":["glm-4","glm-3-turbo"]}', '智谱AI ChatGLM'),
+('qwen', 'QWEN', 0, 4, 6, 6, 30, 3, '{"apiKey":"","baseUrl":"https://dashscope.aliyuncs.com/api/v1"}', '{"defaultModel":"qwen-turbo","supportedModels":["qwen-turbo","qwen-plus","qwen-max"]}', '阿里云通义千问'),
+('zhipu', 'ZHIPU', 0, 5, 5, 5, 30, 3, '{"apiKey":"","baseUrl":"https://open.bigmodel.cn/api/paas/v4"}', '{"defaultModel":"glm-4","supportedModels":["glm-4","glm-3-turbo"]}', '智谱AI'),
+('fastgpt', 'FASTGPT', 0, 6, 4, 4, 30, 3, '{"apiKey":"","baseUrl":"","chatId":""}', '{"defaultModel":"fastgpt","supportedModels":["fastgpt"]}', 'FastGPT平台'),
+('coze', 'COZE', 0, 7, 3, 3, 30, 3, '{"apiKey":"","baseUrl":"https://www.coze.cn/api","botId":""}', '{"defaultModel":"coze","supportedModels":["coze"]}', 'Coze平台'),
+('dify', 'DIFY', 0, 8, 3, 3, 30, 3, '{"apiKey":"","baseUrl":"","appId":""}', '{"defaultModel":"dify","supportedModels":["dify"]}', 'Dify平台'),
+('knowledge', 'KNOWLEDGE', 1, 9, 2, 2, 30, 3, '{"enabled":true}', '{"defaultModel":"knowledge","supportedModels":["knowledge"]}', '内部知识库');
\ No newline at end of file
diff --git a/script/sql/ry_app.sql b/script/sql/ry_app.sql
new file mode 100644
index 0000000..f527133
--- /dev/null
+++ b/script/sql/ry_app.sql
@@ -0,0 +1,229 @@
+-- ----------------------------
+-- App端数据库表结构
+-- ----------------------------
+
+-- 1、App端用户信息表
+CREATE TABLE app_user
+(
+    user_id       BIGINT(20)  NOT NULL COMMENT 'App用户ID',
+    user_name     VARCHAR(30) NOT NULL COMMENT '用户账号',
+    nick_name     VARCHAR(30) NOT NULL COMMENT '用户昵称',
+    phone         VARCHAR(11)  DEFAULT '' COMMENT '手机号码',
+    email         VARCHAR(50)  DEFAULT '' COMMENT '用户邮箱',
+    sex           CHAR(1)      DEFAULT '0' COMMENT '用户性别（0男 1女 2未知）',
+    avatar        BIGINT(20) COMMENT '头像地址',
+    password      VARCHAR(100) DEFAULT '' COMMENT '密码',
+    status        CHAR(1)      DEFAULT '0' COMMENT '帐号状态（0正常 1停用）',
+    del_flag      CHAR(1)      DEFAULT '0' COMMENT '删除标志（0代表存在 1代表删除）',
+    login_ip      VARCHAR(128) DEFAULT '' COMMENT '最后登录IP',
+    login_date    DATETIME COMMENT '最后登录时间',
+    register_time DATETIME COMMENT '注册时间',
+    create_by     BIGINT(20)   DEFAULT NULL COMMENT '创建者',
+    create_time   DATETIME COMMENT '创建时间',
+    update_by     BIGINT(20)   DEFAULT NULL COMMENT '更新者',
+    update_time   DATETIME COMMENT '更新时间',
+    remark        VARCHAR(500) DEFAULT NULL COMMENT '备注',
+    PRIMARY KEY (user_id)
+) ENGINE = InnoDB COMMENT = 'App端用户信息表';
+
+INSERT INTO app_user
+VALUES (1, 'appuser', 'App测试用户 密码admin123', '15888888888', 'appuser@qq.com', '1', NULL,
+        '$2a$10$7JB720yubVSOfvVMe6LeNOKgEoXAw7tCxJRET6pVuiDDz/LQ4Gqk.',
+        '0', '0', '127.0.0.1', SYSDATE(), SYSDATE(), 1, SYSDATE(), NULL, NULL, 'App端测试用户');
+
+-- 2、App端角色信息表
+CREATE TABLE app_role
+(
+    role_id     BIGINT(20)   NOT NULL COMMENT 'App角色ID',
+    role_name   VARCHAR(30)  NOT NULL COMMENT '角色名称',
+    role_key    VARCHAR(100) NOT NULL COMMENT '角色权限字符串',
+    role_sort   INT(4)       NOT NULL COMMENT '显示顺序',
+    status      CHAR(1)      NOT NULL COMMENT '角色状态（0正常 1停用）',
+    del_flag    CHAR(1)      DEFAULT '0' COMMENT '删除标志（0代表存在 1代表删除）',
+    create_by   BIGINT(20)   DEFAULT NULL COMMENT '创建者',
+    create_time DATETIME COMMENT '创建时间',
+    update_by   BIGINT(20)   DEFAULT NULL COMMENT '更新者',
+    update_time DATETIME COMMENT '更新时间',
+    remark      VARCHAR(500) DEFAULT NULL COMMENT '备注',
+    PRIMARY KEY (role_id)
+) ENGINE = InnoDB COMMENT = 'App端角色信息表';
+
+INSERT INTO app_role
+VALUES (1, 'App普通用户', 'app_user', 1, '0', '0', 1, SYSDATE(), NULL, NULL, 'App端普通用户'),
+       (2, 'App VIP用户', 'app_vip', 2, '0', '0', 1, SYSDATE(), NULL, NULL, 'App端VIP用户');
+
+-- 3、App端用户和角色关联表
+CREATE TABLE app_user_role
+(
+    user_id BIGINT(20) NOT NULL COMMENT 'App用户ID',
+    role_id BIGINT(20) NOT NULL COMMENT 'App角色ID',
+    PRIMARY KEY (user_id, role_id)
+) ENGINE = InnoDB COMMENT = 'App端用户和角色关联表';
+
+INSERT INTO app_user_role
+VALUES ('1', '1');
+
+-- 4、App端第三方登录授权表
+CREATE TABLE app_social_auth
+(
+    id            BIGINT(20)    NOT NULL COMMENT '主键',
+    user_id       BIGINT(20)    NOT NULL COMMENT 'App用户ID',
+    platform      VARCHAR(255)  NOT NULL COMMENT '用户来源平台（wechat_mp:微信小程序 wechat_open:微信开放平台 qq:QQ weibo:微博）',
+    platform_uid  VARCHAR(255)  NOT NULL COMMENT '表示平台唯一用户标识',
+    open_id       VARCHAR(255) DEFAULT NULL COMMENT '微信openid',
+    union_id      VARCHAR(255) DEFAULT NULL COMMENT '微信unionid',
+    access_token  VARCHAR(2000) NOT NULL COMMENT '用户的授权令牌',
+    expire_in     INT          DEFAULT NULL COMMENT '用户的授权令牌的有效期',
+    refresh_token VARCHAR(255) DEFAULT NULL COMMENT '刷新令牌',
+    scope         VARCHAR(255) DEFAULT NULL COMMENT '授予的权限',
+    create_by     BIGINT(20)   DEFAULT NULL COMMENT '创建者',
+    create_time   DATETIME COMMENT '创建时间',
+    update_by     BIGINT(20)   DEFAULT NULL COMMENT '更新者',
+    update_time   DATETIME COMMENT '更新时间',
+    del_flag      CHAR(1)      DEFAULT '0' COMMENT '删除标志（0代表存在 1代表删除）',
+    PRIMARY KEY (id)
+) ENGINE = InnoDB COMMENT = 'App端第三方登录授权表';
+
+-- 5、App端登录日志表
+CREATE TABLE app_login_log
+(
+    info_id        BIGINT(20) NOT NULL COMMENT '访问ID',
+    user_name      VARCHAR(50)  DEFAULT '' COMMENT '用户账号',
+    status         CHAR(1)      DEFAULT '0' COMMENT '登录状态（0成功 1失败）',
+    ipaddr         VARCHAR(128) DEFAULT '' COMMENT '登录IP地址',
+    login_location VARCHAR(255) DEFAULT '' COMMENT '登录地点',
+    browser        VARCHAR(50)  DEFAULT '' COMMENT '浏览器类型',
+    os             VARCHAR(50)  DEFAULT '' COMMENT '操作系统',
+    msg            VARCHAR(255) DEFAULT '' COMMENT '提示消息',
+    login_time     DATETIME COMMENT '访问时间',
+    PRIMARY KEY (info_id),
+    KEY idx_app_login_log_s (status),
+    KEY idx_app_login_log_lt (login_time)
+) ENGINE = InnoDB COMMENT = 'App端登录日志表';
+
+-- 6、App端操作日志记录
+CREATE TABLE app_oper_log
+(
+    oper_id        BIGINT(20) NOT NULL COMMENT '日志主键',
+    title          VARCHAR(50)   DEFAULT '' COMMENT '模块标题',
+    business_type  INT(2)        DEFAULT 0 COMMENT '业务类型（0其它 1新增 2修改 3删除）',
+    method         VARCHAR(100)  DEFAULT '' COMMENT '方法名称',
+    request_method VARCHAR(10)   DEFAULT '' COMMENT '请求方式',
+    oper_name      VARCHAR(50)   DEFAULT '' COMMENT '操作人员',
+    oper_url       VARCHAR(255)  DEFAULT '' COMMENT '请求URL',
+    oper_ip        VARCHAR(128)  DEFAULT '' COMMENT '主机地址',
+    oper_location  VARCHAR(255)  DEFAULT '' COMMENT '操作地点',
+    oper_param     VARCHAR(2000) DEFAULT '' COMMENT '请求参数',
+    json_result    VARCHAR(2000) DEFAULT '' COMMENT '返回参数',
+    status         INT(1)        DEFAULT 0 COMMENT '操作状态（0正常 1异常）',
+    error_msg      VARCHAR(2000) DEFAULT '' COMMENT '错误消息',
+    oper_time      DATETIME COMMENT '操作时间',
+    cost_time      BIGINT(20)    DEFAULT 0 COMMENT '消耗时间',
+    PRIMARY KEY (oper_id),
+    KEY idx_app_oper_log_bt (business_type),
+    KEY idx_app_oper_log_s (status),
+    KEY idx_app_oper_log_ot (oper_time)
+) ENGINE = InnoDB COMMENT = 'App端操作日志记录';
+
+-- 7、App端设备信息表
+CREATE TABLE app_device
+(
+    device_id        BIGINT(20)  NOT NULL COMMENT '设备ID',
+    user_id          BIGINT(20)  NOT NULL COMMENT 'App用户ID',
+    device_type      VARCHAR(20) NOT NULL COMMENT '设备类型（ios android h5）',
+    device_name      VARCHAR(100) DEFAULT '' COMMENT '设备名称',
+    device_model     VARCHAR(100) DEFAULT '' COMMENT '设备型号',
+    device_brand     VARCHAR(50)  DEFAULT '' COMMENT '设备品牌',
+    os_version       VARCHAR(50)  DEFAULT '' COMMENT '操作系统版本',
+    app_version      VARCHAR(50)  DEFAULT '' COMMENT 'App版本',
+    push_token       VARCHAR(255) DEFAULT '' COMMENT '推送令牌',
+    is_active        CHAR(1)      DEFAULT '1' COMMENT '是否活跃（0否 1是）',
+    last_active_time DATETIME COMMENT '最后活跃时间',
+    create_time      DATETIME COMMENT '创建时间',
+    update_time      DATETIME COMMENT '更新时间',
+    PRIMARY KEY (device_id),
+    KEY idx_app_device_user_id (user_id),
+    KEY idx_app_device_type (device_type)
+) ENGINE = InnoDB COMMENT = 'App端设备信息表';
+
+-- 8、App端消息推送表
+CREATE TABLE app_message
+(
+    message_id   BIGINT(20)   NOT NULL COMMENT '消息ID',
+    title        VARCHAR(100) NOT NULL COMMENT '消息标题',
+    content      TEXT COMMENT '消息内容',
+    message_type VARCHAR(20)   DEFAULT 'system' COMMENT '消息类型（system:系统消息 notice:通知 activity:活动）',
+    target_type  VARCHAR(20)   DEFAULT 'all' COMMENT '推送目标（all:全部用户 user:指定用户 role:指定角色）',
+    target_ids   VARCHAR(1000) DEFAULT '' COMMENT '目标ID列表（用户ID或角色ID，逗号分隔）',
+    send_time    DATETIME COMMENT '发送时间',
+    status       CHAR(1)       DEFAULT '0' COMMENT '状态（0待发送 1已发送 2发送失败）',
+    create_by    BIGINT(20)    DEFAULT NULL COMMENT '创建者',
+    create_time  DATETIME COMMENT '创建时间',
+    update_by    BIGINT(20)    DEFAULT NULL COMMENT '更新者',
+    update_time  DATETIME COMMENT '更新时间',
+    PRIMARY KEY (message_id),
+    KEY idx_app_message_type (message_type),
+    KEY idx_app_message_status (status)
+) ENGINE = InnoDB COMMENT = 'App端消息推送表';
+
+-- 9、App端用户消息读取记录表
+CREATE TABLE app_user_message
+(
+    id          BIGINT(20) NOT NULL COMMENT '主键',
+    user_id     BIGINT(20) NOT NULL COMMENT 'App用户ID',
+    message_id  BIGINT(20) NOT NULL COMMENT '消息ID',
+    is_read     CHAR(1) DEFAULT '0' COMMENT '是否已读（0未读 1已读）',
+    read_time   DATETIME COMMENT '读取时间',
+    create_time DATETIME COMMENT '创建时间',
+    PRIMARY KEY (id),
+    KEY idx_app_user_message_user (user_id),
+    KEY idx_app_user_message_msg (message_id),
+    KEY idx_app_user_message_read (is_read)
+) ENGINE = InnoDB COMMENT = 'App端用户消息读取记录表';
+
+-- 10、App版本信息表
+CREATE TABLE app_version
+(
+    version_id     BIGINT(20)   NOT NULL COMMENT '版本ID',
+    version_code   INT          NOT NULL COMMENT '版本号（数字）',
+    version_name   VARCHAR(20)  NOT NULL COMMENT '版本名（如1.0.0）',
+    update_content TEXT COMMENT '更新内容',
+    download_url   VARCHAR(500) NOT NULL COMMENT '下载地址',
+    is_force       CHAR(1)     DEFAULT '0' COMMENT '是否强制更新（0否 1是）',
+    platform       VARCHAR(10) DEFAULT 'android' COMMENT '平台（android、ios）',
+    create_time    DATETIME COMMENT '创建时间',
+    PRIMARY KEY (version_id)
+) ENGINE = InnoDB COMMENT ='App版本信息表';
+
+-- 11、App文件表
+DROP TABLE IF EXISTS `app_file`;
+CREATE TABLE `app_file`
+(
+    `file_id`         bigint                                                        NOT NULL AUTO_INCREMENT COMMENT '文件ID',
+    `user_id`         bigint                                                        NOT NULL COMMENT '用户ID',
+    `file_name`       varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '文件名称',
+    `original_name`   varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '原始文件名',
+    `file_path`       varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '文件路径',
+    `file_url`        varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '文件URL',
+    `file_size`       bigint                                                        NOT NULL DEFAULT 0 COMMENT '文件大小（字节）',
+    `file_type`       varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '文件类型',
+    `file_suffix`     varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '文件后缀',
+    `file_category`   int                                                           NOT NULL DEFAULT 6 COMMENT '文件分类（1头像 2图片 3视频 4音频 5文档 6其他）',
+    `storage_service` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci  NOT NULL COMMENT '存储服务',
+    `status`          char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci      NOT NULL DEFAULT '0' COMMENT '状态（0正常 1删除）',
+    `download_count`  bigint                                                        NOT NULL DEFAULT 0 COMMENT '下载次数',
+    `is_public`       char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci      NOT NULL DEFAULT '0' COMMENT '是否公开（0私有 1公开）',
+    `file_md5`        varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '文件MD5值',
+    `remark`          varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注',
+    `create_by`       varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建者',
+    `create_time`     datetime NULL DEFAULT NULL COMMENT '创建时间',
+    `update_by`       varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新者',
+    `update_time`     datetime NULL DEFAULT NULL COMMENT '更新时间',
+    PRIMARY KEY (`file_id`) USING BTREE,
+    INDEX             `idx_user_id`(`user_id` ASC) USING BTREE COMMENT '用户ID索引',
+    INDEX             `idx_file_category`(`file_category` ASC) USING BTREE COMMENT '文件分类索引',
+    INDEX             `idx_status`(`status` ASC) USING BTREE COMMENT '状态索引',
+    INDEX             `idx_is_public`(`is_public` ASC) USING BTREE COMMENT '公开状态索引',
+    INDEX             `idx_file_md5`(`file_md5` ASC) USING BTREE COMMENT 'MD5索引',
+    INDEX             `idx_create_time`(`create_time` ASC) USING BTREE COMMENT '创建时间索引'
+) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = 'App端文件信息表' ROW_FORMAT = Dynamic;
\ No newline at end of file
diff --git a/script/sql/ry_chat.sql b/script/sql/ry_chat.sql
new file mode 100644
index 0000000..29ddad2
--- /dev/null
+++ b/script/sql/ry_chat.sql
@@ -0,0 +1,116 @@
+-- ----------------------------
+-- Table structure for chat_config
+-- ----------------------------
+DROP TABLE IF EXISTS `chat_config`;
+CREATE TABLE `chat_config`
+(
+    `id`           bigint(20)                                                    NOT NULL AUTO_INCREMENT COMMENT '主键',
+    `category`     varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '配置类型',
+    `config_name`  varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '配置名称',
+    `config_value` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci         NOT NULL COMMENT '配置值',
+    `config_dict`  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 '备注',
+    `version`      int(11)                                                       NULL DEFAULT NULL COMMENT '版本',
+    `del_flag`     char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci      NULL DEFAULT '0' COMMENT '删除标志（0代表存在 1代表删除）',
+    `update_ip`    varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新IP',
+    PRIMARY KEY (`id`) USING BTREE,
+    UNIQUE INDEX `unique_category_key` (`category`, `config_name`) USING BTREE
+) ENGINE = InnoDB
+  CHARACTER SET = utf8mb4
+  COLLATE = utf8mb4_general_ci COMMENT = '配置信息表'
+  ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Table structure for chat_message
+-- ----------------------------
+DROP TABLE IF EXISTS `chat_message`;
+CREATE TABLE `chat_message`
+(
+    `id`           bigint(20)                                                    NOT NULL COMMENT '主键',
+    `session_id`   bigint(20)                                                    NULL DEFAULT NULL COMMENT '会话id',
+    `user_id`      bigint(20)                                                    NOT NULL COMMENT '用户id',
+    `content`      longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci     NULL COMMENT '消息内容',
+    `role`         varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '对话角色',
+    `deduct_cost`  double(20, 2)                                                 NULL DEFAULT 0.00 COMMENT '扣除金额',
+    `total_tokens` int(20)                                                       NULL DEFAULT 0 COMMENT '累计 Tokens',
+    `model_name`   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;
+
+-- ----------------------------
+-- Table structure for chat_model
+-- ----------------------------
+DROP TABLE IF EXISTS `chat_model`;
+CREATE TABLE `chat_model`
+(
+    `id`             bigint(20)                                                    NOT NULL COMMENT '主键',
+    `category`       varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci  NULL DEFAULT NULL COMMENT '模型分类',
+    `model_name`     varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci  NULL DEFAULT NULL COMMENT '模型名称',
+    `model_describe` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '模型描述',
+    `model_price`    double                                                        NULL DEFAULT NULL COMMENT '模型价格',
+    `model_type`     char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci      NULL DEFAULT NULL COMMENT '计费类型',
+    `model_show`     char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci      NULL DEFAULT NULL COMMENT '是否显示',
+    `system_prompt`  varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '系统提示词',
+    `api_host`       varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '请求地址',
+    `api_key`        varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '密钥',
+    `api_url`        varchar(50) 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;
+
+-- ----------------------------
+-- 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_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;
+
+-- ----------------------------
+-- Table structure for chat_usage_token
+-- ----------------------------
+DROP TABLE IF EXISTS `chat_usage_token`;
+CREATE TABLE `chat_usage_token`
+(
+    `id`          bigint(20)                                                    NOT NULL COMMENT '主键',
+    `user_id`     bigint(20)                                                    NOT NULL COMMENT '用户',
+    `token`       int(10)                                                       NULL DEFAULT NULL COMMENT '待结算token',
+    `model_name`  varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci  NULL DEFAULT NULL COMMENT '模型名称',
+    `total_token` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '累计使用token',
+    PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB
+  CHARACTER SET = utf8mb4
+  COLLATE = utf8mb4_general_ci COMMENT = '用户token使用详情'
+  ROW_FORMAT = Dynamic;
diff --git a/script/sql/ry_job.sql b/script/sql/ry_job.sql
new file mode 100644
index 0000000..dd86deb
--- /dev/null
+++ b/script/sql/ry_job.sql
@@ -0,0 +1,523 @@
+SET NAMES utf8mb4;
+
+CREATE TABLE `sj_namespace`
+(
+    `id`          bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键',
+    `name`        varchar(64)         NOT NULL COMMENT '名称',
+    `unique_id`   varchar(64)         NOT NULL COMMENT '唯一id',
+    `description` varchar(256)        NOT NULL DEFAULT '' COMMENT '描述',
+    `deleted`     tinyint(4)          NOT NULL DEFAULT 0 COMMENT '逻辑删除 1、删除',
+    `create_dt`   datetime            NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `update_dt`   datetime            NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间',
+    PRIMARY KEY (`id`),
+    KEY `idx_name` (`name`),
+    UNIQUE KEY `uk_unique_id` (`unique_id`)
+) ENGINE = InnoDB
+  DEFAULT CHARSET = utf8mb4 COMMENT ='命名空间';
+
+INSERT INTO `sj_namespace` VALUES (1, 'Development', 'dev', '', 0, now(), now());
+INSERT INTO `sj_namespace` VALUES (2, 'Production', 'prod', '', 0, now(), now());
+
+CREATE TABLE `sj_group_config`
+(
+    `id`                bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键',
+    `namespace_id`      varchar(64)         NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' COMMENT '命名空间id',
+    `group_name`        varchar(64)         NOT NULL DEFAULT '' COMMENT '组名称',
+    `description`       varchar(256)        NOT NULL DEFAULT '' COMMENT '组描述',
+    `token`             varchar(64)         NOT NULL DEFAULT 'SJ_cKqBTPzCsWA3VyuCfFoccmuIEGXjr5KT' COMMENT 'token',
+    `group_status`      tinyint(4)          NOT NULL DEFAULT 0 COMMENT '组状态 0、未启用 1、启用',
+    `version`           int(11)             NOT NULL COMMENT '版本号',
+    `group_partition`   int(11)             NOT NULL COMMENT '分区',
+    `id_generator_mode` tinyint(4)          NOT NULL DEFAULT 1 COMMENT '唯一id生成模式 默认号段模式',
+    `init_scene`        tinyint(4)          NOT NULL DEFAULT 0 COMMENT '是否初始化场景 0:否 1:是',
+    `create_dt`         datetime            NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `update_dt`         datetime            NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间',
+    PRIMARY KEY (`id`),
+    UNIQUE KEY `uk_namespace_id_group_name` (`namespace_id`, `group_name`)
+) ENGINE = InnoDB
+  AUTO_INCREMENT = 0
+  DEFAULT CHARSET = utf8mb4 COMMENT ='组配置';
+
+INSERT INTO `sj_group_config` VALUES (1, 'dev', 'ruoyi_group', '', 'SJ_cKqBTPzCsWA3VyuCfFoccmuIEGXjr5KT', 1, 1, 0, 1, 1,  now(), now());
+INSERT INTO `sj_group_config` VALUES (2, 'prod', 'ruoyi_group', '', 'SJ_cKqBTPzCsWA3VyuCfFoccmuIEGXjr5KT', 1, 1, 0, 1, 1,  now(), now());
+
+CREATE TABLE `sj_notify_config`
+(
+    `id`                     bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键',
+    `namespace_id`           varchar(64)         NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' COMMENT '命名空间id',
+    `group_name`             varchar(64)         NOT NULL COMMENT '组名称',
+    `notify_name`            varchar(64)         NOT NULL DEFAULT '' COMMENT '通知名称',
+    `system_task_type`       tinyint(4)          NOT NULL DEFAULT 3 COMMENT '任务类型 1. 重试任务 2. 重试回调 3、JOB任务 4、WORKFLOW任务',
+    `notify_status`          tinyint(4)          NOT NULL DEFAULT 0 COMMENT '通知状态 0、未启用 1、启用',
+    `recipient_ids`          varchar(128)        NOT NULL COMMENT '接收人id列表',
+    `notify_threshold`       int(11)             NOT NULL DEFAULT 0 COMMENT '通知阈值',
+    `notify_scene`           tinyint(4)          NOT NULL DEFAULT 0 COMMENT '通知场景',
+    `rate_limiter_status`    tinyint(4)          NOT NULL DEFAULT 0 COMMENT '限流状态 0、未启用 1、启用',
+    `rate_limiter_threshold` int(11)             NOT NULL DEFAULT 0 COMMENT '每秒限流阈值',
+    `description`            varchar(256)        NOT NULL DEFAULT '' COMMENT '描述',
+    `create_dt`              datetime            NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `update_dt`              datetime            NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间',
+    PRIMARY KEY (`id`),
+    KEY `idx_namespace_id_group_name_scene_name` (`namespace_id`, `group_name`)
+) ENGINE = InnoDB
+  AUTO_INCREMENT = 0
+  DEFAULT CHARSET = utf8mb4 COMMENT ='通知配置';
+
+CREATE TABLE `sj_notify_recipient`
+(
+    `id`               bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键',
+    `namespace_id`     varchar(64)         NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' COMMENT '命名空间id',
+    `recipient_name`   varchar(64)         NOT NULL COMMENT '接收人名称',
+    `notify_type`      tinyint(4)          NOT NULL DEFAULT 0 COMMENT '通知类型 1、钉钉 2、邮件 3、企业微信 4 飞书 5 webhook',
+    `notify_attribute` varchar(512)        NOT NULL COMMENT '配置属性',
+    `description`      varchar(256)        NOT NULL DEFAULT '' COMMENT '描述',
+    `create_dt`        datetime            NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `update_dt`        datetime            NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间',
+    PRIMARY KEY (`id`),
+    KEY `idx_namespace_id` (`namespace_id`)
+) ENGINE = InnoDB
+  AUTO_INCREMENT = 0
+  DEFAULT CHARSET = utf8mb4 COMMENT ='告警通知接收人';
+
+CREATE TABLE `sj_retry_dead_letter`
+(
+    `id`            bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键',
+    `namespace_id`  varchar(64)         NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' COMMENT '命名空间id',
+    `group_name`    varchar(64)         NOT NULL COMMENT '组名称',
+    `group_id`      bigint(20)          NOT NULL COMMENT '组Id',
+    `scene_name`    varchar(64)         NOT NULL COMMENT '场景名称',
+    `scene_id`      bigint(20)          NOT NULL COMMENT '场景ID',
+    `idempotent_id` varchar(64)         NOT NULL COMMENT '幂等id',
+    `biz_no`        varchar(64)         NOT NULL DEFAULT '' COMMENT '业务编号',
+    `executor_name` varchar(512)        NOT NULL DEFAULT '' COMMENT '执行器名称',
+    `args_str`      text                NOT NULL COMMENT '执行方法参数',
+    `ext_attrs`     text                NOT NULL COMMENT '扩展字段',
+    `create_dt`     datetime            NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    PRIMARY KEY (`id`),
+    KEY `idx_namespace_id_group_name_scene_name` (`namespace_id`, `group_name`, `scene_name`),
+    KEY `idx_idempotent_id` (`idempotent_id`),
+    KEY `idx_biz_no` (`biz_no`),
+    KEY `idx_create_dt` (`create_dt`)
+) ENGINE = InnoDB
+  AUTO_INCREMENT = 0
+  DEFAULT CHARSET = utf8mb4 COMMENT ='死信队列表';
+
+CREATE TABLE `sj_retry`
+(
+    `id`              bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键',
+    `namespace_id`    varchar(64)         NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' COMMENT '命名空间id',
+    `group_name`      varchar(64)         NOT NULL COMMENT '组名称',
+    `group_id`        bigint(20)          NOT NULL COMMENT '组Id',
+    `scene_name`      varchar(64)         NOT NULL COMMENT '场景名称',
+    `scene_id`        bigint(20)          NOT NULL COMMENT '场景ID',
+    `idempotent_id`   varchar(64)         NOT NULL COMMENT '幂等id',
+    `biz_no`          varchar(64)         NOT NULL DEFAULT '' COMMENT '业务编号',
+    `executor_name`   varchar(512)        NOT NULL DEFAULT '' COMMENT '执行器名称',
+    `args_str`        text                NOT NULL COMMENT '执行方法参数',
+    `ext_attrs`       text                NOT NULL COMMENT '扩展字段',
+    `next_trigger_at` bigint(13)          NOT NULL COMMENT '下次触发时间',
+    `retry_count`     int(11)             NOT NULL DEFAULT 0 COMMENT '重试次数',
+    `retry_status`    tinyint(4)          NOT NULL DEFAULT 0 COMMENT '重试状态 0、重试中 1、成功 2、最大重试次数',
+    `task_type`       tinyint(4)          NOT NULL DEFAULT 1 COMMENT '任务类型 1、重试数据 2、回调数据',
+    `bucket_index`    int(11)             NOT NULL DEFAULT 0 COMMENT 'bucket',
+    `parent_id`       bigint(20)          NOT NULL DEFAULT 0 COMMENT '父节点id',
+    `deleted`         bigint(20)          NOT NULL DEFAULT 0 COMMENT '逻辑删除',
+    `create_dt`       datetime            NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `update_dt`       datetime            NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间',
+    PRIMARY KEY (`id`),
+    KEY `idx_biz_no` (`biz_no`),
+    KEY `idx_idempotent_id` (`idempotent_id`),
+    KEY `idx_retry_status_bucket_index` (`retry_status`, `bucket_index`),
+    KEY `idx_parent_id` (`parent_id`),
+    KEY `idx_create_dt` (`create_dt`),
+    UNIQUE KEY `uk_scene_tasktype_idempotentid_deleted` (`scene_id`, `task_type`, `idempotent_id`, `deleted`)
+) ENGINE = InnoDB
+  AUTO_INCREMENT = 0
+  DEFAULT CHARSET = utf8mb4 COMMENT ='重试信息表';
+
+CREATE TABLE `sj_retry_task`
+(
+    `id`               bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键',
+    `namespace_id`     varchar(64)         NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' COMMENT '命名空间id',
+    `group_name`       varchar(64)         NOT NULL COMMENT '组名称',
+    `scene_name`       varchar(64)         NOT NULL COMMENT '场景名称',
+    `retry_id`         bigint(20)          NOT NULL COMMENT '重试信息Id',
+    `ext_attrs`        text                NOT NULL COMMENT '扩展字段',
+    `task_status`      tinyint(4)          NOT NULL DEFAULT 1 COMMENT '重试状态',
+    `task_type`        tinyint(4)          NOT NULL DEFAULT 1 COMMENT '任务类型 1、重试数据 2、回调数据',
+    `operation_reason` tinyint(4)          NOT NULL DEFAULT 0 COMMENT '操作原因',
+    `client_info`      varchar(128)        DEFAULT NULL COMMENT '客户端地址 clientId#ip:port',
+    `create_dt`        datetime            NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `update_dt`        datetime            NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间',
+    PRIMARY KEY (`id`),
+    KEY `idx_group_name_scene_name` (`namespace_id`, `group_name`, `scene_name`),
+    KEY `task_status` (`task_status`),
+    KEY `idx_create_dt` (`create_dt`),
+    KEY `idx_retry_id` (`retry_id`)
+) ENGINE = InnoDB
+  AUTO_INCREMENT = 0
+  DEFAULT CHARSET = utf8mb4 COMMENT ='重试任务表';
+
+CREATE TABLE `sj_retry_task_log_message`
+(
+    `id`            bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键',
+    `namespace_id`  varchar(64)         NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' COMMENT '命名空间id',
+    `group_name`    varchar(64)         NOT NULL COMMENT '组名称',
+    `retry_id`      bigint(20)          NOT NULL COMMENT '重试信息Id',
+    `retry_task_id` bigint(20)          NOT NULL COMMENT '重试任务Id',
+    `message`       longtext            NOT NULL COMMENT '异常信息',
+    `log_num`       int(11)             NOT NULL DEFAULT 1 COMMENT '日志数量',
+    `real_time`     bigint(13)          NOT NULL DEFAULT 0 COMMENT '上报时间',
+    `create_dt`     datetime            NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    PRIMARY KEY (`id`),
+    KEY `idx_namespace_id_group_name_retry_task_id` (`namespace_id`, `group_name`, `retry_task_id`),
+    KEY `idx_create_dt` (`create_dt`)
+) ENGINE = InnoDB
+  AUTO_INCREMENT = 0
+  DEFAULT CHARSET = utf8mb4 COMMENT ='任务调度日志信息记录表';
+
+CREATE TABLE `sj_retry_scene_config`
+(
+    `id`                  bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键',
+    `namespace_id`        varchar(64)         NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' COMMENT '命名空间id',
+    `scene_name`          varchar(64)         NOT NULL COMMENT '场景名称',
+    `group_name`          varchar(64)         NOT NULL COMMENT '组名称',
+    `scene_status`        tinyint(4)          NOT NULL DEFAULT 0 COMMENT '组状态 0、未启用 1、启用',
+    `max_retry_count`     int(11)             NOT NULL DEFAULT 5 COMMENT '最大重试次数',
+    `back_off`            tinyint(4)          NOT NULL DEFAULT 1 COMMENT '1、默认等级 2、固定间隔时间 3、CRON 表达式',
+    `trigger_interval`    varchar(16)         NOT NULL DEFAULT '' COMMENT '间隔时长',
+    `notify_ids`          varchar(128)        NOT NULL DEFAULT '' COMMENT '通知告警场景配置id列表',
+    `deadline_request`    bigint(20) unsigned NOT NULL DEFAULT 60000 COMMENT 'Deadline Request 调用链超时 单位毫秒',
+    `executor_timeout`    int(11) unsigned    NOT NULL DEFAULT 5 COMMENT '任务执行超时时间，单位秒',
+    `route_key`           tinyint(4)          NOT NULL DEFAULT 4 COMMENT '路由策略',
+    `block_strategy`      tinyint(4)          NOT NULL DEFAULT 1 COMMENT '阻塞策略 1、丢弃 2、覆盖 3、并行',
+    `cb_status`           tinyint(4)          NOT NULL DEFAULT 0 COMMENT '回调状态 0、不开启 1、开启',
+    `cb_trigger_type`     tinyint(4)          NOT NULL DEFAULT 1 COMMENT '1、默认等级 2、固定间隔时间 3、CRON 表达式',
+    `cb_max_count`        int(11)             NOT NULL DEFAULT 16 COMMENT '回调的最大执行次数',
+    `cb_trigger_interval` varchar(16)         NOT NULL DEFAULT '' COMMENT '回调的最大执行次数',
+    `description`         varchar(256)        NOT NULL DEFAULT '' COMMENT '描述',
+    `create_dt`           datetime            NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `update_dt`           datetime            NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间',
+    PRIMARY KEY (`id`),
+    UNIQUE KEY `uk_namespace_id_group_name_scene_name` (`namespace_id`, `group_name`, `scene_name`)
+) ENGINE = InnoDB
+  AUTO_INCREMENT = 0
+  DEFAULT CHARSET = utf8mb4 COMMENT ='场景配置';
+
+CREATE TABLE `sj_server_node`
+(
+    `id`           bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键',
+    `namespace_id` varchar(64)         NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' COMMENT '命名空间id',
+    `group_name`   varchar(64)         NOT NULL COMMENT '组名称',
+    `host_id`      varchar(64)         NOT NULL COMMENT '主机id',
+    `host_ip`      varchar(64)         NOT NULL COMMENT '机器ip',
+    `host_port`    int(16)             NOT NULL COMMENT '机器端口',
+    `expire_at`    datetime            NOT NULL COMMENT '过期时间',
+    `node_type`    tinyint(4)          NOT NULL COMMENT '节点类型 1、客户端 2、是服务端',
+    `ext_attrs`    varchar(256)        NULL     DEFAULT '' COMMENT '扩展字段',
+    `create_dt`    datetime            NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `update_dt`    datetime            NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间',
+    PRIMARY KEY (`id`),
+    KEY `idx_namespace_id_group_name` (`namespace_id`, `group_name`),
+    KEY `idx_expire_at_node_type` (`expire_at`, `node_type`),
+    UNIQUE KEY `uk_host_id_host_ip` (`host_id`, `host_ip`)
+) ENGINE = InnoDB
+  AUTO_INCREMENT = 0
+  DEFAULT CHARSET = utf8mb4 COMMENT ='服务器节点';
+
+CREATE TABLE `sj_distributed_lock`
+(
+    `name`       varchar(64)         NOT NULL COMMENT '锁名称',
+    `lock_until` timestamp(3)        NOT NULL DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3) COMMENT '锁定时长',
+    `locked_at`  timestamp(3)        NOT NULL DEFAULT CURRENT_TIMESTAMP(3) COMMENT '锁定时间',
+    `locked_by`  varchar(255)        NOT NULL COMMENT '锁定者',
+    `create_dt`  datetime            NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `update_dt`  datetime            NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
+    PRIMARY KEY (`name`)
+) ENGINE = InnoDB
+  AUTO_INCREMENT = 0
+  DEFAULT CHARSET = utf8mb4 COMMENT ='锁定表';
+
+CREATE TABLE `sj_system_user`
+(
+    `id`        bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键',
+    `username`  varchar(64)         NOT NULL COMMENT '账号',
+    `password`  varchar(128)        NOT NULL COMMENT '密码',
+    `role`      tinyint(4)          NOT NULL DEFAULT 0 COMMENT '角色：1-普通用户、2-管理员',
+    `create_dt` datetime            NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `update_dt` datetime            NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间',
+    PRIMARY KEY (`id`),
+    UNIQUE KEY `uk_username` (`username`) USING BTREE
+) ENGINE = InnoDB
+  DEFAULT CHARSET = utf8mb4 COMMENT ='系统用户表';
+
+-- pwd: admin
+INSERT INTO `sj_system_user` (username, password, role)
+VALUES ('admin', '465c194afb65670f38322df087f0a9bb225cc257e43eb4ac5a0c98ef5b3173ac', 2);
+
+CREATE TABLE `sj_system_user_permission`
+(
+    `id`             bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键',
+    `group_name`     varchar(64)         NOT NULL COMMENT '组名称',
+    `namespace_id`   varchar(64)         NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' COMMENT '命名空间id',
+    `system_user_id` bigint(20)          NOT NULL COMMENT '系统用户id',
+    `create_dt`      datetime            NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `update_dt`      datetime            NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间',
+    PRIMARY KEY (`id`),
+    UNIQUE KEY `uk_namespace_id_group_name_system_user_id` (`namespace_id`, `group_name`, `system_user_id`)
+) ENGINE = InnoDB
+  DEFAULT CHARSET = utf8mb4 COMMENT ='系统用户权限表';
+
+CREATE TABLE `sj_sequence_alloc`
+(
+    `id`           bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键',
+    `namespace_id` varchar(64)         NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' COMMENT '命名空间id',
+    `group_name`   varchar(64)         NOT NULL DEFAULT '' COMMENT '组名称',
+    `max_id`       bigint(20)          NOT NULL DEFAULT 1 COMMENT '最大id',
+    `step`         int(11)             NOT NULL DEFAULT 100 COMMENT '步长',
+    `update_dt`    datetime            NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+    PRIMARY KEY (`id`),
+    UNIQUE KEY `uk_namespace_id_group_name` (`namespace_id`, `group_name`)
+) ENGINE = InnoDB
+  DEFAULT CHARSET = utf8mb4 COMMENT ='号段模式序号ID分配表';
+
+-- 分布式调度DDL
+CREATE TABLE `sj_job`
+(
+    `id`               bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键',
+    `namespace_id`     varchar(64)         NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' COMMENT '命名空间id',
+    `group_name`       varchar(64)         NOT NULL COMMENT '组名称',
+    `job_name`         varchar(64)         NOT NULL COMMENT '名称',
+    `args_str`         text                         DEFAULT NULL COMMENT '执行方法参数',
+    `args_type`        tinyint(4)          NOT NULL DEFAULT 1 COMMENT '参数类型 ',
+    `next_trigger_at`  bigint(13)          NOT NULL COMMENT '下次触发时间',
+    `job_status`       tinyint(4)          NOT NULL DEFAULT 1 COMMENT '任务状态 0、关闭、1、开启',
+    `task_type`        tinyint(4)          NOT NULL DEFAULT 1 COMMENT '任务类型 1、集群 2、广播 3、切片',
+    `route_key`        tinyint(4)          NOT NULL DEFAULT 4 COMMENT '路由策略',
+    `executor_type`    tinyint(4)          NOT NULL DEFAULT 1 COMMENT '执行器类型',
+    `executor_info`    varchar(255)                 DEFAULT NULL COMMENT '执行器名称',
+    `trigger_type`     tinyint(4)          NOT NULL COMMENT '触发类型 1.CRON 表达式 2. 固定时间',
+    `trigger_interval` varchar(255)        NOT NULL COMMENT '间隔时长',
+    `block_strategy`   tinyint(4)          NOT NULL DEFAULT 1 COMMENT '阻塞策略 1、丢弃 2、覆盖 3、并行 4、恢复',
+    `executor_timeout` int(11)             NOT NULL DEFAULT 0 COMMENT '任务执行超时时间，单位秒',
+    `max_retry_times`  int(11)             NOT NULL DEFAULT 0 COMMENT '最大重试次数',
+    `parallel_num`     int(11)             NOT NULL DEFAULT 1 COMMENT '并行数',
+    `retry_interval`   int(11)             NOT NULL DEFAULT 0 COMMENT '重试间隔(s)',
+    `bucket_index`     int(11)             NOT NULL DEFAULT 0 COMMENT 'bucket',
+    `resident`         tinyint(4)          NOT NULL DEFAULT 0 COMMENT '是否是常驻任务',
+    `notify_ids`       varchar(128)        NOT NULL DEFAULT '' COMMENT '通知告警场景配置id列表',
+    `owner_id`         bigint(20)          NULL                 COMMENT '负责人id',
+    `description`      varchar(256)        NOT NULL DEFAULT '' COMMENT '描述',
+    `ext_attrs`        varchar(256)        NULL     DEFAULT '' COMMENT '扩展字段',
+    `deleted`          tinyint(4)          NOT NULL DEFAULT 0 COMMENT '逻辑删除 1、删除',
+    `create_dt`        datetime            NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `update_dt`        datetime            NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间',
+    PRIMARY KEY (`id`),
+    KEY `idx_namespace_id_group_name` (`namespace_id`, `group_name`),
+    KEY `idx_job_status_bucket_index` (`job_status`, `bucket_index`),
+    KEY `idx_create_dt` (`create_dt`)
+) ENGINE = InnoDB
+  AUTO_INCREMENT = 0
+  DEFAULT CHARSET = utf8mb4 COMMENT ='任务信息';
+
+INSERT INTO `sj_job` VALUES (1, 'dev', 'ruoyi_group', 'demo-job', null, 1, 1710344035622, 1, 1, 4, 1, 'testJobExecutor', 2, '60', 1, 60, 3, 1, 1, 116, 0, '', 1, '', '', 0 , now(), now());
+
+CREATE TABLE `sj_job_log_message`
+(
+    `id`            bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键',
+    `namespace_id`  varchar(64)         NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' COMMENT '命名空间id',
+    `group_name`    varchar(64)         NOT NULL COMMENT '组名称',
+    `job_id`        bigint(20)          NOT NULL COMMENT '任务信息id',
+    `task_batch_id` bigint(20)          NOT NULL COMMENT '任务批次id',
+    `task_id`       bigint(20)          NOT NULL COMMENT '调度任务id',
+    `message`       longtext            NOT NULL COMMENT '调度信息',
+    `log_num`       int(11)             NOT NULL DEFAULT 1 COMMENT '日志数量',
+    `real_time`     bigint(13)          NOT NULL DEFAULT 0 COMMENT '上报时间',
+    `ext_attrs`     varchar(256)        NULL     DEFAULT '' COMMENT '扩展字段',
+    `create_dt`     datetime            NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    PRIMARY KEY (`id`),
+    KEY `idx_task_batch_id_task_id` (`task_batch_id`, `task_id`),
+    KEY `idx_create_dt` (`create_dt`),
+    KEY `idx_namespace_id_group_name` (`namespace_id`, `group_name`)
+) ENGINE = InnoDB
+  AUTO_INCREMENT = 0
+  DEFAULT CHARSET = utf8mb4 COMMENT ='调度日志';
+
+CREATE TABLE `sj_job_task`
+(
+    `id`             bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键',
+    `namespace_id`   varchar(64)         NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' COMMENT '命名空间id',
+    `group_name`     varchar(64)         NOT NULL COMMENT '组名称',
+    `job_id`         bigint(20)          NOT NULL COMMENT '任务信息id',
+    `task_batch_id`  bigint(20)          NOT NULL COMMENT '调度任务id',
+    `parent_id`      bigint(20)          NOT NULL DEFAULT 0 COMMENT '父执行器id',
+    `task_status`    tinyint             NOT NULL DEFAULT 0 COMMENT '执行的状态 0、失败 1、成功',
+    `retry_count`    int(11)             NOT NULL DEFAULT 0 COMMENT '重试次数',
+    `mr_stage`       tinyint                      DEFAULT NULL COMMENT '动态分片所处阶段 1:map 2:reduce 3:mergeReduce',
+    `leaf`           tinyint             NOT NULL DEFAULT '1' COMMENT '叶子节点',
+    `task_name`      varchar(255)        NOT NULL DEFAULT '' COMMENT '任务名称',
+    `client_info`    varchar(128)                 DEFAULT NULL COMMENT '客户端地址 clientId#ip:port',
+    `wf_context`     text                         DEFAULT NULL COMMENT '工作流全局上下文',
+    `result_message` text                NOT NULL COMMENT '执行结果',
+    `args_str`       text                         DEFAULT NULL COMMENT '执行方法参数',
+    `args_type`      tinyint             NOT NULL DEFAULT 1 COMMENT '参数类型 ',
+    `ext_attrs`      varchar(256)        NULL     DEFAULT '' COMMENT '扩展字段',
+    `create_dt`      datetime            NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `update_dt`      datetime            NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间',
+    PRIMARY KEY (`id`),
+    KEY `idx_task_batch_id_task_status` (`task_batch_id`, `task_status`),
+    KEY `idx_create_dt` (`create_dt`),
+    KEY `idx_namespace_id_group_name` (`namespace_id`, `group_name`)
+) ENGINE = InnoDB
+  AUTO_INCREMENT = 0
+  DEFAULT CHARSET = utf8mb4 COMMENT ='任务实例';
+
+CREATE TABLE `sj_job_task_batch`
+(
+    `id`                      bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键',
+    `namespace_id`            varchar(64)         NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' COMMENT '命名空间id',
+    `group_name`              varchar(64)         NOT NULL COMMENT '组名称',
+    `job_id`                  bigint(20)          NOT NULL COMMENT '任务id',
+    `workflow_node_id`        bigint(20)          NOT NULL DEFAULT 0 COMMENT '工作流节点id',
+    `parent_workflow_node_id` bigint(20)          NOT NULL DEFAULT 0 COMMENT '工作流任务父批次id',
+    `workflow_task_batch_id`  bigint(20)          NOT NULL DEFAULT 0 COMMENT '工作流任务批次id',
+    `task_batch_status`       tinyint(4)          NOT NULL DEFAULT 0 COMMENT '任务批次状态 0、失败 1、成功',
+    `operation_reason`        tinyint(4)          NOT NULL DEFAULT 0 COMMENT '操作原因',
+    `execution_at`            bigint(13)          NOT NULL DEFAULT 0 COMMENT '任务执行时间',
+    `system_task_type`        tinyint(4)          NOT NULL DEFAULT 3 COMMENT '任务类型 3、JOB任务 4、WORKFLOW任务',
+    `parent_id`               varchar(64)         NOT NULL DEFAULT '' COMMENT '父节点',
+    `ext_attrs`               varchar(256)        NULL     DEFAULT '' COMMENT '扩展字段',
+    `deleted`                 tinyint(4)          NOT NULL DEFAULT 0 COMMENT '逻辑删除 1、删除',
+    `create_dt`               datetime            NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `update_dt`               datetime            NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间',
+    PRIMARY KEY (`id`),
+    KEY `idx_job_id_task_batch_status` (`job_id`, `task_batch_status`),
+    KEY `idx_create_dt` (`create_dt`),
+    KEY `idx_namespace_id_group_name` (`namespace_id`, `group_name`),
+    KEY `idx_workflow_task_batch_id_workflow_node_id` (`workflow_task_batch_id`, `workflow_node_id`)
+) ENGINE = InnoDB
+  AUTO_INCREMENT = 0
+  DEFAULT CHARSET = utf8mb4 COMMENT ='任务批次';
+
+CREATE TABLE `sj_job_summary`
+(
+    `id`               bigint unsigned NOT NULL AUTO_INCREMENT COMMENT '主键',
+    `namespace_id`     VARCHAR(64)     NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' COMMENT '命名空间id',
+    `group_name`       VARCHAR(64)     NOT NULL DEFAULT '' COMMENT '组名称',
+    `business_id`      bigint          NOT NULL COMMENT '业务id (job_id或workflow_id)',
+    `system_task_type` tinyint(4)      NOT NULL DEFAULT 3 COMMENT '任务类型 3、JOB任务 4、WORKFLOW任务',
+    `trigger_at`       datetime        NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '统计时间',
+    `success_num`      int             NOT NULL DEFAULT 0 COMMENT '执行成功-日志数量',
+    `fail_num`         int             NOT NULL DEFAULT 0 COMMENT '执行失败-日志数量',
+    `fail_reason`      varchar(512)    NOT NULL DEFAULT '' COMMENT '失败原因',
+    `stop_num`         int             NOT NULL DEFAULT 0 COMMENT '执行失败-日志数量',
+    `stop_reason`      varchar(512)    NOT NULL DEFAULT '' COMMENT '失败原因',
+    `cancel_num`       int             NOT NULL DEFAULT 0 COMMENT '执行失败-日志数量',
+    `cancel_reason`    varchar(512)    NOT NULL DEFAULT '' COMMENT '失败原因',
+    `create_dt`        datetime        NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `update_dt`        datetime        NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间',
+    PRIMARY KEY (`id`),
+    KEY `idx_namespace_id_group_name_business_id` (`namespace_id`, `group_name`, business_id),
+    UNIQUE KEY `uk_trigger_at_system_task_type_business_id` (`trigger_at`, `system_task_type`, `business_id`) USING BTREE
+) ENGINE = InnoDB
+  AUTO_INCREMENT = 1
+  DEFAULT CHARSET = utf8mb4 COMMENT ='DashBoard_Job';
+
+CREATE TABLE `sj_retry_summary`
+(
+    `id`            bigint unsigned NOT NULL AUTO_INCREMENT COMMENT '主键',
+    `namespace_id`  VARCHAR(64)     NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' COMMENT '命名空间id',
+    `group_name`    VARCHAR(64)     NOT NULL DEFAULT '' COMMENT '组名称',
+    `scene_name`    VARCHAR(50)     NOT NULL DEFAULT '' COMMENT '场景名称',
+    `trigger_at`    datetime        NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '统计时间',
+    `running_num`   int             NOT NULL DEFAULT 0 COMMENT '重试中-日志数量',
+    `finish_num`    int             NOT NULL DEFAULT 0 COMMENT '重试完成-日志数量',
+    `max_count_num` int             NOT NULL DEFAULT 0 COMMENT '重试到达最大次数-日志数量',
+    `suspend_num`   int             NOT NULL DEFAULT 0 COMMENT '暂停重试-日志数量',
+    `create_dt`     datetime        NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `update_dt`     datetime        NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间',
+    PRIMARY KEY (`id`),
+    KEY `idx_trigger_at` (`trigger_at`),
+    UNIQUE KEY `uk_scene_name_trigger_at` (`namespace_id`, `group_name`, `scene_name`, `trigger_at`) USING BTREE
+) ENGINE = InnoDB
+  AUTO_INCREMENT = 1
+  DEFAULT CHARSET = utf8mb4 COMMENT ='DashBoard_Retry';
+
+CREATE TABLE `sj_workflow`
+(
+    `id`               bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键',
+    `workflow_name`    varchar(64)         NOT NULL COMMENT '工作流名称',
+    `namespace_id`     varchar(64)         NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' COMMENT '命名空间id',
+    `group_name`       varchar(64)         NOT NULL COMMENT '组名称',
+    `workflow_status`  tinyint(4)          NOT NULL DEFAULT 1 COMMENT '工作流状态 0、关闭、1、开启',
+    `trigger_type`     tinyint(4)          NOT NULL COMMENT '触发类型 1.CRON 表达式 2. 固定时间',
+    `trigger_interval` varchar(255)        NOT NULL COMMENT '间隔时长',
+    `next_trigger_at`  bigint              NOT NULL COMMENT '下次触发时间',
+    `block_strategy`   tinyint(4)          NOT NULL DEFAULT 1 COMMENT '阻塞策略 1、丢弃 2、覆盖 3、并行',
+    `executor_timeout` int(11)             NOT NULL DEFAULT 0 COMMENT '任务执行超时时间，单位秒',
+    `description`      varchar(256)        NOT NULL DEFAULT '' COMMENT '描述',
+    `flow_info`        text                         DEFAULT NULL COMMENT '流程信息',
+    `wf_context`       text                         DEFAULT NULL COMMENT '上下文',
+    `notify_ids`       varchar(128)        NOT NULL DEFAULT '' COMMENT '通知告警场景配置id列表',
+    `bucket_index`     int(11)             NOT NULL DEFAULT 0 COMMENT 'bucket',
+    `version`          int(11)             NOT NULL COMMENT '版本号',
+    `ext_attrs`        varchar(256)        NULL     DEFAULT '' COMMENT '扩展字段',
+    `deleted`          tinyint(4)          NOT NULL DEFAULT 0 COMMENT '逻辑删除 1、删除',
+    `create_dt`        datetime            NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `update_dt`        datetime            NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间',
+    PRIMARY KEY (`id`),
+    KEY `idx_create_dt` (`create_dt`),
+    KEY `idx_namespace_id_group_name` (`namespace_id`, `group_name`)
+) ENGINE = InnoDB
+  AUTO_INCREMENT = 0
+  DEFAULT CHARSET = utf8mb4 COMMENT ='工作流';
+
+CREATE TABLE `sj_workflow_node`
+(
+    `id`                   bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键',
+    `namespace_id`         varchar(64)         NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' COMMENT '命名空间id',
+    `node_name`            varchar(64)         NOT NULL COMMENT '节点名称',
+    `group_name`           varchar(64)         NOT NULL COMMENT '组名称',
+    `job_id`               bigint(20)          NOT NULL COMMENT '任务信息id',
+    `workflow_id`          bigint(20)          NOT NULL COMMENT '工作流ID',
+    `node_type`            tinyint(4)          NOT NULL DEFAULT 1 COMMENT '1、任务节点 2、条件节点',
+    `expression_type`      tinyint(4)          NOT NULL DEFAULT 0 COMMENT '1、SpEl、2、Aviator 3、QL',
+    `fail_strategy`        tinyint(4)          NOT NULL DEFAULT 1 COMMENT '失败策略 1、跳过 2、阻塞',
+    `workflow_node_status` tinyint(4)          NOT NULL DEFAULT 1 COMMENT '工作流节点状态 0、关闭、1、开启',
+    `priority_level`       int(11)             NOT NULL DEFAULT 1 COMMENT '优先级',
+    `node_info`            text                         DEFAULT NULL COMMENT '节点信息 ',
+    `version`              int(11)             NOT NULL COMMENT '版本号',
+    `ext_attrs`            varchar(256)        NULL     DEFAULT '' COMMENT '扩展字段',
+    `deleted`              tinyint(4)          NOT NULL DEFAULT 0 COMMENT '逻辑删除 1、删除',
+    `create_dt`            datetime            NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `update_dt`            datetime            NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间',
+    PRIMARY KEY (`id`),
+    KEY `idx_create_dt` (`create_dt`),
+    KEY `idx_namespace_id_group_name` (`namespace_id`, `group_name`)
+) ENGINE = InnoDB
+  AUTO_INCREMENT = 0
+  DEFAULT CHARSET = utf8mb4 COMMENT ='工作流节点';
+
+CREATE TABLE `sj_workflow_task_batch`
+(
+    `id`                bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键',
+    `namespace_id`      varchar(64)         NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a' COMMENT '命名空间id',
+    `group_name`        varchar(64)         NOT NULL COMMENT '组名称',
+    `workflow_id`       bigint(20)          NOT NULL COMMENT '工作流任务id',
+    `task_batch_status` tinyint(4)          NOT NULL DEFAULT 0 COMMENT '任务批次状态 0、失败 1、成功',
+    `operation_reason`  tinyint(4)          NOT NULL DEFAULT 0 COMMENT '操作原因',
+    `flow_info`         text                         DEFAULT NULL COMMENT '流程信息',
+    `wf_context`        text                         DEFAULT NULL COMMENT '全局上下文',
+    `execution_at`      bigint(13)          NOT NULL DEFAULT 0 COMMENT '任务执行时间',
+    `ext_attrs`         varchar(256)        NULL     DEFAULT '' COMMENT '扩展字段',
+    `version`           int(11)              NOT NULL DEFAULT 1 COMMENT '版本号',
+    `deleted`           tinyint(4)          NOT NULL DEFAULT 0 COMMENT '逻辑删除 1、删除',
+    `create_dt`         datetime            NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `update_dt`         datetime            NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间',
+    PRIMARY KEY (`id`),
+    KEY `idx_job_id_task_batch_status` (`workflow_id`, `task_batch_status`),
+    KEY `idx_create_dt` (`create_dt`),
+    KEY `idx_namespace_id_group_name` (`namespace_id`, `group_name`)
+) ENGINE = InnoDB
+  AUTO_INCREMENT = 0
+  DEFAULT CHARSET = utf8mb4 COMMENT ='工作流批次';
diff --git a/script/sql/ry_knowledge.sql b/script/sql/ry_knowledge.sql
new file mode 100644
index 0000000..57bb3f7
--- /dev/null
+++ b/script/sql/ry_knowledge.sql
@@ -0,0 +1,386 @@
+-- ----------------------------
+-- Table structure for knowledge_attach
+-- ----------------------------
+DROP TABLE IF EXISTS `knowledge_attach`;
+CREATE TABLE `knowledge_attach`
+(
+    `id`              bigint      NOT NULL AUTO_INCREMENT,
+    `knowledge_id`    varchar(50) NOT NULL COMMENT '知识库ID',
+    `doc_id`          varchar(50) NOT NULL COMMENT '文档ID',
+    `doc_name`        varchar(500)         DEFAULT NULL COMMENT '文档名称',
+    `doc_type`        varchar(50) NOT NULL COMMENT '文档类型',
+    `oss_id`          int                  DEFAULT NULL COMMENT '对象存储ID',
+    `pic_status`      tinyint(1)  NOT NULL DEFAULT 10 COMMENT '拆解图片状态:10未开始,20进行中,30已完成',
+    `pic_anys_status` tinyint(1)  NOT NULL DEFAULT 10 COMMENT '分析图片状态:10未开始,20进行中,30已完成',
+    `vector_status`   tinyint(1)  NOT NULL DEFAULT 10 COMMENT '写入向量数据库状态:10未开始,20进行中,30已完成',
+    `content`         longtext COMMENT '文档内容',
+    `create_by`       bigint               DEFAULT NULL COMMENT '创建人',
+    `create_time`     datetime             DEFAULT NULL COMMENT '创建时间',
+    `update_by`       bigint               DEFAULT NULL COMMENT '更新者',
+    `update_time`     datetime             DEFAULT NULL COMMENT '更新时间',
+    `remark`          varchar(500)         DEFAULT NULL COMMENT '备注',
+    PRIMARY KEY (`id`) USING BTREE,
+    UNIQUE KEY `idx_kname` (`knowledge_id`, `doc_name`) USING BTREE,
+    KEY `idx_knowledge_id` (`knowledge_id`) USING BTREE,
+    KEY `idx_doc_id` (`doc_id`) USING BTREE,
+    KEY `idx_create_time` (`create_time`) USING BTREE
+) ENGINE = InnoDB
+  DEFAULT CHARSET = utf8mb4
+  COLLATE = utf8mb4_general_ci COMMENT ='知识库附件';
+
+-- ----------------------------
+-- Table structure for knowledge_fragment
+-- ----------------------------
+DROP TABLE IF EXISTS `knowledge_fragment`;
+CREATE TABLE `knowledge_fragment`
+(
+    `id`           bigint      NOT NULL AUTO_INCREMENT,
+    `knowledge_id` varchar(50) NOT NULL COMMENT '知识库ID',
+    `doc_id`       varchar(50)  DEFAULT NULL COMMENT '文档ID',
+    `fid`          varchar(50) NOT NULL COMMENT '知识片段ID',
+    `idx`          int         NOT NULL COMMENT '片段索引下标',
+    `content`      text        NOT NULL COMMENT '文档内容',
+    `create_by`    bigint       DEFAULT NULL COMMENT '创建人',
+    `create_time`  datetime     DEFAULT NULL COMMENT '创建时间',
+    `update_by`    bigint       DEFAULT NULL COMMENT '更新者',
+    `update_time`  datetime     DEFAULT NULL COMMENT '更新时间',
+    `remark`       varchar(500) DEFAULT NULL COMMENT '备注',
+    PRIMARY KEY (`id`) USING BTREE,
+    KEY `idx_knowledge_id` (`knowledge_id`) USING BTREE,
+    KEY `idx_doc_id` (`doc_id`) USING BTREE,
+    KEY `idx_fid` (`fid`) USING BTREE,
+    KEY `idx_create_time` (`create_time`) USING BTREE
+) ENGINE = InnoDB
+  DEFAULT CHARSET = utf8mb4
+  COLLATE = utf8mb4_general_ci COMMENT ='知识库知识片段';
+
+-- ----------------------------
+-- Table structure for knowledge_info
+-- ----------------------------
+DROP TABLE IF EXISTS `knowledge_info`;
+CREATE TABLE `knowledge_info`
+(
+    `id`                   bigint      NOT NULL AUTO_INCREMENT,
+    `user_id`              bigint      NOT NULL DEFAULT 0 COMMENT '用户ID',
+    `knowledge_id`         varchar(50) NOT NULL COMMENT '知识库ID',
+    `knowledge_name`       varchar(50) NOT NULL COMMENT '知识库名称',
+    `share`                tinyint(1)  NOT NULL DEFAULT 0 COMMENT '是否公开知识库:0否,1是',
+    `description`          varchar(1000)        DEFAULT NULL COMMENT '描述',
+    `knowledge_separator`  varchar(255)         DEFAULT NULL COMMENT '知识分隔符',
+    `question_separator`   varchar(255)         DEFAULT NULL COMMENT '提问分隔符',
+    `overlap_char`         int                  DEFAULT NULL COMMENT '重叠字符数',
+    `retrieve_limit`       int                  DEFAULT NULL COMMENT '知识库中检索的条数',
+    `text_block_size`      int                  DEFAULT NULL COMMENT '文本块大小',
+    `vector_model_name`    varchar(50)          DEFAULT NULL COMMENT '向量库',
+    `embedding_model_name` varchar(50)          DEFAULT NULL COMMENT '向量模型',
+    `system_prompt`        varchar(255)         DEFAULT NULL COMMENT '系统提示词',
+    `create_by`            bigint               DEFAULT NULL COMMENT '创建人',
+    `create_time`          datetime    NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `update_by`            bigint               DEFAULT NULL COMMENT '更新者',
+    `update_time`          datetime    NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+    `remark`               varchar(500)         DEFAULT NULL COMMENT '备注',
+    PRIMARY KEY (`id`) USING BTREE,
+    UNIQUE KEY `idx_knowledge_id` (`knowledge_id`) USING BTREE,
+    KEY `idx_user_id` (`user_id`) USING BTREE
+) ENGINE = InnoDB
+  DEFAULT CHARSET = utf8mb4
+  COLLATE = utf8mb4_general_ci COMMENT ='知识库';
+
+-- ----------------------------
+-- Table structure for knowledge_prompt_template
+-- ----------------------------
+DROP TABLE IF EXISTS `knowledge_prompt_template`;
+CREATE TABLE `knowledge_prompt_template`
+(
+    `id`               bigint       NOT NULL AUTO_INCREMENT COMMENT '主键',
+    `template_name`    varchar(128) NOT NULL DEFAULT '' COMMENT '提示词模板名称',
+    `template_content` text COMMENT '提示词模板内容',
+    `category`         varchar(16)  NOT NULL DEFAULT 'knowledge' COMMENT '提示词分类:knowledge知识库类型,chat对话类型,draw绘画类型',
+    `create_by`        bigint                DEFAULT NULL COMMENT '创建者',
+    `create_time`      datetime     NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `update_by`        bigint                DEFAULT NULL COMMENT '更新者',
+    `update_time`      datetime     NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+    `remark`           varchar(256)          DEFAULT NULL COMMENT '备注',
+    `del_flag`         tinyint(1)   NOT NULL DEFAULT 0 COMMENT '删除标志:0存在,1删除',
+    PRIMARY KEY (`id`),
+    KEY `idx_category_del` (`category`, `del_flag`),
+    KEY `idx_create_time` (`create_time`)
+) ENGINE = InnoDB
+  DEFAULT CHARSET = utf8mb4
+  COLLATE = utf8mb4_general_ci COMMENT ='知识库提示词模板表';
+
+-- ----------------------------
+-- Table structure for knowledge_schema_group
+-- ----------------------------
+DROP TABLE IF EXISTS `knowledge_schema_group`;
+CREATE TABLE `knowledge_schema_group`
+(
+    `id`          bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
+    `name`        varchar(128) DEFAULT NULL COMMENT '分组名称',
+    `code`        varchar(128) DEFAULT NULL COMMENT '分组编码',
+    `icon`        varchar(100) DEFAULT NULL COMMENT '图标',
+    `remark`      varchar(500) DEFAULT NULL COMMENT '备注',
+    `del_flag`    tinyint(1)   DEFAULT 0 COMMENT '删除标志:0存在,1删除',
+    `create_by`   bigint       DEFAULT NULL COMMENT '创建者',
+    `create_time` datetime     DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `update_by`   bigint       DEFAULT NULL COMMENT '更新者',
+    `update_time` datetime     DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+    PRIMARY KEY (`id`),
+    KEY `idx_knowledge_schema_group_code` (`code`),
+    KEY `idx_knowledge_schema_group_del_flag` (`del_flag`)
+) ENGINE = InnoDB
+  DEFAULT CHARSET = utf8mb4
+  COLLATE = utf8mb4_general_ci COMMENT ='知识库数据模型分组表';
+
+-- ----------------------------
+-- Table structure for knowledge_schema
+-- ----------------------------
+DROP TABLE IF EXISTS `knowledge_schema`;
+CREATE TABLE `knowledge_schema`
+(
+    `id`              bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
+    `schema_group_id` bigint       DEFAULT NULL COMMENT '分组ID',
+    `name`            varchar(128) DEFAULT NULL COMMENT '模型名称',
+    `code`            varchar(128) DEFAULT NULL COMMENT '模型编码',
+    `table_name`      varchar(128) DEFAULT NULL COMMENT '表名',
+    `remark`          varchar(500) DEFAULT NULL COMMENT '备注',
+    `del_flag`        tinyint(1)   DEFAULT 0 COMMENT '删除标志:0存在,1删除',
+    `create_by`       bigint       DEFAULT NULL COMMENT '创建者',
+    `create_time`     datetime     DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `update_by`       bigint       DEFAULT NULL COMMENT '更新者',
+    `update_time`     datetime     DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+    PRIMARY KEY (`id`),
+    KEY `idx_knowledge_schema_group_id` (`schema_group_id`),
+    KEY `idx_knowledge_schema_code` (`code`),
+    KEY `idx_knowledge_schema_table_name` (`table_name`),
+    KEY `idx_knowledge_schema_del_flag` (`del_flag`)
+) ENGINE = InnoDB
+  DEFAULT CHARSET = utf8mb4
+  COLLATE = utf8mb4_general_ci COMMENT ='知识库数据模型表';
+
+-- ----------------------------
+-- Table structure for knowledge_schema_field
+-- ----------------------------
+DROP TABLE IF EXISTS `knowledge_schema_field`;
+CREATE TABLE `knowledge_schema_field`
+(
+    `id`            bigint NOT NULL AUTO_INCREMENT COMMENT '主键',
+    `schema_id`     bigint       DEFAULT NULL COMMENT '模型ID',
+    `schema_name`   varchar(128) DEFAULT NULL COMMENT '模型名称',
+    `name`          varchar(128) DEFAULT NULL COMMENT '字段名称',
+    `code`          varchar(128) DEFAULT NULL COMMENT '字段编码',
+    `type`          varchar(50)  DEFAULT NULL COMMENT '字段类型',
+    `comment`       varchar(500) DEFAULT NULL COMMENT '字段注释',
+    `is_pk`         tinyint(1)   DEFAULT 0 COMMENT '是否主键:0否,1是',
+    `is_required`   tinyint(1)   DEFAULT 0 COMMENT '是否必填:0否,1是',
+    `is_unique`     tinyint(1)   DEFAULT 0 COMMENT '是否唯一:0否,1是',
+    `default_value` varchar(200) DEFAULT NULL COMMENT '默认值',
+    `length`        int          DEFAULT NULL COMMENT '字段长度',
+    `scale`         int          DEFAULT NULL COMMENT '小数位数',
+    `is_list`       tinyint(1)   DEFAULT 0 COMMENT '是否列表显示:0否,1是',
+    `is_query`      tinyint(1)   DEFAULT 0 COMMENT '是否查询字段:0否,1是',
+    `is_insert`     tinyint(1)   DEFAULT 0 COMMENT '是否插入字段:0否,1是',
+    `is_edit`       tinyint(1)   DEFAULT 0 COMMENT '是否编辑字段:0否,1是',
+    `query_type`    varchar(200) DEFAULT NULL COMMENT '查询方式(EQ,NE,GT,LT,LIKE,BETWEEN)',
+    `html_type`     varchar(200) DEFAULT 'input' COMMENT '显示类型(input,textarea,select,checkbox,radio,datetime,image,upload,editor)',
+    `dict_type`     varchar(200) DEFAULT '' COMMENT '字典类型',
+    `sort`          int          DEFAULT NULL COMMENT '排序',
+    `del_flag`      tinyint(1)   DEFAULT 0 COMMENT '删除标志:0存在,1删除',
+    `create_by`     bigint       DEFAULT NULL COMMENT '创建者',
+    `create_time`   datetime     DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `update_by`     bigint       DEFAULT NULL COMMENT '更新者',
+    `update_time`   datetime     DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+    `remark`        varchar(500) DEFAULT NULL COMMENT '备注',
+    PRIMARY KEY (`id`),
+    KEY `idx_knowledge_schema_field_schema_id` (`schema_id`),
+    KEY `idx_knowledge_schema_field_code` (`code`),
+    KEY `idx_knowledge_schema_field_del_flag` (`del_flag`),
+    KEY `idx_knowledge_schema_field_sort` (`sort`)
+) ENGINE = InnoDB
+  DEFAULT CHARSET = utf8mb4
+  COLLATE = utf8mb4_general_ci COMMENT ='知识库数据模型字段表';
+
+-- ----------------------------
+-- Table structure for knowledge_role
+-- ----------------------------
+DROP TABLE IF EXISTS `knowledge_role`;
+CREATE TABLE `knowledge_role`
+(
+    `id`          bigint NOT NULL AUTO_INCREMENT COMMENT '知识库角色id',
+    `name`        varchar(100) DEFAULT NULL COMMENT '知识库角色名称',
+    `del_flag`    tinyint(1)   DEFAULT 0 COMMENT '删除标志:0存在,1删除',
+    `create_by`   bigint       DEFAULT NULL COMMENT '创建者',
+    `create_time` datetime     DEFAULT NULL COMMENT '创建时间',
+    `update_by`   bigint       DEFAULT NULL COMMENT '更新者',
+    `update_time` datetime     DEFAULT NULL COMMENT '更新时间',
+    `remark`      varchar(500) DEFAULT NULL COMMENT '备注',
+    `group_id`    bigint       DEFAULT NULL COMMENT '知识库角色组id',
+    PRIMARY KEY (`id`) USING BTREE,
+    KEY `idx_group_id` (`group_id`) USING BTREE,
+    KEY `idx_del_flag` (`del_flag`) USING BTREE
+) ENGINE = InnoDB
+  DEFAULT CHARSET = utf8mb4
+  COLLATE = utf8mb4_general_ci COMMENT ='知识库角色表';
+
+-- ----------------------------
+-- Table structure for knowledge_role_group
+-- ----------------------------
+DROP TABLE IF EXISTS `knowledge_role_group`;
+CREATE TABLE `knowledge_role_group`
+(
+    `id`          bigint NOT NULL AUTO_INCREMENT COMMENT '知识库角色组id',
+    `name`        varchar(100) DEFAULT NULL COMMENT '知识库角色组name',
+    `del_flag`    tinyint(1)   DEFAULT 0 COMMENT '删除标志:0存在,1删除',
+    `create_by`   bigint       DEFAULT NULL COMMENT '创建者',
+    `create_time` datetime     DEFAULT NULL COMMENT '创建时间',
+    `update_by`   bigint       DEFAULT NULL COMMENT '更新者',
+    `update_time` datetime     DEFAULT NULL COMMENT '更新时间',
+    `remark`      varchar(500) DEFAULT NULL COMMENT '备注',
+    PRIMARY KEY (`id`) USING BTREE,
+    KEY `idx_del_flag` (`del_flag`) USING BTREE
+) ENGINE = InnoDB
+  DEFAULT CHARSET = utf8mb4
+  COLLATE = utf8mb4_general_ci COMMENT ='知识库角色组表';
+
+-- ----------------------------
+-- Table structure for knowledge_role_relation
+-- ----------------------------
+DROP TABLE IF EXISTS `knowledge_role_relation`;
+CREATE TABLE `knowledge_role_relation`
+(
+    `id`                bigint NOT NULL AUTO_INCREMENT COMMENT 'id',
+    `del_flag`          tinyint(1)   DEFAULT 0 COMMENT '删除标志:0存在,1删除',
+    `create_by`         bigint       DEFAULT NULL COMMENT '创建者',
+    `create_time`       datetime     DEFAULT NULL COMMENT '创建时间',
+    `update_by`         bigint       DEFAULT NULL COMMENT '更新者',
+    `update_time`       datetime     DEFAULT NULL COMMENT '更新时间',
+    `remark`            varchar(500) DEFAULT NULL COMMENT '备注',
+    `knowledge_role_id` bigint       DEFAULT NULL COMMENT '知识库角色id',
+    `knowledge_id`      bigint       DEFAULT NULL COMMENT '知识库id',
+    PRIMARY KEY (`id`) USING BTREE,
+    KEY `idx_role_id` (`knowledge_role_id`) USING BTREE,
+    KEY `idx_knowledge_id` (`knowledge_id`) USING BTREE,
+    KEY `idx_del_flag` (`del_flag`) USING BTREE,
+    UNIQUE KEY `uk_role_knowledge` (`knowledge_role_id`, `knowledge_id`) USING BTREE
+) ENGINE = InnoDB
+  DEFAULT CHARSET = utf8mb4
+  COLLATE = utf8mb4_general_ci COMMENT ='知识库角色与知识库关联表';
+
+-- ----------------------------
+-- Table structure for knowledge_vector
+-- ----------------------------
+DROP TABLE IF EXISTS `knowledge_vector`;
+CREATE TABLE `knowledge_vector`
+(
+    `id`           bigint       NOT NULL AUTO_INCREMENT COMMENT '主键ID',
+    `knowledge_id` varchar(50)  NOT NULL COMMENT '知识库ID',
+    `doc_id`       varchar(50)  NOT NULL COMMENT '文档ID',
+    `fragment_id`  varchar(50)  NOT NULL COMMENT '知识片段ID',
+    `vector_id`    varchar(100) NOT NULL COMMENT '向量唯一标识',
+    `vector_data`  blob         NOT NULL COMMENT '向量数据',
+    `dimension`    int          NOT NULL COMMENT '向量维度',
+    `model_name`   varchar(50)  NOT NULL COMMENT '向量模型名称',
+    `status`       tinyint(1)   NOT NULL DEFAULT 0 COMMENT '状态:0启用,1禁用',
+    `create_by`    bigint                DEFAULT NULL COMMENT '创建人',
+    `create_time`  datetime              DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `update_by`    bigint                DEFAULT NULL COMMENT '更新者',
+    `update_time`  datetime              DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+    `remark`       varchar(500)          DEFAULT NULL COMMENT '备注',
+    PRIMARY KEY (`id`) USING BTREE,
+    UNIQUE KEY `idx_vector_id` (`vector_id`) USING BTREE,
+    UNIQUE KEY `idx_fragment_unique` (`knowledge_id`, `doc_id`, `fragment_id`) USING BTREE,
+    KEY `idx_knowledge_id` (`knowledge_id`) USING BTREE,
+    KEY `idx_doc_id` (`doc_id`) USING BTREE,
+    KEY `idx_fragment_id` (`fragment_id`) USING BTREE,
+    KEY `idx_model_name` (`model_name`) USING BTREE,
+    KEY `idx_status` (`status`) USING BTREE,
+    KEY `idx_create_time` (`create_time`) USING BTREE
+) ENGINE = InnoDB
+  DEFAULT CHARSET = utf8mb4
+  COLLATE = utf8mb4_general_ci COMMENT ='知识片段向量表';
+
+-- ----------------------------
+-- Table structure for knowledge_job
+-- ----------------------------
+DROP TABLE IF EXISTS `knowledge_job`;
+CREATE TABLE `knowledge_job`
+(
+    `id`              bigint      NOT NULL AUTO_INCREMENT COMMENT '任务ID',
+    `job_id`          varchar(50) NOT NULL COMMENT '任务唯一标识',
+    `job_type`        varchar(50) NOT NULL COMMENT '任务类型(upload,process,delete,export,embedding,sync)',
+    `job_sub_type`    varchar(50)          DEFAULT NULL COMMENT '任务子类型',
+    `knowledge_id`    varchar(50)          DEFAULT NULL COMMENT '知识库ID',
+    `doc_id`          varchar(50)          DEFAULT NULL COMMENT '文档ID',
+    `user_id`         bigint      NOT NULL COMMENT '用户ID',
+    `status`          tinyint(1)  NOT NULL DEFAULT 0 COMMENT '任务状态:0等待,1进行中,2成功,3失败,4暂停',
+    `progress`        int         NOT NULL DEFAULT 0 COMMENT '进度(0-100)',
+    `total_items`     int                  DEFAULT 0 COMMENT '总项目数',
+    `processed_items` int                  DEFAULT 0 COMMENT '已处理项目数',
+    `success_items`   int                  DEFAULT 0 COMMENT '成功项目数',
+    `failed_items`    int                  DEFAULT 0 COMMENT '失败项目数',
+    `priority`        tinyint(1)  NOT NULL DEFAULT 1 COMMENT '优先级:1低,2中,3高',
+    `retry_count`     int         NOT NULL DEFAULT 0 COMMENT '重试次数',
+    `max_retry`       int         NOT NULL DEFAULT 3 COMMENT '最大重试次数',
+    `start_time`      datetime             DEFAULT NULL COMMENT '开始时间',
+    `end_time`        datetime             DEFAULT NULL COMMENT '结束时间',
+    `timeout`         int                  DEFAULT 3600 COMMENT '超时时间(秒)',
+    `error_message`   text COMMENT '错误信息',
+    `error_stack`     text COMMENT '错误堆栈',
+    `result_data`     text COMMENT '结果数据(JSON格式)',
+    `notify_url`      varchar(500)         DEFAULT NULL COMMENT '通知URL',
+    `notify_status`   tinyint(1)  NOT NULL DEFAULT 0 COMMENT '通知状态:0未通知,1已通知',
+    `create_by`       bigint               DEFAULT NULL COMMENT '创建人',
+    `create_time`     datetime             DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `update_by`       bigint               DEFAULT NULL COMMENT '更新者',
+    `update_time`     datetime             DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+    `remark`          varchar(500)         DEFAULT NULL COMMENT '备注',
+    PRIMARY KEY (`id`) USING BTREE,
+    UNIQUE KEY `idx_job_id` (`job_id`) USING BTREE,
+    KEY `idx_job_type` (`job_type`) USING BTREE,
+    KEY `idx_knowledge_id` (`knowledge_id`) USING BTREE,
+    KEY `idx_doc_id` (`doc_id`) USING BTREE,
+    KEY `idx_user_id` (`user_id`) USING BTREE,
+    KEY `idx_status` (`status`) USING BTREE,
+    KEY `idx_priority` (`priority`) USING BTREE,
+    KEY `idx_create_time` (`create_time`) USING BTREE,
+    KEY `idx_status_create_time` (`status`, `create_time`) USING BTREE
+) ENGINE = InnoDB
+  DEFAULT CHARSET = utf8mb4
+  COLLATE = utf8mb4_general_ci COMMENT ='知识库任务进度表';
+
+-- ----------------------------
+-- Table structure for knowledge_hit_log
+-- ----------------------------
+DROP TABLE IF EXISTS `knowledge_hit_log`;
+CREATE TABLE `knowledge_hit_log`
+(
+    `id`               bigint         NOT NULL AUTO_INCREMENT COMMENT '主键ID',
+    `session_id`       varchar(50)             DEFAULT NULL COMMENT '会话ID',
+    `knowledge_id`     varchar(50)    NOT NULL COMMENT '知识库ID',
+    `doc_id`           varchar(50)             DEFAULT NULL COMMENT '文档ID',
+    `fragment_id`      varchar(50)    NOT NULL COMMENT '知识片段ID',
+    `query_text`       text COMMENT '查询文本',
+    `query_vector`     blob COMMENT '查询向量',
+    `similarity_score` decimal(10, 6) NOT NULL COMMENT '相似度分数',
+    `ranking`          int            NOT NULL COMMENT '排名位置',
+    `model_name`       varchar(50)    NOT NULL COMMENT '向量模型名称',
+    `search_params`    text COMMENT '搜索参数(JSON格式)',
+    `response_time`    int                     DEFAULT 0 COMMENT '响应时间(毫秒)',
+    `hit_count`        int            NOT NULL DEFAULT 1 COMMENT '命中次数',
+    `create_by`        bigint                  DEFAULT NULL COMMENT '创建人',
+    `create_time`      datetime                DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `update_by`        bigint                  DEFAULT NULL COMMENT '更新者',
+    `update_time`      datetime                DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+    `remark`           varchar(500)            DEFAULT NULL COMMENT '备注',
+    PRIMARY KEY (`id`) USING BTREE,
+    KEY `idx_session_id` (`session_id`) USING BTREE,
+    KEY `idx_knowledge_id` (`knowledge_id`) USING BTREE,
+    KEY `idx_doc_id` (`doc_id`) USING BTREE,
+    KEY `idx_fragment_id` (`fragment_id`) USING BTREE,
+    KEY `idx_score` (`similarity_score`) USING BTREE,
+    KEY `idx_model_name` (`model_name`) USING BTREE,
+    KEY `idx_create_time` (`create_time`) USING BTREE,
+    KEY `idx_knowledge_fragment` (`knowledge_id`, `fragment_id`) USING BTREE
+) ENGINE = InnoDB
+  DEFAULT CHARSET = utf8mb4
+  COLLATE = utf8mb4_general_ci COMMENT ='知识检索命中日志表';
diff --git a/script/sql/ry_mall.sql b/script/sql/ry_mall.sql
new file mode 100644
index 0000000..9ff30a2
--- /dev/null
+++ b/script/sql/ry_mall.sql
@@ -0,0 +1,566 @@
+-- ----------------------------
+-- 商品表
+-- ----------------------------
+DROP TABLE IF EXISTS `mall_product`;
+CREATE TABLE `mall_product` (
+  `id` bigint NOT NULL AUTO_INCREMENT COMMENT '商品ID',
+  `name` varchar(128) NOT NULL COMMENT '商品名称',
+  `category_id` bigint DEFAULT NULL COMMENT '分类ID',
+  `brand_id` bigint DEFAULT NULL COMMENT '品牌ID',
+  `cover_url` varchar(512) DEFAULT NULL COMMENT '封面图片',
+  `images` text COMMENT '商品图片(JSON数组)',
+  `description` text COMMENT '商品描述',
+  `detail` text COMMENT '商品详情',
+  `status` tinyint NOT NULL DEFAULT '0' COMMENT '状态(0上架 1下架)',
+  `sort` int DEFAULT '0' COMMENT '排序',
+  `sales_count` int DEFAULT '0' COMMENT '销量',
+  `view_count` int DEFAULT '0' COMMENT '浏览量',
+  `create_by` varchar(64) DEFAULT '' COMMENT '创建者',
+  `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  `update_by` varchar(64) DEFAULT '' COMMENT '更新者',
+  `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+  PRIMARY KEY (`id`),
+  KEY `idx_category_id` (`category_id`),
+  KEY `idx_brand_id` (`brand_id`),
+  KEY `idx_status` (`status`)
+) ENGINE=InnoDB COMMENT='商品表';
+
+-- ----------------------------
+-- SKU表
+-- ----------------------------
+DROP TABLE IF EXISTS `mall_sku`;
+CREATE TABLE `mall_sku` (
+  `id` bigint NOT NULL AUTO_INCREMENT COMMENT 'SKU ID',
+  `product_id` bigint NOT NULL COMMENT '商品ID',
+  `sku_code` varchar(64) NOT NULL COMMENT 'SKU编码',
+  `name` varchar(128) DEFAULT NULL COMMENT 'SKU名称',
+  `price` int NOT NULL COMMENT '价格(分)',
+  `original_price` int DEFAULT NULL COMMENT '原价(分)',
+  `stock` int NOT NULL DEFAULT '0' COMMENT '库存',
+  `image` varchar(512) DEFAULT NULL COMMENT 'SKU图片',
+  `specs` text COMMENT '规格属性(JSON)',
+  `status` tinyint NOT NULL DEFAULT '0' COMMENT '状态(0启用 1禁用)',
+  `create_by` varchar(64) DEFAULT '' COMMENT '创建者',
+  `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  `update_by` varchar(64) DEFAULT '' COMMENT '更新者',
+  `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `uk_sku_code` (`sku_code`),
+  KEY `idx_product_id` (`product_id`),
+  KEY `idx_status` (`status`)
+) ENGINE=InnoDB COMMENT='SKU表';
+
+-- ----------------------------
+-- 购物车表
+-- ----------------------------
+DROP TABLE IF EXISTS `mall_cart`;
+CREATE TABLE `mall_cart` (
+  `id` bigint NOT NULL AUTO_INCREMENT COMMENT '购物车ID',
+  `user_id` bigint NOT NULL COMMENT '用户ID',
+  `sku_id` bigint NOT NULL COMMENT 'SKU ID',
+  `quantity` int NOT NULL DEFAULT '1' COMMENT '数量',
+  `selected` tinyint NOT NULL DEFAULT '1' COMMENT '是否选中(0否 1是)',
+  `create_by` varchar(64) DEFAULT '' COMMENT '创建者',
+  `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  `update_by` varchar(64) DEFAULT '' COMMENT '更新者',
+  `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `uk_user_sku` (`user_id`, `sku_id`),
+  KEY `idx_user_id` (`user_id`)
+) ENGINE=InnoDB COMMENT='购物车表';
+
+-- ----------------------------
+-- 订单表
+-- ----------------------------
+DROP TABLE IF EXISTS `mall_order`;
+CREATE TABLE `mall_order` (
+  `id` bigint NOT NULL AUTO_INCREMENT COMMENT '订单ID',
+  `order_no` varchar(32) NOT NULL COMMENT '订单号',
+  `user_id` bigint NOT NULL COMMENT '用户ID',
+  `total_amount` int NOT NULL COMMENT '订单总金额(分)',
+  `pay_amount` int NOT NULL COMMENT '实付金额(分)',
+  `pay_status` tinyint NOT NULL DEFAULT '0' COMMENT '支付状态(0未支付 1已支付 2已退款)',
+  `pay_order_no` varchar(32) DEFAULT NULL COMMENT '支付单号',
+  `pay_channel_code` varchar(32) DEFAULT NULL COMMENT '支付渠道编码',
+  `pay_time` datetime DEFAULT NULL COMMENT '支付时间',
+  `order_status` tinyint NOT NULL DEFAULT '0' COMMENT '订单状态(0待付款 1待发货 2待收货 3已完成 4已取消)',
+  `delivery_status` tinyint NOT NULL DEFAULT '0' COMMENT '发货状态(0未发货 1已发货 2已收货)',
+  `receiver_name` varchar(64) NOT NULL COMMENT '收货人姓名',
+  `receiver_phone` varchar(32) NOT NULL COMMENT '收货人电话',
+  `receiver_address` varchar(512) NOT NULL COMMENT '收货地址',
+  `remark` varchar(512) DEFAULT NULL COMMENT '备注',
+  `cancel_reason` varchar(256) DEFAULT NULL COMMENT '取消原因',
+  `cancel_time` datetime DEFAULT NULL COMMENT '取消时间',
+  `delivery_time` datetime DEFAULT NULL COMMENT '发货时间',
+  `receive_time` datetime DEFAULT NULL COMMENT '收货时间',
+  `promotion_type` tinyint DEFAULT NULL COMMENT '活动类型(0普通订单 1拼团 2秒杀 3砍价)',
+  `promotion_id` bigint DEFAULT NULL COMMENT '营销活动ID',
+  `seckill_id` bigint DEFAULT NULL COMMENT '秒杀活动ID（仅秒杀订单）',
+  `group_buy_id` bigint DEFAULT NULL COMMENT '拼团活动ID（仅拼团订单）',
+  `bargain_id` bigint DEFAULT NULL COMMENT '砍价活动ID（仅砍价订单）',
+  `create_by` varchar(64) DEFAULT '' COMMENT '创建者',
+  `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  `update_by` varchar(64) DEFAULT '' COMMENT '更新者',
+  `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `uk_order_no` (`order_no`),
+  KEY `idx_user_id` (`user_id`),
+  KEY `idx_pay_order_no` (`pay_order_no`),
+  KEY `idx_order_status` (`order_status`),
+  KEY `idx_pay_status` (`pay_status`),
+  KEY `idx_promotion_type` (`promotion_type`),
+  KEY `idx_promotion_id` (`promotion_id`),
+  KEY `idx_seckill_id` (`seckill_id`)
+) ENGINE=InnoDB COMMENT='订单表';
+
+-- ----------------------------
+-- 订单明细表
+-- ----------------------------
+DROP TABLE IF EXISTS `mall_order_item`;
+CREATE TABLE `mall_order_item` (
+  `id` bigint NOT NULL AUTO_INCREMENT COMMENT '订单明细ID',
+  `order_id` bigint NOT NULL COMMENT '订单ID',
+  `order_no` varchar(32) NOT NULL COMMENT '订单号',
+  `product_id` bigint NOT NULL COMMENT '商品ID',
+  `sku_id` bigint NOT NULL COMMENT 'SKU ID',
+  `product_name` varchar(128) NOT NULL COMMENT '商品名称',
+  `sku_name` varchar(128) DEFAULT NULL COMMENT 'SKU名称',
+  `sku_image` varchar(512) DEFAULT NULL COMMENT 'SKU图片',
+  `price` int NOT NULL COMMENT '单价(分)',
+  `quantity` int NOT NULL COMMENT '数量',
+  `total_amount` int NOT NULL COMMENT '小计金额(分)',
+  `create_by` varchar(64) DEFAULT '' COMMENT '创建者',
+  `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  `update_by` varchar(64) DEFAULT '' COMMENT '更新者',
+  `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+  PRIMARY KEY (`id`),
+  KEY `idx_order_id` (`order_id`),
+  KEY `idx_order_no` (`order_no`),
+  KEY `idx_product_id` (`product_id`),
+  KEY `idx_sku_id` (`sku_id`)
+) ENGINE=InnoDB COMMENT='订单明细表';
+
+-- ----------------------------
+-- 商品分类表
+-- ----------------------------
+DROP TABLE IF EXISTS `mall_category`;
+CREATE TABLE `mall_category` (
+  `id` bigint NOT NULL AUTO_INCREMENT COMMENT '分类ID',
+  `name` varchar(64) NOT NULL COMMENT '分类名称',
+  `parent_id` bigint DEFAULT '0' COMMENT '父分类ID(0表示顶级)',
+  `level` tinyint DEFAULT '1' COMMENT '分类级别(1一级 2二级 3三级)',
+  `icon` varchar(512) DEFAULT NULL COMMENT '分类图标',
+  `sort` int DEFAULT '0' COMMENT '排序',
+  `status` tinyint NOT NULL DEFAULT '0' COMMENT '状态(0启用 1禁用)',
+  `create_by` varchar(64) DEFAULT '' COMMENT '创建者',
+  `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  `update_by` varchar(64) DEFAULT '' COMMENT '更新者',
+  `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+  PRIMARY KEY (`id`),
+  KEY `idx_parent_id` (`parent_id`),
+  KEY `idx_status` (`status`)
+) ENGINE=InnoDB COMMENT='商品分类表';
+
+-- ----------------------------
+-- 品牌表
+-- ----------------------------
+DROP TABLE IF EXISTS `mall_brand`;
+CREATE TABLE `mall_brand` (
+  `id` bigint NOT NULL AUTO_INCREMENT COMMENT '品牌ID',
+  `name` varchar(64) NOT NULL COMMENT '品牌名称',
+  `logo` varchar(512) DEFAULT NULL COMMENT '品牌Logo',
+  `description` varchar(512) DEFAULT NULL COMMENT '品牌描述',
+  `sort` int DEFAULT '0' COMMENT '排序',
+  `status` tinyint NOT NULL DEFAULT '0' COMMENT '状态(0启用 1禁用)',
+  `create_by` varchar(64) DEFAULT '' COMMENT '创建者',
+  `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  `update_by` varchar(64) DEFAULT '' COMMENT '更新者',
+  `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+  PRIMARY KEY (`id`),
+  KEY `idx_status` (`status`)
+) ENGINE=InnoDB COMMENT='品牌表';
+
+-- ----------------------------
+-- 优惠券表
+-- ----------------------------
+DROP TABLE IF EXISTS `mall_coupon`;
+CREATE TABLE `mall_coupon` (
+  `id` bigint NOT NULL AUTO_INCREMENT COMMENT '优惠券ID',
+  `name` varchar(128) NOT NULL COMMENT '优惠券名称',
+  `type` tinyint NOT NULL COMMENT '优惠券类型(0满减 1折扣 2现金)',
+  `discount_amount` int DEFAULT NULL COMMENT '优惠金额(分)',
+  `discount_rate` decimal(5,2) DEFAULT NULL COMMENT '折扣率(%)',
+  `min_amount` int NOT NULL DEFAULT '0' COMMENT '使用门槛(分)',
+  `total_count` int DEFAULT NULL COMMENT '发放总数(null表示不限)',
+  `used_count` int DEFAULT '0' COMMENT '已使用数量',
+  `per_limit` int DEFAULT '1' COMMENT '每人限领数量',
+  `valid_start_time` datetime NOT NULL COMMENT '有效开始时间',
+  `valid_end_time` datetime NOT NULL COMMENT '有效结束时间',
+  `status` tinyint NOT NULL DEFAULT '0' COMMENT '状态(0启用 1禁用)',
+  `remark` varchar(512) DEFAULT NULL COMMENT '备注',
+  `create_by` varchar(64) DEFAULT '' COMMENT '创建者',
+  `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  `update_by` varchar(64) DEFAULT '' COMMENT '更新者',
+  `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+  PRIMARY KEY (`id`),
+  KEY `idx_status` (`status`),
+  KEY `idx_valid_time` (`valid_start_time`, `valid_end_time`)
+) ENGINE=InnoDB COMMENT='优惠券表';
+
+-- ----------------------------
+-- 用户优惠券表
+-- ----------------------------
+DROP TABLE IF EXISTS `mall_coupon_user`;
+CREATE TABLE `mall_coupon_user` (
+  `id` bigint NOT NULL AUTO_INCREMENT COMMENT 'ID',
+  `user_id` bigint NOT NULL COMMENT '用户ID',
+  `coupon_id` bigint NOT NULL COMMENT '优惠券ID',
+  `status` tinyint NOT NULL DEFAULT '0' COMMENT '状态(0未使用 1已使用 2已过期)',
+  `used_time` datetime DEFAULT NULL COMMENT '使用时间',
+  `order_id` bigint DEFAULT NULL COMMENT '使用的订单ID',
+  `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '领取时间',
+  PRIMARY KEY (`id`),
+  KEY `idx_user_id` (`user_id`),
+  KEY `idx_coupon_id` (`coupon_id`),
+  KEY `idx_status` (`status`)
+) ENGINE=InnoDB COMMENT='用户优惠券表';
+
+-- ----------------------------
+-- 营销活动表
+-- ----------------------------
+DROP TABLE IF EXISTS `mall_promotion`;
+CREATE TABLE `mall_promotion` (
+  `id` bigint NOT NULL AUTO_INCREMENT COMMENT '活动ID',
+  `name` varchar(128) NOT NULL COMMENT '活动名称',
+  `type` tinyint NOT NULL COMMENT '活动类型(0普通活动 1拼团 2秒杀 3砍价)',
+  `start_time` datetime NOT NULL COMMENT '开始时间',
+  `end_time` datetime NOT NULL COMMENT '结束时间',
+  `rules` text COMMENT '活动规则(JSON)',
+  `status` tinyint NOT NULL DEFAULT '0' COMMENT '状态(0启用 1禁用)',
+  `remark` varchar(512) DEFAULT NULL COMMENT '备注',
+  `create_by` varchar(64) DEFAULT '' COMMENT '创建者',
+  `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  `update_by` varchar(64) DEFAULT '' COMMENT '更新者',
+  `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+  PRIMARY KEY (`id`),
+  KEY `idx_type` (`type`),
+  KEY `idx_status` (`status`),
+  KEY `idx_time` (`start_time`, `end_time`)
+) ENGINE=InnoDB COMMENT='营销活动表';
+
+-- ----------------------------
+-- 拼团表
+-- ----------------------------
+DROP TABLE IF EXISTS `mall_group_buy`;
+CREATE TABLE `mall_group_buy` (
+  `id` bigint NOT NULL AUTO_INCREMENT COMMENT '拼团ID',
+  `promotion_id` bigint NOT NULL COMMENT '活动ID',
+  `sku_id` bigint NOT NULL COMMENT 'SKU ID',
+  `group_price` int NOT NULL COMMENT '拼团价(分)',
+  `group_size` int NOT NULL COMMENT '成团人数',
+  `duration_hours` int DEFAULT '24' COMMENT '拼团有效期(小时)',
+  `status` tinyint NOT NULL DEFAULT '0' COMMENT '状态(0启用 1禁用)',
+  `create_by` varchar(64) DEFAULT '' COMMENT '创建者',
+  `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  `update_by` varchar(64) DEFAULT '' COMMENT '更新者',
+  `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+  PRIMARY KEY (`id`),
+  KEY `idx_promotion_id` (`promotion_id`),
+  KEY `idx_sku_id` (`sku_id`)
+) ENGINE=InnoDB COMMENT='拼团表';
+
+-- ----------------------------
+-- 拼团订单表
+-- ----------------------------
+DROP TABLE IF EXISTS `mall_group_buy_order`;
+CREATE TABLE `mall_group_buy_order` (
+  `id` bigint NOT NULL AUTO_INCREMENT COMMENT 'ID',
+  `group_buy_id` bigint NOT NULL COMMENT '拼团ID',
+  `group_no` varchar(32) NOT NULL COMMENT '拼团编号',
+  `order_id` bigint NOT NULL COMMENT '订单ID',
+  `user_id` bigint NOT NULL COMMENT '用户ID',
+  `status` tinyint NOT NULL DEFAULT '0' COMMENT '状态(0拼团中 1已成团 2已失败)',
+  `success_time` datetime DEFAULT NULL COMMENT '成团时间',
+  `expire_time` datetime NOT NULL COMMENT '过期时间',
+  `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  PRIMARY KEY (`id`),
+  KEY `idx_group_buy_id` (`group_buy_id`),
+  KEY `idx_group_no` (`group_no`),
+  KEY `idx_order_id` (`order_id`),
+  KEY `idx_status` (`status`)
+) ENGINE=InnoDB COMMENT='拼团订单表';
+
+-- ----------------------------
+-- 秒杀表
+-- ----------------------------
+DROP TABLE IF EXISTS `mall_seckill`;
+CREATE TABLE `mall_seckill` (
+  `id` bigint NOT NULL AUTO_INCREMENT COMMENT '秒杀ID',
+  `promotion_id` bigint NOT NULL COMMENT '活动ID',
+  `sku_id` bigint NOT NULL COMMENT 'SKU ID',
+  `seckill_price` int NOT NULL COMMENT '秒杀价(分)',
+  `seckill_stock` int NOT NULL COMMENT '秒杀库存',
+  `start_time` datetime NOT NULL COMMENT '开始时间',
+  `end_time` datetime NOT NULL COMMENT '结束时间',
+  `status` tinyint NOT NULL DEFAULT '0' COMMENT '状态(0启用 1禁用)',
+  `create_by` varchar(64) DEFAULT '' COMMENT '创建者',
+  `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  `update_by` varchar(64) DEFAULT '' COMMENT '更新者',
+  `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+  PRIMARY KEY (`id`),
+  KEY `idx_promotion_id` (`promotion_id`),
+  KEY `idx_sku_id` (`sku_id`),
+  KEY `idx_time` (`start_time`, `end_time`)
+) ENGINE=InnoDB COMMENT='秒杀表';
+
+-- ----------------------------
+-- 砍价活动表
+-- ----------------------------
+DROP TABLE IF EXISTS `mall_bargain`;
+CREATE TABLE `mall_bargain` (
+  `id` bigint NOT NULL AUTO_INCREMENT COMMENT '砍价ID',
+  `promotion_id` bigint NOT NULL COMMENT '活动ID',
+  `sku_id` bigint NOT NULL COMMENT 'SKU ID',
+  `bargain_price` int NOT NULL COMMENT '砍后价(分)',
+  `original_price` int NOT NULL COMMENT '原价(分)',
+  `bargain_stock` int NOT NULL COMMENT '砍价库存',
+  `min_price` int NOT NULL COMMENT '最低价(分)',
+  `help_count` int NOT NULL DEFAULT '0' COMMENT '需要助力人数',
+  `duration_hours` int DEFAULT '24' COMMENT '砍价有效期(小时)',
+  `status` tinyint NOT NULL DEFAULT '0' COMMENT '状态(0启用 1禁用)',
+  `create_by` varchar(64) DEFAULT '' COMMENT '创建者',
+  `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  `update_by` varchar(64) DEFAULT '' COMMENT '更新者',
+  `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+  PRIMARY KEY (`id`),
+  KEY `idx_promotion_id` (`promotion_id`),
+  KEY `idx_sku_id` (`sku_id`)
+) ENGINE=InnoDB COMMENT='砍价活动表';
+
+-- ----------------------------
+-- 砍价记录表
+-- ----------------------------
+DROP TABLE IF EXISTS `mall_bargain_record`;
+CREATE TABLE `mall_bargain_record` (
+  `id` bigint NOT NULL AUTO_INCREMENT COMMENT 'ID',
+  `bargain_id` bigint NOT NULL COMMENT '砍价活动ID',
+  `bargain_no` varchar(32) NOT NULL COMMENT '砍价编号',
+  `user_id` bigint NOT NULL COMMENT '发起用户ID',
+  `sku_id` bigint NOT NULL COMMENT 'SKU ID',
+  `current_price` int NOT NULL COMMENT '当前价格(分)',
+  `bargain_price` int NOT NULL COMMENT '已砍金额(分)',
+  `help_count` int NOT NULL DEFAULT '0' COMMENT '已助力人数',
+  `status` tinyint NOT NULL DEFAULT '0' COMMENT '状态(0进行中 1已成功 2已失败 3已下单)',
+  `order_id` bigint DEFAULT NULL COMMENT '订单ID',
+  `expire_time` datetime NOT NULL COMMENT '过期时间',
+  `success_time` datetime DEFAULT NULL COMMENT '成功时间',
+  `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  PRIMARY KEY (`id`),
+  KEY `idx_bargain_id` (`bargain_id`),
+  KEY `idx_bargain_no` (`bargain_no`),
+  KEY `idx_user_id` (`user_id`),
+  KEY `idx_status` (`status`)
+) ENGINE=InnoDB COMMENT='砍价记录表';
+
+-- ----------------------------
+-- 砍价助力记录表
+-- ----------------------------
+DROP TABLE IF EXISTS `mall_bargain_help`;
+CREATE TABLE `mall_bargain_help` (
+  `id` bigint NOT NULL AUTO_INCREMENT COMMENT 'ID',
+  `bargain_record_id` bigint NOT NULL COMMENT '砍价记录ID',
+  `bargain_no` varchar(32) NOT NULL COMMENT '砍价编号',
+  `user_id` bigint NOT NULL COMMENT '助力用户ID',
+  `help_price` int NOT NULL COMMENT '助力金额(分)',
+  `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '助力时间',
+  PRIMARY KEY (`id`),
+  KEY `idx_bargain_record_id` (`bargain_record_id`),
+  KEY `idx_bargain_no` (`bargain_no`),
+  KEY `idx_user_id` (`user_id`)
+) ENGINE=InnoDB COMMENT='砍价助力记录表';
+
+-- ----------------------------
+-- 订单评价表
+-- ----------------------------
+DROP TABLE IF EXISTS `mall_order_evaluate`;
+CREATE TABLE `mall_order_evaluate` (
+  `id` bigint NOT NULL AUTO_INCREMENT COMMENT '评价ID',
+  `order_id` bigint NOT NULL COMMENT '订单ID',
+  `order_no` varchar(32) NOT NULL COMMENT '订单号',
+  `order_item_id` bigint NOT NULL COMMENT '订单明细ID',
+  `product_id` bigint NOT NULL COMMENT '商品ID',
+  `sku_id` bigint NOT NULL COMMENT 'SKU ID',
+  `user_id` bigint NOT NULL COMMENT '用户ID',
+  `score` tinyint NOT NULL COMMENT '评分(1-5)',
+  `content` varchar(512) DEFAULT NULL COMMENT '评价内容',
+  `images` text COMMENT '评价图片(JSON数组)',
+  `reply_content` varchar(512) DEFAULT NULL COMMENT '回复内容',
+  `reply_time` datetime DEFAULT NULL COMMENT '回复时间',
+  `status` tinyint NOT NULL DEFAULT '0' COMMENT '状态(0待审核 1已通过 2已驳回)',
+  `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+  PRIMARY KEY (`id`),
+  KEY `idx_order_id` (`order_id`),
+  KEY `idx_order_no` (`order_no`),
+  KEY `idx_order_item_id` (`order_item_id`),
+  KEY `idx_product_id` (`product_id`),
+  KEY `idx_user_id` (`user_id`)
+) ENGINE=InnoDB COMMENT='订单评价表';
+
+-- ----------------------------
+-- 售后申请表
+-- ----------------------------
+DROP TABLE IF EXISTS `mall_after_sale`;
+CREATE TABLE `mall_after_sale` (
+  `id` bigint NOT NULL AUTO_INCREMENT COMMENT '售后ID',
+  `after_sale_no` varchar(32) NOT NULL COMMENT '售后单号',
+  `order_id` bigint NOT NULL COMMENT '订单ID',
+  `order_no` varchar(32) NOT NULL COMMENT '订单号',
+  `order_item_id` bigint NOT NULL COMMENT '订单明细ID',
+  `user_id` bigint NOT NULL COMMENT '用户ID',
+  `type` tinyint NOT NULL COMMENT '售后类型(0退款 1退货 2换货)',
+  `reason` varchar(256) NOT NULL COMMENT '申请原因',
+  `description` varchar(512) DEFAULT NULL COMMENT '问题描述',
+  `images` text COMMENT '凭证图片(JSON数组)',
+  `refund_amount` int DEFAULT NULL COMMENT '退款金额(分)',
+  `quantity` int NOT NULL DEFAULT '1' COMMENT '数量',
+  `status` tinyint NOT NULL DEFAULT '0' COMMENT '状态(0待审核 1已同意 2已拒绝 3待退货 4待收货 5已完成 6已取消)',
+  `refuse_reason` varchar(256) DEFAULT NULL COMMENT '拒绝原因',
+  `refund_order_no` varchar(32) DEFAULT NULL COMMENT '退款单号',
+  `logistics_company` varchar(64) DEFAULT NULL COMMENT '物流公司',
+  `logistics_no` varchar(64) DEFAULT NULL COMMENT '物流单号',
+  `apply_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '申请时间',
+  `audit_time` datetime DEFAULT NULL COMMENT '审核时间',
+  `return_time` datetime DEFAULT NULL COMMENT '退货时间',
+  `receive_time` datetime DEFAULT NULL COMMENT '收货时间',
+  `refund_time` datetime DEFAULT NULL COMMENT '退款时间',
+  `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `uk_after_sale_no` (`after_sale_no`),
+  KEY `idx_order_id` (`order_id`),
+  KEY `idx_order_no` (`order_no`),
+  KEY `idx_user_id` (`user_id`),
+  KEY `idx_status` (`status`)
+) ENGINE=InnoDB COMMENT='售后申请表';
+
+-- ----------------------------
+-- 订单优惠券使用记录表
+-- ----------------------------
+DROP TABLE IF EXISTS `mall_order_coupon`;
+CREATE TABLE `mall_order_coupon` (
+  `id` bigint NOT NULL AUTO_INCREMENT COMMENT 'ID',
+  `order_id` bigint NOT NULL COMMENT '订单ID',
+  `order_no` varchar(32) NOT NULL COMMENT '订单号',
+  `coupon_id` bigint NOT NULL COMMENT '优惠券ID',
+  `coupon_user_id` bigint NOT NULL COMMENT '用户优惠券ID',
+  `discount_amount` int NOT NULL COMMENT '优惠金额(分)',
+  `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '使用时间',
+  PRIMARY KEY (`id`),
+  KEY `idx_order_id` (`order_id`),
+  KEY `idx_order_no` (`order_no`),
+  KEY `idx_coupon_id` (`coupon_id`),
+  KEY `idx_coupon_user_id` (`coupon_user_id`)
+) ENGINE=InnoDB COMMENT='订单优惠券使用记录表';
+
+-- ----------------------------
+-- 收货地址表
+-- ----------------------------
+DROP TABLE IF EXISTS `mall_address`;
+CREATE TABLE `mall_address` (
+  `id` bigint NOT NULL AUTO_INCREMENT COMMENT '地址ID',
+  `user_id` bigint NOT NULL COMMENT '用户ID',
+  `receiver_name` varchar(64) NOT NULL COMMENT '收货人姓名',
+  `receiver_phone` varchar(32) NOT NULL COMMENT '收货人电话',
+  `province` varchar(64) DEFAULT NULL COMMENT '省份',
+  `city` varchar(64) DEFAULT NULL COMMENT '城市',
+  `district` varchar(64) DEFAULT NULL COMMENT '区/县',
+  `address` varchar(512) NOT NULL COMMENT '详细地址',
+  `is_default` tinyint NOT NULL DEFAULT '0' COMMENT '是否默认地址(0否 1是)',
+  `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+  PRIMARY KEY (`id`),
+  KEY `idx_user_id` (`user_id`),
+  KEY `idx_is_default` (`is_default`)
+) ENGINE=InnoDB COMMENT='收货地址表';
+
+-- ----------------------------
+-- 属性模板表
+-- ----------------------------
+DROP TABLE IF EXISTS `mall_attribute_template`;
+CREATE TABLE `mall_attribute_template` (
+  `id` bigint NOT NULL AUTO_INCREMENT COMMENT '模板ID',
+  `name` varchar(64) NOT NULL COMMENT '模板名称',
+  `category_id` bigint DEFAULT NULL COMMENT '分类ID(可选，绑定到分类)',
+  `sort` int DEFAULT '0' COMMENT '排序',
+  `status` tinyint NOT NULL DEFAULT '0' COMMENT '状态(0启用 1禁用)',
+  `remark` varchar(512) DEFAULT NULL COMMENT '备注',
+  `create_by` varchar(64) DEFAULT '' COMMENT '创建者',
+  `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  `update_by` varchar(64) DEFAULT '' COMMENT '更新者',
+  `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+  PRIMARY KEY (`id`),
+  KEY `idx_category_id` (`category_id`),
+  KEY `idx_status` (`status`)
+) ENGINE=InnoDB COMMENT='属性模板表';
+
+-- ----------------------------
+-- 属性表
+-- ----------------------------
+DROP TABLE IF EXISTS `mall_attribute`;
+CREATE TABLE `mall_attribute` (
+  `id` bigint NOT NULL AUTO_INCREMENT COMMENT '属性ID',
+  `template_id` bigint DEFAULT NULL COMMENT '模板ID(可选，绑定到模板)',
+  `name` varchar(64) NOT NULL COMMENT '属性名称',
+  `type` tinyint NOT NULL DEFAULT '0' COMMENT '属性类型(0文本 1数字 2日期 3枚举)',
+  `required` tinyint NOT NULL DEFAULT '0' COMMENT '是否必填(0否 1是)',
+  `sort` int DEFAULT '0' COMMENT '排序',
+  `status` tinyint NOT NULL DEFAULT '0' COMMENT '状态(0启用 1禁用)',
+  `remark` varchar(512) DEFAULT NULL COMMENT '备注',
+  `create_by` varchar(64) DEFAULT '' COMMENT '创建者',
+  `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  `update_by` varchar(64) DEFAULT '' COMMENT '更新者',
+  `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+  PRIMARY KEY (`id`),
+  KEY `idx_template_id` (`template_id`),
+  KEY `idx_status` (`status`)
+) ENGINE=InnoDB COMMENT='属性表';
+
+-- ----------------------------
+-- 属性值表
+-- ----------------------------
+DROP TABLE IF EXISTS `mall_attribute_value`;
+CREATE TABLE `mall_attribute_value` (
+  `id` bigint NOT NULL AUTO_INCREMENT COMMENT '属性值ID',
+  `attribute_id` bigint NOT NULL COMMENT '属性ID',
+  `value` varchar(128) NOT NULL COMMENT '属性值',
+  `sort` int DEFAULT '0' COMMENT '排序',
+  `status` tinyint NOT NULL DEFAULT '0' COMMENT '状态(0启用 1禁用)',
+  `create_by` varchar(64) DEFAULT '' COMMENT '创建者',
+  `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  `update_by` varchar(64) DEFAULT '' COMMENT '更新者',
+  `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+  PRIMARY KEY (`id`),
+  KEY `idx_attribute_id` (`attribute_id`),
+  KEY `idx_status` (`status`)
+) ENGINE=InnoDB COMMENT='属性值表';
+
+-- ----------------------------
+-- 商品属性关联表
+-- ----------------------------
+DROP TABLE IF EXISTS `mall_product_attribute`;
+CREATE TABLE `mall_product_attribute` (
+  `id` bigint NOT NULL AUTO_INCREMENT COMMENT 'ID',
+  `product_id` bigint NOT NULL COMMENT '商品ID',
+  `attribute_id` bigint NOT NULL COMMENT '属性ID',
+  `attribute_value_id` bigint DEFAULT NULL COMMENT '属性值ID(当属性类型为枚举时使用)',
+  `value` varchar(512) DEFAULT NULL COMMENT '属性值(当属性类型为文本/数字/日期时使用，或自定义值)',
+  `create_by` varchar(64) DEFAULT '' COMMENT '创建者',
+  `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  `update_by` varchar(64) DEFAULT '' COMMENT '更新者',
+  `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+  PRIMARY KEY (`id`),
+  KEY `idx_product_id` (`product_id`),
+  KEY `idx_attribute_id` (`attribute_id`),
+  KEY `idx_attribute_value_id` (`attribute_value_id`)
+) ENGINE=InnoDB COMMENT='商品属性关联表';
diff --git a/script/sql/ry_pay.sql b/script/sql/ry_pay.sql
new file mode 100644
index 0000000..8b7bc94
--- /dev/null
+++ b/script/sql/ry_pay.sql
@@ -0,0 +1,142 @@
+-- ----------------------------
+-- 支付应用表
+-- ----------------------------
+DROP TABLE IF EXISTS `pay_app`;
+CREATE TABLE `pay_app` (
+  `id` bigint NOT NULL AUTO_INCREMENT COMMENT '应用ID',
+  `name` varchar(64) NOT NULL COMMENT '应用名',
+  `status` tinyint NOT NULL DEFAULT '0' COMMENT '状态(0开启 1关闭)',
+  `remark` varchar(255) DEFAULT NULL COMMENT '备注',
+  `pay_notify_url` varchar(1024) NOT NULL COMMENT '支付结果回调地址',
+  `refund_notify_url` varchar(1024) NOT NULL COMMENT '退款结果回调地址',
+  `create_by` varchar(64) DEFAULT '' COMMENT '创建者',
+  `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  `update_by` varchar(64) DEFAULT '' COMMENT '更新者',
+  `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB COMMENT='支付应用信息';
+
+-- ----------------------------
+-- 支付渠道表
+-- ----------------------------
+DROP TABLE IF EXISTS `pay_channel`;
+CREATE TABLE `pay_channel` (
+  `id` bigint NOT NULL AUTO_INCREMENT COMMENT '渠道ID',
+  `code` varchar(32) NOT NULL COMMENT '渠道编码(alipay_pc, wx_pub)',
+  `status` tinyint NOT NULL DEFAULT '0' COMMENT '状态(0开启 1关闭)',
+  `remark` varchar(255) DEFAULT NULL COMMENT '备注',
+  `fee_rate` double NOT NULL DEFAULT '0' COMMENT '渠道费率(%)',
+  `app_id` bigint NOT NULL COMMENT '应用ID',
+  `config` text NOT NULL COMMENT '支付渠道配置(JSON)',
+  `create_by` varchar(64) DEFAULT '' COMMENT '创建者',
+  `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  `update_by` varchar(64) DEFAULT '' COMMENT '更新者',
+  `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB COMMENT='支付渠道';
+
+-- ----------------------------
+-- 支付订单表
+-- ----------------------------
+DROP TABLE IF EXISTS `pay_order`;
+CREATE TABLE `pay_order` (
+  `id` bigint NOT NULL AUTO_INCREMENT COMMENT '订单ID',
+  `app_id` bigint NOT NULL COMMENT '应用ID',
+  `channel_id` bigint DEFAULT NULL COMMENT '渠道ID',
+  `channel_code` varchar(32) DEFAULT NULL COMMENT '渠道编码',
+  `merchant_order_id` varchar(64) NOT NULL COMMENT '商户订单编号',
+  `subject` varchar(32) NOT NULL COMMENT '商品标题',
+  `body` varchar(128) DEFAULT NULL COMMENT '商品描述',
+  `notify_url` varchar(1024) NOT NULL COMMENT '异步通知地址',
+  `price` int NOT NULL COMMENT '支付金额(分)',
+  `channel_fee_rate` double DEFAULT '0' COMMENT '渠道费率',
+  `channel_fee_price` int DEFAULT '0' COMMENT '渠道手续费(分)',
+  `status` tinyint NOT NULL COMMENT '状态(0未支付 10已支付 20已退款 30已关闭)',
+  `user_ip` varchar(50) NOT NULL COMMENT '用户IP',
+  `expire_time` datetime NOT NULL COMMENT '订单失效时间',
+  `success_time` datetime DEFAULT NULL COMMENT '支付成功时间',
+  `extension_id` bigint DEFAULT NULL COMMENT '拓展业务ID (如扫码支付的记录ID)',
+  `no` varchar(32) DEFAULT NULL COMMENT '支付单号(内部生成)',
+  `channel_order_no` varchar(64) DEFAULT NULL COMMENT '渠道订单号(微信/支付宝)',
+  `channel_user_id` varchar(64) DEFAULT NULL COMMENT '渠道用户OpenId',
+  `channel_extras` varchar(1024) DEFAULT NULL COMMENT '渠道额外参数(JSON)',
+  `create_by` varchar(64) DEFAULT '' COMMENT '创建者',
+  `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  `update_by` varchar(64) DEFAULT '' COMMENT '更新者',
+  `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+  PRIMARY KEY (`id`),
+  KEY `idx_merchant_order_id` (`merchant_order_id`)
+) ENGINE=InnoDB COMMENT='支付订单';
+
+-- ----------------------------
+-- 退款订单表
+-- ----------------------------
+DROP TABLE IF EXISTS `pay_refund`;
+CREATE TABLE `pay_refund` (
+  `id` bigint NOT NULL AUTO_INCREMENT COMMENT '退款ID',
+  `no` varchar(32) NOT NULL COMMENT '退款单号',
+  `app_id` bigint NOT NULL COMMENT '应用ID',
+  `channel_id` bigint NOT NULL COMMENT '渠道ID',
+  `channel_code` varchar(32) NOT NULL COMMENT '渠道编码',
+  `order_id` bigint NOT NULL COMMENT '支付订单ID',
+  `order_no` varchar(32) NOT NULL COMMENT '支付订单no',
+  `merchant_order_id` varchar(64) NOT NULL COMMENT '商户订单编号',
+  `merchant_refund_id` varchar(64) NOT NULL COMMENT '商户退款编号',
+  `notify_url` varchar(1024) NOT NULL COMMENT '回调地址',
+  `status` tinyint NOT NULL COMMENT '状态(0等待 10成功 20失败)',
+  `pay_price` int NOT NULL COMMENT '支付金额(分)',
+  `refund_price` int NOT NULL COMMENT '退款金额(分)',
+  `reason` varchar(256) NOT NULL COMMENT '退款原因',
+  `user_ip` varchar(50) DEFAULT NULL COMMENT '用户IP',
+  `channel_order_no` varchar(64) NOT NULL COMMENT '渠道订单号',
+  `channel_refund_no` varchar(64) DEFAULT NULL COMMENT '渠道退款单号',
+  `success_time` datetime DEFAULT NULL COMMENT '退款成功时间',
+  `error_code` varchar(32) DEFAULT NULL COMMENT '渠道错误码',
+  `error_msg` varchar(128) DEFAULT NULL COMMENT '渠道错误描述',
+  `create_by` varchar(64) DEFAULT '' COMMENT '创建者',
+  `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  `update_by` varchar(64) DEFAULT '' COMMENT '更新者',
+  `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB COMMENT='退款订单';
+
+-- ----------------------------
+-- 支付通知日志表
+-- ----------------------------
+DROP TABLE IF EXISTS `pay_notify_log`;
+CREATE TABLE `pay_notify_log` (
+  `id` bigint NOT NULL AUTO_INCREMENT COMMENT '日志ID',
+  `app_id` bigint NOT NULL COMMENT '应用ID',
+  `channel_id` bigint NOT NULL COMMENT '渠道ID',
+  `order_id` bigint NOT NULL COMMENT '支付订单ID',
+  `notify_type` varchar(32) NOT NULL COMMENT '通知类型(pay, refund)',
+  `status` tinyint NOT NULL COMMENT '处理状态(0处理中 10成功 20失败)',
+  `request_params` text COMMENT '请求参数',
+  `response_body` text COMMENT '响应结果',
+  `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  PRIMARY KEY (`id`),
+  KEY `idx_order_id` (`order_id`)
+) ENGINE=InnoDB COMMENT='支付通知日志';
+
+-- ----------------------------
+-- 支付通知任务表
+-- ----------------------------
+DROP TABLE IF EXISTS `pay_notify_task`;
+CREATE TABLE `pay_notify_task` (
+  `id` bigint NOT NULL AUTO_INCREMENT COMMENT '任务ID',
+  `order_id` bigint NOT NULL COMMENT '订单ID',
+  `order_no` varchar(32) NOT NULL COMMENT '订单号',
+  `notify_url` varchar(1024) NOT NULL COMMENT '通知地址',
+  `notify_body` text COMMENT '通知内容',
+  `retry_count` int NOT NULL DEFAULT '0' COMMENT '重试次数',
+  `max_retry` int NOT NULL DEFAULT '5' COMMENT '最大重试次数',
+  `status` tinyint NOT NULL DEFAULT '0' COMMENT '状态(0进行中 1成功 2失败)',
+  `next_notify_time` datetime NOT NULL COMMENT '下次通知时间',
+  `create_by` varchar(64) DEFAULT '' COMMENT '创建者',
+  `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  `update_by` varchar(64) DEFAULT '' COMMENT '更新者',
+  `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+  PRIMARY KEY (`id`),
+  KEY `idx_next_notify_time` (`next_notify_time`)
+) ENGINE=InnoDB COMMENT='支付通知任务';
+
diff --git a/script/sql/ry_update.sql b/script/sql/ry_update.sql
new file mode 100644
index 0000000..53441b6
--- /dev/null
+++ b/script/sql/ry_update.sql
@@ -0,0 +1,15 @@
+-- App管理菜单
+insert into sys_menu values('6',   'App管理',      '0',   '2',  'app',          null,                        '', 1, 0, 'M', '0', '0', '',                            'mobile',        103, 1, sysdate(), null, null, 'App管理目录');
+insert into sys_menu values('140', 'App用户管理',  '6',   '1',  'user',         'app/user/index',            '', 1, 0, 'C', '0', '0', 'app:user:list',                 'user',          103, 1, sysdate(), null, null, 'App用户管理菜单');
+insert into sys_menu values('141', 'App会话管理',  '6',   '2',  'session',      'app/session/index',         '', 1, 0, 'C', '0', '0', 'app:session:list',              'link',          103, 1, sysdate(), null, null, 'App会话管理菜单');
+-- AI管理菜单
+insert into sys_menu values('7',   'AI管理',       '0',   '3',  'ai',           null,                        '', 1, 0, 'M', '0', '0', '',                            'robot',         103, 1, sysdate(), null, null, 'AI管理目录');
+insert into sys_menu values('150', 'AI Provider管理', '7', '1', 'provider',     'ai/provider/index',         '', 1, 0, 'C', '0', '0', 'ai:provider:list',              'api',           103, 1, sysdate(), null, null, 'AI Provider管理菜单');
+
+-- App用户管理按钮
+insert into sys_menu values('1401', 'App用户查询', '140', '1', '#', '', '', 1, 0, 'F', '0', '0', 'app:user:query',          '#', 103, 1, sysdate(), null, null, '');
+insert into sys_menu values('1402', 'App用户新增', '140', '2', '#', '', '', 1, 0, 'F', '0', '0', 'app:user:add',            '#', 103, 1, sysdate(), null, null, '');
+insert into sys_menu values('1403', 'App用户修改', '140', '3', '#', '', '', 1, 0, 'F', '0', '0', 'app:user:edit',           '#', 103, 1, sysdate(), null, null, '');
+insert into sys_menu values('1404', 'App用户删除', '140', '4', '#', '', '', 1, 0, 'F', '0', '0', 'app:user:remove',         '#', 103, 1, sysdate(), null, null, '');
+insert into sys_menu values('1405', 'App用户导出', '140', '5', '#', '', '', 1, 0, 'F', '0', '0', 'app:user:export',         '#', 103, 1, sysdate(), null, null, '');
+insert into sys_menu values('1407', 'App用户重置密码', '140', '7', '#', '', '', 1, 0, 'F', '0', '0', 'app:user:resetPwd',       '#', 103, 1, sysdate(), null, null, '');
diff --git a/script/sql/ry_vue.sql b/script/sql/ry_vue.sql
new file mode 100644
index 0000000..f38a6b2
--- /dev/null
+++ b/script/sql/ry_vue.sql
@@ -0,0 +1,885 @@
+-- ----------------------------
+-- 0、第三方平台授权表
+-- ----------------------------
+create table sys_social
+(
+    id                 bigint           not null        comment '主键',
+    user_id            bigint           not null        comment '用户ID',
+    auth_id            varchar(255)     not null        comment '平台+平台唯一id',
+    source             varchar(255)     not null        comment '用户来源',
+    open_id            varchar(255)     default null    comment '平台编号唯一id',
+    user_name          varchar(30)      not null        comment '登录账号',
+    nick_name          varchar(30)      default ''      comment '用户昵称',
+    email              varchar(255)     default ''      comment '用户邮箱',
+    avatar             varchar(500)     default ''      comment '头像地址',
+    access_token       varchar(2000)     not null       comment '用户的授权令牌',
+    expire_in          int              default null    comment '用户的授权令牌的有效期，部分平台可能没有',
+    refresh_token      varchar(255)     default null    comment '刷新令牌，部分平台可能没有',
+    access_code        varchar(2000)     default null   comment '平台的授权信息，部分平台可能没有',
+    union_id           varchar(255)     default null    comment '用户的 unionid',
+    scope              varchar(255)     default null    comment '授予的权限，部分平台可能没有',
+    token_type         varchar(255)     default null    comment '个别平台的授权信息，部分平台可能没有',
+    id_token           varchar(2000)    default null    comment 'id token，部分平台可能没有',
+    mac_algorithm      varchar(255)     default null    comment '小米平台用户的附带属性，部分平台可能没有',
+    mac_key            varchar(255)     default null    comment '小米平台用户的附带属性，部分平台可能没有',
+    code               varchar(255)     default null    comment '用户的授权code，部分平台可能没有',
+    oauth_token        varchar(255)     default null    comment 'Twitter平台用户的附带属性，部分平台可能没有',
+    oauth_token_secret varchar(255)     default null    comment 'Twitter平台用户的附带属性，部分平台可能没有',
+    create_dept        bigint(20)                       comment '创建部门',
+    create_by          bigint(20)                       comment '创建者',
+    create_time        datetime                         comment '创建时间',
+    update_by          bigint(20)                       comment '更新者',
+    update_time        datetime                         comment '更新时间',
+    del_flag           char(1)          default '0'     comment '删除标志（0代表存在 1代表删除）',
+    PRIMARY KEY (id)
+) engine=innodb comment = '社会化关系表';
+
+
+-- ----------------------------
+-- 1、部门表
+-- ----------------------------
+create table sys_dept (
+    dept_id           bigint(20)      not null                   comment '部门id',
+    parent_id         bigint(20)      default 0                  comment '父部门id',
+    ancestors         varchar(500)    default ''                 comment '祖级列表',
+    dept_name         varchar(30)     default ''                 comment '部门名称',
+    dept_category     varchar(100)    default null               comment '部门类别编码',
+    order_num         int(4)          default 0                  comment '显示顺序',
+    leader            bigint(20)      default null               comment '负责人',
+    phone             varchar(11)     default null               comment '联系电话',
+    email             varchar(50)     default null               comment '邮箱',
+    status            char(1)         default '0'                comment '部门状态（0正常 1停用）',
+    del_flag          char(1)         default '0'                comment '删除标志（0代表存在 1代表删除）',
+    create_dept       bigint(20)      default null               comment '创建部门',
+    create_by         bigint(20)      default null               comment '创建者',
+    create_time       datetime                                   comment '创建时间',
+    update_by         bigint(20)      default null               comment '更新者',
+    update_time       datetime                                   comment '更新时间',
+    primary key (dept_id)
+) engine=innodb comment = '部门表';
+
+-- ----------------------------
+-- 初始化-部门表数据
+-- ----------------------------
+insert into sys_dept values(100, 0,   '0',          'XXX科技',   null,0, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate(), null, null);
+insert into sys_dept values(101, 100, '0,100',      '深圳总公司', null,1, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate(), null, null);
+insert into sys_dept values(102, 100, '0,100',      '长沙分公司', null,2, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate(), null, null);
+insert into sys_dept values(103, 101, '0,100,101',  '研发部门',   null,1, 1, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate(), null, null);
+insert into sys_dept values(104, 101, '0,100,101',  '市场部门',   null,2, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate(), null, null);
+insert into sys_dept values(105, 101, '0,100,101',  '测试部门',   null,3, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate(), null, null);
+insert into sys_dept values(106, 101, '0,100,101',  '财务部门',   null,4, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate(), null, null);
+insert into sys_dept values(107, 101, '0,100,101',  '运维部门',   null,5, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate(), null, null);
+insert into sys_dept values(108, 102, '0,100,102',  '市场部门',   null,1, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate(), null, null);
+insert into sys_dept values(109, 102, '0,100,102',  '财务部门',   null,2, null, '15888888888', 'xxx@qq.com', '0', '0', 103, 1, sysdate(), null, null);
+
+
+-- ----------------------------
+-- 2、用户信息表
+-- ----------------------------
+create table sys_user (
+    user_id           bigint(20)      not null                   comment '用户ID',
+    dept_id           bigint(20)      default null               comment '部门ID',
+    user_name         varchar(30)     not null                   comment '用户账号',
+    nick_name         varchar(30)     not null                   comment '用户昵称',
+    user_type         varchar(10)     default 'sys_user'         comment '用户类型（sys_user系统用户）',
+    email             varchar(50)     default ''                 comment '用户邮箱',
+    phonenumber       varchar(11)     default ''                 comment '手机号码',
+    sex               char(1)         default '0'                comment '用户性别（0男 1女 2未知）',
+    avatar            bigint(20)                                 comment '头像地址',
+    password          varchar(100)    default ''                 comment '密码',
+    status            char(1)         default '0'                comment '帐号状态（0正常 1停用）',
+    del_flag          char(1)         default '0'                comment '删除标志（0代表存在 1代表删除）',
+    login_ip          varchar(128)    default ''                 comment '最后登录IP',
+    login_date        datetime                                   comment '最后登录时间',
+    create_dept       bigint(20)      default null               comment '创建部门',
+    create_by         bigint(20)      default null               comment '创建者',
+    create_time       datetime                                   comment '创建时间',
+    update_by         bigint(20)      default null               comment '更新者',
+    update_time       datetime                                   comment '更新时间',
+    remark            varchar(500)    default null               comment '备注',
+    primary key (user_id)
+) engine=innodb comment = '用户信息表';
+
+-- ----------------------------
+-- 初始化-用户信息表数据
+-- ----------------------------
+insert into sys_user values(1, 103, 'admin', '疯狂的狮子Li', 'sys_user', 'crazyLionLi@163.com', '15888888888', '1', null, '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '127.0.0.1', sysdate(), 103, 1, sysdate(), null, null, '管理员');
+insert into sys_user values(3, 108, 'test', '本部门及以下 密码666666', 'sys_user', '', '', '0', null, '$2a$10$b8yUzN0C71sbz.PhNOCgJe.Tu1yWC3RNrTyjSQ8p1W0.aaUXUJ.Ne', '0', '0', '127.0.0.1', sysdate(), 103, 1, sysdate(), 3, sysdate(), null);
+insert into sys_user values(4, 102, 'test1', '仅本人 密码666666', 'sys_user', '', '', '0', null, '$2a$10$b8yUzN0C71sbz.PhNOCgJe.Tu1yWC3RNrTyjSQ8p1W0.aaUXUJ.Ne', '0', '0', '127.0.0.1', sysdate(), 103, 1, sysdate(), 4, sysdate(), null);
+
+-- ----------------------------
+-- 3、岗位信息表
+-- ----------------------------
+create table sys_post
+(
+    post_id       bigint(20)      not null                   comment '岗位ID',
+    dept_id       bigint(20)      not null                   comment '部门id',
+    post_code     varchar(64)     not null                   comment '岗位编码',
+    post_category varchar(100)    default null               comment '岗位类别编码',
+    post_name     varchar(50)     not null                   comment '岗位名称',
+    post_sort     int(4)          not null                   comment '显示顺序',
+    status        char(1)         not null                   comment '状态（0正常 1停用）',
+    create_dept   bigint(20)      default null               comment '创建部门',
+    create_by     bigint(20)      default null               comment '创建者',
+    create_time   datetime                                   comment '创建时间',
+    update_by     bigint(20)      default null               comment '更新者',
+    update_time   datetime                                   comment '更新时间',
+    remark        varchar(500)    default null               comment '备注',
+    primary key (post_id)
+) engine=innodb comment = '岗位信息表';
+
+-- ----------------------------
+-- 初始化-岗位信息表数据
+-- ----------------------------
+insert into sys_post values(1, 103, 'ceo',  null, '董事长',    1, '0', 103, 1, sysdate(), null, null, '');
+insert into sys_post values(2, 100, 'se',   null, '项目经理',  2, '0', 103, 1, sysdate(), null, null, '');
+insert into sys_post values(3, 100, 'hr',   null, '人力资源',  3, '0', 103, 1, sysdate(), null, null, '');
+insert into sys_post values(4, 100, 'user', null, '普通员工',  4, '0', 103, 1, sysdate(), null, null, '');
+
+-- ----------------------------
+-- 4、角色信息表
+-- ----------------------------
+create table sys_role (
+    role_id              bigint(20)      not null                   comment '角色ID',
+    role_name            varchar(30)     not null                   comment '角色名称',
+    role_key             varchar(100)    not null                   comment '角色权限字符串',
+    role_sort            int(4)          not null                   comment '显示顺序',
+    data_scope           char(1)         default '1'                comment '数据范围（1：全部数据权限 2：自定数据权限 3：本部门数据权限 4：本部门及以下数据权限 5：仅本人数据权限 6：部门及以下或本人数据权限）',
+    menu_check_strictly  tinyint(1)      default 1                  comment '菜单树选择项是否关联显示',
+    dept_check_strictly  tinyint(1)      default 1                  comment '部门树选择项是否关联显示',
+    status               char(1)         not null                   comment '角色状态（0正常 1停用）',
+    del_flag             char(1)         default '0'                comment '删除标志（0代表存在 1代表删除）',
+    create_dept          bigint(20)      default null               comment '创建部门',
+    create_by            bigint(20)      default null               comment '创建者',
+    create_time          datetime                                   comment '创建时间',
+    update_by            bigint(20)      default null               comment '更新者',
+    update_time          datetime                                   comment '更新时间',
+    remark               varchar(500)    default null               comment '备注',
+    primary key (role_id)
+) engine=innodb comment = '角色信息表';
+
+-- ----------------------------
+-- 初始化-角色信息表数据
+-- ----------------------------
+insert into sys_role values(1, '超级管理员',  'superadmin',  1, 1, 1, 1, '0', '0', 103, 1, sysdate(), null, null, '超级管理员');
+insert into sys_role values(3, '本部门及以下', 'test1', 3, 4, 1, 1, '0', '0', 103, 1, sysdate(), null, null, '');
+insert into sys_role values(4, '仅本人',      'test2', 4, 5, 1, 1, '0', '0', 103, 1, sysdate(), null, null, '');
+
+-- ----------------------------
+-- 5、菜单权限表
+-- ----------------------------
+create table sys_menu (
+    menu_id           bigint(20)      not null                   comment '菜单ID',
+    menu_name         varchar(50)     not null                   comment '菜单名称',
+    parent_id         bigint(20)      default 0                  comment '父菜单ID',
+    order_num         int(4)          default 0                  comment '显示顺序',
+    path              varchar(200)    default ''                 comment '路由地址',
+    component         varchar(255)    default null               comment '组件路径',
+    query_param       varchar(255)    default null               comment '路由参数',
+    is_frame          int(1)          default 1                  comment '是否为外链（0是 1否）',
+    is_cache          int(1)          default 0                  comment '是否缓存（0缓存 1不缓存）',
+    menu_type         char(1)         default ''                 comment '菜单类型（M目录 C菜单 F按钮）',
+    visible           char(1)         default 0                  comment '显示状态（0显示 1隐藏）',
+    status            char(1)         default 0                  comment '菜单状态（0正常 1停用）',
+    perms             varchar(100)    default null               comment '权限标识',
+    icon              varchar(100)    default '#'                comment '菜单图标',
+    create_dept       bigint(20)      default null               comment '创建部门',
+    create_by         bigint(20)      default null               comment '创建者',
+    create_time       datetime                                   comment '创建时间',
+    update_by         bigint(20)      default null               comment '更新者',
+    update_time       datetime                                   comment '更新时间',
+    remark            varchar(500)    default ''                 comment '备注',
+    primary key (menu_id)
+) engine=innodb comment = '菜单权限表';
+
+-- ----------------------------
+-- 初始化-菜单信息表数据
+-- ----------------------------
+-- 一级菜单
+insert into sys_menu values('1', '系统管理', '0', '1', 'system',           null, '', 1, 0, 'M', '0', '0', '', 'system',   103, 1, sysdate(), null, null, '系统管理目录');
+insert into sys_menu values('2', '系统监控', '0', '3', 'monitor',          null, '', 1, 0, 'M', '0', '0', '', 'monitor',  103, 1, sysdate(), null, null, '系统监控目录');
+insert into sys_menu values('3', '系统工具', '0', '4', 'tool',             null, '', 1, 0, 'M', '0', '0', '', 'tool',     103, 1, sysdate(), null, null, '系统工具目录');
+insert into sys_menu values('4', 'PLUS官网', '0', '5', 'https://gitee.com/dromara/RuoYi-Vue-Plus', null, '', 0, 0, 'M', '0', '0', '', 'guide',    103, 1, sysdate(), null, null, 'RuoYi-Vue-Plus官网地址');
+insert into sys_menu values('5', '测试菜单', '0', '5', 'demo',             null, '', 1, 0, 'M', '0', '0', '', 'star',     103, 1, sysdate(), null, null, '测试菜单');
+-- 二级菜单
+insert into sys_menu values('100',  '用户管理',     '1',   '1', 'user',             'system/user/index',            '', 1, 0, 'C', '0', '0', 'system:user:list',            'user',          103, 1, sysdate(), null, null, '用户管理菜单');
+insert into sys_menu values('101',  '角色管理',     '1',   '2', 'role',             'system/role/index',            '', 1, 0, 'C', '0', '0', 'system:role:list',            'peoples',       103, 1, sysdate(), null, null, '角色管理菜单');
+insert into sys_menu values('102',  '菜单管理',     '1',   '3', 'menu',             'system/menu/index',            '', 1, 0, 'C', '0', '0', 'system:menu:list',            'tree-table',    103, 1, sysdate(), null, null, '菜单管理菜单');
+insert into sys_menu values('103',  '部门管理',     '1',   '4', 'dept',             'system/dept/index',            '', 1, 0, 'C', '0', '0', 'system:dept:list',            'tree',          103, 1, sysdate(), null, null, '部门管理菜单');
+insert into sys_menu values('104',  '岗位管理',     '1',   '5', 'post',             'system/post/index',            '', 1, 0, 'C', '0', '0', 'system:post:list',            'post',          103, 1, sysdate(), null, null, '岗位管理菜单');
+insert into sys_menu values('105',  '字典管理',     '1',   '6', 'dict',             'system/dict/index',            '', 1, 0, 'C', '0', '0', 'system:dict:list',            'dict',          103, 1, sysdate(), null, null, '字典管理菜单');
+insert into sys_menu values('106',  '参数设置',     '1',   '7', 'config',           'system/config/index',          '', 1, 0, 'C', '0', '0', 'system:config:list',          'edit',          103, 1, sysdate(), null, null, '参数设置菜单');
+insert into sys_menu values('107',  '通知公告',     '1',   '8', 'notice',           'system/notice/index',          '', 1, 0, 'C', '0', '0', 'system:notice:list',          'message',       103, 1, sysdate(), null, null, '通知公告菜单');
+insert into sys_menu values('108',  '日志管理',     '1',   '9', 'log',              '',                             '', 1, 0, 'M', '0', '0', '',                            'log',           103, 1, sysdate(), null, null, '日志管理菜单');
+insert into sys_menu values('109',  '在线用户',     '2',   '1', 'online',           'monitor/online/index',         '', 1, 0, 'C', '0', '0', 'monitor:online:list',         'online',        103, 1, sysdate(), null, null, '在线用户菜单');
+insert into sys_menu values('113',  '缓存监控',     '2',   '5', 'cache',            'monitor/cache/index',          '', 1, 0, 'C', '0', '0', 'monitor:cache:list',          'redis',         103, 1, sysdate(), null, null, '缓存监控菜单');
+insert into sys_menu values('115',  '代码生成',     '3',   '2', 'gen',              'tool/gen/index',               '', 1, 0, 'C', '0', '0', 'tool:gen:list',               'code',          103, 1, sysdate(), null, null, '代码生成菜单');
+insert into sys_menu values('123',  '客户端管理',   '1',   '11', 'client',           'system/client/index',          '', 1, 0, 'C', '0', '0', 'system:client:list',          'international', 103, 1, sysdate(), null, null, '客户端管理菜单');
+insert into sys_menu values('116', '修改生成配置',  '3',   '2', 'gen-edit/index/:tableId', 'tool/gen/editTable', '', 1, 1, 'C', '1', '0', 'tool:gen:edit',           '#',               103, 1, sysdate(), null, null, '');
+insert into sys_menu values('130', '分配用户',     '1',   '2', 'role-auth/user/:roleId', 'system/role/authUser', '', 1, 1, 'C', '1', '0', 'system:role:edit',      '#',               103, 1, sysdate(), null, null, '');
+insert into sys_menu values('131', '分配角色',     '1',   '1', 'user-auth/role/:userId', 'system/user/authRole', '', 1, 1, 'C', '1', '0', 'system:user:edit',      '#',               103, 1, sysdate(), null, null, '');
+insert into sys_menu values('132', '字典数据',     '1',   '6', 'dict-data/index/:dictId', 'system/dict/data', '', 1, 1, 'C', '1', '0', 'system:dict:list',         '#',               103, 1, sysdate(), null, null, '');
+insert into sys_menu values('133', '文件配置管理',  '1',   '10', 'oss-config/index',              'system/oss/config', '', 1, 1, 'C', '1', '0', 'system:ossConfig:list',  '#',                103, 1, sysdate(), null, null, '');
+
+-- springboot-admin监控
+insert into sys_menu values('117',  'Admin监控',   '2',   '5',  'Admin',            'monitor/admin/index',         '', 1, 0, 'C', '0', '0', 'monitor:admin:list',           'dashboard',     103, 1, sysdate(), null, null, 'Admin监控菜单');
+-- oss菜单
+insert into sys_menu values('118',  '文件管理',     '1',   '10', 'oss',              'system/oss/index',            '', 1, 0, 'C', '0', '0', 'system:oss:list',              'upload',        103, 1, sysdate(), null, null, '文件管理菜单');
+-- snail-job server控制台
+insert into sys_menu values('120',  '任务调度中心',  '2',   '6',  'snailjob',     'monitor/snailjob/index',    '', 1, 0, 'C', '0', '0', 'monitor:snailjob:list',          'job',           103, 1, sysdate(), null, null, 'SnailJob控制台菜单');
+
+-- 三级菜单
+insert into sys_menu values('500',  '操作日志', '108', '1', 'operlog',    'monitor/operlog/index',    '', 1, 0, 'C', '0', '0', 'monitor:operlog:list',    'form',          103, 1, sysdate(), null, null, '操作日志菜单');
+insert into sys_menu values('501',  '登录日志', '108', '2', 'logininfor', 'monitor/logininfor/index', '', 1, 0, 'C', '0', '0', 'monitor:logininfor:list', 'logininfor',    103, 1, sysdate(), null, null, '登录日志菜单');
+-- 用户管理按钮
+insert into sys_menu values('1001', '用户查询', '100', '1',  '', '', '', 1, 0, 'F', '0', '0', 'system:user:query',          '#', 103, 1, sysdate(), null, null, '');
+insert into sys_menu values('1002', '用户新增', '100', '2',  '', '', '', 1, 0, 'F', '0', '0', 'system:user:add',            '#', 103, 1, sysdate(), null, null, '');
+insert into sys_menu values('1003', '用户修改', '100', '3',  '', '', '', 1, 0, 'F', '0', '0', 'system:user:edit',           '#', 103, 1, sysdate(), null, null, '');
+insert into sys_menu values('1004', '用户删除', '100', '4',  '', '', '', 1, 0, 'F', '0', '0', 'system:user:remove',         '#', 103, 1, sysdate(), null, null, '');
+insert into sys_menu values('1005', '用户导出', '100', '5',  '', '', '', 1, 0, 'F', '0', '0', 'system:user:export',         '#', 103, 1, sysdate(), null, null, '');
+insert into sys_menu values('1006', '用户导入', '100', '6',  '', '', '', 1, 0, 'F', '0', '0', 'system:user:import',         '#', 103, 1, sysdate(), null, null, '');
+insert into sys_menu values('1007', '重置密码', '100', '7',  '', '', '', 1, 0, 'F', '0', '0', 'system:user:resetPwd',       '#', 103, 1, sysdate(), null, null, '');
+-- 角色管理按钮
+insert into sys_menu values('1008', '角色查询', '101', '1',  '', '', '', 1, 0, 'F', '0', '0', 'system:role:query',          '#', 103, 1, sysdate(), null, null, '');
+insert into sys_menu values('1009', '角色新增', '101', '2',  '', '', '', 1, 0, 'F', '0', '0', 'system:role:add',            '#', 103, 1, sysdate(), null, null, '');
+insert into sys_menu values('1010', '角色修改', '101', '3',  '', '', '', 1, 0, 'F', '0', '0', 'system:role:edit',           '#', 103, 1, sysdate(), null, null, '');
+insert into sys_menu values('1011', '角色删除', '101', '4',  '', '', '', 1, 0, 'F', '0', '0', 'system:role:remove',         '#', 103, 1, sysdate(), null, null, '');
+insert into sys_menu values('1012', '角色导出', '101', '5',  '', '', '', 1, 0, 'F', '0', '0', 'system:role:export',         '#', 103, 1, sysdate(), null, null, '');
+-- 菜单管理按钮
+insert into sys_menu values('1013', '菜单查询', '102', '1',  '', '', '', 1, 0, 'F', '0', '0', 'system:menu:query',          '#', 103, 1, sysdate(), null, null, '');
+insert into sys_menu values('1014', '菜单新增', '102', '2',  '', '', '', 1, 0, 'F', '0', '0', 'system:menu:add',            '#', 103, 1, sysdate(), null, null, '');
+insert into sys_menu values('1015', '菜单修改', '102', '3',  '', '', '', 1, 0, 'F', '0', '0', 'system:menu:edit',           '#', 103, 1, sysdate(), null, null, '');
+insert into sys_menu values('1016', '菜单删除', '102', '4',  '', '', '', 1, 0, 'F', '0', '0', 'system:menu:remove',         '#', 103, 1, sysdate(), null, null, '');
+-- 部门管理按钮
+insert into sys_menu values('1017', '部门查询', '103', '1',  '', '', '', 1, 0, 'F', '0', '0', 'system:dept:query',          '#', 103, 1, sysdate(), null, null, '');
+insert into sys_menu values('1018', '部门新增', '103', '2',  '', '', '', 1, 0, 'F', '0', '0', 'system:dept:add',            '#', 103, 1, sysdate(), null, null, '');
+insert into sys_menu values('1019', '部门修改', '103', '3',  '', '', '', 1, 0, 'F', '0', '0', 'system:dept:edit',           '#', 103, 1, sysdate(), null, null, '');
+insert into sys_menu values('1020', '部门删除', '103', '4',  '', '', '', 1, 0, 'F', '0', '0', 'system:dept:remove',         '#', 103, 1, sysdate(), null, null, '');
+-- 岗位管理按钮
+insert into sys_menu values('1021', '岗位查询', '104', '1',  '', '', '', 1, 0, 'F', '0', '0', 'system:post:query',          '#', 103, 1, sysdate(), null, null, '');
+insert into sys_menu values('1022', '岗位新增', '104', '2',  '', '', '', 1, 0, 'F', '0', '0', 'system:post:add',            '#', 103, 1, sysdate(), null, null, '');
+insert into sys_menu values('1023', '岗位修改', '104', '3',  '', '', '', 1, 0, 'F', '0', '0', 'system:post:edit',           '#', 103, 1, sysdate(), null, null, '');
+insert into sys_menu values('1024', '岗位删除', '104', '4',  '', '', '', 1, 0, 'F', '0', '0', 'system:post:remove',         '#', 103, 1, sysdate(), null, null, '');
+insert into sys_menu values('1025', '岗位导出', '104', '5',  '', '', '', 1, 0, 'F', '0', '0', 'system:post:export',         '#', 103, 1, sysdate(), null, null, '');
+-- 字典管理按钮
+insert into sys_menu values('1026', '字典查询', '105', '1', '#', '', '', 1, 0, 'F', '0', '0', 'system:dict:query',          '#', 103, 1, sysdate(), null, null, '');
+insert into sys_menu values('1027', '字典新增', '105', '2', '#', '', '', 1, 0, 'F', '0', '0', 'system:dict:add',            '#', 103, 1, sysdate(), null, null, '');
+insert into sys_menu values('1028', '字典修改', '105', '3', '#', '', '', 1, 0, 'F', '0', '0', 'system:dict:edit',           '#', 103, 1, sysdate(), null, null, '');
+insert into sys_menu values('1029', '字典删除', '105', '4', '#', '', '', 1, 0, 'F', '0', '0', 'system:dict:remove',         '#', 103, 1, sysdate(), null, null, '');
+insert into sys_menu values('1030', '字典导出', '105', '5', '#', '', '', 1, 0, 'F', '0', '0', 'system:dict:export',         '#', 103, 1, sysdate(), null, null, '');
+-- 参数设置按钮
+insert into sys_menu values('1031', '参数查询', '106', '1', '#', '', '', 1, 0, 'F', '0', '0', 'system:config:query',        '#', 103, 1, sysdate(), null, null, '');
+insert into sys_menu values('1032', '参数新增', '106', '2', '#', '', '', 1, 0, 'F', '0', '0', 'system:config:add',          '#', 103, 1, sysdate(), null, null, '');
+insert into sys_menu values('1033', '参数修改', '106', '3', '#', '', '', 1, 0, 'F', '0', '0', 'system:config:edit',         '#', 103, 1, sysdate(), null, null, '');
+insert into sys_menu values('1034', '参数删除', '106', '4', '#', '', '', 1, 0, 'F', '0', '0', 'system:config:remove',       '#', 103, 1, sysdate(), null, null, '');
+insert into sys_menu values('1035', '参数导出', '106', '5', '#', '', '', 1, 0, 'F', '0', '0', 'system:config:export',       '#', 103, 1, sysdate(), null, null, '');
+-- 通知公告按钮
+insert into sys_menu values('1036', '公告查询', '107', '1', '#', '', '', 1, 0, 'F', '0', '0', 'system:notice:query',        '#', 103, 1, sysdate(), null, null, '');
+insert into sys_menu values('1037', '公告新增', '107', '2', '#', '', '', 1, 0, 'F', '0', '0', 'system:notice:add',          '#', 103, 1, sysdate(), null, null, '');
+insert into sys_menu values('1038', '公告修改', '107', '3', '#', '', '', 1, 0, 'F', '0', '0', 'system:notice:edit',         '#', 103, 1, sysdate(), null, null, '');
+insert into sys_menu values('1039', '公告删除', '107', '4', '#', '', '', 1, 0, 'F', '0', '0', 'system:notice:remove',       '#', 103, 1, sysdate(), null, null, '');
+-- 操作日志按钮
+insert into sys_menu values('1040', '操作查询', '500', '1', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:operlog:query',      '#', 103, 1, sysdate(), null, null, '');
+insert into sys_menu values('1041', '操作删除', '500', '2', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:operlog:remove',     '#', 103, 1, sysdate(), null, null, '');
+insert into sys_menu values('1042', '日志导出', '500', '4', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:operlog:export',     '#', 103, 1, sysdate(), null, null, '');
+-- 登录日志按钮
+insert into sys_menu values('1043', '登录查询', '501', '1', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:logininfor:query',   '#', 103, 1, sysdate(), null, null, '');
+insert into sys_menu values('1044', '登录删除', '501', '2', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:logininfor:remove',  '#', 103, 1, sysdate(), null, null, '');
+insert into sys_menu values('1045', '日志导出', '501', '3', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:logininfor:export',  '#', 103, 1, sysdate(), null, null, '');
+insert into sys_menu values('1050', '账户解锁', '501', '4', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:logininfor:unlock',  '#', 103, 1, sysdate(), null, null, '');
+-- 在线用户按钮
+insert into sys_menu values('1046', '在线查询', '109', '1', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:online:query',       '#', 103, 1, sysdate(), null, null, '');
+insert into sys_menu values('1047', '批量强退', '109', '2', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:online:batchLogout', '#', 103, 1, sysdate(), null, null, '');
+insert into sys_menu values('1048', '单条强退', '109', '3', '#', '', '', 1, 0, 'F', '0', '0', 'monitor:online:forceLogout', '#', 103, 1, sysdate(), null, null, '');
+-- 代码生成按钮
+insert into sys_menu values('1055', '生成查询', '115', '1', '#', '', '', 1, 0, 'F', '0', '0', 'tool:gen:query',             '#', 103, 1, sysdate(), null, null, '');
+insert into sys_menu values('1056', '生成修改', '115', '2', '#', '', '', 1, 0, 'F', '0', '0', 'tool:gen:edit',              '#', 103, 1, sysdate(), null, null, '');
+insert into sys_menu values('1057', '生成删除', '115', '3', '#', '', '', 1, 0, 'F', '0', '0', 'tool:gen:remove',            '#', 103, 1, sysdate(), null, null, '');
+insert into sys_menu values('1058', '导入代码', '115', '2', '#', '', '', 1, 0, 'F', '0', '0', 'tool:gen:import',            '#', 103, 1, sysdate(), null, null, '');
+insert into sys_menu values('1059', '预览代码', '115', '4', '#', '', '', 1, 0, 'F', '0', '0', 'tool:gen:preview',           '#', 103, 1, sysdate(), null, null, '');
+insert into sys_menu values('1060', '生成代码', '115', '5', '#', '', '', 1, 0, 'F', '0', '0', 'tool:gen:code',              '#', 103, 1, sysdate(), null, null, '');
+-- oss相关按钮
+insert into sys_menu values('1600', '文件查询', '118', '1', '#', '', '', 1, 0, 'F', '0', '0', 'system:oss:query',        '#', 103, 1, sysdate(), null, null, '');
+insert into sys_menu values('1601', '文件上传', '118', '2', '#', '', '', 1, 0, 'F', '0', '0', 'system:oss:upload',       '#', 103, 1, sysdate(), null, null, '');
+insert into sys_menu values('1602', '文件下载', '118', '3', '#', '', '', 1, 0, 'F', '0', '0', 'system:oss:download',     '#', 103, 1, sysdate(), null, null, '');
+insert into sys_menu values('1603', '文件删除', '118', '4', '#', '', '', 1, 0, 'F', '0', '0', 'system:oss:remove',       '#', 103, 1, sysdate(), null, null, '');
+insert into sys_menu values('1620', '配置列表', '118', '5', '#', '', '', 1, 0, 'F', '0', '0', 'system:ossConfig:list',        '#', 103, 1, sysdate(), null, null, '');
+insert into sys_menu values('1621', '配置添加', '118', '6', '#', '', '', 1, 0, 'F', '0', '0', 'system:ossConfig:add',         '#', 103, 1, sysdate(), null, null, '');
+insert into sys_menu values('1622', '配置编辑', '118', '6', '#', '', '', 1, 0, 'F', '0', '0', 'system:ossConfig:edit',        '#', 103, 1, sysdate(), null, null, '');
+insert into sys_menu values('1623', '配置删除', '118', '6', '#', '', '', 1, 0, 'F', '0', '0', 'system:ossConfig:remove',      '#', 103, 1, sysdate(), null, null, '');
+
+-- 客户端管理按钮
+insert into sys_menu values('1061', '客户端管理查询', '123', '1',  '#', '', '', 1, 0, 'F', '0', '0', 'system:client:query',        '#', 103, 1, sysdate(), null, null, '');
+insert into sys_menu values('1062', '客户端管理新增', '123', '2',  '#', '', '', 1, 0, 'F', '0', '0', 'system:client:add',          '#', 103, 1, sysdate(), null, null, '');
+insert into sys_menu values('1063', '客户端管理修改', '123', '3',  '#', '', '', 1, 0, 'F', '0', '0', 'system:client:edit',         '#', 103, 1, sysdate(), null, null, '');
+insert into sys_menu values('1064', '客户端管理删除', '123', '4',  '#', '', '', 1, 0, 'F', '0', '0', 'system:client:remove',       '#', 103, 1, sysdate(), null, null, '');
+insert into sys_menu values('1065', '客户端管理导出', '123', '5',  '#', '', '', 1, 0, 'F', '0', '0', 'system:client:export',       '#', 103, 1, sysdate(), null, null, '');
+-- 测试菜单
+insert into sys_menu values('1500', '测试单表',      '5',    '1', 'demo', 'demo/demo/index', '',  1, 0, 'C', '0', '0', 'demo:demo:list', '#', 103, 1, sysdate(), null, null, '测试单表菜单');
+insert into sys_menu values('1501', '测试单表查询',   '1500', '1', '#',    '', '',  1, 0, 'F', '0', '0', 'demo:demo:query',               '#', 103, 1, sysdate(), null, null, '');
+insert into sys_menu values('1502', '测试单表新增',   '1500', '2', '#',    '', '',  1, 0, 'F', '0', '0', 'demo:demo:add',                 '#', 103, 1, sysdate(), null, null, '');
+insert into sys_menu values('1503', '测试单表修改',   '1500', '3', '#',    '', '',  1, 0, 'F', '0', '0', 'demo:demo:edit',                '#', 103, 1, sysdate(), null, null, '');
+insert into sys_menu values('1504', '测试单表删除',   '1500', '4', '#',    '', '',  1, 0, 'F', '0', '0', 'demo:demo:remove',              '#', 103, 1, sysdate(), null, null, '');
+insert into sys_menu values('1505', '测试单表导出',   '1500', '5', '#',    '', '',  1, 0, 'F', '0', '0', 'demo:demo:export',              '#', 103, 1, sysdate(), null, null, '');
+insert into sys_menu values('1506', '测试树表',      '5',    '1', 'tree', 'demo/tree/index', '',  1, 0, 'C', '0', '0', 'demo:tree:list', '#', 103, 1, sysdate(), null, null, '测试树表菜单');
+insert into sys_menu values('1507', '测试树表查询',   '1506', '1', '#',    '', '',  1, 0, 'F', '0', '0', 'demo:tree:query',               '#', 103, 1, sysdate(), null, null, '');
+insert into sys_menu values('1508', '测试树表新增',   '1506', '2', '#',    '', '',  1, 0, 'F', '0', '0', 'demo:tree:add',                 '#', 103, 1, sysdate(), null, null, '');
+insert into sys_menu values('1509', '测试树表修改',   '1506', '3', '#',    '', '',  1, 0, 'F', '0', '0', 'demo:tree:edit',                '#', 103, 1, sysdate(), null, null, '');
+insert into sys_menu values('1510', '测试树表删除',   '1506', '4', '#',    '', '',  1, 0, 'F', '0', '0', 'demo:tree:remove',              '#', 103, 1, sysdate(), null, null, '');
+insert into sys_menu values('1511', '测试树表导出',   '1506', '5', '#',    '', '',  1, 0, 'F', '0', '0', 'demo:tree:export',              '#', 103, 1, sysdate(), null, null, '');
+
+-- ----------------------------
+-- 6、用户和角色关联表  用户N-1角色
+-- ----------------------------
+create table sys_user_role (
+    user_id   bigint(20) not null comment '用户ID',
+    role_id   bigint(20) not null comment '角色ID',
+    primary key(user_id, role_id)
+) engine=innodb comment = '用户和角色关联表';
+
+-- ----------------------------
+-- 初始化-用户和角色关联表数据
+-- ----------------------------
+insert into sys_user_role values ('1', '1');
+insert into sys_user_role values ('3', '3');
+insert into sys_user_role values ('4', '4');
+
+-- ----------------------------
+-- 7、角色和菜单关联表  角色1-N菜单
+-- ----------------------------
+create table sys_role_menu (
+    role_id   bigint(20) not null comment '角色ID',
+    menu_id   bigint(20) not null comment '菜单ID',
+    primary key(role_id, menu_id)
+) engine=innodb comment = '角色和菜单关联表';
+
+-- ----------------------------
+-- 初始化-角色和菜单关联表数据
+-- ----------------------------
+insert into sys_role_menu values ('3', '1');
+insert into sys_role_menu values ('3', '5');
+insert into sys_role_menu values ('3', '100');
+insert into sys_role_menu values ('3', '101');
+insert into sys_role_menu values ('3', '102');
+insert into sys_role_menu values ('3', '103');
+insert into sys_role_menu values ('3', '104');
+insert into sys_role_menu values ('3', '105');
+insert into sys_role_menu values ('3', '106');
+insert into sys_role_menu values ('3', '107');
+insert into sys_role_menu values ('3', '108');
+insert into sys_role_menu values ('3', '118');
+insert into sys_role_menu values ('3', '123');
+insert into sys_role_menu values ('3', '500');
+insert into sys_role_menu values ('3', '501');
+insert into sys_role_menu values ('3', '1001');
+insert into sys_role_menu values ('3', '1002');
+insert into sys_role_menu values ('3', '1003');
+insert into sys_role_menu values ('3', '1004');
+insert into sys_role_menu values ('3', '1005');
+insert into sys_role_menu values ('3', '1006');
+insert into sys_role_menu values ('3', '1007');
+insert into sys_role_menu values ('3', '1008');
+insert into sys_role_menu values ('3', '1009');
+insert into sys_role_menu values ('3', '1010');
+insert into sys_role_menu values ('3', '1011');
+insert into sys_role_menu values ('3', '1012');
+insert into sys_role_menu values ('3', '1013');
+insert into sys_role_menu values ('3', '1014');
+insert into sys_role_menu values ('3', '1015');
+insert into sys_role_menu values ('3', '1016');
+insert into sys_role_menu values ('3', '1017');
+insert into sys_role_menu values ('3', '1018');
+insert into sys_role_menu values ('3', '1019');
+insert into sys_role_menu values ('3', '1020');
+insert into sys_role_menu values ('3', '1021');
+insert into sys_role_menu values ('3', '1022');
+insert into sys_role_menu values ('3', '1023');
+insert into sys_role_menu values ('3', '1024');
+insert into sys_role_menu values ('3', '1025');
+insert into sys_role_menu values ('3', '1026');
+insert into sys_role_menu values ('3', '1027');
+insert into sys_role_menu values ('3', '1028');
+insert into sys_role_menu values ('3', '1029');
+insert into sys_role_menu values ('3', '1030');
+insert into sys_role_menu values ('3', '1031');
+insert into sys_role_menu values ('3', '1032');
+insert into sys_role_menu values ('3', '1033');
+insert into sys_role_menu values ('3', '1034');
+insert into sys_role_menu values ('3', '1035');
+insert into sys_role_menu values ('3', '1036');
+insert into sys_role_menu values ('3', '1037');
+insert into sys_role_menu values ('3', '1038');
+insert into sys_role_menu values ('3', '1039');
+insert into sys_role_menu values ('3', '1040');
+insert into sys_role_menu values ('3', '1041');
+insert into sys_role_menu values ('3', '1042');
+insert into sys_role_menu values ('3', '1043');
+insert into sys_role_menu values ('3', '1044');
+insert into sys_role_menu values ('3', '1045');
+insert into sys_role_menu values ('3', '1050');
+insert into sys_role_menu values ('3', '1061');
+insert into sys_role_menu values ('3', '1062');
+insert into sys_role_menu values ('3', '1063');
+insert into sys_role_menu values ('3', '1064');
+insert into sys_role_menu values ('3', '1065');
+insert into sys_role_menu values ('3', '1500');
+insert into sys_role_menu values ('3', '1501');
+insert into sys_role_menu values ('3', '1502');
+insert into sys_role_menu values ('3', '1503');
+insert into sys_role_menu values ('3', '1504');
+insert into sys_role_menu values ('3', '1505');
+insert into sys_role_menu values ('3', '1506');
+insert into sys_role_menu values ('3', '1507');
+insert into sys_role_menu values ('3', '1508');
+insert into sys_role_menu values ('3', '1509');
+insert into sys_role_menu values ('3', '1510');
+insert into sys_role_menu values ('3', '1511');
+insert into sys_role_menu values ('3', '1600');
+insert into sys_role_menu values ('3', '1601');
+insert into sys_role_menu values ('3', '1602');
+insert into sys_role_menu values ('3', '1603');
+insert into sys_role_menu values ('3', '1620');
+insert into sys_role_menu values ('3', '1621');
+insert into sys_role_menu values ('3', '1622');
+insert into sys_role_menu values ('3', '1623');
+insert into sys_role_menu values ('3', '11616');
+insert into sys_role_menu values ('3', '11618');
+insert into sys_role_menu values ('3', '11619');
+insert into sys_role_menu values ('3', '11622');
+insert into sys_role_menu values ('3', '11623');
+insert into sys_role_menu values ('3', '11629');
+insert into sys_role_menu values ('3', '11632');
+insert into sys_role_menu values ('3', '11633');
+insert into sys_role_menu values ('3', '11638');
+insert into sys_role_menu values ('3', '11639');
+insert into sys_role_menu values ('3', '11640');
+insert into sys_role_menu values ('3', '11641');
+insert into sys_role_menu values ('3', '11642');
+insert into sys_role_menu values ('3', '11643');
+insert into sys_role_menu values ('4', '5');
+insert into sys_role_menu values ('4', '1500');
+insert into sys_role_menu values ('4', '1501');
+insert into sys_role_menu values ('4', '1502');
+insert into sys_role_menu values ('4', '1503');
+insert into sys_role_menu values ('4', '1504');
+insert into sys_role_menu values ('4', '1505');
+insert into sys_role_menu values ('4', '1506');
+insert into sys_role_menu values ('4', '1507');
+insert into sys_role_menu values ('4', '1508');
+insert into sys_role_menu values ('4', '1509');
+insert into sys_role_menu values ('4', '1510');
+insert into sys_role_menu values ('4', '1511');
+
+-- ----------------------------
+-- 8、角色和部门关联表  角色1-N部门
+-- ----------------------------
+create table sys_role_dept (
+    role_id   bigint(20) not null comment '角色ID',
+    dept_id   bigint(20) not null comment '部门ID',
+    primary key(role_id, dept_id)
+) engine=innodb comment = '角色和部门关联表';
+
+-- ----------------------------
+-- 9、用户与岗位关联表  用户1-N岗位
+-- ----------------------------
+create table sys_user_post
+(
+    user_id   bigint(20) not null comment '用户ID',
+    post_id   bigint(20) not null comment '岗位ID',
+    primary key (user_id, post_id)
+) engine=innodb comment = '用户与岗位关联表';
+
+-- ----------------------------
+-- 初始化-用户与岗位关联表数据
+-- ----------------------------
+insert into sys_user_post values ('1', '1');
+
+-- ----------------------------
+-- 10、操作日志记录
+-- ----------------------------
+create table sys_oper_log (
+    oper_id           bigint(20)      not null                   comment '日志主键',
+    title             varchar(50)     default ''                 comment '模块标题',
+    business_type     int(2)          default 0                  comment '业务类型（0其它 1新增 2修改 3删除）',
+    method            varchar(100)    default ''                 comment '方法名称',
+    request_method    varchar(10)     default ''                 comment '请求方式',
+    operator_type     int(1)          default 0                  comment '操作类别（0其它 1后台用户 2手机端用户）',
+    oper_name         varchar(50)     default ''                 comment '操作人员',
+    dept_name         varchar(50)     default ''                 comment '部门名称',
+    oper_url          varchar(255)    default ''                 comment '请求URL',
+    oper_ip           varchar(128)    default ''                 comment '主机地址',
+    oper_location     varchar(255)    default ''                 comment '操作地点',
+    oper_param        varchar(4000)   default ''                 comment '请求参数',
+    json_result       varchar(4000)   default ''                 comment '返回参数',
+    status            int(1)          default 0                  comment '操作状态（0正常 1异常）',
+    error_msg         varchar(4000)   default ''                 comment '错误消息',
+    oper_time         datetime                                   comment '操作时间',
+    cost_time         bigint(20)      default 0                  comment '消耗时间',
+    primary key (oper_id),
+    key idx_sys_oper_log_bt (business_type),
+    key idx_sys_oper_log_s  (status),
+    key idx_sys_oper_log_ot (oper_time)
+) engine=innodb comment = '操作日志记录';
+
+-- ----------------------------
+-- 11、字典类型表
+-- ----------------------------
+create table sys_dict_type
+(
+    dict_id          bigint(20)      not null                   comment '字典主键',
+    dict_name        varchar(100)    default ''                 comment '字典名称',
+    dict_type        varchar(100)    default ''                 comment '字典类型',
+    create_dept      bigint(20)      default null               comment '创建部门',
+    create_by        bigint(20)      default null               comment '创建者',
+    create_time      datetime                                   comment '创建时间',
+    update_by        bigint(20)      default null               comment '更新者',
+    update_time      datetime                                   comment '更新时间',
+    remark           varchar(500)    default null               comment '备注',
+    primary key (dict_id),
+    unique (dict_type)
+) engine=innodb comment = '字典类型表';
+
+insert into sys_dict_type values(1, '用户性别', 'sys_user_sex',        103, 1, sysdate(), null, null, '用户性别列表');
+insert into sys_dict_type values(2, '菜单状态', 'sys_show_hide',       103, 1, sysdate(), null, null, '菜单状态列表');
+insert into sys_dict_type values(3, '系统开关', 'sys_normal_disable',  103, 1, sysdate(), null, null, '系统开关列表');
+insert into sys_dict_type values(6, '系统是否', 'sys_yes_no',          103, 1, sysdate(), null, null, '系统是否列表');
+insert into sys_dict_type values(7, '通知类型', 'sys_notice_type',     103, 1, sysdate(), null, null, '通知类型列表');
+insert into sys_dict_type values(8, '通知状态', 'sys_notice_status',   103, 1, sysdate(), null, null, '通知状态列表');
+insert into sys_dict_type values(9, '操作类型', 'sys_oper_type',       103, 1, sysdate(), null, null, '操作类型列表');
+insert into sys_dict_type values(10, '系统状态', 'sys_common_status',  103, 1, sysdate(), null, null, '登录状态列表');
+insert into sys_dict_type values(11, '授权类型', 'sys_grant_type',     103, 1, sysdate(), null, null, '认证授权类型');
+insert into sys_dict_type values(12, '设备类型', 'sys_device_type',    103, 1, sysdate(), null, null, '客户端设备类型');
+
+-- ----------------------------
+-- 12、字典数据表
+-- ----------------------------
+create table sys_dict_data
+(
+    dict_code        bigint(20)      not null                   comment '字典编码',
+    dict_sort        int(4)          default 0                  comment '字典排序',
+    dict_label       varchar(100)    default ''                 comment '字典标签',
+    dict_value       varchar(100)    default ''                 comment '字典键值',
+    dict_type        varchar(100)    default ''                 comment '字典类型',
+    css_class        varchar(100)    default null               comment '样式属性（其他样式扩展）',
+    list_class       varchar(100)    default null               comment '表格回显样式',
+    is_default       char(1)         default 'N'                comment '是否默认（Y是 N否）',
+    create_dept      bigint(20)      default null               comment '创建部门',
+    create_by        bigint(20)      default null               comment '创建者',
+    create_time      datetime                                   comment '创建时间',
+    update_by        bigint(20)      default null               comment '更新者',
+    update_time      datetime                                   comment '更新时间',
+    remark           varchar(500)    default null               comment '备注',
+    primary key (dict_code)
+) engine=innodb comment = '字典数据表';
+
+insert into sys_dict_data values(1, 1,  '男',       '0',       'sys_user_sex',        '',   '',        'Y', 103, 1, sysdate(), null, null, '性别男');
+insert into sys_dict_data values(2, 2,  '女',       '1',       'sys_user_sex',        '',   '',        'N', 103, 1, sysdate(), null, null, '性别女');
+insert into sys_dict_data values(3, 3,  '未知',     '2',       'sys_user_sex',        '',   '',        'N', 103, 1, sysdate(), null, null, '性别未知');
+insert into sys_dict_data values(4, 1,  '显示',     '0',       'sys_show_hide',       '',   'primary', 'Y', 103, 1, sysdate(), null, null, '显示菜单');
+insert into sys_dict_data values(5, 2,  '隐藏',     '1',       'sys_show_hide',       '',   'danger',  'N', 103, 1, sysdate(), null, null, '隐藏菜单');
+insert into sys_dict_data values(6, 1,  '正常',     '0',       'sys_normal_disable',  '',   'primary', 'Y', 103, 1, sysdate(), null, null, '正常状态');
+insert into sys_dict_data values(7, 2,  '停用',     '1',       'sys_normal_disable',  '',   'danger',  'N', 103, 1, sysdate(), null, null, '停用状态');
+insert into sys_dict_data values(12, 1,  '是',       'Y',       'sys_yes_no',          '',   'primary', 'Y', 103, 1, sysdate(), null, null, '系统默认是');
+insert into sys_dict_data values(13, 2,  '否',       'N',       'sys_yes_no',          '',   'danger',  'N', 103, 1, sysdate(), null, null, '系统默认否');
+insert into sys_dict_data values(14, 1,  '通知',     '1',       'sys_notice_type',     '',   'warning', 'Y', 103, 1, sysdate(), null, null, '通知');
+insert into sys_dict_data values(15, 2,  '公告',     '2',       'sys_notice_type',     '',   'success', 'N', 103, 1, sysdate(), null, null, '公告');
+insert into sys_dict_data values(16, 1,  '正常',     '0',       'sys_notice_status',   '',   'primary', 'Y', 103, 1, sysdate(), null, null, '正常状态');
+insert into sys_dict_data values(17, 2,  '关闭',     '1',       'sys_notice_status',   '',   'danger',  'N', 103, 1, sysdate(), null, null, '关闭状态');
+insert into sys_dict_data values(29, 99, '其他',     '0',       'sys_oper_type',       '',   'info',    'N', 103, 1, sysdate(), null, null, '其他操作');
+insert into sys_dict_data values(18, 1,  '新增',     '1',       'sys_oper_type',       '',   'info',    'N', 103, 1, sysdate(), null, null, '新增操作');
+insert into sys_dict_data values(19, 2,  '修改',     '2',       'sys_oper_type',       '',   'info',    'N', 103, 1, sysdate(), null, null, '修改操作');
+insert into sys_dict_data values(20, 3,  '删除',     '3',       'sys_oper_type',       '',   'danger',  'N', 103, 1, sysdate(), null, null, '删除操作');
+insert into sys_dict_data values(21, 4,  '授权',     '4',       'sys_oper_type',       '',   'primary', 'N', 103, 1, sysdate(), null, null, '授权操作');
+insert into sys_dict_data values(22, 5,  '导出',     '5',       'sys_oper_type',       '',   'warning', 'N', 103, 1, sysdate(), null, null, '导出操作');
+insert into sys_dict_data values(23, 6,  '导入',     '6',       'sys_oper_type',       '',   'warning', 'N', 103, 1, sysdate(), null, null, '导入操作');
+insert into sys_dict_data values(24, 7,  '强退',     '7',       'sys_oper_type',       '',   'danger',  'N', 103, 1, sysdate(), null, null, '强退操作');
+insert into sys_dict_data values(25, 8,  '生成代码', '8',       'sys_oper_type',       '',   'warning', 'N', 103, 1, sysdate(), null, null, '生成操作');
+insert into sys_dict_data values(26, 9,  '清空数据', '9',       'sys_oper_type',       '',   'danger',  'N', 103, 1, sysdate(), null, null, '清空操作');
+insert into sys_dict_data values(27, 1,  '成功',     '0',       'sys_common_status',   '',   'primary', 'N', 103, 1, sysdate(), null, null, '正常状态');
+insert into sys_dict_data values(28, 2,  '失败',     '1',       'sys_common_status',   '',   'danger',  'N', 103, 1, sysdate(), null, null, '停用状态');
+insert into sys_dict_data values(30, 0,  '密码认证', 'password',   'sys_grant_type',   'el-check-tag',   'default', 'N', 103, 1, sysdate(), null, null, '密码认证');
+insert into sys_dict_data values(31, 0,  '短信认证', 'sms',        'sys_grant_type',   'el-check-tag',   'default', 'N', 103, 1, sysdate(), null, null, '短信认证');
+insert into sys_dict_data values(32, 0,  '邮件认证', 'email',      'sys_grant_type',   'el-check-tag',   'default', 'N', 103, 1, sysdate(), null, null, '邮件认证');
+insert into sys_dict_data values(33, 0,  '小程序认证', 'xcx',      'sys_grant_type',   'el-check-tag',   'default', 'N', 103, 1, sysdate(), null, null, '小程序认证');
+insert into sys_dict_data values(34, 0,  '三方登录认证', 'social', 'sys_grant_type',   'el-check-tag',   'default', 'N', 103, 1, sysdate(), null, null, '三方登录认证');
+insert into sys_dict_data values(35, 0,  'PC',    'pc',         'sys_device_type',     '',   'default', 'N', 103, 1, sysdate(), null, null, 'PC');
+insert into sys_dict_data values(36, 0,  '安卓', 'android',     'sys_device_type',     '',   'default', 'N', 103, 1, sysdate(), null, null, '安卓');
+insert into sys_dict_data values(37, 0,  'iOS', 'ios',          'sys_device_type',     '',   'default', 'N', 103, 1, sysdate(), null, null, 'iOS');
+insert into sys_dict_data values(38, 0,  '小程序', 'xcx',       'sys_device_type',     '',   'default', 'N', 103, 1, sysdate(), null, null, '小程序');
+insert into sys_dict_data values(60, 0, 'App密码认证', 'app_password', 'sys_grant_type', 'el-check-tag', 'default', 'N', 103, 1, sysdate(), null, null, '密码认证');
+insert into sys_dict_data values(61, 0, 'App短信认证', 'app_sms',      'sys_grant_type', 'el-check-tag', 'default', 'N', 103, 1, sysdate(), null, null, '短信认证');
+insert into sys_dict_data values(62, 0, 'App邮件认证', 'app_email',    'sys_grant_type', 'el-check-tag', 'default', 'N', 103, 1, sysdate(), null, null, '邮件认证');
+insert into sys_dict_data values(63, 0, 'App小程序认证', 'app_wechat_miniprogram',    'sys_grant_type', 'el-check-tag', 'default', 'N', 103, 1, sysdate(), null, null, '小程序认证');
+insert into sys_dict_data values(64, 0, 'App微信公众号认证', 'app_wechat_mp',    'sys_grant_type', 'el-check-tag', 'default', 'N', 103, 1, sysdate(), null, null, '小程序认证');
+insert into sys_dict_data values(65, 0, 'App微信开放平台认证', 'app_wechat_open',    'sys_grant_type', 'el-check-tag', 'default', 'N', 103, 1, sysdate(), null, null, '小程序认证');
+insert into sys_dict_data values(66, 0, 'App三方登录认证', 'app_social','sys_grant_type', 'el-check-tag', 'default', 'N', 103, 1, sysdate(), null, null, '三方登录认证');
+
+-- ----------------------------
+-- 13、参数配置表
+-- ----------------------------
+create table sys_config (
+    config_id         bigint(20)      not null                   comment '参数主键',
+    config_name       varchar(100)    default ''                 comment '参数名称',
+    config_key        varchar(100)    default ''                 comment '参数键名',
+    config_value      varchar(500)    default ''                 comment '参数键值',
+    config_type       char(1)         default 'N'                comment '系统内置（Y是 N否）',
+    create_dept       bigint(20)      default null               comment '创建部门',
+    create_by         bigint(20)      default null               comment '创建者',
+    create_time       datetime                                   comment '创建时间',
+    update_by         bigint(20)      default null               comment '更新者',
+    update_time       datetime                                   comment '更新时间',
+    remark            varchar(500)    default null               comment '备注',
+    primary key (config_id)
+) engine=innodb comment = '参数配置表';
+
+insert into sys_config values(1, '主框架页-默认皮肤样式名称',     'sys.index.skinName',            'skin-blue',     'Y', 103, 1, sysdate(), null, null, '蓝色 skin-blue、绿色 skin-green、紫色 skin-purple、红色 skin-red、黄色 skin-yellow' );
+insert into sys_config values(2, '用户管理-账号初始密码',        'sys.user.initPassword',         '123456',        'Y', 103, 1, sysdate(), null, null, '初始化密码 123456' );
+insert into sys_config values(3, '主框架页-侧边栏主题',          'sys.index.sideTheme',           'theme-dark',    'Y', 103, 1, sysdate(), null, null, '深色主题theme-dark，浅色主题theme-light' );
+insert into sys_config values(5, '账号自助-是否开启用户注册功能',  'sys.account.registerUser',      'false',         'Y', 103, 1, sysdate(), null, null, '是否开启注册用户功能（true开启，false关闭）');
+insert into sys_config values(11, 'OSS预览列表资源开关',         'sys.oss.previewListResource',   'true',          'Y', 103, 1, sysdate(), null, null, 'true:开启, false:关闭');
+
+-- ----------------------------
+-- 14、系统访问记录
+-- ----------------------------
+create table sys_logininfor (
+    info_id        bigint(20)     not null                  comment '访问ID',
+    user_name      varchar(50)    default ''                comment '用户账号',
+    client_key     varchar(32)    default ''                comment '客户端',
+    device_type    varchar(32)    default ''                comment '设备类型',
+    ipaddr         varchar(128)   default ''                comment '登录IP地址',
+    login_location varchar(255)   default ''                comment '登录地点',
+    browser        varchar(50)    default ''                comment '浏览器类型',
+    os             varchar(50)    default ''                comment '操作系统',
+    status         char(1)        default '0'               comment '登录状态（0成功 1失败）',
+    msg            varchar(255)   default ''                comment '提示消息',
+    login_time     datetime                                 comment '访问时间',
+    primary key (info_id),
+    key idx_sys_logininfor_s  (status),
+    key idx_sys_logininfor_lt (login_time)
+) engine=innodb comment = '系统访问记录';
+
+
+-- ----------------------------
+-- 17、通知公告表
+-- ----------------------------
+create table sys_notice (
+    notice_id         bigint(20)      not null                   comment '公告ID',
+    notice_title      varchar(50)     not null                   comment '公告标题',
+    notice_type       char(1)         not null                   comment '公告类型（1通知 2公告）',
+    notice_content    longblob        default null               comment '公告内容',
+    status            char(1)         default '0'                comment '公告状态（0正常 1关闭）',
+    create_dept       bigint(20)      default null               comment '创建部门',
+    create_by         bigint(20)      default null               comment '创建者',
+    create_time       datetime                                   comment '创建时间',
+    update_by         bigint(20)      default null               comment '更新者',
+    update_time       datetime                                   comment '更新时间',
+    remark            varchar(255)    default null               comment '备注',
+    primary key (notice_id)
+) engine=innodb comment = '通知公告表';
+
+-- ----------------------------
+-- 初始化-公告信息表数据
+-- ----------------------------
+insert into sys_notice values('1', '温馨提醒：2018-07-01 新版本发布啦', '2', '新版本内容', '0', 103, 1, sysdate(), null, null, '管理员');
+insert into sys_notice values('2', '维护通知：2018-07-01 系统凌晨维护', '1', '维护内容',   '0', 103, 1, sysdate(), null, null, '管理员');
+
+
+-- ----------------------------
+-- 18、代码生成业务表
+-- ----------------------------
+create table gen_table (
+    table_id          bigint(20)      not null                   comment '编号',
+    data_name         varchar(200)    default ''                 comment '数据源名称',
+    table_name        varchar(200)    default ''                 comment '表名称',
+    table_comment     varchar(500)    default ''                 comment '表描述',
+    sub_table_name    varchar(64)     default null               comment '关联子表的表名',
+    sub_table_fk_name varchar(64)     default null               comment '子表关联的外键名',
+    class_name        varchar(100)    default ''                 comment '实体类名称',
+    tpl_category      varchar(200)    default 'crud'             comment '使用的模板（crud单表操作 tree树表操作）',
+    package_name      varchar(100)                               comment '生成包路径',
+    module_name       varchar(30)                                comment '生成模块名',
+    business_name     varchar(30)                                comment '生成业务名',
+    function_name     varchar(50)                                comment '生成功能名',
+    function_author   varchar(50)                                comment '生成功能作者',
+    gen_type          char(1)         default '0'                comment '生成代码方式（0zip压缩包 1自定义路径）',
+    gen_path          varchar(200)    default '/'                comment '生成路径（不填默认项目路径）',
+    options           varchar(1000)                              comment '其它生成选项',
+    create_dept       bigint(20)      default null               comment '创建部门',
+    create_by         bigint(20)      default null               comment '创建者',
+    create_time       datetime                                   comment '创建时间',
+    update_by         bigint(20)      default null               comment '更新者',
+    update_time       datetime                                   comment '更新时间',
+    remark            varchar(500)    default null               comment '备注',
+    primary key (table_id)
+) engine=innodb comment = '代码生成业务表';
+
+
+-- ----------------------------
+-- 19、代码生成业务表字段
+-- ----------------------------
+create table gen_table_column (
+    column_id         bigint(20)      not null                   comment '编号',
+    table_id          bigint(20)                                 comment '归属表编号',
+    column_name       varchar(200)                               comment '列名称',
+    column_comment    varchar(500)                               comment '列描述',
+    column_type       varchar(100)                               comment '列类型',
+    java_type         varchar(500)                               comment 'JAVA类型',
+    java_field        varchar(200)                               comment 'JAVA字段名',
+    is_pk             char(1)                                    comment '是否主键（1是）',
+    is_increment      char(1)                                    comment '是否自增（1是）',
+    is_required       char(1)                                    comment '是否必填（1是）',
+    is_insert         char(1)                                    comment '是否为插入字段（1是）',
+    is_edit           char(1)                                    comment '是否编辑字段（1是）',
+    is_list           char(1)                                    comment '是否列表字段（1是）',
+    is_query          char(1)                                    comment '是否查询字段（1是）',
+    query_type        varchar(200)    default 'EQ'               comment '查询方式（等于、不等于、大于、小于、范围）',
+    html_type         varchar(200)                               comment '显示类型（文本框、文本域、下拉框、复选框、单选框、日期控件）',
+    dict_type         varchar(200)    default ''                 comment '字典类型',
+    sort              int                                        comment '排序',
+    create_dept       bigint(20)      default null               comment '创建部门',
+    create_by         bigint(20)      default null               comment '创建者',
+    create_time       datetime                                   comment '创建时间',
+    update_by         bigint(20)      default null               comment '更新者',
+    update_time       datetime                                   comment '更新时间',
+    primary key (column_id)
+) engine=innodb comment = '代码生成业务表字段';
+
+-- ----------------------------
+-- OSS对象存储表
+-- ----------------------------
+create table sys_oss (
+    oss_id          bigint(20)   not null                   comment '对象存储主键',
+    file_name       varchar(255) not null default ''        comment '文件名',
+    original_name   varchar(255) not null default ''        comment '原名',
+    file_suffix     varchar(10)  not null default ''        comment '文件后缀名',
+    url             varchar(500) not null                   comment 'URL地址',
+    ext1            text                  default null      comment '扩展字段',
+    create_dept     bigint(20)            default null      comment '创建部门',
+    create_time     datetime              default null      comment '创建时间',
+    create_by       bigint(20)            default null      comment '上传人',
+    update_time     datetime              default null      comment '更新时间',
+    update_by       bigint(20)            default null      comment '更新人',
+    service         varchar(20)  not null default 'minio'   comment '服务商',
+    primary key (oss_id)
+) engine=innodb comment ='OSS对象存储表';
+
+-- ----------------------------
+-- OSS对象存储动态配置表
+-- ----------------------------
+create table sys_oss_config (
+    oss_config_id   bigint(20)    not null                  comment '主键',
+    config_key      varchar(20)   not null  default ''      comment '配置key',
+    access_key      varchar(255)            default ''      comment 'accessKey',
+    secret_key      varchar(255)            default ''      comment '秘钥',
+    bucket_name     varchar(255)            default ''      comment '桶名称',
+    prefix          varchar(255)            default ''      comment '前缀',
+    endpoint        varchar(255)            default ''      comment '访问站点',
+    domain          varchar(255)            default ''      comment '自定义域名',
+    is_https        char(1)                 default 'N'     comment '是否https（Y=是,N=否）',
+    region          varchar(255)            default ''      comment '域',
+    access_policy   char(1)       not null  default '1'     comment '桶权限类型(0=private 1=public 2=custom)',
+    status          char(1)                 default '1'     comment '是否默认（0=是,1=否）',
+    ext1            varchar(255)            default ''      comment '扩展字段',
+    create_dept     bigint(20)              default null    comment '创建部门',
+    create_by       bigint(20)              default null    comment '创建者',
+    create_time     datetime                default null    comment '创建时间',
+    update_by       bigint(20)              default null    comment '更新者',
+    update_time     datetime                default null    comment '更新时间',
+    remark          varchar(500)            default null    comment '备注',
+    primary key (oss_config_id)
+) engine=innodb comment='对象存储配置表';
+
+insert into sys_oss_config values (1, 'minio',  'ruoyi',            'ruoyi123',        'ruoyi',             '', '127.0.0.1:9000',                '','N', '',             '1' ,'0', '', 103, 1, sysdate(), 1, sysdate(), null);
+insert into sys_oss_config values (2, 'qiniu',  'XXXXXXXXXXXXXXX',  'XXXXXXXXXXXXXXX', 'ruoyi',             '', 's3-cn-north-1.qiniucs.com',     '','N', '',             '1' ,'1', '', 103, 1, sysdate(), 1, sysdate(), null);
+insert into sys_oss_config values (3, 'aliyun', 'XXXXXXXXXXXXXXX',  'XXXXXXXXXXXXXXX', 'ruoyi',             '', 'oss-cn-beijing.aliyuncs.com',   '','N', '',             '1' ,'1', '', 103, 1, sysdate(), 1, sysdate(), null);
+insert into sys_oss_config values (4, 'qcloud', 'XXXXXXXXXXXXXXX',  'XXXXXXXXXXXXXXX', 'ruoyi-1240000000',  '', 'cos.ap-beijing.myqcloud.com',   '','N', 'ap-beijing',   '1' ,'1', '', 103, 1, sysdate(), 1, sysdate(), null);
+insert into sys_oss_config values (5, 'image',  'ruoyi',            'ruoyi123',        'ruoyi',             'image', '127.0.0.1:9000',           '','N', '',             '1' ,'1', '', 103, 1, sysdate(), 1, sysdate(), null);
+
+-- ----------------------------
+-- 系统授权表
+-- ----------------------------
+create table sys_client (
+    id                  bigint(20)    not null            comment 'id',
+    client_id           varchar(64)   default null        comment '客户端id',
+    client_key          varchar(32)   default null        comment '客户端key',
+    client_secret       varchar(255)  default null        comment '客户端秘钥',
+    grant_type          varchar(255)  default null        comment '授权类型',
+    device_type         varchar(32)   default null        comment '设备类型',
+    active_timeout      int(11)       default 1800        comment 'token活跃超时时间',
+    timeout             int(11)       default 604800      comment 'token固定超时',
+    status              char(1)       default '0'         comment '状态（0正常 1停用）',
+    del_flag            char(1)       default '0'         comment '删除标志（0代表存在 1代表删除）',
+    create_dept         bigint(20)    default null        comment '创建部门',
+    create_by           bigint(20)    default null        comment '创建者',
+    create_time         datetime      default null        comment '创建时间',
+    update_by           bigint(20)    default null        comment '更新者',
+    update_time         datetime      default null        comment '更新时间',
+    primary key (id)
+) engine=innodb comment='系统授权表';
+
+insert into sys_client values (1, 'e5cd7e4891bf95d1d19206ce24a7b32e', 'pc', 'pc123', 'password,social', 'pc', 1800, 604800, 0, 0, 103, 1, sysdate(), 1, sysdate());
+insert into sys_client values (2, '428a8310cd442757ae699df5d894f051', 'app', 'app123', 'app_password,app_sms,app_social', 'android', 1800, 604800, 0, 0, 103, 1, sysdate(), 1, sysdate());
+
+
+CREATE TABLE test_demo
+(
+    id          bigint(0)    NOT NULL COMMENT '主键',
+    dept_id     bigint(0)    NULL DEFAULT NULL COMMENT '部门id',
+    user_id     bigint(0)    NULL DEFAULT NULL COMMENT '用户id',
+    order_num   int(0)       NULL DEFAULT 0 COMMENT '排序号',
+    test_key    varchar(255) NULL DEFAULT NULL COMMENT 'key键',
+    value       varchar(255) NULL DEFAULT NULL COMMENT '值',
+    version     int(0)       NULL DEFAULT 0 COMMENT '版本',
+    create_dept bigint(0)    NULL DEFAULT NULL COMMENT '创建部门',
+    create_time datetime(0)  NULL DEFAULT NULL COMMENT '创建时间',
+    create_by   bigint(0)    NULL DEFAULT NULL COMMENT '创建人',
+    update_time datetime(0)  NULL DEFAULT NULL COMMENT '更新时间',
+    update_by   bigint(0)    NULL DEFAULT NULL COMMENT '更新人',
+    del_flag    int(0)       NULL DEFAULT 0 COMMENT '删除标志',
+    PRIMARY KEY (id) USING BTREE
+) ENGINE = InnoDB COMMENT = '测试单表';
+
+CREATE TABLE test_tree
+(
+    id          bigint(0)    NOT NULL COMMENT '主键',
+    parent_id   bigint(0)    NULL DEFAULT 0 COMMENT '父id',
+    dept_id     bigint(0)    NULL DEFAULT NULL COMMENT '部门id',
+    user_id     bigint(0)    NULL DEFAULT NULL COMMENT '用户id',
+    tree_name   varchar(255) NULL DEFAULT NULL COMMENT '值',
+    version     int(0)       NULL DEFAULT 0 COMMENT '版本',
+    create_dept bigint(0)    NULL DEFAULT NULL COMMENT '创建部门',
+    create_time datetime(0)  NULL DEFAULT NULL COMMENT '创建时间',
+    create_by   bigint(0)    NULL DEFAULT NULL COMMENT '创建人',
+    update_time datetime(0)  NULL DEFAULT NULL COMMENT '更新时间',
+    update_by   bigint(0)    NULL DEFAULT NULL COMMENT '更新人',
+    del_flag    int(0)       NULL DEFAULT 0 COMMENT '删除标志',
+    PRIMARY KEY (id) USING BTREE
+) ENGINE = InnoDB COMMENT = '测试树表';
+
+INSERT INTO test_demo VALUES (1, 102, 4, 1, '测试数据权限', '测试', 0, 103, sysdate(), 1, NULL, NULL, 0);
+INSERT INTO test_demo VALUES (2, 102, 3, 2, '子节点1', '111', 0, 103, sysdate(), 1, NULL, NULL, 0);
+INSERT INTO test_demo VALUES (3, 102, 3, 3, '子节点2', '222', 0, 103, sysdate(), 1, NULL, NULL, 0);
+INSERT INTO test_demo VALUES (4, 108, 4, 4, '测试数据', 'demo', 0, 103, sysdate(), 1, NULL, NULL, 0);
+INSERT INTO test_demo VALUES (5, 108, 3, 13, '子节点11', '1111', 0, 103, sysdate(), 1, NULL, NULL, 0);
+INSERT INTO test_demo VALUES (6, 108, 3, 12, '子节点22', '2222', 0, 103, sysdate(), 1, NULL, NULL, 0);
+INSERT INTO test_demo VALUES (7, 108, 3, 11, '子节点33', '3333', 0, 103, sysdate(), 1, NULL, NULL, 0);
+INSERT INTO test_demo VALUES (8, 108, 3, 10, '子节点44', '4444', 0, 103, sysdate(), 1, NULL, NULL, 0);
+INSERT INTO test_demo VALUES (9, 108, 3, 9, '子节点55', '5555', 0, 103, sysdate(), 1, NULL, NULL, 0);
+INSERT INTO test_demo VALUES (10, 108, 3, 8, '子节点66', '6666', 0, 103, sysdate(), 1, NULL, NULL, 0);
+INSERT INTO test_demo VALUES (11, 108, 3, 7, '子节点77', '7777', 0, 103, sysdate(), 1, NULL, NULL, 0);
+INSERT INTO test_demo VALUES (12, 108, 3, 6, '子节点88', '8888', 0, 103, sysdate(), 1, NULL, NULL, 0);
+INSERT INTO test_demo VALUES (13, 108, 3, 5, '子节点99', '9999', 0, 103, sysdate(), 1, NULL, NULL, 0);
+
+INSERT INTO test_tree VALUES (1, 0, 102, 4, '测试数据权限', 0, 103, sysdate(), 1, NULL, NULL, 0);
+INSERT INTO test_tree VALUES (2, 1, 102, 3, '子节点1', 0, 103, sysdate(), 1, NULL, NULL, 0);
+INSERT INTO test_tree VALUES (3, 2, 102, 3, '子节点2', 0, 103, sysdate(), 1, NULL, NULL, 0);
+INSERT INTO test_tree VALUES (4, 0, 108, 4, '测试树1', 0, 103, sysdate(), 1, NULL, NULL, 0);
+INSERT INTO test_tree VALUES (5, 4, 108, 3, '子节点11', 0, 103, sysdate(), 1, NULL, NULL, 0);
+INSERT INTO test_tree VALUES (6, 4, 108, 3, '子节点22', 0, 103, sysdate(), 1, NULL, NULL, 0);
+INSERT INTO test_tree VALUES (7, 4, 108, 3, '子节点33', 0, 103, sysdate(), 1, NULL, NULL, 0);
+INSERT INTO test_tree VALUES (8, 5, 108, 3, '子节点44', 0, 103, sysdate(), 1, NULL, NULL, 0);
+INSERT INTO test_tree VALUES (9, 6, 108, 3, '子节点55', 0, 103, sysdate(), 1, NULL, NULL, 0);
+INSERT INTO test_tree VALUES (10, 7, 108, 3, '子节点66', 0, 103, sysdate(), 1, NULL, NULL, 0);
+INSERT INTO test_tree VALUES (11, 7, 108, 3, '子节点77', 0, 103, sysdate(), 1, NULL, NULL, 0);
+INSERT INTO test_tree VALUES (12, 10, 108, 3, '子节点88', 0, 103, sysdate(), 1, NULL, NULL, 0);
+INSERT INTO test_tree VALUES (13, 10, 108, 3, '子节点99', 0, 103, sysdate(), 1, NULL, NULL, 0);
diff --git a/script/sql/ry_workflow.sql b/script/sql/ry_workflow.sql
new file mode 100644
index 0000000..77ed93c
--- /dev/null
+++ b/script/sql/ry_workflow.sql
@@ -0,0 +1,255 @@
+-- ----------------------------
+-- 0、warm-flow-all.sql，地址：https://gitee.com/dromara/warm-flow/blob/master/sql/mysql/warm-flow-all.sql
+-- ----------------------------
+CREATE TABLE `flow_definition`
+(
+    `id`              bigint          NOT NULL COMMENT '主键id',
+    `flow_code`       varchar(40)     NOT NULL COMMENT '流程编码',
+    `flow_name`       varchar(100)    NOT NULL COMMENT '流程名称',
+    `category`        varchar(100)             DEFAULT NULL COMMENT '流程类别',
+    `version`         varchar(20)     NOT NULL COMMENT '流程版本',
+    `is_publish`      tinyint(1)      NOT NULL DEFAULT '0' COMMENT '是否发布（0未发布 1已发布 9失效）',
+    `form_custom`     char(1)                  DEFAULT 'N' COMMENT '审批表单是否自定义（Y是 N否）',
+    `form_path`       varchar(100)             DEFAULT NULL COMMENT '审批表单路径',
+    `activity_status` tinyint(1)      NOT NULL DEFAULT '1' COMMENT '流程激活状态（0挂起 1激活）',
+    `listener_type`   varchar(100)             DEFAULT NULL COMMENT '监听器类型',
+    `listener_path`   varchar(400)             DEFAULT NULL COMMENT '监听器路径',
+    `ext`             varchar(500)             DEFAULT NULL COMMENT '业务详情 存业务表对象json字符串',
+    `create_time`     datetime                 DEFAULT NULL COMMENT '创建时间',
+    `update_time`     datetime                 DEFAULT NULL COMMENT '更新时间',
+    `del_flag`        char(1)                  DEFAULT '0' COMMENT '删除标志',
+    `tenant_id`       varchar(40)              DEFAULT NULL COMMENT '租户id',
+    PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB COMMENT ='流程定义表';
+
+CREATE TABLE `flow_node`
+(
+    `id`              bigint        NOT NULL COMMENT '主键id',
+    `node_type`       tinyint(1)      NOT NULL COMMENT '节点类型（0开始节点 1中间节点 2结束节点 3互斥网关 4并行网关）',
+    `definition_id`   bigint          NOT NULL COMMENT '流程定义id',
+    `node_code`       varchar(100)    NOT NULL COMMENT '流程节点编码',
+    `node_name`       varchar(100)  DEFAULT NULL COMMENT '流程节点名称',
+    `permission_flag` varchar(200)  DEFAULT NULL COMMENT '权限标识（权限类型:权限标识，可以多个，用@@隔开)',
+    `node_ratio`      decimal(6, 3) DEFAULT NULL COMMENT '流程签署比例值',
+    `coordinate`      varchar(100)  DEFAULT NULL COMMENT '坐标',
+    `any_node_skip`   varchar(100)  DEFAULT NULL COMMENT '任意结点跳转',
+    `listener_type`   varchar(100)  DEFAULT NULL COMMENT '监听器类型',
+    `listener_path`   varchar(400)  DEFAULT NULL COMMENT '监听器路径',
+    `handler_type`    varchar(100)  DEFAULT NULL COMMENT '处理器类型',
+    `handler_path`    varchar(400)  DEFAULT NULL COMMENT '处理器路径',
+    `form_custom`     char(1)       DEFAULT 'N' COMMENT '审批表单是否自定义（Y是 N否）',
+    `form_path`       varchar(100)  DEFAULT NULL COMMENT '审批表单路径',
+    `version`         varchar(20)     NOT NULL COMMENT '版本',
+    `create_time`     datetime      DEFAULT NULL COMMENT '创建时间',
+    `update_time`     datetime      DEFAULT NULL COMMENT '更新时间',
+    `ext`             text          COMMENT '节点扩展属性',
+    `del_flag`        char(1)       DEFAULT '0' COMMENT '删除标志',
+    `tenant_id`       varchar(40)   DEFAULT NULL COMMENT '租户id',
+    PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB COMMENT ='流程节点表';
+
+CREATE TABLE `flow_skip`
+(
+    `id`             bigint       NOT NULL COMMENT '主键id',
+    `definition_id`  bigint          NOT NULL COMMENT '流程定义id',
+    `now_node_code`  varchar(100)    NOT NULL COMMENT '当前流程节点的编码',
+    `now_node_type`  tinyint(1)   DEFAULT NULL COMMENT '当前节点类型（0开始节点 1中间节点 2结束节点 3互斥网关 4并行网关）',
+    `next_node_code` varchar(100)    NOT NULL COMMENT '下一个流程节点的编码',
+    `next_node_type` tinyint(1)   DEFAULT NULL COMMENT '下一个节点类型（0开始节点 1中间节点 2结束节点 3互斥网关 4并行网关）',
+    `skip_name`      varchar(100) DEFAULT NULL COMMENT '跳转名称',
+    `skip_type`      varchar(40)  DEFAULT NULL COMMENT '跳转类型（PASS审批通过 REJECT退回）',
+    `skip_condition` varchar(200) DEFAULT NULL COMMENT '跳转条件',
+    `coordinate`     varchar(100) DEFAULT NULL COMMENT '坐标',
+    `create_time`    datetime     DEFAULT NULL COMMENT '创建时间',
+    `update_time`    datetime     DEFAULT NULL COMMENT '更新时间',
+    `del_flag`       char(1)      DEFAULT '0' COMMENT '删除标志',
+    `tenant_id`      varchar(40)  DEFAULT NULL COMMENT '租户id',
+    PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB COMMENT ='节点跳转关联表';
+
+CREATE TABLE `flow_instance`
+(
+    `id`              bigint      NOT NULL COMMENT '主键id',
+    `definition_id`   bigint      NOT NULL COMMENT '对应flow_definition表的id',
+    `business_id`     varchar(40) NOT NULL COMMENT '业务id',
+    `node_type`       tinyint(1)  NOT NULL COMMENT '节点类型（0开始节点 1中间节点 2结束节点 3互斥网关 4并行网关）',
+    `node_code`       varchar(40) NOT NULL COMMENT '流程节点编码',
+    `node_name`       varchar(100)         DEFAULT NULL COMMENT '流程节点名称',
+    `variable`        text COMMENT '任务变量',
+    `flow_status`     varchar(20) NOT NULL COMMENT '流程状态（0待提交 1审批中 2审批通过 4终止 5作废 6撤销 8已完成 9已退回 10失效 11拿回）',
+    `activity_status` tinyint(1)  NOT NULL DEFAULT '1' COMMENT '流程激活状态（0挂起 1激活）',
+    `def_json`        text COMMENT '流程定义json',
+    `create_by`       varchar(64)          DEFAULT '' COMMENT '创建者',
+    `create_time`     datetime             DEFAULT NULL COMMENT '创建时间',
+    `update_time`     datetime             DEFAULT NULL COMMENT '更新时间',
+    `ext`             varchar(500)         DEFAULT NULL COMMENT '扩展字段，预留给业务系统使用',
+    `del_flag`        char(1)              DEFAULT '0' COMMENT '删除标志',
+    `tenant_id`       varchar(40)          DEFAULT NULL COMMENT '租户id',
+    PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB COMMENT ='流程实例表';
+
+CREATE TABLE `flow_task`
+(
+    `id`            bigint       NOT NULL COMMENT '主键id',
+    `definition_id` bigint       NOT NULL COMMENT '对应flow_definition表的id',
+    `instance_id`   bigint       NOT NULL COMMENT '对应flow_instance表的id',
+    `node_code`     varchar(100) NOT NULL COMMENT '节点编码',
+    `node_name`     varchar(100) DEFAULT NULL COMMENT '节点名称',
+    `node_type`     tinyint(1)   NOT NULL COMMENT '节点类型（0开始节点 1中间节点 2结束节点 3互斥网关 4并行网关）',
+    `flow_status`   varchar(20)  NOT NULL COMMENT '流程状态（0待提交 1审批中 2审批通过 4终止 5作废 6撤销 8已完成 9已退回 10失效 11拿回）',
+    `form_custom`   char(1)      DEFAULT 'N' COMMENT '审批表单是否自定义（Y是 N否）',
+    `form_path`     varchar(100) DEFAULT NULL COMMENT '审批表单路径',
+    `create_time`   datetime     DEFAULT NULL COMMENT '创建时间',
+    `update_time`   datetime     DEFAULT NULL COMMENT '更新时间',
+    `del_flag`      char(1)      DEFAULT '0' COMMENT '删除标志',
+    `tenant_id`     varchar(40)  DEFAULT NULL COMMENT '租户id',
+    PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB COMMENT ='待办任务表';
+
+CREATE TABLE `flow_his_task`
+(
+    `id`               bigint(20)                   NOT NULL COMMENT '主键id',
+    `definition_id`    bigint(20)                   NOT NULL COMMENT '对应flow_definition表的id',
+    `instance_id`      bigint(20)                   NOT NULL COMMENT '对应flow_instance表的id',
+    `task_id`          bigint(20)                   NOT NULL COMMENT '对应flow_task表的id',
+    `node_code`        varchar(100)                 DEFAULT NULL COMMENT '开始节点编码',
+    `node_name`        varchar(100)                 DEFAULT NULL COMMENT '开始节点名称',
+    `node_type`        tinyint(1)                   DEFAULT NULL COMMENT '开始节点类型（0开始节点 1中间节点 2结束节点 3互斥网关 4并行网关）',
+    `target_node_code` varchar(200)                 DEFAULT NULL COMMENT '目标节点编码',
+    `target_node_name` varchar(200)                 DEFAULT NULL COMMENT '结束节点名称',
+    `approver`         varchar(40)                  DEFAULT NULL COMMENT '审批者',
+    `cooperate_type`   tinyint(1)                   NOT NULL DEFAULT '0' COMMENT '协作方式(1审批 2转办 3委派 4会签 5票签 6加签 7减签)',
+    `collaborator`     varchar(40)                  DEFAULT NULL COMMENT '协作人',
+    `skip_type`        varchar(10)                  NOT NULL COMMENT '流转类型（PASS通过 REJECT退回 NONE无动作）',
+    `flow_status`      varchar(20)                  NOT NULL COMMENT '流程状态（0待提交 1审批中 2审批通过 4终止 5作废 6撤销 8已完成 9已退回 10失效 11拿回）',
+    `form_custom`      char(1)                      DEFAULT 'N' COMMENT '审批表单是否自定义（Y是 N否）',
+    `form_path`        varchar(100)                 DEFAULT NULL COMMENT '审批表单路径',
+    `message`          varchar(500)                 DEFAULT NULL COMMENT '审批意见',
+    `variable`         TEXT                         DEFAULT NULL COMMENT '任务变量',
+    `ext`              TEXT                         DEFAULT NULL COMMENT '业务详情 存业务表对象json字符串',
+    `create_time`      datetime                     DEFAULT NULL COMMENT '任务开始时间',
+    `update_time`      datetime                     DEFAULT NULL COMMENT '审批完成时间',
+    `del_flag`         char(1)                      DEFAULT '0' COMMENT '删除标志',
+    `tenant_id`        varchar(40)                  DEFAULT NULL COMMENT '租户id',
+    PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB COMMENT ='历史任务记录表';
+
+
+CREATE TABLE `flow_user`
+(
+    `id`           bigint      NOT NULL COMMENT '主键id',
+    `type`         char(1)         NOT NULL COMMENT '人员类型（1待办任务的审批人权限 2待办任务的转办人权限 3待办任务的委托人权限）',
+    `processed_by` varchar(80) DEFAULT NULL COMMENT '权限人',
+    `associated`   bigint          NOT NULL COMMENT '任务表id',
+    `create_time`  datetime    DEFAULT NULL COMMENT '创建时间',
+    `create_by`    varchar(80) DEFAULT NULL COMMENT '创建人',
+    `update_time`  datetime    DEFAULT NULL COMMENT '更新时间',
+    `del_flag`     char(1)     DEFAULT '0' COMMENT '删除标志',
+    `tenant_id`    varchar(40) DEFAULT NULL COMMENT '租户id',
+    PRIMARY KEY (`id`) USING BTREE,
+    KEY `user_processed_type` (`processed_by`, `type`),
+    KEY `user_associated` (`associated`) USING BTREE
+) ENGINE = InnoDB COMMENT ='流程用户表';
+
+-- ----------------------------
+-- 流程分类表
+-- ----------------------------
+create table flow_category
+(
+    category_id   bigint(20)  not null comment '流程分类ID',
+    parent_id     bigint(20)   default 0 comment '父流程分类id',
+    ancestors     varchar(500) default '' comment '祖级列表',
+    category_name varchar(30) not null comment '流程分类名称',
+    order_num     int(4)       default 0 comment '显示顺序',
+    del_flag      char(1)      default '0' comment '删除标志（0代表存在 1代表删除）',
+    create_dept   bigint(20)  null comment '创建部门',
+    create_by     bigint(20)  null comment '创建者',
+    create_time   datetime    null comment '创建时间',
+    update_by     bigint(20)  null comment '更新者',
+    update_time   datetime    null comment '更新时间',
+    primary key (category_id)
+) engine = innodb comment = '流程分类';
+
+INSERT INTO flow_category values (100, 0, '0', 'OA审批', 0, '0', 103, 1, sysdate(), null, null);
+INSERT INTO flow_category values (101, 100, '0,100', '假勤管理', 0, '0', 103, 1, sysdate(), null, null);
+INSERT INTO flow_category values (102, 100, '0,100', '人事管理', 1, '0', 103, 1, sysdate(), null, null);
+INSERT INTO flow_category values (103, 101, '0,100,101', '请假', 0, '0', 103, 1, sysdate(), null, null);
+INSERT INTO flow_category values (104, 101, '0,100,101', '出差', 1, '0', 103, 1, sysdate(), null, null);
+INSERT INTO flow_category values (105, 101, '0,100,101', '加班', 2, '0', 103, 1, sysdate(), null, null);
+INSERT INTO flow_category values (106, 101, '0,100,101', '换班', 3, '0', 103, 1, sysdate(), null, null);
+INSERT INTO flow_category values (107, 101, '0,100,101', '外出', 4, '0', 103, 1, sysdate(), null, null);
+INSERT INTO flow_category values (108, 102, '0,100,102', '转正', 1, '0', 103, 1, sysdate(), null, null);
+INSERT INTO flow_category values (109, 102, '0,100,102', '离职', 2, '0', 103, 1, sysdate(), null, null);
+
+-- ----------------------------
+-- 请假单信息
+-- ----------------------------
+create table test_leave
+(
+    id          bigint(20)   not null comment 'id',
+    leave_type  varchar(255) not null comment '请假类型',
+    start_date  datetime     not null comment '开始时间',
+    end_date    datetime     not null comment '结束时间',
+    leave_days  int(10)      not null comment '请假天数',
+    remark      varchar(255) null comment '请假原因',
+    status      varchar(255) null comment '状态',
+    create_dept bigint       null comment '创建部门',
+    create_by   bigint       null comment '创建者',
+    create_time datetime     null comment '创建时间',
+    update_by   bigint       null comment '更新者',
+    update_time datetime     null comment '更新时间',
+    PRIMARY KEY (id) USING BTREE
+) ENGINE = InnoDB COMMENT = '请假申请表';
+
+insert into sys_menu values ('11616', '工作流', '0', '6', 'workflow', '', '', '1', '0', 'M', '0', '0', '', 'workflow', 103, 1, sysdate(),NULL, NULL, '');
+insert into sys_menu values ('11618', '我的任务', '0', '7', 'task', '', '', '1', '0', 'M', '0', '0', '', 'my-task', 103, 1, sysdate(), NULL, NULL, '');
+insert into sys_menu values ('11619', '我的待办', '11618', '2', 'taskWaiting', 'workflow/task/taskWaiting', '', '1', '1', 'C', '0', '0', '', 'waiting', 103, 1, sysdate(), NULL, NULL, '');
+insert into sys_menu values ('11632', '我的已办', '11618', '3', 'taskFinish', 'workflow/task/taskFinish', '', '1', '1', 'C', '0', '0', '', 'finish', 103, 1, sysdate(), NULL, NULL, '');
+insert into sys_menu values ('11633', '我的抄送', '11618', '4', 'taskCopyList', 'workflow/task/taskCopyList', '', '1', '1', 'C', '0', '0', '', 'my-copy', 103, 1, sysdate(), NULL, NULL, '');
+insert into sys_menu values ('11620', '流程定义', '11616', '3', 'processDefinition', 'workflow/processDefinition/index', '', '1', '1', 'C', '0', '0', '', 'process-definition', 103, 1, sysdate(), NULL, NULL, '');
+insert into sys_menu values ('11621', '流程实例', '11630', '1', 'processInstance', 'workflow/processInstance/index', '', '1', '1', 'C', '0', '0', '', 'tree-table', 103, 1, sysdate(), NULL, NULL, '');
+insert into sys_menu values ('11622', '流程分类', '11616', '1', 'category', 'workflow/category/index', '', '1', '0', 'C', '0', '0', 'workflow:category:list', 'category', 103, 1, sysdate(), NULL, NULL, '');
+insert into sys_menu values ('11629', '我发起的', '11618', '1', 'myDocument', 'workflow/task/myDocument', '', '1', '1', 'C', '0', '0', '', 'guide', 103, 1, sysdate(), NULL, NULL, '');
+insert into sys_menu values ('11630', '流程监控', '11616', '4', 'monitor', '', '', '1', '0', 'M', '0', '0', '', 'monitor', 103, 1, sysdate(), NULL, NULL, '');
+insert into sys_menu values ('11631', '待办任务', '11630', '2', 'allTaskWaiting', 'workflow/task/allTaskWaiting', '', '1', '1', 'C', '0', '0', '', 'waiting', 103, 1, sysdate(), NULL, NULL, '');
+insert into sys_menu values ('11700', '流程设计', '11616', '5', 'design/index',   'workflow/processDefinition/design', '', 1, 1, 'C', '1', '0', 'workflow:leave:edit', '#', 103, 1, sysdate(), null, null, '');
+insert into sys_menu values ('11701', '请假申请', '11616', '6', 'leaveEdit/index', 'workflow/leave/leaveEdit', '', 1, 1, 'C', '1', '0', 'workflow:leave:edit', '#', 103, 1, sysdate(), null, null, '');
+-- 流程分类管理相关按钮
+insert into sys_menu values ('11623', '流程分类查询', '11622', '1', '#', '', '', 1, 0, 'F', '0', '0', 'workflow:category:query', '#', 103, 1,sysdate(), null, null, '');
+insert into sys_menu values ('11624', '流程分类新增', '11622', '2', '#', '', '', 1, 0, 'F', '0', '0', 'workflow:category:add', '#', 103, 1,sysdate(), null, null, '');
+insert into sys_menu values ('11625', '流程分类修改', '11622', '3', '#', '', '', 1, 0, 'F', '0', '0', 'workflow:category:edit', '#', 103, 1,sysdate(), null, null, '');
+insert into sys_menu values ('11626', '流程分类删除', '11622', '4', '#', '', '', 1, 0, 'F', '0', '0', 'workflow:category:remove', '#', 103,1, sysdate(), null, null, '');
+insert into sys_menu values ('11627', '流程分类导出', '11622', '5', '#', '', '', 1, 0, 'F', '0', '0', 'workflow:category:export', '#', 103,1, sysdate(), null, null, '');
+-- 请假测试相关按钮
+insert into sys_menu VALUES (11638, '请假申请',     5,    1, 'leave', 'workflow/leave/index', '', 1, 0, 'C', '0', '0', 'workflow:leave:list', '#', 103, 1, sysdate(), NULL, NULL, '请假申请菜单');
+insert into sys_menu VALUES (11639, '请假申请查询', 11638, 1, '#', '', '', 1, 0, 'F', '0', '0', 'workflow:leave:query', '#', 103, 1, sysdate(), NULL, NULL, '');
+insert into sys_menu VALUES (11640, '请假申请新增', 11638, 2, '#', '', '', 1, 0, 'F', '0', '0', 'workflow:leave:add', '#', 103, 1, sysdate(), NULL, NULL, '');
+insert into sys_menu VALUES (11641, '请假申请修改', 11638, 3, '#', '', '', 1, 0, 'F', '0', '0', 'workflow:leave:edit', '#', 103, 1, sysdate(), NULL, NULL, '');
+insert into sys_menu VALUES (11642, '请假申请删除', 11638, 4, '#', '', '', 1, 0, 'F', '0', '0', 'workflow:leave:remove', '#', 103, 1, sysdate(), NULL, NULL, '');
+insert into sys_menu VALUES (11643, '请假申请导出', 11638, 5, '#', '', '', 1, 0, 'F', '0', '0', 'workflow:leave:export', '#', 103, 1, sysdate(), NULL, NULL, '');
+
+INSERT INTO sys_dict_type VALUES (13, '业务状态', 'wf_business_status', 103, 1, sysdate(), NULL, NULL, '业务状态列表');
+INSERT INTO sys_dict_type VALUES (14, '表单类型', 'wf_form_type', 103, 1, sysdate(), NULL, NULL, '表单类型列表');
+INSERT INTO sys_dict_type VALUES (15, '任务状态', 'wf_task_status', 103, 1, sysdate(), NULL, NULL, '任务状态');
+INSERT INTO sys_dict_data VALUES (39, 1, '已撤销', 'cancel', 'wf_business_status', '', 'danger', 'N', 103, 1, sysdate(), NULL, NULL,'已撤销');
+INSERT INTO sys_dict_data VALUES (40, 2, '草稿', 'draft', 'wf_business_status', '', 'info', 'N', 103, 1, sysdate(), NULL, NULL, '草稿');
+INSERT INTO sys_dict_data VALUES (41, 3, '待审核', 'waiting', 'wf_business_status', '', 'primary', 'N', 103, 1, sysdate(), NULL, NULL,'待审核');
+INSERT INTO sys_dict_data VALUES (42, 4, '已完成', 'finish', 'wf_business_status', '', 'success', 'N', 103, 1, sysdate(), NULL, NULL,'已完成');
+INSERT INTO sys_dict_data VALUES (43, 5, '已作废', 'invalid', 'wf_business_status', '', 'danger', 'N', 103, 1, sysdate(), NULL, NULL,'已作废');
+INSERT INTO sys_dict_data VALUES (44, 6, '已退回', 'back', 'wf_business_status', '', 'danger', 'N', 103, 1, sysdate(), NULL, NULL,'已退回');
+INSERT INTO sys_dict_data VALUES (45, 7, '已终止', 'termination', 'wf_business_status', '', 'danger', 'N', 103, 1, sysdate(), NULL,NULL, '已终止');
+INSERT INTO sys_dict_data VALUES (46, 1, '自定义表单', 'static', 'wf_form_type', '', 'success', 'N', 103, 1, sysdate(), NULL, NULL,'自定义表单');
+INSERT INTO sys_dict_data VALUES (47, 2, '动态表单', 'dynamic', 'wf_form_type', '', 'primary', 'N', 103, 1, sysdate(), NULL, NULL,'动态表单');
+INSERT INTO sys_dict_data VALUES (48, 1, '撤销', 'cancel', 'wf_task_status', '', 'danger', 'N', 103, 1, sysdate(), NULL, NULL, '撤销');
+INSERT INTO sys_dict_data VALUES (49, 2, '通过', 'pass', 'wf_task_status', '', 'success', 'N', 103, 1, sysdate(), NULL, NULL, '通过');
+INSERT INTO sys_dict_data VALUES (50, 3, '待审核', 'waiting', 'wf_task_status', '', 'primary', 'N', 103, 1, sysdate(), NULL, NULL, '待审核');
+INSERT INTO sys_dict_data VALUES (51, 4, '作废', 'invalid', 'wf_task_status', '', 'danger', 'N', 103, 1, sysdate(), NULL, NULL, '作废');
+INSERT INTO sys_dict_data VALUES (52, 5, '退回', 'back', 'wf_task_status', '', 'danger', 'N', 103, 1, sysdate(), NULL, NULL, '退回');
+INSERT INTO sys_dict_data VALUES (53, 6, '终止', 'termination', 'wf_task_status', '', 'danger', 'N', 103, 1, sysdate(), NULL, NULL, '终止');
+INSERT INTO sys_dict_data VALUES (54, 7, '转办', 'transfer', 'wf_task_status', '', 'primary', 'N', 103, 1, sysdate(), NULL, NULL, '转办');
+INSERT INTO sys_dict_data VALUES (55, 8, '委托', 'depute', 'wf_task_status', '', 'primary', 'N', 103, 1, sysdate(), NULL, NULL, '委托');
+INSERT INTO sys_dict_data VALUES (56, 9, '抄送', 'copy', 'wf_task_status', '', 'primary', 'N', 103, 1, sysdate(), NULL, NULL, '抄送');
+INSERT INTO sys_dict_data VALUES (57, 10, '加签', 'sign', 'wf_task_status', '', 'primary', 'N', 103, 1, sysdate(), NULL, NULL, '加签');
+INSERT INTO sys_dict_data VALUES (58, 11, '减签', 'sign_off', 'wf_task_status', '', 'danger', 'N', 103, 1, sysdate(), NULL, NULL, '减签');
+INSERT INTO sys_dict_data VALUES (59, 11, '超时', 'timeout', 'wf_task_status', '', 'danger', 'N', 103, 1, sysdate(), NULL, NULL, '超时');
+
diff --git a/script/sql/sqlserver/sqlserver_ry_app_5.X.sql b/script/sql/sqlserver/sqlserver_ry_app_5.X.sql
new file mode 100644
index 0000000..ee0c181
--- /dev/null
+++ b/script/sql/sqlserver/sqlserver_ry_app_5.X.sql
@@ -0,0 +1,320 @@
+-- ----------------------------
+-- App端数据库表结构 (SQL Server版本)
+-- 适用于 RuoYi-Vue-Plus 5.X 版本
+-- ----------------------------
+
+-- 1、App端用户信息表
+CREATE TABLE app_user (
+    user_id       BIGINT       NOT NULL,
+    user_name     NVARCHAR(30) NOT NULL,
+    nick_name     NVARCHAR(30) NOT NULL,
+    phone         NVARCHAR(11) DEFAULT '',
+    email         NVARCHAR(50) DEFAULT '',
+    sex           CHAR(1)      DEFAULT '0',
+    avatar        BIGINT,
+    password      NVARCHAR(100) DEFAULT '',
+    status        CHAR(1)      DEFAULT '0',
+    del_flag      CHAR(1)      DEFAULT '0',
+    login_ip      NVARCHAR(128) DEFAULT '',
+    login_date    DATETIME2,
+    register_time DATETIME2,
+    create_by     BIGINT,
+    create_time   DATETIME2,
+    update_by     BIGINT,
+    update_time   DATETIME2,
+    remark        NVARCHAR(500),
+    CONSTRAINT PK_app_user PRIMARY KEY (user_id)
+);
+
+EXEC sp_addextendedproperty 'MS_Description', 'App端用户信息表', 'SCHEMA', 'dbo', 'TABLE', 'app_user';
+EXEC sp_addextendedproperty 'MS_Description', 'App用户ID', 'SCHEMA', 'dbo', 'TABLE', 'app_user', 'COLUMN', 'user_id';
+EXEC sp_addextendedproperty 'MS_Description', '用户账号', 'SCHEMA', 'dbo', 'TABLE', 'app_user', 'COLUMN', 'account';
+EXEC sp_addextendedproperty 'MS_Description', '用户昵称', 'SCHEMA', 'dbo', 'TABLE', 'app_user', 'COLUMN', 'nick_name';
+EXEC sp_addextendedproperty 'MS_Description', '手机号码', 'SCHEMA', 'dbo', 'TABLE', 'app_user', 'COLUMN', 'phone';
+EXEC sp_addextendedproperty 'MS_Description', '用户邮箱', 'SCHEMA', 'dbo', 'TABLE', 'app_user', 'COLUMN', 'email';
+EXEC sp_addextendedproperty 'MS_Description', '用户性别（0男 1女 2未知）', 'SCHEMA', 'dbo', 'TABLE', 'app_user', 'COLUMN', 'sex';
+EXEC sp_addextendedproperty 'MS_Description', '头像地址', 'SCHEMA', 'dbo', 'TABLE', 'app_user', 'COLUMN', 'avatar';
+EXEC sp_addextendedproperty 'MS_Description', '密码', 'SCHEMA', 'dbo', 'TABLE', 'app_user', 'COLUMN', 'password';
+EXEC sp_addextendedproperty 'MS_Description', '帐号状态（0正常 1停用）', 'SCHEMA', 'dbo', 'TABLE', 'app_user', 'COLUMN', 'status';
+EXEC sp_addextendedproperty 'MS_Description', '删除标志（0代表存在 1代表删除）', 'SCHEMA', 'dbo', 'TABLE', 'app_user', 'COLUMN', 'del_flag';
+EXEC sp_addextendedproperty 'MS_Description', '最后登录IP', 'SCHEMA', 'dbo', 'TABLE', 'app_user', 'COLUMN', 'login_ip';
+EXEC sp_addextendedproperty 'MS_Description', '最后登录时间', 'SCHEMA', 'dbo', 'TABLE', 'app_user', 'COLUMN', 'login_date';
+EXEC sp_addextendedproperty 'MS_Description', '注册时间', 'SCHEMA', 'dbo', 'TABLE', 'app_user', 'COLUMN', 'register_time';
+EXEC sp_addextendedproperty 'MS_Description', '创建者', 'SCHEMA', 'dbo', 'TABLE', 'app_user', 'COLUMN', 'create_by';
+EXEC sp_addextendedproperty 'MS_Description', '创建时间', 'SCHEMA', 'dbo', 'TABLE', 'app_user', 'COLUMN', 'create_time';
+EXEC sp_addextendedproperty 'MS_Description', '更新者', 'SCHEMA', 'dbo', 'TABLE', 'app_user', 'COLUMN', 'update_by';
+EXEC sp_addextendedproperty 'MS_Description', '更新时间', 'SCHEMA', 'dbo', 'TABLE', 'app_user', 'COLUMN', 'update_time';
+EXEC sp_addextendedproperty 'MS_Description', '备注', 'SCHEMA', 'dbo', 'TABLE', 'app_user', 'COLUMN', 'remark';
+
+INSERT INTO app_user VALUES (1, 'appuser', 'App测试用户', '15888888888', 'appuser@qq.com', '1', NULL,
+        '$2a$10$7JB720yubVSOfvVMe6LeNOKgEoXAw7tCxJRET6pVuiDDz/LQ4Gqk.',
+        '0', '0', '127.0.0.1', GETDATE(), GETDATE(), 1, GETDATE(), NULL, NULL, 'App端测试用户');
+
+-- 2、App端角色信息表
+CREATE TABLE app_role (
+    role_id     BIGINT        NOT NULL,
+    role_name   NVARCHAR(30)  NOT NULL,
+    role_key    NVARCHAR(100) NOT NULL,
+    role_sort   INT           NOT NULL,
+    status      CHAR(1)       NOT NULL,
+    del_flag    CHAR(1)       DEFAULT '0',
+    create_by   BIGINT,
+    create_time DATETIME2,
+    update_by   BIGINT,
+    update_time DATETIME2,
+    remark      NVARCHAR(500),
+    CONSTRAINT PK_app_role PRIMARY KEY (role_id)
+);
+
+EXEC sp_addextendedproperty 'MS_Description', 'App端角色信息表', 'SCHEMA', 'dbo', 'TABLE', 'app_role';
+EXEC sp_addextendedproperty 'MS_Description', 'App角色ID', 'SCHEMA', 'dbo', 'TABLE', 'app_role', 'COLUMN', 'role_id';
+EXEC sp_addextendedproperty 'MS_Description', '角色名称', 'SCHEMA', 'dbo', 'TABLE', 'app_role', 'COLUMN', 'role_name';
+EXEC sp_addextendedproperty 'MS_Description', '角色权限字符串', 'SCHEMA', 'dbo', 'TABLE', 'app_role', 'COLUMN', 'role_key';
+EXEC sp_addextendedproperty 'MS_Description', '显示顺序', 'SCHEMA', 'dbo', 'TABLE', 'app_role', 'COLUMN', 'role_sort';
+EXEC sp_addextendedproperty 'MS_Description', '角色状态（0正常 1停用）', 'SCHEMA', 'dbo', 'TABLE', 'app_role', 'COLUMN', 'status';
+EXEC sp_addextendedproperty 'MS_Description', '删除标志（0代表存在 1代表删除）', 'SCHEMA', 'dbo', 'TABLE', 'app_role', 'COLUMN', 'del_flag';
+EXEC sp_addextendedproperty 'MS_Description', '创建者', 'SCHEMA', 'dbo', 'TABLE', 'app_role', 'COLUMN', 'create_by';
+EXEC sp_addextendedproperty 'MS_Description', '创建时间', 'SCHEMA', 'dbo', 'TABLE', 'app_role', 'COLUMN', 'create_time';
+EXEC sp_addextendedproperty 'MS_Description', '更新者', 'SCHEMA', 'dbo', 'TABLE', 'app_role', 'COLUMN', 'update_by';
+EXEC sp_addextendedproperty 'MS_Description', '更新时间', 'SCHEMA', 'dbo', 'TABLE', 'app_role', 'COLUMN', 'update_time';
+EXEC sp_addextendedproperty 'MS_Description', '备注', 'SCHEMA', 'dbo', 'TABLE', 'app_role', 'COLUMN', 'remark';
+
+INSERT INTO app_role VALUES (1, 'App普通用户', 'app_user', 1, '0', '0', 1, GETDATE(), NULL, NULL, 'App端普通用户');
+INSERT INTO app_role VALUES (2, 'App VIP用户', 'app_vip', 2, '0', '0', 1, GETDATE(), NULL, NULL, 'App端VIP用户');
+
+-- 3、App端用户和角色关联表
+CREATE TABLE app_user_role (
+    user_id BIGINT NOT NULL,
+    role_id BIGINT NOT NULL,
+    CONSTRAINT PK_app_user_role PRIMARY KEY (user_id, role_id)
+);
+
+EXEC sp_addextendedproperty 'MS_Description', 'App端用户和角色关联表', 'SCHEMA', 'dbo', 'TABLE', 'app_user_role';
+EXEC sp_addextendedproperty 'MS_Description', 'App用户ID', 'SCHEMA', 'dbo', 'TABLE', 'app_user_role', 'COLUMN', 'user_id';
+EXEC sp_addextendedproperty 'MS_Description', 'App角色ID', 'SCHEMA', 'dbo', 'TABLE', 'app_user_role', 'COLUMN', 'role_id';
+
+INSERT INTO app_user_role VALUES (1, 1);
+
+-- 4、App端第三方登录授权表
+CREATE TABLE app_social_auth (
+    id            BIGINT         NOT NULL,
+    user_id       BIGINT         NOT NULL,
+    platform      NVARCHAR(255)  NOT NULL,
+    platform_uid  NVARCHAR(255)  NOT NULL,
+    open_id       NVARCHAR(255),
+    union_id      NVARCHAR(255),
+    access_token  NVARCHAR(MAX)  NOT NULL,
+    expire_in     INT,
+    refresh_token NVARCHAR(255),
+    scope         NVARCHAR(255),
+    create_by     BIGINT,
+    create_time   DATETIME2,
+    update_by     BIGINT,
+    update_time   DATETIME2,
+    del_flag      CHAR(1) DEFAULT '0',
+    CONSTRAINT PK_app_social_auth PRIMARY KEY (id)
+);
+
+EXEC sp_addextendedproperty 'MS_Description', 'App端第三方登录授权表', 'SCHEMA', 'dbo', 'TABLE', 'app_social_auth';
+EXEC sp_addextendedproperty 'MS_Description', '主键', 'SCHEMA', 'dbo', 'TABLE', 'app_social_auth', 'COLUMN', 'id';
+EXEC sp_addextendedproperty 'MS_Description', 'App用户ID', 'SCHEMA', 'dbo', 'TABLE', 'app_social_auth', 'COLUMN', 'user_id';
+EXEC sp_addextendedproperty 'MS_Description', '用户来源平台（wechat_mp:微信小程序 wechat_open:微信开放平台 qq:QQ weibo:微博）', 'SCHEMA', 'dbo', 'TABLE', 'app_social_auth', 'COLUMN', 'platform';
+EXEC sp_addextendedproperty 'MS_Description', '表示平台唯一用户标识', 'SCHEMA', 'dbo', 'TABLE', 'app_social_auth', 'COLUMN', 'platform_uid';
+EXEC sp_addextendedproperty 'MS_Description', '微信openid', 'SCHEMA', 'dbo', 'TABLE', 'app_social_auth', 'COLUMN', 'open_id';
+EXEC sp_addextendedproperty 'MS_Description', '微信unionid', 'SCHEMA', 'dbo', 'TABLE', 'app_social_auth', 'COLUMN', 'union_id';
+EXEC sp_addextendedproperty 'MS_Description', '用户的授权令牌', 'SCHEMA', 'dbo', 'TABLE', 'app_social_auth', 'COLUMN', 'access_token';
+EXEC sp_addextendedproperty 'MS_Description', '用户的授权令牌的有效期', 'SCHEMA', 'dbo', 'TABLE', 'app_social_auth', 'COLUMN', 'expire_in';
+EXEC sp_addextendedproperty 'MS_Description', '刷新令牌', 'SCHEMA', 'dbo', 'TABLE', 'app_social_auth', 'COLUMN', 'refresh_token';
+EXEC sp_addextendedproperty 'MS_Description', '授予的权限', 'SCHEMA', 'dbo', 'TABLE', 'app_social_auth', 'COLUMN', 'scope';
+EXEC sp_addextendedproperty 'MS_Description', '创建者', 'SCHEMA', 'dbo', 'TABLE', 'app_social_auth', 'COLUMN', 'create_by';
+EXEC sp_addextendedproperty 'MS_Description', '创建时间', 'SCHEMA', 'dbo', 'TABLE', 'app_social_auth', 'COLUMN', 'create_time';
+EXEC sp_addextendedproperty 'MS_Description', '更新者', 'SCHEMA', 'dbo', 'TABLE', 'app_social_auth', 'COLUMN', 'update_by';
+EXEC sp_addextendedproperty 'MS_Description', '更新时间', 'SCHEMA', 'dbo', 'TABLE', 'app_social_auth', 'COLUMN', 'update_time';
+EXEC sp_addextendedproperty 'MS_Description', '删除标志（0代表存在 1代表删除）', 'SCHEMA', 'dbo', 'TABLE', 'app_social_auth', 'COLUMN', 'del_flag';
+
+-- 5、App端登录日志表
+CREATE TABLE app_login_log (
+    info_id        BIGINT        NOT NULL,
+    user_name      NVARCHAR(50)  DEFAULT '',
+    status         CHAR(1)       DEFAULT '0',
+    ipaddr         NVARCHAR(128) DEFAULT '',
+    login_location NVARCHAR(255) DEFAULT '',
+    browser        NVARCHAR(50)  DEFAULT '',
+    os             NVARCHAR(50)  DEFAULT '',
+    msg            NVARCHAR(255) DEFAULT '',
+    login_time     DATETIME2,
+    CONSTRAINT PK_app_login_log PRIMARY KEY (info_id)
+);
+
+EXEC sp_addextendedproperty 'MS_Description', 'App端登录日志表', 'SCHEMA', 'dbo', 'TABLE', 'app_login_log';
+EXEC sp_addextendedproperty 'MS_Description', '访问ID', 'SCHEMA', 'dbo', 'TABLE', 'app_login_log', 'COLUMN', 'info_id';
+EXEC sp_addextendedproperty 'MS_Description', '用户账号', 'SCHEMA', 'dbo', 'TABLE', 'app_login_log', 'COLUMN', 'user_name';
+EXEC sp_addextendedproperty 'MS_Description', '登录状态（0成功 1失败）', 'SCHEMA', 'dbo', 'TABLE', 'app_login_log', 'COLUMN', 'status';
+EXEC sp_addextendedproperty 'MS_Description', '登录IP地址', 'SCHEMA', 'dbo', 'TABLE', 'app_login_log', 'COLUMN', 'ipaddr';
+EXEC sp_addextendedproperty 'MS_Description', '登录地点', 'SCHEMA', 'dbo', 'TABLE', 'app_login_log', 'COLUMN', 'login_location';
+EXEC sp_addextendedproperty 'MS_Description', '浏览器类型', 'SCHEMA', 'dbo', 'TABLE', 'app_login_log', 'COLUMN', 'browser';
+EXEC sp_addextendedproperty 'MS_Description', '操作系统', 'SCHEMA', 'dbo', 'TABLE', 'app_login_log', 'COLUMN', 'os';
+EXEC sp_addextendedproperty 'MS_Description', '提示消息', 'SCHEMA', 'dbo', 'TABLE', 'app_login_log', 'COLUMN', 'msg';
+EXEC sp_addextendedproperty 'MS_Description', '访问时间', 'SCHEMA', 'dbo', 'TABLE', 'app_login_log', 'COLUMN', 'login_time';
+
+CREATE INDEX IX_app_login_log_status ON app_login_log (status);
+CREATE INDEX IX_app_login_log_login_time ON app_login_log (login_time);
+
+-- 6、App端操作日志记录
+CREATE TABLE app_oper_log (
+    oper_id        BIGINT         NOT NULL,
+    title          NVARCHAR(50)   DEFAULT '',
+    business_type  SMALLINT       DEFAULT 0,
+    method         NVARCHAR(100)  DEFAULT '',
+    request_method NVARCHAR(10)   DEFAULT '',
+    oper_name      NVARCHAR(50)   DEFAULT '',
+    oper_url       NVARCHAR(255)  DEFAULT '',
+    oper_ip        NVARCHAR(128)  DEFAULT '',
+    oper_location  NVARCHAR(255)  DEFAULT '',
+    oper_param     NVARCHAR(MAX)  DEFAULT '',
+    json_result    NVARCHAR(MAX)  DEFAULT '',
+    status         SMALLINT       DEFAULT 0,
+    error_msg      NVARCHAR(MAX)  DEFAULT '',
+    oper_time      DATETIME2,
+    cost_time      BIGINT         DEFAULT 0,
+    CONSTRAINT PK_app_oper_log PRIMARY KEY (oper_id)
+);
+
+EXEC sp_addextendedproperty 'MS_Description', 'App端操作日志记录', 'SCHEMA', 'dbo', 'TABLE', 'app_oper_log';
+EXEC sp_addextendedproperty 'MS_Description', '日志主键', 'SCHEMA', 'dbo', 'TABLE', 'app_oper_log', 'COLUMN', 'oper_id';
+EXEC sp_addextendedproperty 'MS_Description', '模块标题', 'SCHEMA', 'dbo', 'TABLE', 'app_oper_log', 'COLUMN', 'title';
+EXEC sp_addextendedproperty 'MS_Description', '业务类型（0其它 1新增 2修改 3删除）', 'SCHEMA', 'dbo', 'TABLE', 'app_oper_log', 'COLUMN', 'business_type';
+EXEC sp_addextendedproperty 'MS_Description', '方法名称', 'SCHEMA', 'dbo', 'TABLE', 'app_oper_log', 'COLUMN', 'method';
+EXEC sp_addextendedproperty 'MS_Description', '请求方式', 'SCHEMA', 'dbo', 'TABLE', 'app_oper_log', 'COLUMN', 'request_method';
+EXEC sp_addextendedproperty 'MS_Description', '操作人员', 'SCHEMA', 'dbo', 'TABLE', 'app_oper_log', 'COLUMN', 'oper_name';
+EXEC sp_addextendedproperty 'MS_Description', '请求URL', 'SCHEMA', 'dbo', 'TABLE', 'app_oper_log', 'COLUMN', 'oper_url';
+EXEC sp_addextendedproperty 'MS_Description', '主机地址', 'SCHEMA', 'dbo', 'TABLE', 'app_oper_log', 'COLUMN', 'oper_ip';
+EXEC sp_addextendedproperty 'MS_Description', '操作地点', 'SCHEMA', 'dbo', 'TABLE', 'app_oper_log', 'COLUMN', 'oper_location';
+EXEC sp_addextendedproperty 'MS_Description', '请求参数', 'SCHEMA', 'dbo', 'TABLE', 'app_oper_log', 'COLUMN', 'oper_param';
+EXEC sp_addextendedproperty 'MS_Description', '返回参数', 'SCHEMA', 'dbo', 'TABLE', 'app_oper_log', 'COLUMN', 'json_result';
+EXEC sp_addextendedproperty 'MS_Description', '操作状态（0正常 1异常）', 'SCHEMA', 'dbo', 'TABLE', 'app_oper_log', 'COLUMN', 'status';
+EXEC sp_addextendedproperty 'MS_Description', '错误消息', 'SCHEMA', 'dbo', 'TABLE', 'app_oper_log', 'COLUMN', 'error_msg';
+EXEC sp_addextendedproperty 'MS_Description', '操作时间', 'SCHEMA', 'dbo', 'TABLE', 'app_oper_log', 'COLUMN', 'oper_time';
+EXEC sp_addextendedproperty 'MS_Description', '消耗时间', 'SCHEMA', 'dbo', 'TABLE', 'app_oper_log', 'COLUMN', 'cost_time';
+
+CREATE INDEX IX_app_oper_log_business_type ON app_oper_log (business_type);
+CREATE INDEX IX_app_oper_log_status ON app_oper_log (status);
+CREATE INDEX IX_app_oper_log_oper_time ON app_oper_log (oper_time);
+
+-- 7、App端设备信息表
+CREATE TABLE app_device (
+    device_id        BIGINT        NOT NULL,
+    user_id          BIGINT        NOT NULL,
+    device_type      NVARCHAR(20)  NOT NULL,
+    device_name      NVARCHAR(100) DEFAULT '',
+    device_model     NVARCHAR(100) DEFAULT '',
+    device_brand     NVARCHAR(50)  DEFAULT '',
+    os_version       NVARCHAR(50)  DEFAULT '',
+    app_version      NVARCHAR(50)  DEFAULT '',
+    push_token       NVARCHAR(255) DEFAULT '',
+    is_active        CHAR(1)       DEFAULT '1',
+    last_active_time DATETIME2,
+    create_time      DATETIME2,
+    update_time      DATETIME2,
+    CONSTRAINT PK_app_device PRIMARY KEY (device_id)
+);
+
+EXEC sp_addextendedproperty 'MS_Description', 'App端设备信息表', 'SCHEMA', 'dbo', 'TABLE', 'app_device';
+EXEC sp_addextendedproperty 'MS_Description', '设备ID', 'SCHEMA', 'dbo', 'TABLE', 'app_device', 'COLUMN', 'device_id';
+EXEC sp_addextendedproperty 'MS_Description', 'App用户ID', 'SCHEMA', 'dbo', 'TABLE', 'app_device', 'COLUMN', 'user_id';
+EXEC sp_addextendedproperty 'MS_Description', '设备类型（ios android h5）', 'SCHEMA', 'dbo', 'TABLE', 'app_device', 'COLUMN', 'device_type';
+EXEC sp_addextendedproperty 'MS_Description', '设备名称', 'SCHEMA', 'dbo', 'TABLE', 'app_device', 'COLUMN', 'device_name';
+EXEC sp_addextendedproperty 'MS_Description', '设备型号', 'SCHEMA', 'dbo', 'TABLE', 'app_device', 'COLUMN', 'device_model';
+EXEC sp_addextendedproperty 'MS_Description', '设备品牌', 'SCHEMA', 'dbo', 'TABLE', 'app_device', 'COLUMN', 'device_brand';
+EXEC sp_addextendedproperty 'MS_Description', '操作系统版本', 'SCHEMA', 'dbo', 'TABLE', 'app_device', 'COLUMN', 'os_version';
+EXEC sp_addextendedproperty 'MS_Description', 'App版本', 'SCHEMA', 'dbo', 'TABLE', 'app_device', 'COLUMN', 'app_version';
+EXEC sp_addextendedproperty 'MS_Description', '推送令牌', 'SCHEMA', 'dbo', 'TABLE', 'app_device', 'COLUMN', 'push_token';
+EXEC sp_addextendedproperty 'MS_Description', '是否活跃（0否 1是）', 'SCHEMA', 'dbo', 'TABLE', 'app_device', 'COLUMN', 'is_active';
+EXEC sp_addextendedproperty 'MS_Description', '最后活跃时间', 'SCHEMA', 'dbo', 'TABLE', 'app_device', 'COLUMN', 'last_active_time';
+EXEC sp_addextendedproperty 'MS_Description', '创建时间', 'SCHEMA', 'dbo', 'TABLE', 'app_device', 'COLUMN', 'create_time';
+EXEC sp_addextendedproperty 'MS_Description', '更新时间', 'SCHEMA', 'dbo', 'TABLE', 'app_device', 'COLUMN', 'update_time';
+
+CREATE INDEX IX_app_device_user_id ON app_device (user_id);
+CREATE INDEX IX_app_device_device_type ON app_device (device_type);
+
+-- 8、App端消息推送表
+CREATE TABLE app_message (
+    message_id   BIGINT        NOT NULL,
+    title        NVARCHAR(100) NOT NULL,
+    content      NVARCHAR(MAX),
+    message_type NVARCHAR(20)  DEFAULT 'system',
+    target_type  NVARCHAR(20)  DEFAULT 'all',
+    target_ids   NVARCHAR(1000) DEFAULT '',
+    send_time    DATETIME2,
+    status       CHAR(1)       DEFAULT '0',
+    create_by    BIGINT,
+    create_time  DATETIME2,
+    update_by    BIGINT,
+    update_time  DATETIME2,
+    CONSTRAINT PK_app_message PRIMARY KEY (message_id)
+);
+
+EXEC sp_addextendedproperty 'MS_Description', 'App端消息推送表', 'SCHEMA', 'dbo', 'TABLE', 'app_message';
+EXEC sp_addextendedproperty 'MS_Description', '消息ID', 'SCHEMA', 'dbo', 'TABLE', 'app_message', 'COLUMN', 'message_id';
+EXEC sp_addextendedproperty 'MS_Description', '消息标题', 'SCHEMA', 'dbo', 'TABLE', 'app_message', 'COLUMN', 'title';
+EXEC sp_addextendedproperty 'MS_Description', '消息内容', 'SCHEMA', 'dbo', 'TABLE', 'app_message', 'COLUMN', 'content';
+EXEC sp_addextendedproperty 'MS_Description', '消息类型（system:系统消息 notice:通知 activity:活动）', 'SCHEMA', 'dbo', 'TABLE', 'app_message', 'COLUMN', 'message_type';
+EXEC sp_addextendedproperty 'MS_Description', '推送目标（all:全部用户 user:指定用户 role:指定角色）', 'SCHEMA', 'dbo', 'TABLE', 'app_message', 'COLUMN', 'target_type';
+EXEC sp_addextendedproperty 'MS_Description', '目标ID列表（用户ID或角色ID，逗号分隔）', 'SCHEMA', 'dbo', 'TABLE', 'app_message', 'COLUMN', 'target_ids';
+EXEC sp_addextendedproperty 'MS_Description', '发送时间', 'SCHEMA', 'dbo', 'TABLE', 'app_message', 'COLUMN', 'send_time';
+EXEC sp_addextendedproperty 'MS_Description', '状态（0待发送 1已发送 2发送失败）', 'SCHEMA', 'dbo', 'TABLE', 'app_message', 'COLUMN', 'status';
+EXEC sp_addextendedproperty 'MS_Description', '创建者', 'SCHEMA', 'dbo', 'TABLE', 'app_message', 'COLUMN', 'create_by';
+EXEC sp_addextendedproperty 'MS_Description', '创建时间', 'SCHEMA', 'dbo', 'TABLE', 'app_message', 'COLUMN', 'create_time';
+EXEC sp_addextendedproperty 'MS_Description', '更新者', 'SCHEMA', 'dbo', 'TABLE', 'app_message', 'COLUMN', 'update_by';
+EXEC sp_addextendedproperty 'MS_Description', '更新时间', 'SCHEMA', 'dbo', 'TABLE', 'app_message', 'COLUMN', 'update_time';
+
+CREATE INDEX IX_app_message_message_type ON app_message (message_type);
+CREATE INDEX IX_app_message_status ON app_message (status);
+
+-- 9、App端用户消息读取记录表
+CREATE TABLE app_user_message (
+    id          BIGINT NOT NULL,
+    user_id     BIGINT NOT NULL,
+    message_id  BIGINT NOT NULL,
+    is_read     CHAR(1) DEFAULT '0',
+    read_time   DATETIME2,
+    create_time DATETIME2,
+    CONSTRAINT PK_app_user_message PRIMARY KEY (id)
+);
+
+EXEC sp_addextendedproperty 'MS_Description', 'App端用户消息读取记录表', 'SCHEMA', 'dbo', 'TABLE', 'app_user_message';
+EXEC sp_addextendedproperty 'MS_Description', '主键', 'SCHEMA', 'dbo', 'TABLE', 'app_user_message', 'COLUMN', 'id';
+EXEC sp_addextendedproperty 'MS_Description', 'App用户ID', 'SCHEMA', 'dbo', 'TABLE', 'app_user_message', 'COLUMN', 'user_id';
+EXEC sp_addextendedproperty 'MS_Description', '消息ID', 'SCHEMA', 'dbo', 'TABLE', 'app_user_message', 'COLUMN', 'message_id';
+EXEC sp_addextendedproperty 'MS_Description', '是否已读（0未读 1已读）', 'SCHEMA', 'dbo', 'TABLE', 'app_user_message', 'COLUMN', 'is_read';
+EXEC sp_addextendedproperty 'MS_Description', '读取时间', 'SCHEMA', 'dbo', 'TABLE', 'app_user_message', 'COLUMN', 'read_time';
+EXEC sp_addextendedproperty 'MS_Description', '创建时间', 'SCHEMA', 'dbo', 'TABLE', 'app_user_message', 'COLUMN', 'create_time';
+
+CREATE INDEX IX_app_user_message_user_id ON app_user_message (user_id);
+CREATE INDEX IX_app_user_message_message_id ON app_user_message (message_id);
+CREATE INDEX IX_app_user_message_is_read ON app_user_message (is_read);
+
+-- 10、App版本信息表
+CREATE TABLE app_version (
+    version_id     BIGINT        NOT NULL,
+    version_code   INT           NOT NULL,
+    version_name   NVARCHAR(20)  NOT NULL,
+    update_content NVARCHAR(MAX),
+    download_url   NVARCHAR(500) NOT NULL,
+    is_force       CHAR(1)       DEFAULT '0',
+    platform       NVARCHAR(10)  DEFAULT 'android',
+    create_time    DATETIME2,
+    CONSTRAINT PK_app_version PRIMARY KEY (version_id)
+);
+
+EXEC sp_addextendedproperty 'MS_Description', 'App版本信息表', 'SCHEMA', 'dbo', 'TABLE', 'app_version';
+EXEC sp_addextendedproperty 'MS_Description', '版本ID', 'SCHEMA', 'dbo', 'TABLE', 'app_version', 'COLUMN', 'version_id';
+EXEC sp_addextendedproperty 'MS_Description', '版本号（数字）', 'SCHEMA', 'dbo', 'TABLE', 'app_version', 'COLUMN', 'version_code';
+EXEC sp_addextendedproperty 'MS_Description', '版本名（如1.0.0）', 'SCHEMA', 'dbo', 'TABLE', 'app_version', 'COLUMN', 'version_name';
+EXEC sp_addextendedproperty 'MS_Description', '更新内容', 'SCHEMA', 'dbo', 'TABLE', 'app_version', 'COLUMN', 'update_content';
+EXEC sp_addextendedproperty 'MS_Description', '下载地址', 'SCHEMA', 'dbo', 'TABLE', 'app_version', 'COLUMN', 'download_url';
+EXEC sp_addextendedproperty 'MS_Description', '是否强制更新（0否 1是）', 'SCHEMA', 'dbo', 'TABLE', 'app_version', 'COLUMN', 'is_force';
+EXEC sp_addextendedproperty 'MS_Description', '平台（android、ios）', 'SCHEMA', 'dbo', 'TABLE', 'app_version', 'COLUMN', 'platform';
+EXEC sp_addextendedproperty 'MS_Description', '创建时间', 'SCHEMA', 'dbo', 'TABLE', 'app_version', 'COLUMN', 'create_time';
+
+COMMIT;
\ No newline at end of file
diff --git a/script/sql/sqlserver/sqlserver_ry_job.sql b/script/sql/sqlserver/sqlserver_ry_job.sql
new file mode 100644
index 0000000..9268e9f
--- /dev/null
+++ b/script/sql/sqlserver/sqlserver_ry_job.sql
@@ -0,0 +1,2825 @@
+/*
+ SnailJob Database Transfer Tool
+ Source Server Type    : MySQL
+ Target Server Type    : Microsoft SQL Server
+ Date: 2025-04-26 10:03:23
+*/
+
+
+-- sj_namespace
+CREATE TABLE sj_namespace
+(
+    id          bigint        NOT NULL PRIMARY KEY IDENTITY,
+    name        nvarchar(64)  NOT NULL,
+    unique_id   nvarchar(64)  NOT NULL,
+    description nvarchar(256) NOT NULL DEFAULT '',
+    deleted     tinyint       NOT NULL DEFAULT 0,
+    create_dt   datetime2     NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    update_dt   datetime2     NOT NULL DEFAULT CURRENT_TIMESTAMP
+)
+GO
+
+CREATE INDEX idx_sj_namespace_01 ON sj_namespace (name)
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'主键',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_namespace',
+     'COLUMN', N'id'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'名称',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_namespace',
+     'COLUMN', N'name'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'唯一id',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_namespace',
+     'COLUMN', N'unique_id'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'描述',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_namespace',
+     'COLUMN', N'description'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'逻辑删除 1、删除',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_namespace',
+     'COLUMN', N'deleted'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'创建时间',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_namespace',
+     'COLUMN', N'create_dt'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'修改时间',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_namespace',
+     'COLUMN', N'update_dt'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'命名空间',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_namespace'
+GO
+
+INSERT INTO sj_namespace(name, unique_id, description, deleted, create_dt, update_dt) VALUES (N'Development', N'dev', N'', 0, getdate(), getdate())
+GO
+INSERT INTO sj_namespace(name, unique_id, description, deleted, create_dt, update_dt) VALUES (N'Production', N'prod', N'', 0, getdate(), getdate())
+GO
+
+-- sj_group_config
+CREATE TABLE sj_group_config
+(
+    id                bigint        NOT NULL PRIMARY KEY IDENTITY,
+    namespace_id      nvarchar(64)  NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a',
+    group_name        nvarchar(64)  NOT NULL DEFAULT '',
+    description       nvarchar(256) NOT NULL DEFAULT '',
+    token             nvarchar(64)  NOT NULL DEFAULT 'SJ_cKqBTPzCsWA3VyuCfFoccmuIEGXjr5KT',
+    group_status      tinyint       NOT NULL DEFAULT 0,
+    version           int           NOT NULL,
+    group_partition   int           NOT NULL,
+    id_generator_mode tinyint       NOT NULL DEFAULT 1,
+    init_scene        tinyint       NOT NULL DEFAULT 0,
+    create_dt         datetime2     NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    update_dt         datetime2     NOT NULL DEFAULT CURRENT_TIMESTAMP
+)
+GO
+
+CREATE UNIQUE INDEX uk_sj_group_config_01 ON sj_group_config (namespace_id, group_name)
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'主键',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_group_config',
+     'COLUMN', N'id'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'命名空间id',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_group_config',
+     'COLUMN', N'namespace_id'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'组名称',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_group_config',
+     'COLUMN', N'group_name'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'组描述',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_group_config',
+     'COLUMN', N'description'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'token',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_group_config',
+     'COLUMN', N'token'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'组状态 0、未启用 1、启用',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_group_config',
+     'COLUMN', N'group_status'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'版本号',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_group_config',
+     'COLUMN', N'version'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'分区',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_group_config',
+     'COLUMN', N'group_partition'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'唯一id生成模式 默认号段模式',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_group_config',
+     'COLUMN', N'id_generator_mode'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'是否初始化场景 0:否 1:是',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_group_config',
+     'COLUMN', N'init_scene'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'创建时间',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_group_config',
+     'COLUMN', N'create_dt'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'修改时间',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_group_config',
+     'COLUMN', N'update_dt'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'组配置',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_group_config'
+GO
+
+INSERT INTO sj_group_config(namespace_id, group_name, description, token, group_status, version, group_partition, id_generator_mode, init_scene, create_dt, update_dt) VALUES (N'dev', N'ruoyi_group', N'', N'SJ_cKqBTPzCsWA3VyuCfFoccmuIEGXjr5KT', N'1', N'1', N'0', N'1', N'1', getdate(), getdate())
+GO
+INSERT INTO sj_group_config(namespace_id, group_name, description, token, group_status, version, group_partition, id_generator_mode, init_scene, create_dt, update_dt) VALUES (N'prod', N'ruoyi_group', N'', N'SJ_cKqBTPzCsWA3VyuCfFoccmuIEGXjr5KT', N'1', N'1', N'0', N'1', N'1', getdate(), getdate())
+GO
+
+-- sj_notify_config
+CREATE TABLE sj_notify_config
+(
+    id                     bigint        NOT NULL PRIMARY KEY IDENTITY,
+    namespace_id           nvarchar(64)  NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a',
+    group_name             nvarchar(64)  NOT NULL,
+    notify_name            nvarchar(64)  NOT NULL DEFAULT '',
+    system_task_type       tinyint       NOT NULL DEFAULT 3,
+    notify_status          tinyint       NOT NULL DEFAULT 0,
+    recipient_ids          nvarchar(128) NOT NULL,
+    notify_threshold       int           NOT NULL DEFAULT 0,
+    notify_scene           tinyint       NOT NULL DEFAULT 0,
+    rate_limiter_status    tinyint       NOT NULL DEFAULT 0,
+    rate_limiter_threshold int           NOT NULL DEFAULT 0,
+    description            nvarchar(256) NOT NULL DEFAULT '',
+    create_dt              datetime2     NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    update_dt              datetime2     NOT NULL DEFAULT CURRENT_TIMESTAMP
+)
+GO
+
+CREATE INDEX idx_sj_notify_config_01 ON sj_notify_config (namespace_id, group_name)
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'主键',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_notify_config',
+     'COLUMN', N'id'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'命名空间id',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_notify_config',
+     'COLUMN', N'namespace_id'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'组名称',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_notify_config',
+     'COLUMN', N'group_name'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'通知名称',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_notify_config',
+     'COLUMN', N'notify_name'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'任务类型 1. 重试任务 2. 重试回调 3、JOB任务 4、WORKFLOW任务',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_notify_config',
+     'COLUMN', N'system_task_type'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'通知状态 0、未启用 1、启用',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_notify_config',
+     'COLUMN', N'notify_status'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'接收人id列表',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_notify_config',
+     'COLUMN', N'recipient_ids'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'通知阈值',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_notify_config',
+     'COLUMN', N'notify_threshold'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'通知场景',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_notify_config',
+     'COLUMN', N'notify_scene'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'限流状态 0、未启用 1、启用',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_notify_config',
+     'COLUMN', N'rate_limiter_status'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'每秒限流阈值',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_notify_config',
+     'COLUMN', N'rate_limiter_threshold'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'描述',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_notify_config',
+     'COLUMN', N'description'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'创建时间',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_notify_config',
+     'COLUMN', N'create_dt'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'修改时间',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_notify_config',
+     'COLUMN', N'update_dt'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'通知配置',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_notify_config'
+GO
+
+-- sj_notify_recipient
+CREATE TABLE sj_notify_recipient
+(
+    id               bigint        NOT NULL PRIMARY KEY IDENTITY,
+    namespace_id     nvarchar(64)  NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a',
+    recipient_name   nvarchar(64)  NOT NULL,
+    notify_type      tinyint       NOT NULL DEFAULT 0,
+    notify_attribute nvarchar(512) NOT NULL,
+    description      nvarchar(256) NOT NULL DEFAULT '',
+    create_dt        datetime2     NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    update_dt        datetime2     NOT NULL DEFAULT CURRENT_TIMESTAMP
+)
+GO
+
+CREATE INDEX idx_sj_notify_recipient_01 ON sj_notify_recipient (namespace_id)
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'主键',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_notify_recipient',
+     'COLUMN', N'id'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'命名空间id',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_notify_recipient',
+     'COLUMN', N'namespace_id'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'接收人名称',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_notify_recipient',
+     'COLUMN', N'recipient_name'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'通知类型 1、钉钉 2、邮件 3、企业微信 4 飞书 5 webhook',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_notify_recipient',
+     'COLUMN', N'notify_type'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'配置属性',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_notify_recipient',
+     'COLUMN', N'notify_attribute'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'描述',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_notify_recipient',
+     'COLUMN', N'description'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'创建时间',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_notify_recipient',
+     'COLUMN', N'create_dt'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'修改时间',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_notify_recipient',
+     'COLUMN', N'update_dt'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'告警通知接收人',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_notify_recipient'
+GO
+
+-- sj_retry_dead_letter
+CREATE TABLE sj_retry_dead_letter
+(
+    id            bigint        NOT NULL PRIMARY KEY IDENTITY,
+    namespace_id  nvarchar(64)  NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a',
+    group_name    nvarchar(64)  NOT NULL,
+    group_id      bigint        NOT NULL,
+    scene_name    nvarchar(64)  NOT NULL,
+    scene_id      bigint        NOT NULL,
+    idempotent_id nvarchar(64)  NOT NULL,
+    biz_no        nvarchar(64)  NOT NULL DEFAULT '',
+    executor_name nvarchar(512) NOT NULL DEFAULT '',
+    args_str      nvarchar(max) NOT NULL,
+    ext_attrs     nvarchar(max) NOT NULL,
+    create_dt     datetime2     NOT NULL DEFAULT CURRENT_TIMESTAMP
+)
+GO
+
+CREATE INDEX idx_sj_retry_dead_letter_01 ON sj_retry_dead_letter (namespace_id, group_name, scene_name)
+GO
+CREATE INDEX idx_sj_retry_dead_letter_02 ON sj_retry_dead_letter (idempotent_id)
+GO
+CREATE INDEX idx_sj_retry_dead_letter_03 ON sj_retry_dead_letter (biz_no)
+GO
+CREATE INDEX idx_sj_retry_dead_letter_04 ON sj_retry_dead_letter (create_dt)
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'主键',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_retry_dead_letter',
+     'COLUMN', N'id'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'命名空间id',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_retry_dead_letter',
+     'COLUMN', N'namespace_id'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'组名称',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_retry_dead_letter',
+     'COLUMN', N'group_name'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'组Id',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_retry_dead_letter',
+     'COLUMN', N'group_id'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'场景名称',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_retry_dead_letter',
+     'COLUMN', N'scene_name'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'场景ID',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_retry_dead_letter',
+     'COLUMN', N'scene_id'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'幂等id',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_retry_dead_letter',
+     'COLUMN', N'idempotent_id'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'业务编号',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_retry_dead_letter',
+     'COLUMN', N'biz_no'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'执行器名称',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_retry_dead_letter',
+     'COLUMN', N'executor_name'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'执行方法参数',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_retry_dead_letter',
+     'COLUMN', N'args_str'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'扩展字段',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_retry_dead_letter',
+     'COLUMN', N'ext_attrs'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'创建时间',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_retry_dead_letter',
+     'COLUMN', N'create_dt'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'死信队列表',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_retry_dead_letter'
+GO
+
+-- sj_retry
+CREATE TABLE sj_retry
+(
+    id              bigint        NOT NULL PRIMARY KEY IDENTITY,
+    namespace_id    nvarchar(64)  NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a',
+    group_name      nvarchar(64)  NOT NULL,
+    group_id        bigint        NOT NULL,
+    scene_name      nvarchar(64)  NOT NULL,
+    scene_id        bigint        NOT NULL,
+    idempotent_id   nvarchar(64)  NOT NULL,
+    biz_no          nvarchar(64)  NOT NULL DEFAULT '',
+    executor_name   nvarchar(512) NOT NULL DEFAULT '',
+    args_str        nvarchar(max) NOT NULL,
+    ext_attrs       nvarchar(max) NOT NULL,
+    next_trigger_at bigint        NOT NULL,
+    retry_count     int           NOT NULL DEFAULT 0,
+    retry_status    tinyint       NOT NULL DEFAULT 0,
+    task_type       tinyint       NOT NULL DEFAULT 1,
+    bucket_index    int           NOT NULL DEFAULT 0,
+    parent_id       bigint        NOT NULL DEFAULT 0,
+    deleted         bigint        NOT NULL DEFAULT 0,
+    create_dt       datetime2     NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    update_dt       datetime2     NOT NULL DEFAULT CURRENT_TIMESTAMP
+)
+GO
+
+CREATE UNIQUE INDEX uk_sj_retry_01 ON sj_retry (scene_id, task_type, idempotent_id, deleted)
+GO
+
+CREATE INDEX idx_sj_retry_01 ON sj_retry (biz_no)
+GO
+CREATE INDEX idx_sj_retry_02 ON sj_retry (retry_status, bucket_index)
+GO
+CREATE INDEX idx_sj_retry_03 ON sj_retry (parent_id)
+GO
+CREATE INDEX idx_sj_retry_04 ON sj_retry (create_dt)
+GO
+CREATE INDEX idx_sj_retry_05 ON sj_retry (idempotent_id)
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'主键',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_retry',
+     'COLUMN', N'id'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'命名空间id',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_retry',
+     'COLUMN', N'namespace_id'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'组名称',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_retry',
+     'COLUMN', N'group_name'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'组Id',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_retry',
+     'COLUMN', N'group_id'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'场景名称',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_retry',
+     'COLUMN', N'scene_name'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'场景ID',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_retry',
+     'COLUMN', N'scene_id'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'幂等id',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_retry',
+     'COLUMN', N'idempotent_id'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'业务编号',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_retry',
+     'COLUMN', N'biz_no'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'执行器名称',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_retry',
+     'COLUMN', N'executor_name'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'执行方法参数',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_retry',
+     'COLUMN', N'args_str'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'扩展字段',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_retry',
+     'COLUMN', N'ext_attrs'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'下次触发时间',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_retry',
+     'COLUMN', N'next_trigger_at'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'重试次数',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_retry',
+     'COLUMN', N'retry_count'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'重试状态 0、重试中 1、成功 2、最大重试次数',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_retry',
+     'COLUMN', N'retry_status'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'任务类型 1、重试数据 2、回调数据',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_retry',
+     'COLUMN', N'task_type'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'bucket',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_retry',
+     'COLUMN', N'bucket_index'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'父节点id',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_retry',
+     'COLUMN', N'parent_id'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'逻辑删除',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_retry',
+     'COLUMN', N'deleted'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'创建时间',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_retry',
+     'COLUMN', N'create_dt'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'修改时间',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_retry',
+     'COLUMN', N'update_dt'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'重试信息表',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_retry'
+GO
+
+-- sj_retry_task
+CREATE TABLE sj_retry_task
+(
+    id               bigint        NOT NULL PRIMARY KEY IDENTITY,
+    namespace_id     nvarchar(64)  NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a',
+    group_name       nvarchar(64)  NOT NULL,
+    scene_name       nvarchar(64)  NOT NULL,
+    retry_id         bigint        NOT NULL,
+    ext_attrs        nvarchar(max) NOT NULL,
+    task_status      tinyint       NOT NULL DEFAULT 1,
+    task_type        tinyint       NOT NULL DEFAULT 1,
+    operation_reason tinyint       NOT NULL DEFAULT 0,
+    client_info      nvarchar(128) NULL     DEFAULT NULL,
+    create_dt        datetime2     NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    update_dt        datetime2     NOT NULL DEFAULT CURRENT_TIMESTAMP
+)
+GO
+
+CREATE INDEX idx_sj_retry_task_01 ON sj_retry_task (namespace_id, group_name, scene_name)
+GO
+CREATE INDEX idx_sj_retry_task_02 ON sj_retry_task (task_status)
+GO
+CREATE INDEX idx_sj_retry_task_03 ON sj_retry_task (create_dt)
+GO
+CREATE INDEX idx_sj_retry_task_04 ON sj_retry_task (retry_id)
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'主键',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_retry_task',
+     'COLUMN', N'id'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'命名空间id',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_retry_task',
+     'COLUMN', N'namespace_id'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'组名称',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_retry_task',
+     'COLUMN', N'group_name'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'场景名称',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_retry_task',
+     'COLUMN', N'scene_name'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'重试信息Id',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_retry_task',
+     'COLUMN', N'retry_id'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'扩展字段',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_retry_task',
+     'COLUMN', N'ext_attrs'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'重试状态',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_retry_task',
+     'COLUMN', N'task_status'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'任务类型 1、重试数据 2、回调数据',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_retry_task',
+     'COLUMN', N'task_type'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'操作原因',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_retry_task',
+     'COLUMN', N'operation_reason'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'客户端地址 clientId#ip:port',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_retry_task',
+     'COLUMN', N'client_info'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'创建时间',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_retry_task',
+     'COLUMN', N'create_dt'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'修改时间',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_retry_task',
+     'COLUMN', N'update_dt'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'重试任务表',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_retry_task'
+GO
+
+-- sj_retry_task_log_message
+CREATE TABLE sj_retry_task_log_message
+(
+    id            bigint        NOT NULL PRIMARY KEY IDENTITY,
+    namespace_id  nvarchar(64)  NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a',
+    group_name    nvarchar(64)  NOT NULL,
+    retry_id      bigint        NOT NULL,
+    retry_task_id bigint        NOT NULL,
+    message       nvarchar(max) NOT NULL,
+    log_num       int           NOT NULL DEFAULT 1,
+    real_time     bigint        NOT NULL DEFAULT 0,
+    create_dt     datetime2     NOT NULL DEFAULT CURRENT_TIMESTAMP
+)
+GO
+
+CREATE INDEX idx_sj_retry_task_log_message_01 ON sj_retry_task_log_message (namespace_id, group_name, retry_task_id)
+GO
+CREATE INDEX idx_sj_retry_task_log_message_02 ON sj_retry_task_log_message (create_dt)
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'主键',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_retry_task_log_message',
+     'COLUMN', N'id'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'命名空间id',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_retry_task_log_message',
+     'COLUMN', N'namespace_id'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'组名称',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_retry_task_log_message',
+     'COLUMN', N'group_name'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'重试信息Id',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_retry_task_log_message',
+     'COLUMN', N'retry_id'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'重试任务Id',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_retry_task_log_message',
+     'COLUMN', N'retry_task_id'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'异常信息',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_retry_task_log_message',
+     'COLUMN', N'message'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'日志数量',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_retry_task_log_message',
+     'COLUMN', N'log_num'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'上报时间',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_retry_task_log_message',
+     'COLUMN', N'real_time'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'创建时间',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_retry_task_log_message',
+     'COLUMN', N'create_dt'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'任务调度日志信息记录表',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_retry_task_log_message'
+GO
+
+-- sj_retry_scene_config
+CREATE TABLE sj_retry_scene_config
+(
+    id                  bigint        NOT NULL PRIMARY KEY IDENTITY,
+    namespace_id        nvarchar(64)  NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a',
+    scene_name          nvarchar(64)  NOT NULL,
+    group_name          nvarchar(64)  NOT NULL,
+    scene_status        tinyint       NOT NULL DEFAULT 0,
+    max_retry_count     int           NOT NULL DEFAULT 5,
+    back_off            tinyint       NOT NULL DEFAULT 1,
+    trigger_interval    nvarchar(16)  NOT NULL DEFAULT '',
+    notify_ids          nvarchar(128) NOT NULL DEFAULT '',
+    deadline_request    bigint        NOT NULL DEFAULT 60000,
+    executor_timeout    int           NOT NULL DEFAULT 5,
+    route_key           tinyint       NOT NULL DEFAULT 4,
+    block_strategy      tinyint       NOT NULL DEFAULT 1,
+    cb_status           tinyint       NOT NULL DEFAULT 0,
+    cb_trigger_type     tinyint       NOT NULL DEFAULT 1,
+    cb_max_count        int           NOT NULL DEFAULT 16,
+    cb_trigger_interval nvarchar(16)  NOT NULL DEFAULT '',
+    description         nvarchar(256) NOT NULL DEFAULT '',
+    create_dt           datetime2     NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    update_dt           datetime2     NOT NULL DEFAULT CURRENT_TIMESTAMP
+)
+GO
+
+CREATE UNIQUE INDEX uk_sj_retry_scene_config_01 ON sj_retry_scene_config (namespace_id, group_name, scene_name)
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'主键',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_retry_scene_config',
+     'COLUMN', N'id'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'命名空间id',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_retry_scene_config',
+     'COLUMN', N'namespace_id'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'场景名称',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_retry_scene_config',
+     'COLUMN', N'scene_name'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'组名称',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_retry_scene_config',
+     'COLUMN', N'group_name'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'组状态 0、未启用 1、启用',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_retry_scene_config',
+     'COLUMN', N'scene_status'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'最大重试次数',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_retry_scene_config',
+     'COLUMN', N'max_retry_count'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'1、默认等级 2、固定间隔时间 3、CRON 表达式',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_retry_scene_config',
+     'COLUMN', N'back_off'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'间隔时长',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_retry_scene_config',
+     'COLUMN', N'trigger_interval'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'通知告警场景配置id列表',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_retry_scene_config',
+     'COLUMN', N'notify_ids'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'Deadline Request 调用链超时 单位毫秒',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_retry_scene_config',
+     'COLUMN', N'deadline_request'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'任务执行超时时间，单位秒',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_retry_scene_config',
+     'COLUMN', N'executor_timeout'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'路由策略',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_retry_scene_config',
+     'COLUMN', N'route_key'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'阻塞策略 1、丢弃 2、覆盖 3、并行',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_retry_scene_config',
+     'COLUMN', N'block_strategy'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'回调状态 0、不开启 1、开启',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_retry_scene_config',
+     'COLUMN', N'cb_status'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'1、默认等级 2、固定间隔时间 3、CRON 表达式',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_retry_scene_config',
+     'COLUMN', N'cb_trigger_type'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'回调的最大执行次数',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_retry_scene_config',
+     'COLUMN', N'cb_max_count'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'回调的最大执行次数',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_retry_scene_config',
+     'COLUMN', N'cb_trigger_interval'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'描述',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_retry_scene_config',
+     'COLUMN', N'description'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'创建时间',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_retry_scene_config',
+     'COLUMN', N'create_dt'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'修改时间',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_retry_scene_config',
+     'COLUMN', N'update_dt'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'场景配置',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_retry_scene_config'
+GO
+
+-- sj_server_node
+CREATE TABLE sj_server_node
+(
+    id           bigint        NOT NULL PRIMARY KEY IDENTITY,
+    namespace_id nvarchar(64)  NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a',
+    group_name   nvarchar(64)  NOT NULL,
+    host_id      nvarchar(64)  NOT NULL,
+    host_ip      nvarchar(64)  NOT NULL,
+    host_port    int           NOT NULL,
+    expire_at    datetime2     NOT NULL,
+    node_type    tinyint       NOT NULL,
+    ext_attrs    nvarchar(256) NULL     DEFAULT '',
+    create_dt    datetime2     NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    update_dt    datetime2     NOT NULL DEFAULT CURRENT_TIMESTAMP
+)
+GO
+
+CREATE UNIQUE INDEX uk_sj_server_node_01 ON sj_server_node (host_id, host_ip)
+GO
+
+CREATE INDEX idx_sj_server_node_01 ON sj_server_node (namespace_id, group_name)
+GO
+CREATE INDEX idx_sj_server_node_02 ON sj_server_node (expire_at, node_type)
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'主键',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_server_node',
+     'COLUMN', N'id'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'命名空间id',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_server_node',
+     'COLUMN', N'namespace_id'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'组名称',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_server_node',
+     'COLUMN', N'group_name'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'主机id',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_server_node',
+     'COLUMN', N'host_id'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'机器ip',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_server_node',
+     'COLUMN', N'host_ip'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'机器端口',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_server_node',
+     'COLUMN', N'host_port'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'过期时间',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_server_node',
+     'COLUMN', N'expire_at'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'节点类型 1、客户端 2、是服务端',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_server_node',
+     'COLUMN', N'node_type'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'扩展字段',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_server_node',
+     'COLUMN', N'ext_attrs'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'创建时间',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_server_node',
+     'COLUMN', N'create_dt'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'修改时间',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_server_node',
+     'COLUMN', N'update_dt'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'服务器节点',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_server_node'
+GO
+
+-- sj_distributed_lock
+CREATE TABLE sj_distributed_lock
+(
+    name       nvarchar(64)  NOT NULL,
+    lock_until datetime2     NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    locked_at  datetime2     NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    locked_by  nvarchar(255) NOT NULL,
+    create_dt  datetime2     NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    update_dt  datetime2     NOT NULL DEFAULT CURRENT_TIMESTAMP
+)
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'锁名称',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_distributed_lock',
+     'COLUMN', N'name'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'锁定时长',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_distributed_lock',
+     'COLUMN', N'lock_until'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'锁定时间',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_distributed_lock',
+     'COLUMN', N'locked_at'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'锁定者',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_distributed_lock',
+     'COLUMN', N'locked_by'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'创建时间',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_distributed_lock',
+     'COLUMN', N'create_dt'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'修改时间',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_distributed_lock',
+     'COLUMN', N'update_dt'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'锁定表',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_distributed_lock'
+GO
+
+-- sj_system_user
+CREATE TABLE sj_system_user
+(
+    id        bigint        NOT NULL PRIMARY KEY IDENTITY,
+    username  nvarchar(64)  NOT NULL,
+    password  nvarchar(128) NOT NULL,
+    role      tinyint       NOT NULL DEFAULT 0,
+    create_dt datetime2     NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    update_dt datetime2     NOT NULL DEFAULT CURRENT_TIMESTAMP
+)
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'主键',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_system_user',
+     'COLUMN', N'id'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'账号',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_system_user',
+     'COLUMN', N'username'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'密码',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_system_user',
+     'COLUMN', N'password'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'角色：1-普通用户、2-管理员',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_system_user',
+     'COLUMN', N'role'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'创建时间',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_system_user',
+     'COLUMN', N'create_dt'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'修改时间',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_system_user',
+     'COLUMN', N'update_dt'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'系统用户表',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_system_user'
+GO
+
+-- pwd: admin
+INSERT INTO sj_system_user(username, password, role, create_dt, update_dt) VALUES (N'admin', N'465c194afb65670f38322df087f0a9bb225cc257e43eb4ac5a0c98ef5b3173ac', N'2', getdate(), getdate())
+GO
+
+-- sj_system_user_permission
+CREATE TABLE sj_system_user_permission
+(
+    id             bigint       NOT NULL PRIMARY KEY IDENTITY,
+    group_name     nvarchar(64) NOT NULL,
+    namespace_id   nvarchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a',
+    system_user_id bigint       NOT NULL,
+    create_dt      datetime2    NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    update_dt      datetime2    NOT NULL DEFAULT CURRENT_TIMESTAMP
+)
+GO
+
+CREATE UNIQUE INDEX uk_sj_system_user_permission_01 ON sj_system_user_permission (namespace_id, group_name, system_user_id)
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'主键',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_system_user_permission',
+     'COLUMN', N'id'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'组名称',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_system_user_permission',
+     'COLUMN', N'group_name'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'命名空间id',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_system_user_permission',
+     'COLUMN', N'namespace_id'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'系统用户id',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_system_user_permission',
+     'COLUMN', N'system_user_id'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'创建时间',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_system_user_permission',
+     'COLUMN', N'create_dt'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'修改时间',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_system_user_permission',
+     'COLUMN', N'update_dt'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'系统用户权限表',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_system_user_permission'
+GO
+
+-- sj_sequence_alloc
+CREATE TABLE sj_sequence_alloc
+(
+    id           bigint       NOT NULL PRIMARY KEY IDENTITY,
+    namespace_id nvarchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a',
+    group_name   nvarchar(64) NOT NULL DEFAULT '',
+    max_id       bigint       NOT NULL DEFAULT 1,
+    step         int          NOT NULL DEFAULT 100,
+    update_dt    datetime2    NOT NULL DEFAULT CURRENT_TIMESTAMP
+)
+GO
+
+CREATE UNIQUE INDEX uk_sj_sequence_alloc_01 ON sj_sequence_alloc (namespace_id, group_name)
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'主键',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_sequence_alloc',
+     'COLUMN', N'id'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'命名空间id',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_sequence_alloc',
+     'COLUMN', N'namespace_id'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'组名称',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_sequence_alloc',
+     'COLUMN', N'group_name'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'最大id',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_sequence_alloc',
+     'COLUMN', N'max_id'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'步长',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_sequence_alloc',
+     'COLUMN', N'step'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'更新时间',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_sequence_alloc',
+     'COLUMN', N'update_dt'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'号段模式序号ID分配表',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_sequence_alloc'
+GO
+
+-- sj_job
+CREATE TABLE sj_job
+(
+    id               bigint        NOT NULL PRIMARY KEY IDENTITY,
+    namespace_id     nvarchar(64)  NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a',
+    group_name       nvarchar(64)  NOT NULL,
+    job_name         nvarchar(64)  NOT NULL,
+    args_str         nvarchar(max) NULL     DEFAULT NULL,
+    args_type        tinyint       NOT NULL DEFAULT 1,
+    next_trigger_at  bigint        NOT NULL,
+    job_status       tinyint       NOT NULL DEFAULT 1,
+    task_type        tinyint       NOT NULL DEFAULT 1,
+    route_key        tinyint       NOT NULL DEFAULT 4,
+    executor_type    tinyint       NOT NULL DEFAULT 1,
+    executor_info    nvarchar(255) NULL     DEFAULT NULL,
+    trigger_type     tinyint       NOT NULL,
+    trigger_interval nvarchar(255) NOT NULL,
+    block_strategy   tinyint       NOT NULL DEFAULT 1,
+    executor_timeout int           NOT NULL DEFAULT 0,
+    max_retry_times  int           NOT NULL DEFAULT 0,
+    parallel_num     int           NOT NULL DEFAULT 1,
+    retry_interval   int           NOT NULL DEFAULT 0,
+    bucket_index     int           NOT NULL DEFAULT 0,
+    resident         tinyint       NOT NULL DEFAULT 0,
+    notify_ids       nvarchar(128) NOT NULL DEFAULT '',
+    owner_id         bigint        NULL,
+    description      nvarchar(256) NOT NULL DEFAULT '',
+    ext_attrs        nvarchar(256) NULL     DEFAULT '',
+    deleted          tinyint       NOT NULL DEFAULT 0,
+    create_dt        datetime2     NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    update_dt        datetime2     NOT NULL DEFAULT CURRENT_TIMESTAMP
+)
+GO
+
+CREATE INDEX idx_sj_job_01 ON sj_job (namespace_id, group_name)
+GO
+CREATE INDEX idx_sj_job_02 ON sj_job (job_status, bucket_index)
+GO
+CREATE INDEX idx_sj_job_03 ON sj_job (create_dt)
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'主键',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_job',
+     'COLUMN', N'id'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'命名空间id',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_job',
+     'COLUMN', N'namespace_id'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'组名称',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_job',
+     'COLUMN', N'group_name'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'名称',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_job',
+     'COLUMN', N'job_name'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'执行方法参数',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_job',
+     'COLUMN', N'args_str'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'参数类型 ',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_job',
+     'COLUMN', N'args_type'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'下次触发时间',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_job',
+     'COLUMN', N'next_trigger_at'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'任务状态 0、关闭、1、开启',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_job',
+     'COLUMN', N'job_status'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'任务类型 1、集群 2、广播 3、切片',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_job',
+     'COLUMN', N'task_type'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'路由策略',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_job',
+     'COLUMN', N'route_key'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'执行器类型',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_job',
+     'COLUMN', N'executor_type'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'执行器名称',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_job',
+     'COLUMN', N'executor_info'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'触发类型 1.CRON 表达式 2. 固定时间',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_job',
+     'COLUMN', N'trigger_type'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'间隔时长',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_job',
+     'COLUMN', N'trigger_interval'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'阻塞策略 1、丢弃 2、覆盖 3、并行 4、恢复',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_job',
+     'COLUMN', N'block_strategy'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'任务执行超时时间，单位秒',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_job',
+     'COLUMN', N'executor_timeout'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'最大重试次数',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_job',
+     'COLUMN', N'max_retry_times'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'并行数',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_job',
+     'COLUMN', N'parallel_num'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'重试间隔 ( s)',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_job',
+     'COLUMN', N'retry_interval'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'bucket',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_job',
+     'COLUMN', N'bucket_index'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'是否是常驻任务',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_job',
+     'COLUMN', N'resident'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'通知告警场景配置id列表',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_job',
+     'COLUMN', N'notify_ids'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'负责人id',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_job',
+     'COLUMN', N'owner_id'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'描述',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_job',
+     'COLUMN', N'description'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'扩展字段',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_job',
+     'COLUMN', N'ext_attrs'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'逻辑删除 1、删除',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_job',
+     'COLUMN', N'deleted'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'创建时间',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_job',
+     'COLUMN', N'create_dt'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'修改时间',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_job',
+     'COLUMN', N'update_dt'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'任务信息',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_job'
+GO
+
+INSERT INTO sj_job (namespace_id, group_name, job_name, args_str, args_type, next_trigger_at, job_status, task_type, route_key, executor_type, executor_info, trigger_type, trigger_interval, block_strategy,executor_timeout, max_retry_times, parallel_num, retry_interval, bucket_index, resident, notify_ids, owner_id, description, ext_attrs, deleted, create_dt, update_dt) VALUES (N'dev', N'ruoyi_group', N'demo-job', null, 1, 1710344035622, 1, 1, 4, 1, N'testJobExecutor', 2, N'60', 1, 60, 3, 1, 1, 116, 0, N'', 1, N'', N'', 0, getdate(), getdate())
+GO
+
+-- sj_job_log_message
+CREATE TABLE sj_job_log_message
+(
+    id            bigint        NOT NULL PRIMARY KEY IDENTITY,
+    namespace_id  nvarchar(64)  NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a',
+    group_name    nvarchar(64)  NOT NULL,
+    job_id        bigint        NOT NULL,
+    task_batch_id bigint        NOT NULL,
+    task_id       bigint        NOT NULL,
+    message       nvarchar(max) NOT NULL,
+    log_num       int           NOT NULL DEFAULT 1,
+    real_time     bigint        NOT NULL DEFAULT 0,
+    ext_attrs     nvarchar(256) NULL     DEFAULT '',
+    create_dt     datetime2     NOT NULL DEFAULT CURRENT_TIMESTAMP
+)
+GO
+
+CREATE INDEX idx_sj_job_log_message_01 ON sj_job_log_message (task_batch_id, task_id)
+GO
+CREATE INDEX idx_sj_job_log_message_02 ON sj_job_log_message (create_dt)
+GO
+CREATE INDEX idx_sj_job_log_message_03 ON sj_job_log_message (namespace_id, group_name)
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'主键',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_job_log_message',
+     'COLUMN', N'id'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'命名空间id',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_job_log_message',
+     'COLUMN', N'namespace_id'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'组名称',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_job_log_message',
+     'COLUMN', N'group_name'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'任务信息id',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_job_log_message',
+     'COLUMN', N'job_id'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'任务批次id',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_job_log_message',
+     'COLUMN', N'task_batch_id'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'调度任务id',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_job_log_message',
+     'COLUMN', N'task_id'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'调度信息',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_job_log_message',
+     'COLUMN', N'message'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'日志数量',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_job_log_message',
+     'COLUMN', N'log_num'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'上报时间',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_job_log_message',
+     'COLUMN', N'real_time'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'扩展字段',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_job_log_message',
+     'COLUMN', N'ext_attrs'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'创建时间',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_job_log_message',
+     'COLUMN', N'create_dt'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'调度日志',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_job_log_message'
+GO
+
+-- sj_job_task
+CREATE TABLE sj_job_task
+(
+    id             bigint        NOT NULL PRIMARY KEY IDENTITY,
+    namespace_id   nvarchar(64)  NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a',
+    group_name     nvarchar(64)  NOT NULL,
+    job_id         bigint        NOT NULL,
+    task_batch_id  bigint        NOT NULL,
+    parent_id      bigint        NOT NULL DEFAULT 0,
+    task_status    tinyint       NOT NULL DEFAULT 0,
+    retry_count    int           NOT NULL DEFAULT 0,
+    mr_stage       tinyint       NULL     DEFAULT NULL,
+    leaf           tinyint       NOT NULL DEFAULT '1',
+    task_name      nvarchar(255) NOT NULL DEFAULT '',
+    client_info    nvarchar(128) NULL     DEFAULT NULL,
+    wf_context     nvarchar(max) NULL     DEFAULT NULL,
+    result_message nvarchar(max) NOT NULL,
+    args_str       nvarchar(max) NULL     DEFAULT NULL,
+    args_type      tinyint       NOT NULL DEFAULT 1,
+    ext_attrs      nvarchar(256) NULL     DEFAULT '',
+    create_dt      datetime2     NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    update_dt      datetime2     NOT NULL DEFAULT CURRENT_TIMESTAMP
+)
+GO
+
+CREATE INDEX idx_sj_job_task_01 ON sj_job_task (task_batch_id, task_status)
+GO
+CREATE INDEX idx_sj_job_task_02 ON sj_job_task (create_dt)
+GO
+CREATE INDEX idx_sj_job_task_03 ON sj_job_task (namespace_id, group_name)
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'主键',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_job_task',
+     'COLUMN', N'id'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'命名空间id',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_job_task',
+     'COLUMN', N'namespace_id'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'组名称',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_job_task',
+     'COLUMN', N'group_name'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'任务信息id',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_job_task',
+     'COLUMN', N'job_id'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'调度任务id',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_job_task',
+     'COLUMN', N'task_batch_id'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'父执行器id',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_job_task',
+     'COLUMN', N'parent_id'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'执行的状态 0、失败 1、成功',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_job_task',
+     'COLUMN', N'task_status'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'重试次数',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_job_task',
+     'COLUMN', N'retry_count'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'动态分片所处阶段 1:map 2:reduce 3:mergeReduce',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_job_task',
+     'COLUMN', N'mr_stage'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'叶子节点',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_job_task',
+     'COLUMN', N'leaf'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'任务名称',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_job_task',
+     'COLUMN', N'task_name'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'客户端地址 clientId#ip:port',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_job_task',
+     'COLUMN', N'client_info'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'工作流全局上下文',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_job_task',
+     'COLUMN', N'wf_context'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'执行结果',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_job_task',
+     'COLUMN', N'result_message'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'执行方法参数',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_job_task',
+     'COLUMN', N'args_str'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'参数类型 ',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_job_task',
+     'COLUMN', N'args_type'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'扩展字段',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_job_task',
+     'COLUMN', N'ext_attrs'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'创建时间',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_job_task',
+     'COLUMN', N'create_dt'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'修改时间',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_job_task',
+     'COLUMN', N'update_dt'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'任务实例',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_job_task'
+GO
+
+-- sj_job_task_batch
+CREATE TABLE sj_job_task_batch
+(
+    id                      bigint        NOT NULL PRIMARY KEY IDENTITY,
+    namespace_id            nvarchar(64)  NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a',
+    group_name              nvarchar(64)  NOT NULL,
+    job_id                  bigint        NOT NULL,
+    workflow_node_id        bigint        NOT NULL DEFAULT 0,
+    parent_workflow_node_id bigint        NOT NULL DEFAULT 0,
+    workflow_task_batch_id  bigint        NOT NULL DEFAULT 0,
+    task_batch_status       tinyint       NOT NULL DEFAULT 0,
+    operation_reason        tinyint       NOT NULL DEFAULT 0,
+    execution_at            bigint        NOT NULL DEFAULT 0,
+    system_task_type        tinyint       NOT NULL DEFAULT 3,
+    parent_id               nvarchar(64)  NOT NULL DEFAULT '',
+    ext_attrs               nvarchar(256) NULL     DEFAULT '',
+    deleted                 tinyint       NOT NULL DEFAULT 0,
+    create_dt               datetime2     NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    update_dt               datetime2     NOT NULL DEFAULT CURRENT_TIMESTAMP
+)
+GO
+
+CREATE INDEX idx_sj_job_task_batch_01 ON sj_job_task_batch (job_id, task_batch_status)
+GO
+CREATE INDEX idx_sj_job_task_batch_02 ON sj_job_task_batch (create_dt)
+GO
+CREATE INDEX idx_sj_job_task_batch_03 ON sj_job_task_batch (namespace_id, group_name)
+GO
+CREATE INDEX idx_sj_job_task_batch_04 ON sj_job_task_batch (workflow_task_batch_id, workflow_node_id)
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'主键',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_job_task_batch',
+     'COLUMN', N'id'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'命名空间id',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_job_task_batch',
+     'COLUMN', N'namespace_id'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'组名称',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_job_task_batch',
+     'COLUMN', N'group_name'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'任务id',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_job_task_batch',
+     'COLUMN', N'job_id'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'工作流节点id',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_job_task_batch',
+     'COLUMN', N'workflow_node_id'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'工作流任务父批次id',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_job_task_batch',
+     'COLUMN', N'parent_workflow_node_id'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'工作流任务批次id',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_job_task_batch',
+     'COLUMN', N'workflow_task_batch_id'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'任务批次状态 0、失败 1、成功',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_job_task_batch',
+     'COLUMN', N'task_batch_status'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'操作原因',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_job_task_batch',
+     'COLUMN', N'operation_reason'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'任务执行时间',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_job_task_batch',
+     'COLUMN', N'execution_at'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'任务类型 3、JOB任务 4、WORKFLOW任务',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_job_task_batch',
+     'COLUMN', N'system_task_type'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'父节点',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_job_task_batch',
+     'COLUMN', N'parent_id'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'扩展字段',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_job_task_batch',
+     'COLUMN', N'ext_attrs'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'逻辑删除 1、删除',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_job_task_batch',
+     'COLUMN', N'deleted'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'创建时间',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_job_task_batch',
+     'COLUMN', N'create_dt'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'修改时间',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_job_task_batch',
+     'COLUMN', N'update_dt'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'任务批次',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_job_task_batch'
+GO
+
+-- sj_job_summary
+CREATE TABLE sj_job_summary
+(
+    id               bigint        NOT NULL PRIMARY KEY IDENTITY,
+    namespace_id     nvarchar(64)  NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a',
+    group_name       nvarchar(64)  NOT NULL DEFAULT '',
+    business_id      bigint        NOT NULL,
+    system_task_type tinyint       NOT NULL DEFAULT 3,
+    trigger_at       datetime2     NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    success_num      int           NOT NULL DEFAULT 0,
+    fail_num         int           NOT NULL DEFAULT 0,
+    fail_reason      nvarchar(512) NOT NULL DEFAULT '',
+    stop_num         int           NOT NULL DEFAULT 0,
+    stop_reason      nvarchar(512) NOT NULL DEFAULT '',
+    cancel_num       int           NOT NULL DEFAULT 0,
+    cancel_reason    nvarchar(512) NOT NULL DEFAULT '',
+    create_dt        datetime2     NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    update_dt        datetime2     NOT NULL DEFAULT CURRENT_TIMESTAMP
+)
+GO
+
+CREATE UNIQUE INDEX uk_sj_job_summary_01 ON sj_job_summary (trigger_at, system_task_type, business_id)
+GO
+
+CREATE INDEX idx_sj_job_summary_01 ON sj_job_summary (namespace_id, group_name, business_id)
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'主键',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_job_summary',
+     'COLUMN', N'id'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'命名空间id',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_job_summary',
+     'COLUMN', N'namespace_id'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'组名称',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_job_summary',
+     'COLUMN', N'group_name'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'业务id  ( job_id或workflow_id)',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_job_summary',
+     'COLUMN', N'business_id'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'任务类型 3、JOB任务 4、WORKFLOW任务',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_job_summary',
+     'COLUMN', N'system_task_type'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'统计时间',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_job_summary',
+     'COLUMN', N'trigger_at'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'执行成功-日志数量',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_job_summary',
+     'COLUMN', N'success_num'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'执行失败-日志数量',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_job_summary',
+     'COLUMN', N'fail_num'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'失败原因',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_job_summary',
+     'COLUMN', N'fail_reason'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'执行失败-日志数量',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_job_summary',
+     'COLUMN', N'stop_num'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'失败原因',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_job_summary',
+     'COLUMN', N'stop_reason'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'执行失败-日志数量',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_job_summary',
+     'COLUMN', N'cancel_num'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'失败原因',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_job_summary',
+     'COLUMN', N'cancel_reason'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'创建时间',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_job_summary',
+     'COLUMN', N'create_dt'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'修改时间',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_job_summary',
+     'COLUMN', N'update_dt'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'DashBoard_Job',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_job_summary'
+GO
+
+-- sj_retry_summary
+CREATE TABLE sj_retry_summary
+(
+    id            bigint       NOT NULL PRIMARY KEY IDENTITY,
+    namespace_id  nvarchar(64) NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a',
+    group_name    nvarchar(64) NOT NULL DEFAULT '',
+    scene_name    nvarchar(50) NOT NULL DEFAULT '',
+    trigger_at    datetime2    NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    running_num   int          NOT NULL DEFAULT 0,
+    finish_num    int          NOT NULL DEFAULT 0,
+    max_count_num int          NOT NULL DEFAULT 0,
+    suspend_num   int          NOT NULL DEFAULT 0,
+    create_dt     datetime2    NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    update_dt     datetime2    NOT NULL DEFAULT CURRENT_TIMESTAMP
+)
+GO
+
+CREATE UNIQUE INDEX uk_sj_retry_summary_01 ON sj_retry_summary (namespace_id, group_name, scene_name, trigger_at)
+GO
+
+CREATE INDEX idx_sj_retry_summary_01 ON sj_retry_summary (trigger_at)
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'主键',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_retry_summary',
+     'COLUMN', N'id'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'命名空间id',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_retry_summary',
+     'COLUMN', N'namespace_id'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'组名称',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_retry_summary',
+     'COLUMN', N'group_name'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'场景名称',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_retry_summary',
+     'COLUMN', N'scene_name'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'统计时间',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_retry_summary',
+     'COLUMN', N'trigger_at'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'重试中-日志数量',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_retry_summary',
+     'COLUMN', N'running_num'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'重试完成-日志数量',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_retry_summary',
+     'COLUMN', N'finish_num'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'重试到达最大次数-日志数量',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_retry_summary',
+     'COLUMN', N'max_count_num'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'暂停重试-日志数量',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_retry_summary',
+     'COLUMN', N'suspend_num'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'创建时间',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_retry_summary',
+     'COLUMN', N'create_dt'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'修改时间',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_retry_summary',
+     'COLUMN', N'update_dt'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'DashBoard_Retry',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_retry_summary'
+GO
+
+-- sj_workflow
+CREATE TABLE sj_workflow
+(
+    id               bigint        NOT NULL PRIMARY KEY IDENTITY,
+    workflow_name    nvarchar(64)  NOT NULL,
+    namespace_id     nvarchar(64)  NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a',
+    group_name       nvarchar(64)  NOT NULL,
+    workflow_status  tinyint       NOT NULL DEFAULT 1,
+    trigger_type     tinyint       NOT NULL,
+    trigger_interval nvarchar(255) NOT NULL,
+    next_trigger_at  bigint        NOT NULL,
+    block_strategy   tinyint       NOT NULL DEFAULT 1,
+    executor_timeout int           NOT NULL DEFAULT 0,
+    description      nvarchar(256) NOT NULL DEFAULT '',
+    flow_info        nvarchar(max) NULL     DEFAULT NULL,
+    wf_context       nvarchar(max) NULL     DEFAULT NULL,
+    notify_ids       nvarchar(128) NOT NULL DEFAULT '',
+    bucket_index     int           NOT NULL DEFAULT 0,
+    version          int           NOT NULL,
+    ext_attrs        nvarchar(256) NULL     DEFAULT '',
+    deleted          tinyint       NOT NULL DEFAULT 0,
+    create_dt        datetime2     NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    update_dt        datetime2     NOT NULL DEFAULT CURRENT_TIMESTAMP
+)
+GO
+
+CREATE INDEX idx_sj_workflow_01 ON sj_workflow (create_dt)
+GO
+CREATE INDEX idx_sj_workflow_02 ON sj_workflow (namespace_id, group_name)
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'主键',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_workflow',
+     'COLUMN', N'id'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'工作流名称',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_workflow',
+     'COLUMN', N'workflow_name'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'命名空间id',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_workflow',
+     'COLUMN', N'namespace_id'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'组名称',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_workflow',
+     'COLUMN', N'group_name'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'工作流状态 0、关闭、1、开启',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_workflow',
+     'COLUMN', N'workflow_status'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'触发类型 1.CRON 表达式 2. 固定时间',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_workflow',
+     'COLUMN', N'trigger_type'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'间隔时长',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_workflow',
+     'COLUMN', N'trigger_interval'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'下次触发时间',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_workflow',
+     'COLUMN', N'next_trigger_at'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'阻塞策略 1、丢弃 2、覆盖 3、并行',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_workflow',
+     'COLUMN', N'block_strategy'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'任务执行超时时间，单位秒',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_workflow',
+     'COLUMN', N'executor_timeout'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'描述',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_workflow',
+     'COLUMN', N'description'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'流程信息',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_workflow',
+     'COLUMN', N'flow_info'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'上下文',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_workflow',
+     'COLUMN', N'wf_context'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'通知告警场景配置id列表',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_workflow',
+     'COLUMN', N'notify_ids'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'bucket',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_workflow',
+     'COLUMN', N'bucket_index'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'版本号',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_workflow',
+     'COLUMN', N'version'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'扩展字段',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_workflow',
+     'COLUMN', N'ext_attrs'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'逻辑删除 1、删除',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_workflow',
+     'COLUMN', N'deleted'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'创建时间',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_workflow',
+     'COLUMN', N'create_dt'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'修改时间',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_workflow',
+     'COLUMN', N'update_dt'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'工作流',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_workflow'
+GO
+
+-- sj_workflow_node
+CREATE TABLE sj_workflow_node
+(
+    id                   bigint        NOT NULL PRIMARY KEY IDENTITY,
+    namespace_id         nvarchar(64)  NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a',
+    node_name            nvarchar(64)  NOT NULL,
+    group_name           nvarchar(64)  NOT NULL,
+    job_id               bigint        NOT NULL,
+    workflow_id          bigint        NOT NULL,
+    node_type            tinyint       NOT NULL DEFAULT 1,
+    expression_type      tinyint       NOT NULL DEFAULT 0,
+    fail_strategy        tinyint       NOT NULL DEFAULT 1,
+    workflow_node_status tinyint       NOT NULL DEFAULT 1,
+    priority_level       int           NOT NULL DEFAULT 1,
+    node_info            nvarchar(max) NULL     DEFAULT NULL,
+    version              int           NOT NULL,
+    ext_attrs            nvarchar(256) NULL     DEFAULT '',
+    deleted              tinyint       NOT NULL DEFAULT 0,
+    create_dt            datetime2     NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    update_dt            datetime2     NOT NULL DEFAULT CURRENT_TIMESTAMP
+)
+GO
+
+CREATE INDEX idx_sj_workflow_node_01 ON sj_workflow_node (create_dt)
+GO
+CREATE INDEX idx_sj_workflow_node_02 ON sj_workflow_node (namespace_id, group_name)
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'主键',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_workflow_node',
+     'COLUMN', N'id'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'命名空间id',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_workflow_node',
+     'COLUMN', N'namespace_id'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'节点名称',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_workflow_node',
+     'COLUMN', N'node_name'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'组名称',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_workflow_node',
+     'COLUMN', N'group_name'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'任务信息id',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_workflow_node',
+     'COLUMN', N'job_id'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'工作流ID',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_workflow_node',
+     'COLUMN', N'workflow_id'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'1、任务节点 2、条件节点',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_workflow_node',
+     'COLUMN', N'node_type'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'1、SpEl、2、Aviator 3、QL',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_workflow_node',
+     'COLUMN', N'expression_type'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'失败策略 1、跳过 2、阻塞',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_workflow_node',
+     'COLUMN', N'fail_strategy'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'工作流节点状态 0、关闭、1、开启',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_workflow_node',
+     'COLUMN', N'workflow_node_status'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'优先级',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_workflow_node',
+     'COLUMN', N'priority_level'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'节点信息 ',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_workflow_node',
+     'COLUMN', N'node_info'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'版本号',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_workflow_node',
+     'COLUMN', N'version'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'扩展字段',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_workflow_node',
+     'COLUMN', N'ext_attrs'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'逻辑删除 1、删除',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_workflow_node',
+     'COLUMN', N'deleted'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'创建时间',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_workflow_node',
+     'COLUMN', N'create_dt'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'修改时间',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_workflow_node',
+     'COLUMN', N'update_dt'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'工作流节点',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_workflow_node'
+GO
+
+-- sj_workflow_task_batch
+CREATE TABLE sj_workflow_task_batch
+(
+    id                bigint        NOT NULL PRIMARY KEY IDENTITY,
+    namespace_id      nvarchar(64)  NOT NULL DEFAULT '764d604ec6fc45f68cd92514c40e9e1a',
+    group_name        nvarchar(64)  NOT NULL,
+    workflow_id       bigint        NOT NULL,
+    task_batch_status tinyint       NOT NULL DEFAULT 0,
+    operation_reason  tinyint       NOT NULL DEFAULT 0,
+    flow_info         nvarchar(max) NULL     DEFAULT NULL,
+    wf_context        nvarchar(max) NULL     DEFAULT NULL,
+    execution_at      bigint        NOT NULL DEFAULT 0,
+    ext_attrs         nvarchar(256) NULL     DEFAULT '',
+    version           int           NOT NULL DEFAULT 1,
+    deleted           tinyint       NOT NULL DEFAULT 0,
+    create_dt         datetime2     NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    update_dt         datetime2     NOT NULL DEFAULT CURRENT_TIMESTAMP
+)
+GO
+
+CREATE INDEX idx_sj_workflow_task_batch_01 ON sj_workflow_task_batch (workflow_id, task_batch_status)
+GO
+CREATE INDEX idx_sj_workflow_task_batch_02 ON sj_workflow_task_batch (create_dt)
+GO
+CREATE INDEX idx_sj_workflow_task_batch_03 ON sj_workflow_task_batch (namespace_id, group_name)
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'主键',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_workflow_task_batch',
+     'COLUMN', N'id'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'命名空间id',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_workflow_task_batch',
+     'COLUMN', N'namespace_id'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'组名称',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_workflow_task_batch',
+     'COLUMN', N'group_name'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'工作流任务id',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_workflow_task_batch',
+     'COLUMN', N'workflow_id'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'任务批次状态 0、失败 1、成功',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_workflow_task_batch',
+     'COLUMN', N'task_batch_status'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'操作原因',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_workflow_task_batch',
+     'COLUMN', N'operation_reason'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'流程信息',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_workflow_task_batch',
+     'COLUMN', N'flow_info'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'全局上下文',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_workflow_task_batch',
+     'COLUMN', N'wf_context'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'任务执行时间',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_workflow_task_batch',
+     'COLUMN', N'execution_at'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'扩展字段',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_workflow_task_batch',
+     'COLUMN', N'ext_attrs'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'版本号',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_workflow_task_batch',
+     'COLUMN', N'version'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'逻辑删除 1、删除',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_workflow_task_batch',
+     'COLUMN', N'deleted'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'创建时间',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_workflow_task_batch',
+     'COLUMN', N'create_dt'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'修改时间',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_workflow_task_batch',
+     'COLUMN', N'update_dt'
+GO
+
+EXEC sp_addextendedproperty
+     'MS_Description', N'工作流批次',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sj_workflow_task_batch'
+GO
diff --git a/script/sql/sqlserver/sqlserver_ry_vue_5.X.sql b/script/sql/sqlserver/sqlserver_ry_vue_5.X.sql
new file mode 100644
index 0000000..acf23ad
--- /dev/null
+++ b/script/sql/sqlserver/sqlserver_ry_vue_5.X.sql
@@ -0,0 +1,3245 @@
+create table sys_social
+(
+    id                 bigint            NOT NULL,
+    user_id            bigint            NOT NULL,
+    auth_id            nvarchar(255)     NOT NULL,
+    source             nvarchar(255)     NOT NULL,
+    open_id            nvarchar(255)     NULL,
+    user_name          nvarchar(30)      NOT NULL,
+    nick_name          nvarchar(30)      DEFAULT ('')   NULL,
+    email              nvarchar(255)     DEFAULT ('')   NULL,
+    avatar             nvarchar(500)     DEFAULT ('')   NULL,
+    access_token       nvarchar(2000)    NOT NULL,
+    expire_in          bigint            NULL,
+    refresh_token      nvarchar(2000)    NULL,
+    access_code        nvarchar(255)     NULL,
+    union_id           nvarchar(255)     NULL,
+    scope              nvarchar(255)     NULL,
+    token_type         nvarchar(255)     NULL,
+    id_token           nvarchar(2000)    NULL,
+    mac_algorithm      nvarchar(255)     NULL,
+    mac_key            nvarchar(255)     NULL,
+    code               nvarchar(255)     NULL,
+    oauth_token        nvarchar(255)     NULL,
+    oauth_token_secret nvarchar(255)     NULL,
+    create_dept        bigint,
+    create_by          bigint,
+    create_time        datetime2(7),
+    update_by          bigint,
+    update_time        datetime2(7),
+    del_flag           nchar             DEFAULT ('0')   NULL,
+    CONSTRAINT PK__sys_social__B21E8F2427725F8A PRIMARY KEY CLUSTERED (id)
+    WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON)
+    ON [PRIMARY]
+)
+ON [PRIMARY]
+GO
+
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'id' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_social',
+    'COLUMN', N'id'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'用户ID' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_social',
+    'COLUMN', N'user_id'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'平台+平台唯一id' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_social',
+    'COLUMN', N'auth_id'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'用户来源' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_social',
+    'COLUMN', N'source'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'平台编号唯一id' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_social',
+    'COLUMN', N'open_id'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'登录账号' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_social',
+    'COLUMN', N'user_name'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'用户昵称' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_social',
+    'COLUMN', N'nick_name'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'用户邮箱' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_social',
+    'COLUMN', N'email'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'头像地址' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_social',
+    'COLUMN', N'avatar'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'用户的授权令牌' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_social',
+    'COLUMN', N'access_token'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'用户的授权令牌的有效期，部分平台可能没有' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_social',
+    'COLUMN', N'expire_in'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'刷新令牌，部分平台可能没有' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_social',
+    'COLUMN', N'refresh_token'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'平台的授权信息，部分平台可能没有' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_social',
+    'COLUMN', N'access_code'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'用户的 unionid' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_social',
+    'COLUMN', N'union_id'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'授予的权限，部分平台可能没有' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_social',
+    'COLUMN', N'scope'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'个别平台的授权信息，部分平台可能没有' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_social',
+    'COLUMN', N'token_type'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'id token，部分平台可能没有' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_social',
+    'COLUMN', N'id_token'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'小米平台用户的附带属性，部分平台可能没有' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_social',
+    'COLUMN', N'mac_algorithm'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'小米平台用户的附带属性，部分平台可能没有' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_social',
+    'COLUMN', N'mac_key'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'用户的授权code，部分平台可能没有' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_social',
+    'COLUMN', N'code'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'Twitter平台用户的附带属性，部分平台可能没有' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_social',
+    'COLUMN', N'oauth_token'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'Twitter平台用户的附带属性，部分平台可能没有' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_social',
+    'COLUMN', N'oauth_token_secret'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'删除标志（0代表存在 1代表删除）' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_social',
+    'COLUMN', N'del_flag'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'创建部门' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_social',
+    'COLUMN', N'create_dept'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'创建者' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_social',
+    'COLUMN', N'create_by'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'创建时间' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_social',
+    'COLUMN', N'create_time'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'更新者' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_social',
+    'COLUMN', N'update_by'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'更新时间' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_social',
+    'COLUMN', N'update_time'
+GO
+EXEC sp_addextendedproperty
+    'MS_Description', N'社会化关系表',
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_social'
+GO
+
+
+
+CREATE TABLE gen_table
+(
+    table_id          bigint                         NOT NULL,
+    data_name         nvarchar(200) DEFAULT ''       NULL,
+    table_name        nvarchar(200) DEFAULT ''       NULL,
+    table_comment     nvarchar(500) DEFAULT ''       NULL,
+    sub_table_name    nvarchar(64)                   NULL,
+    sub_table_fk_name nvarchar(64)                   NULL,
+    class_name        nvarchar(100) DEFAULT ''       NULL,
+    tpl_category      nvarchar(200) DEFAULT ('crud') NULL,
+    package_name      nvarchar(100)                  NULL,
+    module_name       nvarchar(30)                   NULL,
+    business_name     nvarchar(30)                   NULL,
+    function_name     nvarchar(50)                   NULL,
+    function_author   nvarchar(50)                   NULL,
+    gen_type          nchar(1)      DEFAULT ('0')    NULL,
+    gen_path          nvarchar(200) DEFAULT ('/')    NULL,
+    options           nvarchar(1000)                 NULL,
+    create_dept       bigint                         NULL,
+    create_by         bigint                         NULL,
+    create_time       datetime2(7)                   NULL,
+    update_by         bigint                         NULL,
+    update_time       datetime2(7)                   NULL,
+    remark            nvarchar(500)                  NULL,
+    CONSTRAINT PK__gen_tabl__B21E8F2427725F8A PRIMARY KEY CLUSTERED (table_id)
+        WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON)
+        ON [PRIMARY]
+)
+ON [PRIMARY]
+GO
+
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'编号' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'gen_table',
+    'COLUMN', N'table_id'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'数据源名称' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'gen_table',
+    'COLUMN', N'data_name'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'表名称' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'gen_table',
+    'COLUMN', N'table_name'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'表描述' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'gen_table',
+    'COLUMN', N'table_comment'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'关联子表的表名' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'gen_table',
+    'COLUMN', N'sub_table_name'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'子表关联的外键名' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'gen_table',
+    'COLUMN', N'sub_table_fk_name'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'实体类名称' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'gen_table',
+    'COLUMN', N'class_name'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'使用的模板（crud单表操作 tree树表操作）' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'gen_table',
+    'COLUMN', N'tpl_category'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'生成包路径' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'gen_table',
+    'COLUMN', N'package_name'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'生成模块名' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'gen_table',
+    'COLUMN', N'module_name'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'生成业务名' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'gen_table',
+    'COLUMN', N'business_name'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'生成功能名' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'gen_table',
+    'COLUMN', N'function_name'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'生成功能作者' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'gen_table',
+    'COLUMN', N'function_author'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'生成代码方式（0zip压缩包 1自定义路径）' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'gen_table',
+    'COLUMN', N'gen_type'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'生成路径（不填默认项目路径）' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'gen_table',
+    'COLUMN', N'gen_path'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'其它生成选项' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'gen_table',
+    'COLUMN', N'options'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'创建部门' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'gen_table',
+    'COLUMN', N'create_dept'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'创建者' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'gen_table',
+    'COLUMN', N'create_by'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'创建时间' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'gen_table',
+    'COLUMN', N'create_time'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'更新者' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'gen_table',
+    'COLUMN', N'update_by'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'更新时间' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'gen_table',
+    'COLUMN', N'update_time'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'备注' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'gen_table',
+    'COLUMN', N'remark'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'代码生成业务表' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'gen_table'
+GO
+
+CREATE TABLE gen_table_column
+(
+    column_id      bigint                       NOT NULL,
+    table_id       bigint                       NULL,
+    column_name    nvarchar(200)                NULL,
+    column_comment nvarchar(500)                NULL,
+    column_type    nvarchar(100)                NULL,
+    java_type      nvarchar(500)                NULL,
+    java_field     nvarchar(200)                NULL,
+    is_pk          nchar(1)                     NULL,
+    is_increment   nchar(1)                     NULL,
+    is_required    nchar(1)                     NULL,
+    is_insert      nchar(1)                     NULL,
+    is_edit        nchar(1)                     NULL,
+    is_list        nchar(1)                     NULL,
+    is_query       nchar(1)                     NULL,
+    query_type     nvarchar(200) DEFAULT ('EQ') NULL,
+    html_type      nvarchar(200)                NULL,
+    dict_type      nvarchar(200) DEFAULT ''     NULL,
+    sort           int                          NULL,
+    create_dept    bigint                       NULL,
+    create_by      bigint                       NULL,
+    create_time    datetime2(7)                 NULL,
+    update_by      bigint                       NULL,
+    update_time    datetime2(7)                 NULL,
+    CONSTRAINT PK__gen_tabl__E301851F2E68B4E8 PRIMARY KEY CLUSTERED (column_id)
+        WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON)
+        ON [PRIMARY]
+)
+ON [PRIMARY]
+GO
+
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'编号' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'gen_table_column',
+    'COLUMN', N'column_id'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'归属表编号' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'gen_table_column',
+    'COLUMN', N'table_id'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'列名称' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'gen_table_column',
+    'COLUMN', N'column_name'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'列描述' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'gen_table_column',
+    'COLUMN', N'column_comment'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'列类型' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'gen_table_column',
+    'COLUMN', N'column_type'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'JAVA类型' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'gen_table_column',
+    'COLUMN', N'java_type'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'JAVA字段名' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'gen_table_column',
+    'COLUMN', N'java_field'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'是否主键（1是）' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'gen_table_column',
+    'COLUMN', N'is_pk'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'是否自增（1是）' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'gen_table_column',
+    'COLUMN', N'is_increment'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'是否必填（1是）' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'gen_table_column',
+    'COLUMN', N'is_required'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'是否为插入字段（1是）' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'gen_table_column',
+    'COLUMN', N'is_insert'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'是否编辑字段（1是）' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'gen_table_column',
+    'COLUMN', N'is_edit'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'是否列表字段（1是）' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'gen_table_column',
+    'COLUMN', N'is_list'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'是否查询字段（1是）' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'gen_table_column',
+    'COLUMN', N'is_query'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'查询方式（等于、不等于、大于、小于、范围）' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'gen_table_column',
+    'COLUMN', N'query_type'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'显示类型（文本框、文本域、下拉框、复选框、单选框、日期控件）' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'gen_table_column',
+    'COLUMN', N'html_type'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'字典类型' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'gen_table_column',
+    'COLUMN', N'dict_type'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'排序' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'gen_table_column',
+    'COLUMN', N'sort'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'创建部门' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'gen_table_column',
+    'COLUMN', N'create_dept'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'创建者' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'gen_table_column',
+    'COLUMN', N'create_by'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'创建时间' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'gen_table_column',
+    'COLUMN', N'create_time'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'更新者' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'gen_table_column',
+    'COLUMN', N'update_by'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'更新时间' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'gen_table_column',
+    'COLUMN', N'update_time'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'代码生成业务表字段' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'gen_table_column'
+GO
+
+CREATE TABLE sys_config
+(
+    config_id    bigint                      NOT NULL,
+    config_name  nvarchar(100) DEFAULT ''    NULL,
+    config_key   nvarchar(100) DEFAULT ''    NULL,
+    config_value nvarchar(500) DEFAULT ''    NULL,
+    config_type  nchar(1)      DEFAULT ('N') NULL,
+    create_dept  bigint                      NULL,
+    create_by    bigint                      NULL,
+    create_time  datetime2(7)                NULL,
+    update_by    bigint                      NULL,
+    update_time  datetime2(7)                NULL,
+    remark       nvarchar(500)               NULL,
+    CONSTRAINT PK__sys_conf__4AD1BFF182643682 PRIMARY KEY CLUSTERED (config_id)
+        WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON)
+        ON [PRIMARY]
+)
+ON [PRIMARY]
+GO
+
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'参数主键' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_config',
+    'COLUMN', N'config_id'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'参数名称' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_config',
+    'COLUMN', N'config_name'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'参数键名' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_config',
+    'COLUMN', N'config_key'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'参数键值' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_config',
+    'COLUMN', N'config_value'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'系统内置（Y是 N否）' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_config',
+    'COLUMN', N'config_type'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'创建部门' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_config',
+    'COLUMN', N'create_dept'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'创建者' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_config',
+    'COLUMN', N'create_by'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'创建时间' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_config',
+    'COLUMN', N'create_time'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'更新者' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_config',
+    'COLUMN', N'update_by'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'更新时间' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_config',
+    'COLUMN', N'update_time'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'备注' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_config',
+    'COLUMN', N'remark'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'参数配置表' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_config'
+GO
+
+INSERT sys_config VALUES (1, N'主框架页-默认皮肤样式名称', N'sys.index.skinName', N'skin-blue', N'Y', 103, 1, getdate(), NULL, NULL, N'蓝色 skin-blue、绿色 skin-green、紫色 skin-purple、红色 skin-red、黄色 skin-yellow')
+GO
+INSERT sys_config VALUES (2, N'用户管理-账号初始密码', N'sys.user.initPassword', N'123456', N'Y', 103, 1, getdate(), NULL, NULL, N'初始化密码 123456')
+GO
+INSERT sys_config VALUES (3, N'主框架页-侧边栏主题', N'sys.index.sideTheme', N'theme-dark', N'Y', 103, 1, getdate(), NULL, NULL, N'深色主题theme-dark，浅色主题theme-light')
+GO
+INSERT sys_config VALUES (5, N'账号自助-是否开启用户注册功能', N'sys.account.registerUser', N'false', N'Y', 103, 1, getdate(), NULL, NULL, N'是否开启注册用户功能（true开启，false关闭）')
+GO
+INSERT sys_config VALUES (11, N'OSS预览列表资源开关', N'sys.oss.previewListResource', N'true', N'Y', 103, 1, getdate(), NULL, NULL, N'true:开启, false:关闭');
+GO
+
+CREATE TABLE sys_dept
+(
+    dept_id     bigint                     NOT NULL,
+    parent_id   bigint       DEFAULT ((0)) NULL,
+    ancestors   nvarchar(500)DEFAULT ''    NULL,
+    dept_name   nvarchar(30)               NULL,
+    dept_category nvarchar(100) DEFAULT '' NULL,
+    order_num   int          DEFAULT ((0)) NULL,
+    leader      bigint                     NULL,
+    phone       nvarchar(11)               NULL,
+    email       nvarchar(50)               NULL,
+    status      nchar(1)     DEFAULT ('0') NULL,
+    del_flag    nchar(1)     DEFAULT ('0') NULL,
+    create_dept bigint                     NULL,
+    create_by   bigint                     NULL,
+    create_time datetime2(7)               NULL,
+    update_by   bigint                     NULL,
+    update_time datetime2(7)               NULL,
+    CONSTRAINT PK__sys_dept__DCA659747DE13804 PRIMARY KEY CLUSTERED (dept_id)
+        WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON)
+        ON [PRIMARY]
+)
+ON [PRIMARY]
+GO
+
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'部门id' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_dept',
+    'COLUMN', N'dept_id'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'父部门id' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_dept',
+    'COLUMN', N'parent_id'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'祖级列表' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_dept',
+    'COLUMN', N'ancestors'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'部门名称' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_dept',
+    'COLUMN', N'dept_name'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'部门类别编码' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_dept',
+    'COLUMN', N'dept_category'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'显示顺序' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_dept',
+    'COLUMN', N'order_num'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'负责人' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_dept',
+    'COLUMN', N'leader'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'联系电话' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_dept',
+    'COLUMN', N'phone'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'邮箱' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_dept',
+    'COLUMN', N'email'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'部门状态（0正常 1停用）' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_dept',
+    'COLUMN', N'status'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'删除标志（0代表存在 1代表删除）' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_dept',
+    'COLUMN', N'del_flag'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'创建部门' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_dept',
+    'COLUMN', N'create_dept'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'创建者' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_dept',
+    'COLUMN', N'create_by'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'创建时间' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_dept',
+    'COLUMN', N'create_time'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'更新者' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_dept',
+    'COLUMN', N'update_by'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'更新时间' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_dept',
+    'COLUMN', N'update_time'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'部门表' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_dept'
+GO
+
+INSERT sys_dept VALUES (100, 0, N'0', N'XXX科技', NULL, 0, NULL, N'15888888888', N'xxx@qq.com', N'0', N'0', 103, 1, getdate(), NULL, NULL)
+GO
+INSERT sys_dept VALUES (101, 100, N'0,100', N'深圳总公司', NULL, 1, NULL, N'15888888888', N'xxx@qq.com', N'0', N'0', 103, 1, getdate(), NULL, NULL)
+GO
+INSERT sys_dept VALUES (102, 100, N'0,100', N'长沙分公司', NULL, 2, NULL, N'15888888888', N'xxx@qq.com', N'0', N'0', 103, 1, getdate(), NULL, NULL)
+GO
+INSERT sys_dept VALUES (103, 101, N'0,100,101', N'研发部门', NULL, 1, 1, N'15888888888', N'xxx@qq.com', N'0', N'0', 103, 1, getdate(), NULL, NULL)
+GO
+INSERT sys_dept VALUES (104, 101, N'0,100,101', N'市场部门', NULL, 2, NULL, N'15888888888', N'xxx@qq.com', N'0', N'0', 103, 1, getdate(), NULL, NULL)
+GO
+INSERT sys_dept VALUES (105, 101, N'0,100,101', N'测试部门', NULL, 3, NULL, N'15888888888', N'xxx@qq.com', N'0', N'0', 103, 1, getdate(), NULL, NULL)
+GO
+INSERT sys_dept VALUES (106, 101, N'0,100,101', N'财务部门', NULL, 4, NULL, N'15888888888', N'xxx@qq.com', N'0', N'0', 103, 1, getdate(), NULL, NULL)
+GO
+INSERT sys_dept VALUES (107, 101, N'0,100,101', N'运维部门', NULL, 5, NULL, N'15888888888', N'xxx@qq.com', N'0', N'0', 103, 1, getdate(), NULL, NULL)
+GO
+INSERT sys_dept VALUES (108, 102, N'0,100,102', N'市场部门', NULL, 1, NULL, N'15888888888', N'xxx@qq.com', N'0', N'0', 103, 1, getdate(), NULL, NULL)
+GO
+INSERT sys_dept VALUES (109, 102, N'0,100,102', N'财务部门', NULL, 2, NULL, N'15888888888', N'xxx@qq.com', N'0', N'0', 103, 1, getdate(), NULL, NULL)
+GO
+
+CREATE TABLE sys_dict_data
+(
+    dict_code   bigint                      NOT NULL,
+    dict_sort   int           DEFAULT ((0)) NULL,
+    dict_label  nvarchar(100) DEFAULT ''    NULL,
+    dict_value  nvarchar(100) DEFAULT ''    NULL,
+    dict_type   nvarchar(100) DEFAULT ''    NULL,
+    css_class   nvarchar(100)               NULL,
+    list_class  nvarchar(100)               NULL,
+    is_default  nchar(1)      DEFAULT ('N') NULL,
+    create_dept bigint                      NULL,
+    create_by   bigint                      NULL,
+    create_time datetime2(7)                NULL,
+    update_by   bigint                      NULL,
+    update_time datetime2(7)                NULL,
+    remark      nvarchar(500)               NULL,
+    CONSTRAINT PK__sys_dict__19CBC34B661AF3B3 PRIMARY KEY CLUSTERED (dict_code)
+        WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON)
+        ON [PRIMARY]
+)
+ON [PRIMARY]
+GO
+
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'字典编码' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_dict_data',
+    'COLUMN', N'dict_code'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'字典排序' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_dict_data',
+    'COLUMN', N'dict_sort'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'字典标签' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_dict_data',
+    'COLUMN', N'dict_label'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'字典键值' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_dict_data',
+    'COLUMN', N'dict_value'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'字典类型' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_dict_data',
+    'COLUMN', N'dict_type'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'样式属性（其他样式扩展）' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_dict_data',
+    'COLUMN', N'css_class'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'表格回显样式' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_dict_data',
+    'COLUMN', N'list_class'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'是否默认（Y是 N否）' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_dict_data',
+    'COLUMN', N'is_default'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'创建部门' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_dict_data',
+    'COLUMN', N'create_dept'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'创建者' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_dict_data',
+    'COLUMN', N'create_by'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'创建时间' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_dict_data',
+    'COLUMN', N'create_time'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'更新者' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_dict_data',
+    'COLUMN', N'update_by'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'更新时间' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_dict_data',
+    'COLUMN', N'update_time'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'备注' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_dict_data',
+    'COLUMN', N'remark'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'字典数据表' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_dict_data'
+GO
+
+INSERT sys_dict_data VALUES (1, 1, N'男', N'0', N'sys_user_sex', N'', N'', N'Y', 103, 1, getdate(), NULL, NULL, N'性别男')
+GO
+INSERT sys_dict_data VALUES (2, 2, N'女', N'1', N'sys_user_sex', N'', N'', N'N', 103, 1, getdate(), NULL, NULL, N'性别女')
+GO
+INSERT sys_dict_data VALUES (3, 3, N'未知', N'2', N'sys_user_sex', N'', N'', N'N', 103, 1, getdate(), NULL, NULL, N'性别未知')
+GO
+INSERT sys_dict_data VALUES (4, 1, N'显示', N'0', N'sys_show_hide', N'', N'primary', N'Y', 103, 1, getdate(), NULL, NULL, N'显示菜单')
+GO
+INSERT sys_dict_data VALUES (5, 2, N'隐藏', N'1', N'sys_show_hide', N'', N'danger', N'N', 103, 1, getdate(), NULL, NULL, N'隐藏菜单')
+GO
+INSERT sys_dict_data VALUES (6, 1, N'正常', N'0', N'sys_normal_disable', N'', N'primary', N'Y', 103, 1, getdate(), NULL, NULL, N'正常状态')
+GO
+INSERT sys_dict_data VALUES (7, 2, N'停用', N'1', N'sys_normal_disable', N'', N'danger', N'N', 103, 1, getdate(), NULL, NULL, N'停用状态')
+GO
+INSERT sys_dict_data VALUES (8, 1, N'正常', N'0', N'sys_job_status', N'', N'primary', N'Y', 103, 1, getdate(), NULL, NULL, N'正常状态')
+GO
+INSERT sys_dict_data VALUES (9, 2, N'暂停', N'1', N'sys_job_status', N'', N'danger', N'N', 103, 1, getdate(), NULL, NULL, N'停用状态')
+GO
+INSERT sys_dict_data VALUES (10, 1, N'默认', N'DEFAULT', N'sys_job_group', N'', N'', N'Y', 103, 1, getdate(), NULL, NULL, N'默认分组')
+GO
+INSERT sys_dict_data VALUES (11, 2, N'系统', N'SYSTEM', N'sys_job_group', N'', N'', N'N', 103, 1, getdate(), NULL, NULL, N'系统分组')
+GO
+INSERT sys_dict_data VALUES (12, 1, N'是', N'Y', N'sys_yes_no', N'', N'primary', N'Y', 103, 1, getdate(), NULL, NULL, N'系统默认是')
+GO
+INSERT sys_dict_data VALUES (13, 2, N'否', N'N', N'sys_yes_no', N'', N'danger', N'N', 103, 1, getdate(), NULL, NULL, N'系统默认否')
+GO
+INSERT sys_dict_data VALUES (14, 1, N'通知', N'1', N'sys_notice_type', N'', N'warning', N'Y', 103, 1, getdate(), NULL, NULL, N'通知')
+GO
+INSERT sys_dict_data VALUES (15, 2, N'公告', N'2', N'sys_notice_type', N'', N'success', N'N', 103, 1, getdate(), NULL, NULL, N'公告')
+GO
+INSERT sys_dict_data VALUES (16, 1, N'正常', N'0', N'sys_notice_status', N'', N'primary', N'Y', 103, 1, getdate(), NULL, NULL, N'正常状态')
+GO
+INSERT sys_dict_data VALUES (17, 2, N'关闭', N'1', N'sys_notice_status', N'', N'danger', N'N', 103, 1, getdate(), NULL, NULL, N'关闭状态')
+GO
+INSERT sys_dict_data VALUES (29, 99, N'其他', N'0', N'sys_oper_type', N'', N'info', N'N', 103, 1, getdate(), NULL, NULL, N'其他操作');
+GO
+INSERT sys_dict_data VALUES (18, 1, N'新增', N'1', N'sys_oper_type', N'', N'info', N'N', 103, 1, getdate(), NULL, NULL, N'新增操作')
+GO
+INSERT sys_dict_data VALUES (19, 2, N'修改', N'2', N'sys_oper_type', N'', N'info', N'N', 103, 1, getdate(), NULL, NULL, N'修改操作')
+GO
+INSERT sys_dict_data VALUES (20, 3, N'删除', N'3', N'sys_oper_type', N'', N'danger', N'N', 103, 1, getdate(), NULL, NULL, N'删除操作')
+GO
+INSERT sys_dict_data VALUES (21, 4, N'授权', N'4', N'sys_oper_type', N'', N'primary', N'N', 103, 1, getdate(), NULL, NULL, N'授权操作')
+GO
+INSERT sys_dict_data VALUES (22, 5, N'导出', N'5', N'sys_oper_type', N'', N'warning', N'N', 103, 1, getdate(), NULL, NULL, N'导出操作')
+GO
+INSERT sys_dict_data VALUES (23, 6, N'导入', N'6', N'sys_oper_type', N'', N'warning', N'N', 103, 1, getdate(), NULL, NULL, N'导入操作')
+GO
+INSERT sys_dict_data VALUES (24, 7, N'强退', N'7', N'sys_oper_type', N'', N'danger', N'N', 103, 1, getdate(), NULL, NULL, N'强退操作')
+GO
+INSERT sys_dict_data VALUES (25, 8, N'生成代码', N'8', N'sys_oper_type', N'', N'warning', N'N', 103, 1, getdate(), NULL, NULL, N'生成操作')
+GO
+INSERT sys_dict_data VALUES (26, 9, N'清空数据', N'9', N'sys_oper_type', N'', N'danger', N'N', 103, 1, getdate(), NULL, NULL, N'清空操作')
+GO
+INSERT sys_dict_data VALUES (27, 1, N'成功', N'0', N'sys_common_status', N'', N'primary', N'N', 103, 1, getdate(), NULL, NULL, N'正常状态')
+GO
+INSERT sys_dict_data VALUES (28, 2, N'失败', N'1', N'sys_common_status', N'', N'danger', N'N', 103, 1, getdate(), NULL, NULL, N'停用状态')
+GO
+INSERT sys_dict_data VALUES (30, 0, N'密码认证', N'password', N'sys_grant_type', N'', N'default', N'N', 103, 1, getdate(), NULL, NULL, N'密码认证')
+GO
+INSERT sys_dict_data VALUES (31, 0, N'短信认证', N'sms', N'sys_grant_type', N'', N'default', N'N', 103, 1, getdate(), NULL, NULL, N'短信认证')
+GO
+INSERT sys_dict_data VALUES (32, 0, N'邮件认证', N'email', N'sys_grant_type', N'', N'default', N'N', 103, 1, getdate(), NULL, NULL, N'邮件认证')
+GO
+INSERT sys_dict_data VALUES (33, 0, N'小程序认证', N'xcx', N'sys_grant_type', N'', N'default', N'N', 103, 1, getdate(), NULL, NULL, N'小程序认证')
+GO
+INSERT sys_dict_data VALUES (34, 0, N'三方登录认证', N'social', N'sys_grant_type', N'', N'default', N'N', 103, 1, getdate(), NULL, NULL, N'三方登录认证')
+GO
+INSERT sys_dict_data VALUES (35, 0, N'PC', N'pc', N'sys_device_type', N'', N'default', N'N', 103, 1, getdate(), NULL, NULL, N'PC')
+GO
+INSERT sys_dict_data VALUES (36, 0, N'安卓', N'android', N'sys_device_type', N'', N'default', N'N', 103, 1, getdate(), NULL, NULL, N'安卓')
+GO
+INSERT sys_dict_data VALUES (37, 0, N'iOS', N'ios', N'sys_device_type', N'', N'default', N'N', 103, 1, getdate(), NULL, NULL, N'iOS')
+GO
+INSERT sys_dict_data VALUES (38, 0, N'小程序', N'xcx', N'sys_device_type', N'', N'default', N'N', 103, 1, getdate(), NULL, NULL, N'小程序')
+GO
+
+CREATE TABLE sys_dict_type
+(
+    dict_id     bigint                      NOT NULL,
+    dict_name   nvarchar(100) DEFAULT ''    NULL,
+    dict_type   nvarchar(100) DEFAULT ''    NULL,
+    create_dept bigint                      NULL,
+    create_by   bigint                      NULL,
+    create_time datetime2(7)                NULL,
+    update_by   bigint                      NULL,
+    update_time datetime2(7)                NULL,
+    remark      nvarchar(500)               NULL,
+    CONSTRAINT PK__sys_dict__3BD4186C409C5391 PRIMARY KEY CLUSTERED (dict_id)
+        WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON)
+        ON [PRIMARY]
+)
+ON [PRIMARY]
+GO
+
+CREATE NONCLUSTERED INDEX sys_dict_type_index1 ON sys_dict_type (dict_type)
+GO
+
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'字典主键' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_dict_type',
+    'COLUMN', N'dict_id'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'字典名称' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_dict_type',
+    'COLUMN', N'dict_name'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'字典类型' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_dict_type',
+    'COLUMN', N'dict_type'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'创建部门' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_dict_type',
+    'COLUMN', N'create_dept'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'创建者' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_dict_type',
+    'COLUMN', N'create_by'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'创建时间' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_dict_type',
+    'COLUMN', N'create_time'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'更新者' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_dict_type',
+    'COLUMN', N'update_by'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'更新时间' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_dict_type',
+    'COLUMN', N'update_time'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'备注' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_dict_type',
+    'COLUMN', N'remark'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'字典类型表' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_dict_type'
+GO
+
+INSERT sys_dict_type VALUES (1, N'用户性别', N'sys_user_sex', 103, 1, getdate(), NULL, NULL, N'用户性别列表')
+GO
+INSERT sys_dict_type VALUES (2, N'菜单状态', N'sys_show_hide', 103, 1, getdate(), NULL, NULL, N'菜单状态列表')
+GO
+INSERT sys_dict_type VALUES (3, N'系统开关', N'sys_normal_disable', 103, 1, getdate(), NULL, NULL, N'系统开关列表')
+GO
+INSERT sys_dict_type VALUES (4, N'任务状态', N'sys_job_status', 103, 1, getdate(), NULL, NULL, N'任务状态列表')
+GO
+INSERT sys_dict_type VALUES (5, N'任务分组', N'sys_job_group', 103, 1, getdate(), NULL, NULL, N'任务分组列表')
+GO
+INSERT sys_dict_type VALUES (6, N'系统是否', N'sys_yes_no', 103, 1, getdate(), NULL, NULL, N'系统是否列表')
+GO
+INSERT sys_dict_type VALUES (7, N'通知类型', N'sys_notice_type', 103, 1, getdate(), NULL, NULL, N'通知类型列表')
+GO
+INSERT sys_dict_type VALUES (8, N'通知状态', N'sys_notice_status', 103, 1, getdate(), NULL, NULL, N'通知状态列表')
+GO
+INSERT sys_dict_type VALUES (9, N'操作类型', N'sys_oper_type', 103, 1, getdate(), NULL, NULL, N'操作类型列表')
+GO
+INSERT sys_dict_type VALUES (10, N'系统状态', N'sys_common_status', 103, 1, getdate(), NULL, NULL, N'登录状态列表')
+GO
+INSERT sys_dict_type VALUES (11, N'授权类型', N'sys_grant_type', 103, 1, getdate(), NULL, NULL, N'认证授权类型')
+GO
+INSERT sys_dict_type VALUES (12, N'设备类型', N'sys_device_type', 103, 1, getdate(), NULL, NULL, N'客户端设备类型')
+GO
+
+CREATE TABLE sys_logininfor
+(
+    info_id        bigint                      NOT NULL,
+    user_name      nvarchar(50)  DEFAULT ''    NULL,
+    client_key     nvarchar(32)  DEFAULT ''    NULL,
+    device_type    nvarchar(32)  DEFAULT ''    NULL,
+    ipaddr         nvarchar(128) DEFAULT ''    NULL,
+    login_location nvarchar(255) DEFAULT ''    NULL,
+    browser        nvarchar(50)  DEFAULT ''    NULL,
+    os             nvarchar(50)  DEFAULT ''    NULL,
+    status         nchar(1)      DEFAULT ('0') NULL,
+    msg            nvarchar(255) DEFAULT ''    NULL,
+    login_time     datetime2(7)                NULL,
+    CONSTRAINT PK__sys_logi__3D8A9C1A1854AE10 PRIMARY KEY CLUSTERED (info_id)
+        WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON)
+        ON [PRIMARY]
+)
+ON [PRIMARY]
+GO
+
+CREATE NONCLUSTERED INDEX idx_sys_logininfor_s ON sys_logininfor (status)
+GO
+CREATE NONCLUSTERED INDEX idx_sys_logininfor_lt ON sys_logininfor (login_time)
+GO
+
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'访问ID' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_logininfor',
+    'COLUMN', N'info_id'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'用户账号' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_logininfor',
+    'COLUMN', N'user_name'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'客户端' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_logininfor',
+    'COLUMN', N'client_key'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'设备类型' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_logininfor',
+    'COLUMN', N'device_type'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'登录IP地址' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_logininfor',
+    'COLUMN', N'ipaddr'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'登录地点' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_logininfor',
+    'COLUMN', N'login_location'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'浏览器类型' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_logininfor',
+    'COLUMN', N'browser'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'操作系统' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_logininfor',
+    'COLUMN', N'os'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'登录状态（0成功 1失败）' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_logininfor',
+    'COLUMN', N'status'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'提示消息' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_logininfor',
+    'COLUMN', N'msg'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'访问时间' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_logininfor',
+    'COLUMN', N'login_time'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'系统访问记录' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_logininfor'
+GO
+
+CREATE TABLE sys_menu
+(
+    menu_id     bigint                      NOT NULL,
+    menu_name   nvarchar(50)                NOT NULL,
+    parent_id   bigint        DEFAULT ((0)) NULL,
+    order_num   int           DEFAULT ((0)) NULL,
+    path        nvarchar(200) DEFAULT ''    NULL,
+    component   nvarchar(255)               NULL,
+    query_param nvarchar(255)               NULL,
+    is_frame    int           DEFAULT ((1)) NULL,
+    is_cache    int           DEFAULT ((0)) NULL,
+    menu_type   nchar(1)      DEFAULT ''    NULL,
+    visible     nchar(1)      DEFAULT ((0)) NULL,
+    status      nchar(1)      DEFAULT ((0)) NULL,
+    perms       nvarchar(100)               NULL,
+    icon        nvarchar(100) DEFAULT ('#') NULL,
+    create_dept bigint                      NULL,
+    create_by   bigint                      NULL,
+    create_time datetime2(7)                NULL,
+    update_by   bigint                      NULL,
+    update_time datetime2(7)                NULL,
+    remark      nvarchar(500) DEFAULT ''    NULL,
+    CONSTRAINT PK__sys_menu__4CA0FADCF8545C58 PRIMARY KEY CLUSTERED (menu_id)
+        WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON)
+        ON [PRIMARY]
+)
+ON [PRIMARY]
+GO
+
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'菜单ID' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_menu',
+    'COLUMN', N'menu_id'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'菜单名称' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_menu',
+    'COLUMN', N'menu_name'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'父菜单ID' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_menu',
+    'COLUMN', N'parent_id'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'显示顺序' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_menu',
+    'COLUMN', N'order_num'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'路由地址' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_menu',
+    'COLUMN', N'path'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'组件路径' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_menu',
+    'COLUMN', N'component'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'路由参数' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_menu',
+    'COLUMN', N'query_param'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'是否为外链（0是 1否）' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_menu',
+    'COLUMN', N'is_frame'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'是否缓存（0缓存 1不缓存）' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_menu',
+    'COLUMN', N'is_cache'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'菜单类型（M目录 C菜单 F按钮）' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_menu',
+    'COLUMN', N'menu_type'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'显示状态（0显示 1隐藏）' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_menu',
+    'COLUMN', N'visible'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'菜单状态（0正常 1停用）' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_menu',
+    'COLUMN', N'status'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'权限标识' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_menu',
+    'COLUMN', N'perms'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'菜单图标' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_menu',
+    'COLUMN', N'icon'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'创建部门' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_menu',
+    'COLUMN', N'create_dept'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'创建者' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_menu',
+    'COLUMN', N'create_by'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'创建时间' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_menu',
+    'COLUMN', N'create_time'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'更新者' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_menu',
+    'COLUMN', N'update_by'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'更新时间' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_menu',
+    'COLUMN', N'update_time'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'备注' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_menu',
+    'COLUMN', N'remark'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'菜单权限表' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_menu'
+GO
+
+INSERT sys_menu VALUES (1, N'系统管理', 0, 1, N'system', NULL, N'', 1, 0, N'M', N'0', N'0', N'', N'system', 103, 1, getdate(), NULL, NULL, N'系统管理目录')
+GO
+INSERT sys_menu VALUES (2, N'系统监控', 0, 3, N'monitor', NULL, N'', 1, 0, N'M', N'0', N'0', N'', N'monitor', 103, 1, getdate(), NULL, NULL, N'系统监控目录')
+GO
+INSERT sys_menu VALUES (3, N'系统工具', 0, 4, N'tool', NULL, N'', 1, 0, N'M', N'0', N'0', N'', N'tool', 103, 1, getdate(), NULL, NULL, N'系统工具目录')
+GO
+INSERT sys_menu VALUES (4, N'PLUS官网', 0, 5, N'https://gitee.com/dromara/RuoYi-Vue-Plus', null, N'', 0, 0, N'M', N'0', N'0', N'', N'guide', 103, 1, getdate(), null, null, N'RuoYi-Vue-Plus官网地址');
+GO
+INSERT sys_menu VALUES (5, N'测试菜单', 0, 5, N'demo', NULL, N'', 1, 0, N'M', N'0', N'0', NULL, N'star', 103, 1, getdate(), NULL, NULL, N'');
+GO
+INSERT sys_menu VALUES (100, N'用户管理', 1, 1, N'user', N'system/user/index', N'', 1, 0, N'C', N'0', N'0', N'system:user:list', N'user', 103, 1, getdate(), NULL, NULL, N'用户管理菜单')
+GO
+INSERT sys_menu VALUES (101, N'角色管理', 1, 2, N'role', N'system/role/index', N'', 1, 0, N'C', N'0', N'0', N'system:role:list', N'peoples', 103, 1, getdate(), NULL, NULL, N'角色管理菜单')
+GO
+INSERT sys_menu VALUES (102, N'菜单管理', 1, 3, N'menu', N'system/menu/index', N'', 1, 0, N'C', N'0', N'0', N'system:menu:list', N'tree-table', 103, 1, getdate(), NULL, NULL, N'菜单管理菜单')
+GO
+INSERT sys_menu VALUES (103, N'部门管理', 1, 4, N'dept', N'system/dept/index', N'', 1, 0, N'C', N'0', N'0', N'system:dept:list', N'tree', 103, 1, getdate(), NULL, NULL, N'部门管理菜单')
+GO
+INSERT sys_menu VALUES (104, N'岗位管理', 1, 5, N'post', N'system/post/index', N'', 1, 0, N'C', N'0', N'0', N'system:post:list', N'post', 103, 1, getdate(), NULL, NULL, N'岗位管理菜单')
+GO
+INSERT sys_menu VALUES (105, N'字典管理', 1, 6, N'dict', N'system/dict/index', N'', 1, 0, N'C', N'0', N'0', N'system:dict:list', N'dict', 103, 1, getdate(), NULL, NULL, N'字典管理菜单')
+GO
+INSERT sys_menu VALUES (106, N'参数设置', 1, 7, N'config', N'system/config/index', N'', 1, 0, N'C', N'0', N'0', N'system:config:list', N'edit', 103, 1, getdate(), NULL, NULL, N'参数设置菜单')
+GO
+INSERT sys_menu VALUES (107, N'通知公告', 1, 8, N'notice', N'system/notice/index', N'', 1, 0, N'C', N'0', N'0', N'system:notice:list', N'message', 103, 1, getdate(), NULL, NULL, N'通知公告菜单')
+GO
+INSERT sys_menu VALUES (108, N'日志管理', 1, 9, N'log', N'', N'', 1, 0, N'M', N'0', N'0', N'', N'log', 103, 1, getdate(), NULL, NULL, N'日志管理菜单')
+GO
+INSERT sys_menu VALUES (109, N'在线用户', 2, 1, N'online', N'monitor/online/index', N'', 1, 0, N'C', N'0', N'0', N'monitor:online:list', N'online', 103, 1, getdate(), NULL, NULL, N'在线用户菜单')
+GO
+INSERT sys_menu VALUES (113, N'缓存监控', 2, 5, N'cache', N'monitor/cache/index', N'', 1, 0, N'C', N'0', N'0', N'monitor:cache:list', N'redis', 103, 1, getdate(), NULL, NULL, N'缓存监控菜单')
+GO
+INSERT sys_menu VALUES (115, N'代码生成', 3, 2, N'gen', N'tool/gen/index', N'', 1, 0, N'C', N'0', N'0', N'tool:gen:list', N'code', 103, 1, getdate(), NULL, NULL, N'代码生成菜单')
+GO
+INSERT sys_menu VALUES (123, N'客户端管理', 1, 11, N'client', N'system/client/index', N'', 1, 0, N'C', N'0', N'0', N'system:client:list', N'international', 103, 1, getdate(), NULL, NULL, N'客户端管理菜单')
+GO
+INSERT sys_menu VALUES (116, N'修改生成配置',  3,   2, N'gen-edit/index/:tableId', N'tool/gen/editTable', N'', 1, 1, N'C', N'1', N'0', N'tool:gen:edit',           N'#',               103, 1, getdate(), null, null, N'');
+GO
+INSERT sys_menu VALUES (130, N'分配用户',     1,   2, N'role-auth/user/:roleId', N'system/role/authUser', N'', 1, 1, N'C', N'1', N'0', N'system:role:edit',      N'#',               103, 1, getdate(), null, null, N'');
+GO
+INSERT sys_menu VALUES (131, N'分配角色',     1,   1, N'user-auth/role/:userId', N'system/user/authRole', N'', 1, 1, N'C', N'1', N'0', N'system:user:edit',      N'#',               103, 1, getdate(), null, null, N'');
+GO
+INSERT sys_menu VALUES (132, N'字典数据',     1,   6, N'dict-data/index/:dictId', N'system/dict/data', N'', 1, 1, N'C', N'1', N'0', N'system:dict:list',         N'#',               103, 1, getdate(), null, null, N'');
+GO
+INSERT sys_menu VALUES (133, N'文件配置管理',  1,   10, N'oss-config/index',              N'system/oss/config', N'', 1, 1, N'C', N'1', N'0', N'system:ossConfig:list',  N'#',                103, 1, getdate(), null, null, N'');
+GO
+
+INSERT sys_menu VALUES (117, N'Admin监控', 2, 5, N'Admin', N'monitor/admin/index', N'', 1, 0, N'C', N'0', N'0', N'monitor:admin:list', N'dashboard', 103, 1, getdate(), NULL, NULL, N'Admin监控菜单');
+GO
+INSERT sys_menu VALUES (118, N'文件管理', 1, 10, N'oss', N'system/oss/index', N'', 1, 0, N'C', '0', N'0', N'system:oss:list', N'upload', 103, 1, getdate(), NULL, NULL, N'文件管理菜单');
+GO
+INSERT sys_menu VALUES (120, N'任务调度中心', 2, 5, N'snailjob', N'monitor/snailjob/index', N'', 1, 0, N'C', N'0', N'0', N'monitor:snailjob:list', N'job', 103, 1, getdate(), NULL, NULL, N'SnailJob控制台菜单');
+GO
+INSERT sys_menu VALUES (500, N'操作日志', 108, 1, N'operlog', N'monitor/operlog/index', N'', 1, 0, N'C', N'0', N'0', N'monitor:operlog:list', N'form', 103, 1, getdate(), NULL, NULL, N'操作日志菜单')
+GO
+INSERT sys_menu VALUES (501, N'登录日志', 108, 2, N'logininfor', N'monitor/logininfor/index', N'', 1, 0, N'C', N'0', N'0', N'monitor:logininfor:list', N'logininfor', 103, 1, getdate(), NULL, NULL, N'登录日志菜单')
+GO
+INSERT sys_menu VALUES (1001, N'用户查询', 100, 1, N'', N'', N'', 1, 0, N'F', N'0', N'0', N'system:user:query', N'#', 103, 1, getdate(), NULL, NULL, N'')
+GO
+INSERT sys_menu VALUES (1002, N'用户新增', 100, 2, N'', N'', N'', 1, 0, N'F', N'0', N'0', N'system:user:add', N'#', 103, 1, getdate(), NULL, NULL, N'')
+GO
+INSERT sys_menu VALUES (1003, N'用户修改', 100, 3, N'', N'', N'', 1, 0, N'F', N'0', N'0', N'system:user:edit', N'#', 103, 1, getdate(), NULL, NULL, N'')
+GO
+INSERT sys_menu VALUES (1004, N'用户删除', 100, 4, N'', N'', N'', 1, 0, N'F', N'0', N'0', N'system:user:remove', N'#', 103, 1, getdate(), NULL, NULL, N'')
+GO
+INSERT sys_menu VALUES (1005, N'用户导出', 100, 5, N'', N'', N'', 1, 0, N'F', N'0', N'0', N'system:user:export', N'#', 103, 1, getdate(), NULL, NULL, N'')
+GO
+INSERT sys_menu VALUES (1006, N'用户导入', 100, 6, N'', N'', N'', 1, 0, N'F', N'0', N'0', N'system:user:import', N'#', 103, 1, getdate(), NULL, NULL, N'')
+GO
+INSERT sys_menu VALUES (1007, N'重置密码', 100, 7, N'', N'', N'', 1, 0, N'F', N'0', N'0', N'system:user:resetPwd', N'#', 103, 1, getdate(), NULL, NULL, N'')
+GO
+INSERT sys_menu VALUES (1008, N'角色查询', 101, 1, N'', N'', N'', 1, 0, N'F', N'0', N'0', N'system:role:query', N'#', 103, 1, getdate(), NULL, NULL, N'')
+GO
+INSERT sys_menu VALUES (1009, N'角色新增', 101, 2, N'', N'', N'', 1, 0, N'F', N'0', N'0', N'system:role:add', N'#', 103, 1, getdate(), NULL, NULL, N'')
+GO
+INSERT sys_menu VALUES (1010, N'角色修改', 101, 3, N'', N'', N'', 1, 0, N'F', N'0', N'0', N'system:role:edit', N'#', 103, 1, getdate(), NULL, NULL, N'')
+GO
+INSERT sys_menu VALUES (1011, N'角色删除', 101, 4, N'', N'', N'', 1, 0, N'F', N'0', N'0', N'system:role:remove', N'#', 103, 1, getdate(), NULL, NULL, N'')
+GO
+INSERT sys_menu VALUES (1012, N'角色导出', 101, 5, N'', N'', N'', 1, 0, N'F', N'0', N'0', N'system:role:export', N'#', 103, 1, getdate(), NULL, NULL, N'')
+GO
+INSERT sys_menu VALUES (1013, N'菜单查询', 102, 1, N'', N'', N'', 1, 0, N'F', N'0', N'0', N'system:menu:query', N'#', 103, 1, getdate(), NULL, NULL, N'')
+GO
+INSERT sys_menu VALUES (1014, N'菜单新增', 102, 2, N'', N'', N'', 1, 0, N'F', N'0', N'0', N'system:menu:add', N'#', 103, 1, getdate(), NULL, NULL, N'')
+GO
+INSERT sys_menu VALUES (1015, N'菜单修改', 102, 3, N'', N'', N'', 1, 0, N'F', N'0', N'0', N'system:menu:edit', N'#', 103, 1, getdate(), NULL, NULL, N'')
+GO
+INSERT sys_menu VALUES (1016, N'菜单删除', 102, 4, N'', N'', N'', 1, 0, N'F', N'0', N'0', N'system:menu:remove', N'#', 103, 1, getdate(), NULL, NULL, N'')
+GO
+INSERT sys_menu VALUES (1017, N'部门查询', 103, 1, N'', N'', N'', 1, 0, N'F', N'0', N'0', N'system:dept:query', N'#', 103, 1, getdate(), NULL, NULL, N'')
+GO
+INSERT sys_menu VALUES (1018, N'部门新增', 103, 2, N'', N'', N'', 1, 0, N'F', N'0', N'0', N'system:dept:add', N'#', 103, 1, getdate(), NULL, NULL, N'')
+GO
+INSERT sys_menu VALUES (1019, N'部门修改', 103, 3, N'', N'', N'', 1, 0, N'F', N'0', N'0', N'system:dept:edit', N'#', 103, 1, getdate(), NULL, NULL, N'')
+GO
+INSERT sys_menu VALUES (1020, N'部门删除', 103, 4, N'', N'', N'', 1, 0, N'F', N'0', N'0', N'system:dept:remove', N'#', 103, 1, getdate(), NULL, NULL, N'')
+GO
+INSERT sys_menu VALUES (1021, N'岗位查询', 104, 1, N'', N'', N'', 1, 0, N'F', N'0', N'0', N'system:post:query', N'#', 103, 1, getdate(), NULL, NULL, N'')
+GO
+INSERT sys_menu VALUES (1022, N'岗位新增', 104, 2, N'', N'', N'', 1, 0, N'F', N'0', N'0', N'system:post:add', N'#', 103, 1, getdate(), NULL, NULL, N'')
+GO
+INSERT sys_menu VALUES (1023, N'岗位修改', 104, 3, N'', N'', N'', 1, 0, N'F', N'0', N'0', N'system:post:edit', N'#', 103, 1, getdate(), NULL, NULL, N'')
+GO
+INSERT sys_menu VALUES (1024, N'岗位删除', 104, 4, N'', N'', N'', 1, 0, N'F', N'0', N'0', N'system:post:remove', N'#', 103, 1, getdate(), NULL, NULL, N'')
+GO
+INSERT sys_menu VALUES (1025, N'岗位导出', 104, 5, N'', N'', N'', 1, 0, N'F', N'0', N'0', N'system:post:export', N'#', 103, 1, getdate(), NULL, NULL, N'')
+GO
+INSERT sys_menu VALUES (1026, N'字典查询', 105, 1, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'system:dict:query', N'#', 103, 1, getdate(), NULL, NULL, N'')
+GO
+INSERT sys_menu VALUES (1027, N'字典新增', 105, 2, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'system:dict:add', N'#', 103, 1, getdate(), NULL, NULL, N'')
+GO
+INSERT sys_menu VALUES (1028, N'字典修改', 105, 3, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'system:dict:edit', N'#', 103, 1, getdate(), NULL, NULL, N'')
+GO
+INSERT sys_menu VALUES (1029, N'字典删除', 105, 4, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'system:dict:remove', N'#', 103, 1, getdate(), NULL, NULL, N'')
+GO
+INSERT sys_menu VALUES (1030, N'字典导出', 105, 5, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'system:dict:export', N'#', 103, 1, getdate(), NULL, NULL, N'')
+GO
+INSERT sys_menu VALUES (1031, N'参数查询', 106, 1, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'system:config:query', N'#', 103, 1, getdate(), NULL, NULL, N'')
+GO
+INSERT sys_menu VALUES (1032, N'参数新增', 106, 2, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'system:config:add', N'#', 103, 1, getdate(), NULL, NULL, N'')
+GO
+INSERT sys_menu VALUES (1033, N'参数修改', 106, 3, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'system:config:edit', N'#', 103, 1, getdate(), NULL, NULL, N'')
+GO
+INSERT sys_menu VALUES (1034, N'参数删除', 106, 4, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'system:config:remove', N'#', 103, 1, getdate(), NULL, NULL, N'')
+GO
+INSERT sys_menu VALUES (1035, N'参数导出', 106, 5, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'system:config:export', N'#', 103, 1, getdate(), NULL, NULL, N'')
+GO
+INSERT sys_menu VALUES (1036, N'公告查询', 107, 1, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'system:notice:query', N'#', 103, 1, getdate(), NULL, NULL, N'')
+GO
+INSERT sys_menu VALUES (1037, N'公告新增', 107, 2, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'system:notice:add', N'#', 103, 1, getdate(), NULL, NULL, N'')
+GO
+INSERT sys_menu VALUES (1038, N'公告修改', 107, 3, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'system:notice:edit', N'#', 103, 1, getdate(), NULL, NULL, N'')
+GO
+INSERT sys_menu VALUES (1039, N'公告删除', 107, 4, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'system:notice:remove', N'#', 103, 1, getdate(), NULL, NULL, N'')
+GO
+INSERT sys_menu VALUES (1040, N'操作查询', 500, 1, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'monitor:operlog:query', N'#', 103, 1, getdate(), NULL, NULL, N'')
+GO
+INSERT sys_menu VALUES (1041, N'操作删除', 500, 2, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'monitor:operlog:remove', N'#', 103, 1, getdate(), NULL, NULL, N'')
+GO
+INSERT sys_menu VALUES (1042, N'日志导出', 500, 4, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'monitor:operlog:export', N'#', 103, 1, getdate(), NULL, NULL, N'')
+GO
+INSERT sys_menu VALUES (1043, N'登录查询', 501, 1, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'monitor:logininfor:query', N'#', 103, 1, getdate(), NULL, NULL, N'')
+GO
+INSERT sys_menu VALUES (1044, N'登录删除', 501, 2, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'monitor:logininfor:remove', N'#', 103, 1, getdate(), NULL, NULL, N'')
+GO
+INSERT sys_menu VALUES (1045, N'日志导出', 501, 3, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'monitor:logininfor:export', N'#', 103, 1, getdate(), NULL, NULL, N'')
+GO
+INSERT sys_menu VALUES (1050, N'账户解锁', 501, 4, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'monitor:logininfor:unlock',  N'#', 103, 1, getdate(), NULL, NULL, N'')
+GO
+INSERT sys_menu VALUES (1046, N'在线查询', 109, 1, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'monitor:online:query', N'#', 103, 1, getdate(), NULL, NULL, N'')
+GO
+INSERT sys_menu VALUES (1047, N'批量强退', 109, 2, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'monitor:online:batchLogout', N'#', 103, 1, getdate(), NULL, NULL, N'')
+GO
+INSERT sys_menu VALUES (1048, N'单条强退', 109, 3, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'monitor:online:forceLogout', N'#', 103, 1, getdate(), NULL, NULL, N'')
+GO
+INSERT sys_menu VALUES (1055, N'生成查询', 115, 1, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'tool:gen:query', N'#', 103, 1, getdate(), NULL, NULL, N'')
+GO
+INSERT sys_menu VALUES (1056, N'生成修改', 115, 2, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'tool:gen:edit', N'#', 103, 1, getdate(), NULL, NULL, N'')
+GO
+INSERT sys_menu VALUES (1057, N'生成删除', 115, 3, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'tool:gen:remove', N'#', 103, 1, getdate(), NULL, NULL, N'')
+GO
+INSERT sys_menu VALUES (1058, N'导入代码', 115, 2, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'tool:gen:import', N'#', 103, 1, getdate(), NULL, NULL, N'')
+GO
+INSERT sys_menu VALUES (1059, N'预览代码', 115, 4, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'tool:gen:preview', N'#', 103, 1, getdate(), NULL, NULL, N'')
+GO
+INSERT sys_menu VALUES (1060, N'生成代码', 115, 5, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'tool:gen:code', N'#', 103, 1, getdate(), NULL, NULL, N'')
+GO
+-- oss相关按钮
+INSERT sys_menu VALUES (1600, N'文件查询', 118, 1, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'system:oss:query', N'#', 103, 1, getdate(), NULL, NULL, N'');
+GO
+INSERT sys_menu VALUES (1601, N'文件上传', 118, 2, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'system:oss:upload', N'#', 103, 1, getdate(), NULL, NULL, N'');
+GO
+INSERT sys_menu VALUES (1602, N'文件下载', 118, 3, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'system:oss:download', N'#', 103, 1, getdate(), NULL, NULL, N'');
+GO
+INSERT sys_menu VALUES (1603, N'文件删除', 118, 4, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'system:oss:remove', N'#', 103, 1, getdate(), NULL, NULL, N'');
+GO
+INSERT sys_menu VALUES (1620, N'配置列表', 118, 5, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'system:ossConfig:list', N'#', 103, 1, getdate(), NULL, NULL, N'');
+GO
+INSERT sys_menu VALUES (1621, N'配置添加', 118, 6, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'system:ossConfig:add', N'#', 103, 1, getdate(), NULL, NULL, N'');
+GO
+INSERT sys_menu VALUES (1622, N'配置编辑', 118, 6, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'system:ossConfig:edit', N'#', 103, 1, getdate(), NULL, NULL, N'');
+GO
+INSERT sys_menu VALUES (1623, N'配置删除', 118, 6, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'system:ossConfig:remove', N'#', 103, 1, getdate(), NULL, NULL, N'');
+GO
+-- 客户端管理按钮
+INSERT sys_menu VALUES (1061, N'客户端管理查询', 123, 1, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'system:client:query', N'#', 103, 1, getdate(), NULL, NULL, N'');
+GO
+INSERT sys_menu VALUES (1062, N'客户端管理新增', 123, 2, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'system:client:add', N'#', 103, 1, getdate(), NULL, NULL, N'');
+GO
+INSERT sys_menu VALUES (1063, N'客户端管理修改', 123, 3, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'system:client:edit', N'#', 103, 1, getdate(), NULL, NULL, N'');
+GO
+INSERT sys_menu VALUES (1064, N'客户端管理删除', 123, 4, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'system:client:remove', N'#', 103, 1, getdate(), NULL, NULL, N'');
+GO
+INSERT sys_menu VALUES (1065, N'客户端管理导出', 123, 5, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'system:client:export', N'#', 103, 1, getdate(), NULL, NULL, N'');
+GO
+-- 测试菜单
+INSERT sys_menu VALUES (1500, N'测试单表', 5, 1, N'demo', N'demo/demo/index', N'', 1, 0, N'C', N'0', N'0', N'demo:demo:list', N'#', 103, 1, getdate(), NULL, NULL, N'测试单表菜单');
+GO
+INSERT sys_menu VALUES (1501, N'测试单表查询', 1500, 1, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'demo:demo:query', N'#', 103, 1, getdate(), NULL, NULL, N'');
+GO
+INSERT sys_menu VALUES (1502, N'测试单表新增', 1500, 2, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'demo:demo:add', N'#', 103, 1, getdate(), NULL, NULL, N'');
+GO
+INSERT sys_menu VALUES (1503, N'测试单表修改', 1500, 3, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'demo:demo:edit', N'#', 103, 1, getdate(), NULL, NULL, N'');
+GO
+INSERT sys_menu VALUES (1504, N'测试单表删除', 1500, 4, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'demo:demo:remove', N'#', 103, 1, getdate(), NULL, NULL, N'');
+GO
+INSERT sys_menu VALUES (1505, N'测试单表导出', 1500, 5, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'demo:demo:export', N'#', 103, 1, getdate(), NULL, NULL, N'');
+GO
+
+INSERT sys_menu VALUES (1506, N'测试树表', 5, 1, N'tree', N'demo/tree/index', N'', 1, 0, N'C', N'0', N'0', N'demo:tree:list', N'#', 103, 1, getdate(), NULL, NULL, N'测试树表菜单');
+GO
+INSERT sys_menu VALUES (1507, N'测试树表查询', 1506, 1, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'demo:tree:query', N'#', 103, 1, getdate(), NULL, NULL, N'');
+GO
+INSERT sys_menu VALUES (1508, N'测试树表新增', 1506, 2, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'demo:tree:add', N'#', 103, 1, getdate(), NULL, NULL, N'');
+GO
+INSERT sys_menu VALUES (1509, N'测试树表修改', 1506, 3, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'demo:tree:edit', N'#', 103, 1, getdate(), NULL, NULL, N'');
+GO
+INSERT sys_menu VALUES (1510, N'测试树表删除', 1506, 4, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'demo:tree:remove', N'#', 103, 1, getdate(), NULL, NULL, N'');
+GO
+INSERT sys_menu VALUES (1511, N'测试树表导出', 1506, 5, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'demo:tree:export', N'#', 103, 1, getdate(), NULL, NULL, N'');
+GO
+
+CREATE TABLE sys_notice
+(
+    notice_id      bigint                     NOT NULL,
+    notice_title   nvarchar(50)               NOT NULL,
+    notice_type    nchar(1)                   NOT NULL,
+    notice_content nvarchar(max)              NULL,
+    status         nchar(1)     DEFAULT ('0') NULL,
+    create_dept    bigint                     NULL,
+    create_by      bigint                     NULL,
+    create_time    datetime2(7)               NULL,
+    update_by      bigint                     NULL,
+    update_time    datetime2(7)               NULL,
+    remark         nvarchar(255)              NULL,
+    CONSTRAINT PK__sys_noti__3E82A5DB0EC94801 PRIMARY KEY CLUSTERED (notice_id)
+        WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON)
+        ON [PRIMARY]
+)
+ON [PRIMARY]
+TEXTIMAGE_ON [PRIMARY]
+GO
+
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'公告ID' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_notice',
+    'COLUMN', N'notice_id'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'公告标题' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_notice',
+    'COLUMN', N'notice_title'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'公告类型（1通知 2公告）' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_notice',
+    'COLUMN', N'notice_type'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'公告内容' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_notice',
+    'COLUMN', N'notice_content'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'公告状态（0正常 1关闭）' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_notice',
+    'COLUMN', N'status'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'创建部门' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_notice',
+    'COLUMN', N'create_dept'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'创建者' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_notice',
+    'COLUMN', N'create_by'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'创建时间' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_notice',
+    'COLUMN', N'create_time'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'更新者' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_notice',
+    'COLUMN', N'update_by'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'更新时间' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_notice',
+    'COLUMN', N'update_time'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'备注' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_notice',
+    'COLUMN', N'remark'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'通知公告表' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_notice'
+GO
+
+INSERT sys_notice VALUES (1, N'温馨提醒：2018-07-01 若依新版本发布啦', N'2', N'新版本内容', N'0', 103, 1, getdate(), NULL, NULL, N'管理员')
+GO
+INSERT sys_notice VALUES (2, N'维护通知：2018-07-01 若依系统凌晨维护', N'1', N'维护内容', N'0', 103, 1, getdate(), NULL, NULL, N'管理员')
+GO
+
+CREATE TABLE sys_oper_log
+(
+    oper_id        bigint                       NOT NULL,
+    title          nvarchar(50)   DEFAULT ''    NULL,
+    business_type  int            DEFAULT ((0)) NULL,
+    method         nvarchar(100)  DEFAULT ''    NULL,
+    request_method nvarchar(10)   DEFAULT ''    NULL,
+    operator_type  int            DEFAULT ((0)) NULL,
+    oper_name      nvarchar(50)   DEFAULT ''    NULL,
+    dept_name      nvarchar(50)   DEFAULT ''    NULL,
+    oper_url       nvarchar(255)  DEFAULT ''    NULL,
+    oper_ip        nvarchar(128)  DEFAULT ''    NULL,
+    oper_location  nvarchar(255)  DEFAULT ''    NULL,
+    oper_param     nvarchar(4000) DEFAULT ''    NULL,
+    json_result    nvarchar(4000) DEFAULT ''    NULL,
+    status         int            DEFAULT ((0)) NULL,
+    error_msg      nvarchar(4000) DEFAULT ''    NULL,
+    oper_time      datetime2(7)                 NULL,
+    cost_time      bigint         DEFAULT ((0)) NULL,
+    CONSTRAINT PK__sys_oper__34723BF9BD954573 PRIMARY KEY CLUSTERED (oper_id)
+        WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON)
+        ON [PRIMARY]
+)
+ON [PRIMARY]
+GO
+
+CREATE NONCLUSTERED INDEX idx_sys_oper_log_bt ON sys_oper_log (business_type)
+GO
+CREATE NONCLUSTERED INDEX idx_sys_oper_log_s ON sys_oper_log (status)
+GO
+CREATE NONCLUSTERED INDEX idx_sys_oper_log_ot ON sys_oper_log (oper_time)
+GO
+
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'日志主键' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_oper_log',
+    'COLUMN', N'oper_id'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'模块标题' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_oper_log',
+    'COLUMN', N'title'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'业务类型（0其它 1新增 2修改 3删除）' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_oper_log',
+    'COLUMN', N'business_type'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'方法名称' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_oper_log',
+    'COLUMN', N'method'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'请求方式' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_oper_log',
+    'COLUMN', N'request_method'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'操作类别（0其它 1后台用户 2手机端用户）' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_oper_log',
+    'COLUMN', N'operator_type'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'操作人员' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_oper_log',
+    'COLUMN', N'oper_name'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'部门名称' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_oper_log',
+    'COLUMN', N'dept_name'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'请求URL' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_oper_log',
+    'COLUMN', N'oper_url'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'主机地址' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_oper_log',
+    'COLUMN', N'oper_ip'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'操作地点' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_oper_log',
+    'COLUMN', N'oper_location'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'请求参数' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_oper_log',
+    'COLUMN', N'oper_param'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'返回参数' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_oper_log',
+    'COLUMN', N'json_result'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'操作状态（0正常 1异常）' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_oper_log',
+    'COLUMN', N'status'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'错误消息' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_oper_log',
+    'COLUMN', N'error_msg'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'操作时间' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_oper_log',
+    'COLUMN', N'oper_time'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'消耗时间' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_oper_log',
+    'COLUMN', N'cost_time'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'操作日志记录' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_oper_log'
+GO
+
+CREATE TABLE sys_post
+(
+    post_id     bigint                          NOT NULL,
+    dept_id     bigint                          NOT NULL,
+    post_code   nvarchar(64)                    NOT NULL,
+    post_category nvarchar(100)                 NULL,
+    post_name   nvarchar(50)                    NOT NULL,
+    post_sort   int                             NOT NULL,
+    status      nchar(1)                        NOT NULL,
+    create_dept bigint                          NULL,
+    create_by   bigint                          NULL,
+    create_time datetime2(7)                    NULL,
+    update_by   bigint                          NULL,
+    update_time datetime2(7)                    NULL,
+    remark      nvarchar(500)                   NULL,
+    CONSTRAINT PK__sys_post__3ED7876668E2D081 PRIMARY KEY CLUSTERED (post_id)
+        WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON)
+        ON [PRIMARY]
+)
+ON [PRIMARY]
+GO
+
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'岗位ID' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_post',
+    'COLUMN', N'post_id'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'部门id' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_post',
+    'COLUMN', N'dept_id'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'岗位编码' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_post',
+    'COLUMN', N'post_code'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'岗位类别编码' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_post',
+    'COLUMN', N'post_category'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'岗位名称' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_post',
+    'COLUMN', N'post_name'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'显示顺序' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_post',
+    'COLUMN', N'post_sort'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'状态（0正常 1停用）' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_post',
+    'COLUMN', N'status'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'创建部门' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_post',
+    'COLUMN', N'create_dept'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'创建者' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_post',
+    'COLUMN', N'create_by'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'创建时间' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_post',
+    'COLUMN', N'create_time'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'更新者' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_post',
+    'COLUMN', N'update_by'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'更新时间' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_post',
+    'COLUMN', N'update_time'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'备注' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_post',
+    'COLUMN', N'remark'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'岗位信息表' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_post'
+GO
+
+INSERT sys_post VALUES (1, 103, N'ceo', NULL,  N'董事长', 1, N'0', 103, 1, getdate(), NULL, NULL, N'')
+GO
+INSERT sys_post VALUES (2, 100, N'se', NULL,  N'项目经理', 2, N'0', 103, 1, getdate(), NULL, NULL, N'')
+GO
+INSERT sys_post VALUES (3, 100, N'hr', NULL,  N'人力资源', 3, N'0', 103, 1, getdate(), NULL, NULL, N'')
+GO
+INSERT sys_post VALUES (4, 100, N'user', NULL,  N'普通员工', 4, N'0', 103, 1, getdate(), NULL, NULL, N'')
+GO
+
+CREATE TABLE sys_role
+(
+    role_id             bigint                     NOT NULL,
+    role_name           nvarchar(30)               NOT NULL,
+    role_key            nvarchar(100)              NOT NULL,
+    role_sort           int                        NOT NULL,
+    data_scope          nchar(1)     DEFAULT ('1') NULL,
+    menu_check_strictly tinyint      DEFAULT ((1)) NULL,
+    dept_check_strictly tinyint      DEFAULT ((1)) NULL,
+    status              nchar(1)                   NOT NULL,
+    del_flag            nchar(1)     DEFAULT ('0') NULL,
+    create_dept         bigint                     NULL,
+    create_by           bigint                     NULL,
+    create_time         datetime2(7)               NULL,
+    update_by           bigint                     NULL,
+    update_time         datetime2(7)               NULL,
+    remark              nvarchar(500)              NULL,
+    CONSTRAINT PK__sys_role__760965CCF9383145 PRIMARY KEY CLUSTERED (role_id)
+        WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON)
+        ON [PRIMARY]
+)
+ON [PRIMARY]
+GO
+
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'角色ID' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_role',
+    'COLUMN', N'role_id'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'角色名称' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_role',
+    'COLUMN', N'role_name'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'角色权限字符串' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_role',
+    'COLUMN', N'role_key'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'显示顺序' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_role',
+    'COLUMN', N'role_sort'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'数据范围（1：全部数据权限 2：自定数据权限 3：本部门数据权限 4：本部门及以下数据权限 5：仅本人数据权限 6：部门及以下或本人数据权限）' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_role',
+    'COLUMN', N'data_scope'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'菜单树选择项是否关联显示' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_role',
+    'COLUMN', N'menu_check_strictly'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'部门树选择项是否关联显示' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_role',
+    'COLUMN', N'dept_check_strictly'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'角色状态（0正常 1停用）' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_role',
+    'COLUMN', N'status'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'删除标志（0代表存在 1代表删除）' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_role',
+    'COLUMN', N'del_flag'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'创建部门' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_role',
+    'COLUMN', N'create_dept'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'创建者' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_role',
+    'COLUMN', N'create_by'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'创建时间' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_role',
+    'COLUMN', N'create_time'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'更新者' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_role',
+    'COLUMN', N'update_by'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'更新时间' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_role',
+    'COLUMN', N'update_time'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'备注' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_role',
+    'COLUMN', N'remark'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'角色信息表' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_role'
+GO
+
+INSERT sys_role VALUES (1, N'超级管理员', N'superadmin', 1, N'1', 1, 1, N'0', N'0', 103, 1, getdate(), NULL, NULL, N'超级管理员')
+GO
+INSERT sys_role VALUES (3, N'本部门及以下', N'test1', 3, N'4', 1, 1, N'0', N'0', 103, 1, getdate(), NULL, NULL, N'');
+GO
+INSERT sys_role VALUES (4, N'仅本人', N'test2', 4, N'5', 1, 1, N'0', N'0', 103, 1, getdate(), NULL, NULL, N'');
+GO
+
+CREATE TABLE sys_role_dept
+(
+    role_id bigint NOT NULL,
+    dept_id bigint NOT NULL,
+    CONSTRAINT PK__sys_role__2BC3005BABBCA08A PRIMARY KEY CLUSTERED (role_id, dept_id)
+        WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON)
+        ON [PRIMARY]
+)
+ON [PRIMARY]
+GO
+
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'角色ID' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_role_dept',
+    'COLUMN', N'role_id'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'部门ID' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_role_dept',
+    'COLUMN', N'dept_id'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'角色和部门关联表' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_role_dept'
+GO
+
+CREATE TABLE sys_role_menu
+(
+    role_id bigint NOT NULL,
+    menu_id bigint NOT NULL,
+    CONSTRAINT PK__sys_role__A2C36A6187BA4B17 PRIMARY KEY CLUSTERED (role_id, menu_id)
+        WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON)
+        ON [PRIMARY]
+)
+ON [PRIMARY]
+GO
+
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'角色ID' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_role_menu',
+    'COLUMN', N'role_id'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'菜单ID' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_role_menu',
+    'COLUMN', N'menu_id'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'角色和菜单关联表' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_role_menu'
+GO
+
+-- ----------------------------
+-- 初始化-角色和菜单关联表数据
+-- ----------------------------
+INSERT sys_role_menu VALUES (3, 1);
+GO
+INSERT sys_role_menu VALUES (3, 5);
+GO
+INSERT sys_role_menu VALUES (3, 100);
+GO
+INSERT sys_role_menu VALUES (3, 101);
+GO
+INSERT sys_role_menu VALUES (3, 102);
+GO
+INSERT sys_role_menu VALUES (3, 103);
+GO
+INSERT sys_role_menu VALUES (3, 104);
+GO
+INSERT sys_role_menu VALUES (3, 105);
+GO
+INSERT sys_role_menu VALUES (3, 106);
+GO
+INSERT sys_role_menu VALUES (3, 107);
+GO
+INSERT sys_role_menu VALUES (3, 108);
+GO
+INSERT sys_role_menu VALUES (3, 118);
+GO
+INSERT sys_role_menu VALUES (3, 123);
+GO
+INSERT sys_role_menu VALUES (3, 500);
+GO
+INSERT sys_role_menu VALUES (3, 501);
+GO
+INSERT sys_role_menu VALUES (3, 1001);
+GO
+INSERT sys_role_menu VALUES (3, 1002);
+GO
+INSERT sys_role_menu VALUES (3, 1003);
+GO
+INSERT sys_role_menu VALUES (3, 1004);
+GO
+INSERT sys_role_menu VALUES (3, 1005);
+GO
+INSERT sys_role_menu VALUES (3, 1006);
+GO
+INSERT sys_role_menu VALUES (3, 1007);
+GO
+INSERT sys_role_menu VALUES (3, 1008);
+GO
+INSERT sys_role_menu VALUES (3, 1009);
+GO
+INSERT sys_role_menu VALUES (3, 1010);
+GO
+INSERT sys_role_menu VALUES (3, 1011);
+GO
+INSERT sys_role_menu VALUES (3, 1012);
+GO
+INSERT sys_role_menu VALUES (3, 1013);
+GO
+INSERT sys_role_menu VALUES (3, 1014);
+GO
+INSERT sys_role_menu VALUES (3, 1015);
+GO
+INSERT sys_role_menu VALUES (3, 1016);
+GO
+INSERT sys_role_menu VALUES (3, 1017);
+GO
+INSERT sys_role_menu VALUES (3, 1018);
+GO
+INSERT sys_role_menu VALUES (3, 1019);
+GO
+INSERT sys_role_menu VALUES (3, 1020);
+GO
+INSERT sys_role_menu VALUES (3, 1021);
+GO
+INSERT sys_role_menu VALUES (3, 1022);
+GO
+INSERT sys_role_menu VALUES (3, 1023);
+GO
+INSERT sys_role_menu VALUES (3, 1024);
+GO
+INSERT sys_role_menu VALUES (3, 1025);
+GO
+INSERT sys_role_menu VALUES (3, 1026);
+GO
+INSERT sys_role_menu VALUES (3, 1027);
+GO
+INSERT sys_role_menu VALUES (3, 1028);
+GO
+INSERT sys_role_menu VALUES (3, 1029);
+GO
+INSERT sys_role_menu VALUES (3, 1030);
+GO
+INSERT sys_role_menu VALUES (3, 1031);
+GO
+INSERT sys_role_menu VALUES (3, 1032);
+GO
+INSERT sys_role_menu VALUES (3, 1033);
+GO
+INSERT sys_role_menu VALUES (3, 1034);
+GO
+INSERT sys_role_menu VALUES (3, 1035);
+GO
+INSERT sys_role_menu VALUES (3, 1036);
+GO
+INSERT sys_role_menu VALUES (3, 1037);
+GO
+INSERT sys_role_menu VALUES (3, 1038);
+GO
+INSERT sys_role_menu VALUES (3, 1039);
+GO
+INSERT sys_role_menu VALUES (3, 1040);
+GO
+INSERT sys_role_menu VALUES (3, 1041);
+GO
+INSERT sys_role_menu VALUES (3, 1042);
+GO
+INSERT sys_role_menu VALUES (3, 1043);
+GO
+INSERT sys_role_menu VALUES (3, 1044);
+GO
+INSERT sys_role_menu VALUES (3, 1045);
+GO
+INSERT sys_role_menu VALUES (3, 1050);
+GO
+INSERT sys_role_menu VALUES (3, 1061);
+GO
+INSERT sys_role_menu VALUES (3, 1062);
+GO
+INSERT sys_role_menu VALUES (3, 1063);
+GO
+INSERT sys_role_menu VALUES (3, 1064);
+GO
+INSERT sys_role_menu VALUES (3, 1065);
+GO
+INSERT sys_role_menu VALUES (3, 1500);
+GO
+INSERT sys_role_menu VALUES (3, 1501);
+GO
+INSERT sys_role_menu VALUES (3, 1502);
+GO
+INSERT sys_role_menu VALUES (3, 1503);
+GO
+INSERT sys_role_menu VALUES (3, 1504);
+GO
+INSERT sys_role_menu VALUES (3, 1505);
+GO
+INSERT sys_role_menu VALUES (3, 1506);
+GO
+INSERT sys_role_menu VALUES (3, 1507);
+GO
+INSERT sys_role_menu VALUES (3, 1508);
+GO
+INSERT sys_role_menu VALUES (3, 1509);
+GO
+INSERT sys_role_menu VALUES (3, 1510);
+GO
+INSERT sys_role_menu VALUES (3, 1511);
+GO
+INSERT sys_role_menu VALUES (3, 1600);
+GO
+INSERT sys_role_menu VALUES (3, 1601);
+GO
+INSERT sys_role_menu VALUES (3, 1602);
+GO
+INSERT sys_role_menu VALUES (3, 1603);
+GO
+INSERT sys_role_menu VALUES (3, 1620);
+GO
+INSERT sys_role_menu VALUES (3, 1621);
+GO
+INSERT sys_role_menu VALUES (3, 1622);
+GO
+INSERT sys_role_menu VALUES (3, 1623);
+GO
+INSERT sys_role_menu VALUES (3, 11616);
+GO
+INSERT sys_role_menu VALUES (3, 11618);
+GO
+INSERT sys_role_menu VALUES (3, 11619);
+GO
+INSERT sys_role_menu VALUES (3, 11622);
+GO
+INSERT sys_role_menu VALUES (3, 11623);
+GO
+INSERT sys_role_menu VALUES (3, 11629);
+GO
+INSERT sys_role_menu VALUES (3, 11632);
+GO
+INSERT sys_role_menu VALUES (3, 11633);
+GO
+INSERT sys_role_menu VALUES (3, 11638);
+GO
+INSERT sys_role_menu VALUES (3, 11639);
+GO
+INSERT sys_role_menu VALUES (3, 11640);
+GO
+INSERT sys_role_menu VALUES (3, 11641);
+GO
+INSERT sys_role_menu VALUES (3, 11642);
+GO
+INSERT sys_role_menu VALUES (3, 11643);
+GO
+INSERT sys_role_menu VALUES (4, 5);
+GO
+INSERT sys_role_menu VALUES (4, 1500);
+GO
+INSERT sys_role_menu VALUES (4, 1501);
+GO
+INSERT sys_role_menu VALUES (4, 1502);
+GO
+INSERT sys_role_menu VALUES (4, 1503);
+GO
+INSERT sys_role_menu VALUES (4, 1504);
+GO
+INSERT sys_role_menu VALUES (4, 1505);
+GO
+INSERT sys_role_menu VALUES (4, 1506);
+GO
+INSERT sys_role_menu VALUES (4, 1507);
+GO
+INSERT sys_role_menu VALUES (4, 1508);
+GO
+INSERT sys_role_menu VALUES (4, 1509);
+GO
+INSERT sys_role_menu VALUES (4, 1510);
+GO
+INSERT sys_role_menu VALUES (4, 1511);
+GO
+
+CREATE TABLE sys_user
+(
+    user_id     bigint                             NOT NULL,
+    dept_id     bigint                             NULL,
+    user_name   nvarchar(30)                       NOT NULL,
+    nick_name   nvarchar(30)                       NOT NULL,
+    user_type   nvarchar(10)  DEFAULT ('sys_user') NULL,
+    email       nvarchar(50)  DEFAULT ''           NULL,
+    phonenumber nvarchar(11)  DEFAULT ''           NULL,
+    sex         nchar(1)      DEFAULT ('0')        NULL,
+    avatar      bigint                             NULL,
+    password    nvarchar(100) DEFAULT ''           NULL,
+    status      nchar(1)      DEFAULT ('0')        NULL,
+    del_flag    nchar(1)      DEFAULT ('0')        NULL,
+    login_ip    nvarchar(128) DEFAULT ''           NULL,
+    login_date  datetime2(7)                       NULL,
+    create_dept bigint                             NULL,
+    create_by   bigint                             NULL,
+    create_time datetime2(7)                       NULL,
+    update_by   bigint                             NULL,
+    update_time datetime2(7)                       NULL,
+    remark      nvarchar(500)                      NULL,
+    CONSTRAINT PK__sys_user__B9BE370F79170B6A PRIMARY KEY CLUSTERED (user_id)
+        WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON)
+        ON [PRIMARY]
+)
+ON [PRIMARY]
+GO
+
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'用户ID' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_user',
+    'COLUMN', N'user_id'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'部门ID' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_user',
+    'COLUMN', N'dept_id'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'用户账号' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_user',
+    'COLUMN', N'user_name'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'用户昵称' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_user',
+    'COLUMN', N'nick_name'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'用户类型（sys_user系统用户）' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_user',
+    'COLUMN', N'user_type'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'用户邮箱' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_user',
+    'COLUMN', N'email'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'手机号码' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_user',
+    'COLUMN', N'phonenumber'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'用户性别（0男 1女 2未知）' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_user',
+    'COLUMN', N'sex'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'头像地址' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_user',
+    'COLUMN', N'avatar'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'密码' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_user',
+    'COLUMN', N'password'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'帐号状态（0正常 1停用）' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_user',
+    'COLUMN', N'status'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'删除标志（0代表存在 1代表删除）' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_user',
+    'COLUMN', N'del_flag'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'最后登录IP' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_user',
+    'COLUMN', N'login_ip'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'最后登录时间' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_user',
+    'COLUMN', N'login_date'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'创建部门' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_user',
+    'COLUMN', N'create_dept'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'创建者' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_user',
+    'COLUMN', N'create_by'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'创建时间' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_user',
+    'COLUMN', N'create_time'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'更新者' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_user',
+    'COLUMN', N'update_by'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'更新时间' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_user',
+    'COLUMN', N'update_time'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'备注' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_user',
+    'COLUMN', N'remark'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'用户信息表' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_user'
+GO
+
+INSERT sys_user VALUES (1, 103,  N'admin', N'疯狂的狮子Li', N'sys_user', N'crazyLionLi@163.com', N'15888888888', N'1', NULL, N'$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', N'0', N'0', N'127.0.0.1', getdate(), 103, 1, getdate(), NULL, NULL, N'管理员')
+GO
+INSERT sys_user VALUES (3, 108, N'test', N'本部门及以下 密码666666', N'sys_user', N'', N'', N'0', NULL, N'$2a$10$b8yUzN0C71sbz.PhNOCgJe.Tu1yWC3RNrTyjSQ8p1W0.aaUXUJ.Ne', N'0', N'0', N'127.0.0.1', getdate(), 103, 1, getdate(), 3, getdate(), NULL);
+GO
+INSERT sys_user VALUES (4, 102, N'test1', N'仅本人 密码666666', N'sys_user', N'', N'', N'0', NULL, N'$2a$10$b8yUzN0C71sbz.PhNOCgJe.Tu1yWC3RNrTyjSQ8p1W0.aaUXUJ.Ne', N'0', N'0', N'127.0.0.1', getdate(), 103, 1, getdate(), 4, getdate(), NULL);
+GO
+
+CREATE TABLE sys_user_post
+(
+    user_id bigint NOT NULL,
+    post_id bigint NOT NULL,
+    CONSTRAINT PK__sys_user__CA534F799C04589B PRIMARY KEY CLUSTERED (user_id, post_id)
+        WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON)
+        ON [PRIMARY]
+)
+ON [PRIMARY]
+GO
+
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'用户ID' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_user_post',
+    'COLUMN', N'user_id'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'岗位ID' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_user_post',
+    'COLUMN', N'post_id'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'用户与岗位关联表' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_user_post'
+GO
+
+INSERT sys_user_post VALUES (1, 1)
+GO
+
+CREATE TABLE sys_user_role
+(
+    user_id bigint NOT NULL,
+    role_id bigint NOT NULL,
+    CONSTRAINT PK__sys_user__6EDEA153FB34D8F0 PRIMARY KEY CLUSTERED (user_id, role_id)
+        WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON)
+        ON [PRIMARY]
+)
+ON [PRIMARY]
+GO
+
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'用户ID' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_user_role',
+    'COLUMN', N'user_id'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'角色ID' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_user_role',
+    'COLUMN', N'role_id'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'用户和角色关联表' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_user_role'
+GO
+
+INSERT sys_user_role VALUES (1, 1)
+GO
+INSERT sys_user_role VALUES (3, 3);
+GO
+INSERT sys_user_role VALUES (4, 4);
+GO
+
+CREATE TABLE sys_oss
+(
+    oss_id        bigint                          NOT NULL,
+    file_name     nvarchar(255) DEFAULT ''        NOT NULL,
+    original_name nvarchar(255) DEFAULT ''        NOT NULL,
+    file_suffix   nvarchar(10)  DEFAULT ''        NOT NULL,
+    url           nvarchar(500)                   NOT NULL,
+    ext1          nvarchar(500) DEFAULT ''        NULL,
+    create_dept   bigint                          NULL,
+    create_time   datetime2(7)                    NULL,
+    create_by     bigint                          NULL,
+    update_time   datetime2(7)                    NULL,
+    update_by     bigint                          NULL,
+    service       nvarchar(20)  DEFAULT ('minio') NOT NULL,
+    CONSTRAINT PK__sys_oss__91241EA442389F0D PRIMARY KEY CLUSTERED (oss_id)
+        WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON)
+        ON [PRIMARY]
+)
+ON [PRIMARY]
+GO
+
+EXEC sp_addextendedproperty
+    'MS_Description', N'对象存储主键',
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_oss',
+    'COLUMN', N'oss_id'
+GO
+EXEC sp_addextendedproperty
+    'MS_Description', N'文件名',
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_oss',
+    'COLUMN', N'file_name'
+GO
+EXEC sp_addextendedproperty
+    'MS_Description', N'原名',
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_oss',
+    'COLUMN', N'original_name'
+GO
+EXEC sp_addextendedproperty
+    'MS_Description', N'文件后缀名',
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_oss',
+    'COLUMN', N'file_suffix'
+GO
+EXEC sp_addextendedproperty
+    'MS_Description', N'URL地址',
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_oss',
+    'COLUMN', N'url'
+GO
+EXEC sp_addextendedproperty
+    'MS_Description', N'扩展字段',
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_oss',
+    'COLUMN', N'ext1'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'创建部门' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_oss',
+    'COLUMN', N'create_dept'
+GO
+EXEC sp_addextendedproperty
+    'MS_Description', N'创建时间',
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_oss',
+    'COLUMN', N'create_time'
+GO
+EXEC sp_addextendedproperty
+    'MS_Description', N'上传人',
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_oss',
+    'COLUMN', N'create_by'
+GO
+EXEC sp_addextendedproperty
+    'MS_Description', N'更新时间',
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_oss',
+    'COLUMN', N'update_time'
+GO
+EXEC sp_addextendedproperty
+    'MS_Description', N'更新人',
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_oss',
+    'COLUMN', N'update_by'
+GO
+EXEC sp_addextendedproperty
+    'MS_Description', N'服务商',
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_oss',
+    'COLUMN', N'service'
+GO
+EXEC sp_addextendedproperty
+    'MS_Description', N'OSS对象存储表',
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_oss'
+GO
+
+CREATE TABLE sys_oss_config
+(
+    oss_config_id bigint                      NOT NULL,
+    config_key    nvarchar(20)  DEFAULT ''    NOT NULL,
+    access_key    nvarchar(255) DEFAULT ''    NULL,
+    secret_key    nvarchar(255) DEFAULT ''    NULL,
+    bucket_name   nvarchar(255) DEFAULT ''    NULL,
+    prefix        nvarchar(255) DEFAULT ''    NULL,
+    endpoint      nvarchar(255) DEFAULT ''    NULL,
+    domain        nvarchar(255) DEFAULT ''    NULL,
+    is_https      nchar(1)      DEFAULT ('N') NULL,
+    region        nvarchar(255) DEFAULT ''    NULL,
+    access_policy nchar(1)      DEFAULT ('1') NOT NULL,
+    status        nchar(1)      DEFAULT ('1') NULL,
+    ext1          nvarchar(255) DEFAULT ''    NULL,
+    create_dept   bigint                      NULL,
+    create_by     bigint                      NULL,
+    create_time   datetime2(7)                NULL,
+    update_by     bigint                      NULL,
+    update_time   datetime2(7)                NULL,
+    remark        nvarchar(500)               NULL,
+    CONSTRAINT PK__sys_oss___BFBDE87009ED2882 PRIMARY KEY CLUSTERED (oss_config_id)
+        WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON)
+        ON [PRIMARY]
+)
+ON [PRIMARY]
+GO
+
+EXEC sp_addextendedproperty
+    'MS_Description', N'主键',
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_oss_config',
+    'COLUMN', N'oss_config_id'
+GO
+EXEC sp_addextendedproperty
+    'MS_Description', N'配置key',
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_oss_config',
+    'COLUMN', N'config_key'
+GO
+EXEC sp_addextendedproperty
+    'MS_Description', N'accessKey',
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_oss_config',
+    'COLUMN', N'access_key'
+GO
+EXEC sp_addextendedproperty
+    'MS_Description', N'秘钥',
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_oss_config',
+    'COLUMN', N'secret_key'
+GO
+EXEC sp_addextendedproperty
+    'MS_Description', N'桶名称',
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_oss_config',
+    'COLUMN', N'bucket_name'
+GO
+EXEC sp_addextendedproperty
+    'MS_Description', N'前缀',
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_oss_config',
+    'COLUMN', N'prefix'
+GO
+EXEC sp_addextendedproperty
+    'MS_Description', N'访问站点',
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_oss_config',
+    'COLUMN', N'endpoint'
+GO
+EXEC sp_addextendedproperty
+     'MS_Description', N'自定义域名',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sys_oss_config',
+     'COLUMN', N'domain'
+GO
+EXEC sp_addextendedproperty
+    'MS_Description', N'是否https（Y=是,N=否）',
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_oss_config',
+    'COLUMN', N'is_https'
+GO
+EXEC sp_addextendedproperty
+    'MS_Description', N'域',
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_oss_config',
+    'COLUMN', N'region'
+GO
+EXEC sp_addextendedproperty
+     'MS_Description', N'桶权限类型(0=private 1=public 2=custom)',
+     'SCHEMA', N'dbo',
+     'TABLE', N'sys_oss_config',
+     'COLUMN', N'access_policy'
+GO
+EXEC sp_addextendedproperty
+    'MS_Description', N'是否默认（0=是,1=否）',
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_oss_config',
+    'COLUMN', N'status'
+GO
+EXEC sp_addextendedproperty
+    'MS_Description', N'扩展字段',
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_oss_config',
+    'COLUMN', N'ext1'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'创建部门' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_oss_config',
+    'COLUMN', N'create_dept'
+GO
+EXEC sp_addextendedproperty
+    'MS_Description', N'创建者',
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_oss_config',
+    'COLUMN', N'create_by'
+GO
+EXEC sp_addextendedproperty
+    'MS_Description', N'创建时间',
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_oss_config',
+    'COLUMN', N'create_time'
+GO
+EXEC sp_addextendedproperty
+    'MS_Description', N'更新者',
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_oss_config',
+    'COLUMN', N'update_by'
+GO
+EXEC sp_addextendedproperty
+    'MS_Description', N'更新时间',
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_oss_config',
+    'COLUMN', N'update_time'
+GO
+EXEC sp_addextendedproperty
+    'MS_Description', N'备注',
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_oss_config',
+    'COLUMN', N'remark'
+GO
+EXEC sp_addextendedproperty
+    'MS_Description', N'对象存储配置表',
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_oss_config'
+GO
+
+INSERT INTO sys_oss_config VALUES (N'1', N'minio', N'ruoyi',            N'ruoyi123',        N'ruoyi',            N'', N'127.0.0.1:9000',                    N'',N'N', N'',           N'1', N'0', N'', 103, 1, getdate(), 1, getdate(), NULL)
+GO
+INSERT INTO sys_oss_config VALUES (N'2', N'qiniu', N'XXXXXXXXXXXXXXXX', N'XXXXXXXXXXXXXXX', N'ruoyi',            N'', N's3-cn-north-1.qiniucs.com',         N'',N'N', N'',           N'1', N'1', N'', 103, 1, getdate(), 1, getdate(), NULL)
+GO
+INSERT INTO sys_oss_config VALUES (N'3', N'aliyun', N'XXXXXXXXXXXXXXX', N'XXXXXXXXXXXXXXX', N'ruoyi',            N'', N'oss-cn-beijing.aliyuncs.com',       N'',N'N', N'',           N'1', N'1', N'', 103, 1, getdate(), 1, getdate(), NULL)
+GO
+INSERT INTO sys_oss_config VALUES (N'4', N'qcloud', N'XXXXXXXXXXXXXXX', N'XXXXXXXXXXXXXXX', N'ruoyi-1250000000', N'', N'cos.ap-beijing.myqcloud.com',       N'',N'N', N'ap-beijing', N'1', N'1', N'', 103, 1, getdate(), 1, getdate(), NULL)
+GO
+INSERT INTO sys_oss_config VALUES (N'5', N'image',  N'ruoyi',           N'ruoyi123',        N'ruoyi',            N'image', N'127.0.0.1:9000',               N'',N'N', N'',           N'1', N'1', N'', 103, 1, getdate(), 1, getdate(), NULL)
+GO
+
+
+CREATE TABLE sys_client
+(
+    id                  bigint                              NOT NULL,
+    client_id           nvarchar(64)  DEFAULT ''            NULL,
+    client_key          nvarchar(32) DEFAULT ''            NULL,
+    client_secret       nvarchar(255) DEFAULT ''            NULL,
+    grant_type          nvarchar(255) DEFAULT ''            NULL,
+    device_type         nvarchar(32) DEFAULT ''            NULL,
+    active_timeout      int           DEFAULT ((1800))      NULL,
+    timeout             int           DEFAULT ((604800))    NULL,
+    status              nchar(1)      DEFAULT ('0')         NULL,
+    del_flag            nchar(1)      DEFAULT ('0')         NULL,
+    create_dept         bigint                              NULL,
+    create_by           bigint                              NULL,
+    create_time         datetime2(7)                        NULL,
+    update_by           bigint                              NULL,
+    update_time         datetime2(7)                        NULL
+    CONSTRAINT PK__sys_client___BFBDE87009ED2882 PRIMARY KEY CLUSTERED (id)
+        WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON)
+        ON [PRIMARY]
+)
+ON [PRIMARY]
+GO
+
+EXEC sp_addextendedproperty
+    'MS_Description', N'主键',
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_client',
+    'COLUMN', N'id'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'客户端id' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_client',
+    'COLUMN', N'client_id'
+GO
+EXEC sp_addextendedproperty
+    'MS_Description', N'客户端key',
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_client',
+    'COLUMN', N'client_key'
+GO
+EXEC sp_addextendedproperty
+    'MS_Description', N'客户端秘钥',
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_client',
+    'COLUMN', N'client_secret'
+GO
+EXEC sp_addextendedproperty
+    'MS_Description', N'授权类型',
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_client',
+    'COLUMN', N'grant_type'
+GO
+EXEC sp_addextendedproperty
+    'MS_Description', N'设备类型',
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_client',
+    'COLUMN', N'device_type'
+GO
+EXEC sp_addextendedproperty
+    'MS_Description', N'token活跃超时时间',
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_client',
+    'COLUMN', N'active_timeout'
+GO
+EXEC sp_addextendedproperty
+    'MS_Description', N'token固定超时',
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_client',
+    'COLUMN', N'timeout'
+GO
+EXEC sp_addextendedproperty
+    'MS_Description', N'状态（0正常 1停用）',
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_client',
+    'COLUMN', N'status'
+GO
+EXEC sp_addextendedproperty
+    'MS_Description', N'删除标志（0代表存在 1代表删除）',
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_client',
+    'COLUMN', N'del_flag'
+GO
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'创建部门' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_client',
+    'COLUMN', N'create_dept'
+GO
+EXEC sp_addextendedproperty
+    'MS_Description', N'创建者',
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_client',
+    'COLUMN', N'create_by'
+GO
+EXEC sp_addextendedproperty
+    'MS_Description', N'创建时间',
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_client',
+    'COLUMN', N'create_time'
+GO
+EXEC sp_addextendedproperty
+    'MS_Description', N'更新者',
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_client',
+    'COLUMN', N'update_by'
+GO
+EXEC sp_addextendedproperty
+    'MS_Description', N'更新时间',
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_client',
+    'COLUMN', N'update_time'
+GO
+EXEC sp_addextendedproperty
+    'MS_Description', N'系统授权表',
+    'SCHEMA', N'dbo',
+    'TABLE', N'sys_client'
+GO
+
+INSERT INTO sys_client VALUES (N'1', N'e5cd7e4891bf95d1d19206ce24a7b32e', N'pc', N'pc123', N'password,social', N'pc', 1800, 604800, N'0', N'0', 103, 1, getdate(), 1, getdate())
+GO
+INSERT INTO sys_client VALUES (N'2', N'428a8310cd442757ae699df5d894f051', N'app', N'app123', N'password,sms,social', N'android', 1800, 604800, N'0', N'0', 103, 1, getdate(), 1, getdate())
+GO
+
+CREATE TABLE test_demo
+(
+    id          bigint            NOT NULL,
+    dept_id     bigint            NULL,
+    user_id     bigint            NULL,
+    order_num   int DEFAULT ((0)) NULL,
+    test_key    nvarchar(255)     NULL,
+    value       nvarchar(255)     NULL,
+    version     int DEFAULT ((0)) NULL,
+    create_dept bigint            NULL,
+    create_time datetime2(0)      NULL,
+    create_by   bigint            NULL,
+    update_time datetime2(0)      NULL,
+    update_by   bigint            NULL,
+    del_flag    int DEFAULT ((0)) NULL,
+    CONSTRAINT PK__test_dem__3213E83F176051C8 PRIMARY KEY CLUSTERED (id)
+        WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON)
+        ON [PRIMARY]
+)
+ON [PRIMARY]
+GO
+
+EXEC sp_addextendedproperty
+    'MS_Description', N'主键',
+    'SCHEMA', N'dbo',
+    'TABLE', N'test_demo',
+    'COLUMN', N'id'
+GO
+
+EXEC sp_addextendedproperty
+    'MS_Description', N'部门id',
+    'SCHEMA', N'dbo',
+    'TABLE', N'test_demo',
+    'COLUMN', N'dept_id'
+GO
+
+EXEC sp_addextendedproperty
+    'MS_Description', N'用户id',
+    'SCHEMA', N'dbo',
+    'TABLE', N'test_demo',
+    'COLUMN', N'user_id'
+GO
+
+EXEC sp_addextendedproperty
+    'MS_Description', N'排序号',
+    'SCHEMA', N'dbo',
+    'TABLE', N'test_demo',
+    'COLUMN', N'order_num'
+GO
+
+EXEC sp_addextendedproperty
+    'MS_Description', N'key键',
+    'SCHEMA', N'dbo',
+    'TABLE', N'test_demo',
+    'COLUMN', N'test_key'
+GO
+
+EXEC sp_addextendedproperty
+    'MS_Description', N'值',
+    'SCHEMA', N'dbo',
+    'TABLE', N'test_demo',
+    'COLUMN', N'value'
+GO
+
+EXEC sp_addextendedproperty
+    'MS_Description', N'版本',
+    'SCHEMA', N'dbo',
+    'TABLE', N'test_demo',
+    'COLUMN', N'version'
+GO
+
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'创建部门' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'test_demo',
+    'COLUMN', N'create_dept'
+GO
+
+EXEC sp_addextendedproperty
+    'MS_Description', N'创建时间',
+    'SCHEMA', N'dbo',
+    'TABLE', N'test_demo',
+    'COLUMN', N'create_time'
+GO
+
+EXEC sp_addextendedproperty
+    'MS_Description', N'创建人',
+    'SCHEMA', N'dbo',
+    'TABLE', N'test_demo',
+    'COLUMN', N'create_by'
+GO
+
+EXEC sp_addextendedproperty
+    'MS_Description', N'更新时间',
+    'SCHEMA', N'dbo',
+    'TABLE', N'test_demo',
+    'COLUMN', N'update_time'
+GO
+
+EXEC sp_addextendedproperty
+    'MS_Description', N'更新人',
+    'SCHEMA', N'dbo',
+    'TABLE', N'test_demo',
+    'COLUMN', N'update_by'
+GO
+
+EXEC sp_addextendedproperty
+    'MS_Description', N'删除标志',
+    'SCHEMA', N'dbo',
+    'TABLE', N'test_demo',
+    'COLUMN', N'del_flag'
+GO
+
+EXEC sp_addextendedproperty
+    'MS_Description', N'测试单表',
+    'SCHEMA', N'dbo',
+    'TABLE', N'test_demo'
+GO
+
+CREATE TABLE test_tree
+(
+    id          bigint               NOT NULL,
+    parent_id   bigint DEFAULT ((0)) NULL,
+    dept_id     bigint               NULL,
+    user_id     bigint               NULL,
+    tree_name   nvarchar(255)        NULL,
+    version     int    DEFAULT ((0)) NULL,
+    create_dept bigint               NULL,
+    create_time datetime2(0)         NULL,
+    create_by   bigint               NULL,
+    update_time datetime2(0)         NULL,
+    update_by   bigint               NULL,
+    del_flag    int    DEFAULT ((0)) NULL,
+    CONSTRAINT PK__test_tre__3213E83FC75A1B63 PRIMARY KEY CLUSTERED (id)
+        WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON)
+        ON [PRIMARY]
+)
+ON [PRIMARY]
+GO
+
+EXEC sp_addextendedproperty
+    'MS_Description', N'主键',
+    'SCHEMA', N'dbo',
+    'TABLE', N'test_tree',
+    'COLUMN', N'id'
+GO
+
+EXEC sp_addextendedproperty
+    'MS_Description', N'父id',
+    'SCHEMA', N'dbo',
+    'TABLE', N'test_tree',
+    'COLUMN', N'parent_id'
+GO
+
+EXEC sp_addextendedproperty
+    'MS_Description', N'部门id',
+    'SCHEMA', N'dbo',
+    'TABLE', N'test_tree',
+    'COLUMN', N'dept_id'
+GO
+
+EXEC sp_addextendedproperty
+    'MS_Description', N'用户id',
+    'SCHEMA', N'dbo',
+    'TABLE', N'test_tree',
+    'COLUMN', N'user_id'
+GO
+
+EXEC sp_addextendedproperty
+    'MS_Description', N'值',
+    'SCHEMA', N'dbo',
+    'TABLE', N'test_tree',
+    'COLUMN', N'tree_name'
+GO
+
+EXEC sp_addextendedproperty
+    'MS_Description', N'版本',
+    'SCHEMA', N'dbo',
+    'TABLE', N'test_tree',
+    'COLUMN', N'version'
+GO
+
+EXEC sys.sp_addextendedproperty
+    'MS_Description', N'创建部门' ,
+    'SCHEMA', N'dbo',
+    'TABLE', N'test_tree',
+    'COLUMN', N'create_dept'
+GO
+
+EXEC sp_addextendedproperty
+    'MS_Description', N'创建时间',
+    'SCHEMA', N'dbo',
+    'TABLE', N'test_tree',
+    'COLUMN', N'create_time'
+GO
+
+EXEC sp_addextendedproperty
+    'MS_Description', N'创建人',
+    'SCHEMA', N'dbo',
+    'TABLE', N'test_tree',
+    'COLUMN', N'create_by'
+GO
+
+EXEC sp_addextendedproperty
+    'MS_Description', N'更新时间',
+    'SCHEMA', N'dbo',
+    'TABLE', N'test_tree',
+    'COLUMN', N'update_time'
+GO
+
+EXEC sp_addextendedproperty
+    'MS_Description', N'更新人',
+    'SCHEMA', N'dbo',
+    'TABLE', N'test_tree',
+    'COLUMN', N'update_by'
+GO
+
+EXEC sp_addextendedproperty
+    'MS_Description', N'删除标志',
+    'SCHEMA', N'dbo',
+    'TABLE', N'test_tree',
+    'COLUMN', N'del_flag'
+GO
+
+EXEC sp_addextendedproperty
+    'MS_Description', N'测试树表',
+    'SCHEMA', N'dbo',
+    'TABLE', N'test_tree'
+GO
+
+INSERT test_demo VALUES (1, 102, 4, 1, N'测试数据权限', N'测试', 0, 103, getdate(), 1, NULL, NULL, 0);
+GO
+INSERT test_demo VALUES (2, 102, 3, 2, N'子节点1', N'111', 0, 103, getdate(), 1, NULL, NULL, 0);
+GO
+INSERT test_demo VALUES (3, 102, 3, 3, N'子节点2', N'222', 0, 103, getdate(), 1, NULL, NULL, 0);
+GO
+INSERT test_demo VALUES (4, 108, 4, 4, N'测试数据', N'demo', 0, 103, getdate(), 1, NULL, NULL, 0);
+GO
+INSERT test_demo VALUES (5, 108, 3, 13, N'子节点11', N'1111', 0, 103, getdate(), 1, NULL, NULL, 0);
+GO
+INSERT test_demo VALUES (6, 108, 3, 12, N'子节点22', N'2222', 0, 103, getdate(), 1, NULL, NULL, 0);
+GO
+INSERT test_demo VALUES (7, 108, 3, 11, N'子节点33', N'3333', 0, 103, getdate(), 1, NULL, NULL, 0);
+GO
+INSERT test_demo VALUES (8, 108, 3, 10, N'子节点44', N'4444', 0, 103, getdate(), 1, NULL, NULL, 0);
+GO
+INSERT test_demo VALUES (9, 108, 3, 9, N'子节点55', N'5555', 0, 103, getdate(), 1, NULL, NULL, 0);
+GO
+INSERT test_demo VALUES (10, 108, 3, 8, N'子节点66', N'6666', 0, 103, getdate(), 1, NULL, NULL, 0);
+GO
+INSERT test_demo VALUES (11, 108, 3, 7, N'子节点77', N'7777', 0, 103, getdate(), 1, NULL, NULL, 0);
+GO
+INSERT test_demo VALUES (12, 108, 3, 6, N'子节点88', N'8888', 0, 103, getdate(), 1, NULL, NULL, 0);
+GO
+INSERT test_demo VALUES (13, 108, 3, 5, N'子节点99', N'9999', 0, 103, getdate(), 1, NULL, NULL, 0);
+GO
+
+INSERT test_tree VALUES (1, 0, 102, 4, N'测试数据权限', 0, 103, getdate(), 1, NULL, NULL, 0);
+GO
+INSERT test_tree VALUES (2, 1, 102, 3, N'子节点1', 0, 103, getdate(), 1, NULL, NULL, 0);
+GO
+INSERT test_tree VALUES (3, 2, 102, 3, N'子节点2', 0, 103, getdate(), 1, NULL, NULL, 0);
+GO
+INSERT test_tree VALUES (4, 0, 108, 4, N'测试树1', 0, 103, getdate(), 1, NULL, NULL, 0);
+GO
+INSERT test_tree VALUES (5, 4, 108, 3, N'子节点11', 0, 103, getdate(), 1, NULL, NULL, 0);
+GO
+INSERT test_tree VALUES (6, 4, 108, 3, N'子节点22', 0, 103, getdate(), 1, NULL, NULL, 0);
+GO
+INSERT test_tree VALUES (7, 4, 108, 3, N'子节点33', 0, 103, getdate(), 1, NULL, NULL, 0);
+GO
+INSERT test_tree VALUES (8, 5, 108, 3, N'子节点44', 0, 103, getdate(), 1, NULL, NULL, 0);
+GO
+INSERT test_tree VALUES (9, 6, 108, 3, N'子节点55', 0, 103, getdate(), 1, NULL, NULL, 0);
+GO
+INSERT test_tree VALUES (10, 7, 108, 3, N'子节点66', 0, 103, getdate(), 1, NULL, NULL, 0);
+GO
+INSERT test_tree VALUES (11, 7, 108, 3, N'子节点77', 0, 103, getdate(), 1, NULL, NULL, 0);
+GO
+INSERT test_tree VALUES (12, 10, 108, 3, N'子节点88', 0, 103, getdate(), 1, NULL, NULL, 0);
+GO
+INSERT test_tree VALUES (13, 10, 108, 3, N'子节点99', 0, 103, getdate(), 1, NULL, NULL, 0);
+GO
diff --git a/script/sql/sqlserver/sqlserver_ry_workflow.sql b/script/sql/sqlserver/sqlserver_ry_workflow.sql
new file mode 100644
index 0000000..6d63701
--- /dev/null
+++ b/script/sql/sqlserver/sqlserver_ry_workflow.sql
@@ -0,0 +1,1354 @@
+-- ----------------------------
+-- 0、warm-flow-all.sql，地址：https://gitee.com/dromara/warm-flow/blob/master/sql/sqlserver/sqlserver.sql
+-- ----------------------------
+CREATE TABLE flow_definition (
+    id bigint NOT NULL,
+    flow_code nvarchar(40) NOT NULL,
+    flow_name nvarchar(100) NOT NULL,
+    category nvarchar(100) NULL,
+    version nvarchar(20) NOT NULL,
+    is_publish tinyint DEFAULT('0') NULL,
+    form_custom nchar(1) DEFAULT('N') NULL,
+    form_path nvarchar(100) NULL,
+    activity_status tinyint DEFAULT('1') NULL,
+    listener_type nvarchar(100) NULL,
+    listener_path nvarchar(400) NULL,
+    ext nvarchar(500) NULL,
+    create_time datetime2(7)  NULL,
+    update_time datetime2(7)  NULL,
+    del_flag nchar(1) DEFAULT('0') NULL,
+    tenant_id nvarchar(40) NULL,
+    CONSTRAINT PK__flow_def__3213E83FEE39AE33 PRIMARY KEY CLUSTERED (id)
+    WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON)
+    ON [PRIMARY]
+)
+ON [PRIMARY]
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'主键id',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_definition',
+'COLUMN', N'id'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'流程编码',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_definition',
+'COLUMN', N'flow_code'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'流程名称',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_definition',
+'COLUMN', N'flow_name'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'流程类别',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_definition',
+'COLUMN', N'category'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'流程版本',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_definition',
+'COLUMN', N'version'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'是否发布（0未发布 1已发布 9失效）',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_definition',
+'COLUMN', N'is_publish'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'审批表单是否自定义（Y是 N否）',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_definition',
+'COLUMN', N'form_custom'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'审批表单路径',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_definition',
+'COLUMN', N'form_path'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'流程激活状态（0挂起 1激活）',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_definition',
+'COLUMN', N'activity_status'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'监听器类型',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_definition',
+'COLUMN', N'listener_type'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'监听器路径',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_definition',
+'COLUMN', N'listener_path'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'业务详情 存业务表对象json字符串',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_definition',
+'COLUMN', N'ext'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'创建时间',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_definition',
+'COLUMN', N'create_time'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'更新时间',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_definition',
+'COLUMN', N'update_time'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'删除标志',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_definition',
+'COLUMN', N'del_flag'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'租户id',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_definition',
+'COLUMN', N'tenant_id'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'流程定义表',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_definition'
+GO
+
+CREATE TABLE flow_node (
+    id bigint NOT NULL,
+    node_type tinyint NOT NULL,
+    definition_id bigint NOT NULL,
+    node_code nvarchar(100) NOT NULL,
+    node_name nvarchar(100) NULL,
+    permission_flag nvarchar(200) NULL,
+    node_ratio decimal(6,3)  NULL,
+    coordinate nvarchar(100) NULL,
+    any_node_skip nvarchar(100) NULL,
+    listener_type nvarchar(100) NULL,
+    listener_path nvarchar(400) NULL,
+    handler_type nvarchar(100) NULL,
+    handler_path nvarchar(400) NULL,
+    form_custom nchar(1) DEFAULT('N') NULL,
+    form_path nvarchar(100) NULL,
+    version nvarchar(20) NOT NULL,
+    create_time datetime2(7)  NULL,
+    update_time datetime2(7)  NULL,
+    ext nvarchar(max) NULL,
+    del_flag nchar(1) DEFAULT('0') NULL,
+    tenant_id nvarchar(40) NULL,
+    CONSTRAINT PK__flow_nod__3213E83F372470DE PRIMARY KEY CLUSTERED (id)
+    WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON)
+    ON [PRIMARY]
+)
+ON [PRIMARY]
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'主键id',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_node',
+'COLUMN', N'id'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'节点类型（0开始节点 1中间节点 2结束节点 3互斥网关 4并行网关）',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_node',
+'COLUMN', N'node_type'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'流程定义id',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_node',
+'COLUMN', N'definition_id'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'流程节点编码',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_node',
+'COLUMN', N'node_code'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'流程节点名称',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_node',
+'COLUMN', N'node_name'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'权限标识（权限类型:权限标识，可以多个，用@@隔开)',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_node',
+'COLUMN', N'permission_flag'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'流程签署比例值',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_node',
+'COLUMN', N'node_ratio'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'坐标',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_node',
+'COLUMN', N'coordinate'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'任意结点跳转',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_node',
+'COLUMN', N'any_node_skip'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'监听器类型',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_node',
+'COLUMN', N'listener_type'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'监听器路径',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_node',
+'COLUMN', N'listener_path'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'处理器类型',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_node',
+'COLUMN', N'handler_type'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'处理器路径',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_node',
+'COLUMN', N'handler_path'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'审批表单是否自定义（Y是 N否）',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_node',
+'COLUMN', N'form_custom'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'审批表单路径',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_node',
+'COLUMN', N'form_path'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'版本',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_node',
+'COLUMN', N'version'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'创建时间',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_node',
+'COLUMN', N'create_time'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'更新时间',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_node',
+'COLUMN', N'update_time'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'节点扩展属性',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_node',
+'COLUMN', N'ext'
+GO
+
+
+EXEC sp_addextendedproperty
+'MS_Description', N'删除标志',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_node',
+'COLUMN', N'del_flag'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'租户id',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_node',
+'COLUMN', N'tenant_id'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'流程节点表',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_node'
+GO
+
+CREATE TABLE flow_skip (
+    id bigint NOT NULL,
+    definition_id bigint NOT NULL,
+    now_node_code nvarchar(100) NOT NULL,
+    now_node_type tinyint  NULL,
+    next_node_code nvarchar(100) NOT NULL,
+    next_node_type tinyint  NULL,
+    skip_name nvarchar(100) NULL,
+    skip_type nvarchar(40) NULL,
+    skip_condition nvarchar(200) NULL,
+    coordinate nvarchar(100) NULL,
+    create_time datetime2(7)  NULL,
+    update_time datetime2(7)  NULL,
+    del_flag nchar(1) DEFAULT('0') NULL,
+    tenant_id nvarchar(40) NULL,
+    CONSTRAINT PK__flow_ski__3213E83F073FEE6E PRIMARY KEY CLUSTERED (id)
+    WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON)
+    ON [PRIMARY]
+)
+ON [PRIMARY]
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'主键id',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_skip',
+'COLUMN', N'id'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'流程定义id',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_skip',
+'COLUMN', N'definition_id'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'当前流程节点的编码',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_skip',
+'COLUMN', N'now_node_code'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'当前节点类型（0开始节点 1中间节点 2结束节点 3互斥网关 4并行网关）',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_skip',
+'COLUMN', N'now_node_type'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'下一个流程节点的编码',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_skip',
+'COLUMN', N'next_node_code'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'下一个节点类型（0开始节点 1中间节点 2结束节点 3互斥网关 4并行网关）',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_skip',
+'COLUMN', N'next_node_type'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'跳转名称',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_skip',
+'COLUMN', N'skip_name'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'跳转类型（PASS审批通过 REJECT退回）',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_skip',
+'COLUMN', N'skip_type'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'跳转条件',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_skip',
+'COLUMN', N'skip_condition'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'坐标',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_skip',
+'COLUMN', N'coordinate'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'创建时间',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_skip',
+'COLUMN', N'create_time'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'更新时间',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_skip',
+'COLUMN', N'update_time'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'删除标志',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_skip',
+'COLUMN', N'del_flag'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'租户id',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_skip',
+'COLUMN', N'tenant_id'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'节点跳转关联表',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_skip'
+GO
+
+CREATE TABLE flow_instance (
+    id bigint NOT NULL,
+    definition_id bigint NOT NULL,
+    business_id nvarchar(40) NOT NULL,
+    node_type tinyint NOT NULL,
+    node_code nvarchar(40) NOT NULL,
+    node_name nvarchar(100) NULL,
+    variable nvarchar(max) NULL,
+    flow_status nvarchar(20) NOT NULL,
+    activity_status tinyint DEFAULT('1') NULL,
+    def_json nvarchar(max) NULL,
+    create_by nvarchar(64) NULL,
+    create_time datetime2(7)  NULL,
+    update_time datetime2(7)  NULL,
+    ext nvarchar(500) NULL,
+    del_flag nchar(1) DEFAULT('0') NULL,
+    tenant_id nvarchar(40) NULL,
+    CONSTRAINT PK__flow_ins__3213E83F5190FEE1 PRIMARY KEY CLUSTERED (id)
+    WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON)
+    ON [PRIMARY]
+)
+ON [PRIMARY]
+TEXTIMAGE_ON [PRIMARY]
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'主键id',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_instance',
+'COLUMN', N'id'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'对应flow_definition表的id',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_instance',
+'COLUMN', N'definition_id'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'业务id',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_instance',
+'COLUMN', N'business_id'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'节点类型（0开始节点 1中间节点 2结束节点 3互斥网关 4并行网关）',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_instance',
+'COLUMN', N'node_type'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'流程节点编码',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_instance',
+'COLUMN', N'node_code'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'流程节点名称',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_instance',
+'COLUMN', N'node_name'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'任务变量',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_instance',
+'COLUMN', N'variable'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'流程状态（0待提交 1审批中 2审批通过 4终止 5作废 6撤销 8已完成 9已退回 10失效 11拿回）',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_instance',
+'COLUMN', N'flow_status'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'流程激活状态（0挂起 1激活）',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_instance',
+'COLUMN', N'activity_status'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'流程定义json',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_instance',
+'COLUMN', N'def_json'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'创建者',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_instance',
+'COLUMN', N'create_by'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'创建时间',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_instance',
+'COLUMN', N'create_time'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'更新时间',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_instance',
+'COLUMN', N'update_time'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'扩展字段，预留给业务系统使用',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_instance',
+'COLUMN', N'ext'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'删除标志',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_instance',
+'COLUMN', N'del_flag'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'租户id',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_instance',
+'COLUMN', N'tenant_id'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'流程实例表',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_instance'
+GO
+
+CREATE TABLE flow_task (
+    id bigint NOT NULL,
+    definition_id bigint NOT NULL,
+    instance_id bigint NOT NULL,
+    node_code nvarchar(100) NOT NULL,
+    node_name nvarchar(100) NULL,
+    node_type tinyint NOT NULL,
+    flow_status nvarchar(20) NOT NULL,
+    form_custom nchar(1) DEFAULT('N') NULL,
+    form_path nvarchar(100) NULL,
+    create_time datetime2(7)  NULL,
+    update_time datetime2(7)  NULL,
+    del_flag nchar(1) DEFAULT('0') NULL,
+    tenant_id nvarchar(40) NULL,
+    CONSTRAINT PK__flow_tas__3213E83F5AE1F1BA PRIMARY KEY CLUSTERED (id)
+    WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON)
+    ON [PRIMARY]
+)
+ON [PRIMARY]
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'主键id',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_task',
+'COLUMN', N'id'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'对应flow_definition表的id',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_task',
+'COLUMN', N'definition_id'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'对应flow_instance表的id',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_task',
+'COLUMN', N'instance_id'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'节点编码',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_task',
+'COLUMN', N'node_code'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'节点名称',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_task',
+'COLUMN', N'node_name'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'节点类型（0开始节点 1中间节点 2结束节点 3互斥网关 4并行网关）',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_task',
+'COLUMN', N'node_type'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'流程状态（0待提交 1审批中 2审批通过 4终止 5作废 6撤销 8已完成 9已退回 10失效 11拿回）',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_task',
+'COLUMN', N'flow_status'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'审批表单是否自定义（Y是 N否）',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_task',
+'COLUMN', N'form_custom'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'审批表单路径',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_task',
+'COLUMN', N'form_path'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'创建时间',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_task',
+'COLUMN', N'create_time'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'更新时间',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_task',
+'COLUMN', N'update_time'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'删除标志',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_task',
+'COLUMN', N'del_flag'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'租户id',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_task',
+'COLUMN', N'tenant_id'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'待办任务表',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_task'
+GO
+
+CREATE TABLE flow_his_task (
+    id bigint NOT NULL,
+    definition_id bigint NOT NULL,
+    instance_id bigint NOT NULL,
+    task_id bigint NOT NULL,
+    node_code nvarchar(200) NULL,
+    node_name nvarchar(200) NULL,
+    node_type tinyint  NULL,
+    target_node_code nvarchar(100) NULL,
+    target_node_name nvarchar(100) NULL,
+    approver nvarchar(40) NULL,
+    cooperate_type tinyint DEFAULT('0') NULL,
+    collaborator nvarchar(40) NULL,
+    skip_type nvarchar(10) NOT NULL,
+    flow_status nvarchar(20) NOT NULL,
+    form_custom nchar(1) DEFAULT('N') NULL,
+    form_path nvarchar(100) NULL,
+    message nvarchar(500) NULL,
+    variable nvarchar(max) NULL,
+    ext nvarchar(max) NULL,
+    create_time datetime2(7)  NULL,
+    update_time datetime2(7)  NULL,
+    del_flag nchar(1) DEFAULT('0') NULL,
+    tenant_id nvarchar(40) NULL,
+    CONSTRAINT PK__flow_his__3213E83F67951564 PRIMARY KEY CLUSTERED (id)
+    WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON)
+    ON [PRIMARY]
+)
+ON [PRIMARY]
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'主键id',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_his_task',
+'COLUMN', N'id'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'对应flow_definition表的id',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_his_task',
+'COLUMN', N'definition_id'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'对应flow_instance表的id',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_his_task',
+'COLUMN', N'instance_id'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'对应flow_task表的id',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_his_task',
+'COLUMN', N'task_id'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'开始节点编码',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_his_task',
+'COLUMN', N'node_code'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'开始节点名称',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_his_task',
+'COLUMN', N'node_name'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'开始节点类型（0开始节点 1中间节点 2结束节点 3互斥网关 4并行网关）',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_his_task',
+'COLUMN', N'node_type'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'目标节点编码',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_his_task',
+'COLUMN', N'target_node_code'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'结束节点名称',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_his_task',
+'COLUMN', N'target_node_name'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'审批者',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_his_task',
+'COLUMN', N'approver'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'协作方式(1审批 2转办 3委派 4会签 5票签 6加签 7减签)',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_his_task',
+'COLUMN', N'cooperate_type'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'协作人',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_his_task',
+'COLUMN', N'collaborator'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'流转类型（PASS通过 REJECT退回 NONE无动作）',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_his_task',
+'COLUMN', N'skip_type'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'流程状态（0待提交 1审批中 2审批通过 4终止 5作废 6撤销 8已完成 9已退回 10失效 11拿回）',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_his_task',
+'COLUMN', N'flow_status'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'审批表单是否自定义（Y是 N否）',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_his_task',
+'COLUMN', N'form_custom'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'审批表单路径',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_his_task',
+'COLUMN', N'form_path'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'审批意见',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_his_task',
+'COLUMN', N'message'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'任务变量',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_his_task',
+'COLUMN', N'variable'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'业务详情 存业务表对象json字符串',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_his_task',
+'COLUMN', N'ext'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'任务开始时间',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_his_task',
+'COLUMN', N'create_time'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'审批完成时间',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_his_task',
+'COLUMN', N'update_time'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'删除标志',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_his_task',
+'COLUMN', N'del_flag'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'租户id',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_his_task',
+'COLUMN', N'tenant_id'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'历史任务记录表',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_his_task'
+GO
+
+CREATE TABLE flow_user (
+    id bigint NOT NULL,
+    type nchar(1) NOT NULL,
+    processed_by nvarchar(80) NULL,
+    associated bigint NOT NULL,
+    create_time datetime2(7)  NULL,
+    create_by nvarchar(80) NULL,
+    update_time datetime2(7)  NULL,
+    del_flag nchar(1) DEFAULT('0') NULL,
+    tenant_id nvarchar(40) NULL,
+    CONSTRAINT PK__flow_use__3213E83FFA38CA8B PRIMARY KEY CLUSTERED (id)
+    WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON)
+    ON [PRIMARY]
+)
+ON [PRIMARY]
+GO
+
+CREATE NONCLUSTERED INDEX user_processed_type ON flow_user (processed_by ASC, type ASC)
+GO
+CREATE NONCLUSTERED INDEX user_associated_idx ON flow_user (associated ASC)
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'主键id',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_user',
+'COLUMN', N'id'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'人员类型（1待办任务的审批人权限 2待办任务的转办人权限 3待办任务的委托人权限）',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_user',
+'COLUMN', N'type'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'权限人',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_user',
+'COLUMN', N'processed_by'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'任务表id',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_user',
+'COLUMN', N'associated'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'创建时间',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_user',
+'COLUMN', N'create_time'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'创建人',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_user',
+'COLUMN', N'create_by'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'更新时间',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_user',
+'COLUMN', N'update_time'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'删除标志',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_user',
+'COLUMN', N'del_flag'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'租户id',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_user',
+'COLUMN', N'tenant_id'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'流程用户表',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_user'
+GO
+
+CREATE TABLE flow_category (
+    category_id bigint NOT NULL,
+    tenant_id nvarchar(20) DEFAULT('000000') NULL,
+    parent_id bigint  DEFAULT(0) NULL,
+    ancestors nvarchar(500) DEFAULT('') NULL,
+    category_name nvarchar(30) NOT NULL,
+    order_num int  DEFAULT(0) NULL,
+    del_flag nchar(1) DEFAULT('0') NULL,
+    create_dept bigint  NULL,
+    create_by bigint  NULL,
+    create_time datetime2(7)  NULL,
+    update_by bigint  NULL,
+    update_time datetime2(7)  NULL,
+    CONSTRAINT PK__flow_cat__D54EE9B4AE98B9C1 PRIMARY KEY CLUSTERED (category_id)
+    WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON)
+    ON [PRIMARY]
+)
+ON [PRIMARY]
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'流程分类ID',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_category',
+'COLUMN', N'category_id'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'租户编号',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_category',
+'COLUMN', N'tenant_id'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'父流程分类id',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_category',
+'COLUMN', N'parent_id'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'祖级列表',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_category',
+'COLUMN', N'ancestors'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'流程分类名称',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_category',
+'COLUMN', N'category_name'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'显示顺序',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_category',
+'COLUMN', N'order_num'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'删除标志（0代表存在 1代表删除）',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_category',
+'COLUMN', N'del_flag'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'创建部门',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_category',
+'COLUMN', N'create_dept'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'创建者',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_category',
+'COLUMN', N'create_by'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'创建时间',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_category',
+'COLUMN', N'create_time'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'更新者',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_category',
+'COLUMN', N'update_by'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'更新时间',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_category',
+'COLUMN', N'update_time'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'流程分类',
+'SCHEMA', N'dbo',
+'TABLE', N'flow_category'
+GO
+
+INSERT flow_category VALUES (100, N'000000', 0, N'0', N'OA审批', 0, N'0', 103, 1, getdate(), NULL, NULL);
+GO
+INSERT flow_category VALUES (101, N'000000', 100, N'0,100', N'假勤管理', 0, N'0', 103, 1, getdate(), NULL, NULL);
+GO
+INSERT flow_category VALUES (102, N'000000', 100, N'0,100', N'人事管理', 1, N'0', 103, 1, getdate(), NULL, NULL);
+GO
+INSERT flow_category VALUES (103, N'000000', 101, N'0,100,101', N'请假', 0, N'0', 103, 1, getdate(), NULL, NULL);
+GO
+INSERT flow_category VALUES (104, N'000000', 101, N'0,100,101', N'出差', 1, N'0', 103, 1, getdate(), NULL, NULL);
+GO
+INSERT flow_category VALUES (105, N'000000', 101, N'0,100,101', N'加班', 2, N'0', 103, 1, getdate(), NULL, NULL);
+GO
+INSERT flow_category VALUES (106, N'000000', 101, N'0,100,101', N'换班', 3, N'0', 103, 1, getdate(), NULL, NULL);
+GO
+INSERT flow_category VALUES (107, N'000000', 101, N'0,100,101', N'外出', 4, N'0', 103, 1, getdate(), NULL, NULL);
+GO
+INSERT flow_category VALUES (108, N'000000', 102, N'0,100,102', N'转正', 1, N'0', 103, 1, getdate(), NULL, NULL);
+GO
+INSERT flow_category VALUES (109, N'000000', 102, N'0,100,102', N'离职', 2, N'0', 103, 1, getdate(), NULL, NULL);
+GO
+
+CREATE TABLE test_leave (
+    id bigint NOT NULL,
+    tenant_id nvarchar(20) DEFAULT('000000') NULL,
+    leave_type nvarchar(255) NOT NULL,
+    start_date datetime2(7) NOT NULL,
+    end_date datetime2(7) NOT NULL,
+    leave_days int NOT NULL,
+    remark nvarchar(255) NULL,
+    status nvarchar(255) NULL,
+    create_dept bigint  NULL,
+    create_by bigint  NULL,
+    create_time datetime2(7)  NULL,
+    update_by bigint  NULL,
+    update_time datetime2(7)  NULL,
+    CONSTRAINT PK__test_lea__3213E83F348788FA PRIMARY KEY CLUSTERED (id)
+    WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON)
+    ON [PRIMARY]
+)
+ON [PRIMARY]
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'id',
+'SCHEMA', N'dbo',
+'TABLE', N'test_leave',
+'COLUMN', N'id'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'租户编号',
+'SCHEMA', N'dbo',
+'TABLE', N'test_leave',
+'COLUMN', N'tenant_id'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'请假类型',
+'SCHEMA', N'dbo',
+'TABLE', N'test_leave',
+'COLUMN', N'leave_type'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'开始时间',
+'SCHEMA', N'dbo',
+'TABLE', N'test_leave',
+'COLUMN', N'start_date'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'结束时间',
+'SCHEMA', N'dbo',
+'TABLE', N'test_leave',
+'COLUMN', N'end_date'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'请假天数',
+'SCHEMA', N'dbo',
+'TABLE', N'test_leave',
+'COLUMN', N'leave_days'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'请假原因',
+'SCHEMA', N'dbo',
+'TABLE', N'test_leave',
+'COLUMN', N'remark'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'状态',
+'SCHEMA', N'dbo',
+'TABLE', N'test_leave',
+'COLUMN', N'status'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'创建部门',
+'SCHEMA', N'dbo',
+'TABLE', N'test_leave',
+'COLUMN', N'create_dept'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'创建者',
+'SCHEMA', N'dbo',
+'TABLE', N'test_leave',
+'COLUMN', N'create_by'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'创建时间',
+'SCHEMA', N'dbo',
+'TABLE', N'test_leave',
+'COLUMN', N'create_time'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'更新者',
+'SCHEMA', N'dbo',
+'TABLE', N'test_leave',
+'COLUMN', N'update_by'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'更新时间',
+'SCHEMA', N'dbo',
+'TABLE', N'test_leave',
+'COLUMN', N'update_time'
+GO
+
+EXEC sp_addextendedproperty
+'MS_Description', N'请假申请表',
+'SCHEMA', N'dbo',
+'TABLE', N'test_leave'
+GO
+
+INSERT sys_menu VALUES (11616, N'工作流', 0, 6, N'workflow', NULL, N'', 1, 0, N'M', N'0', N'0', N'', N'workflow', 103, 1, GETDATE(), NULL, NULL, N'');
+GO
+INSERT sys_menu VALUES (11618, N'我的任务', 0, 7, N'task', NULL, N'', 1, 0, N'M', N'0', N'0', N'', N'my-task', 103, 1, GETDATE(), NULL, NULL, N'');
+GO
+INSERT sys_menu VALUES (11619, N'我的待办', 11618, 2, N'taskWaiting', N'workflow/task/taskWaiting', N'', 1, 1, N'C', N'0', N'0', N'', N'waiting', 103, 1, GETDATE(), NULL, NULL, N'');
+GO
+INSERT sys_menu VALUES (11632, N'我的已办', 11618, 3, N'taskFinish', N'workflow/task/taskFinish', N'', 1, 1, N'C', N'0', N'0', N'', N'finish', 103, 1, GETDATE(), NULL, NULL, N'');
+GO
+INSERT sys_menu VALUES (11633, N'我的抄送', 11618, 4, N'taskCopyList', N'workflow/task/taskCopyList', N'', 1, 1, N'C', N'0', N'0', N'', N'my-copy', 103, 1, GETDATE(), NULL, NULL, N'');
+GO
+INSERT sys_menu VALUES (11620, N'流程定义', 11616, 3, N'processDefinition', N'workflow/processDefinition/index', N'', 1, 1, N'C', N'0', N'0', N'', N'process-definition', 103, 1, GETDATE(), NULL, NULL, N'');
+GO
+INSERT sys_menu VALUES (11621, N'流程实例', 11630, 1, N'processInstance', N'workflow/processInstance/index', N'', 1, 1, N'C', N'0', N'0', N'', N'tree-table', 103, 1, GETDATE(), NULL, NULL, N'');
+GO
+INSERT sys_menu VALUES (11622, N'流程分类', 11616, 1, N'category', N'workflow/category/index', N'', 1, 0, N'C', N'0', N'0', N'workflow:category:list', N'category', 103, 1, GETDATE(), NULL, NULL, N'');
+GO
+INSERT sys_menu VALUES (11629, N'我发起的', 11618, 1, N'myDocument', N'workflow/task/myDocument', N'', 1, 1, N'C', N'0', N'0', N'', N'guide', 103, 1, GETDATE(), NULL, NULL, N'');
+GO
+INSERT sys_menu VALUES (11630, N'流程监控', 11616, 4, N'monitor', NULL, N'', 1, 0, N'M', N'0', N'0', N'', N'monitor', 103, 1, GETDATE(), NULL, NULL, N'');
+GO
+INSERT sys_menu VALUES (11631, N'待办任务', 11630, 2, N'allTaskWaiting', N'workflow/task/allTaskWaiting', N'', 1, 1, N'C', N'0', N'0', N'', N'waiting', 103, 1, GETDATE(), NULL, NULL, N'');
+GO
+INSERT sys_menu VALUES (11700, N'流程设计', 11616, 5, N'design/index',   N'workflow/processDefinition/design', N'', 1, 1, N'C', N'1', N'0', N'workflow:leave:edit', N'#', 103, 1, GETDATE(), NULL, NULL, N'');
+GO
+INSERT sys_menu VALUES (11701, N'请假申请', 11616, 6, N'leaveEdit/index', N'workflow/leave/leaveEdit', N'', 1, 1, N'C', N'1', N'0', N'workflow:leave:edit', N'#', 103, 1, GETDATE(), NULL, NULL, N'');
+GO
+
+-- 流程分类管理相关按钮
+INSERT sys_menu VALUES (11623, N'流程分类查询', 11622, 1, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'workflow:category:query', N'#', 103, 1, GETDATE(), NULL, NULL, N'');
+GO
+INSERT sys_menu VALUES (11624, N'流程分类新增', 11622, 2, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'workflow:category:add', N'#', 103, 1, GETDATE(), NULL, NULL, N'');
+GO
+INSERT sys_menu VALUES (11625, N'流程分类修改', 11622, 3, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'workflow:category:edit', N'#', 103, 1, GETDATE(), NULL, NULL, N'');
+GO
+INSERT sys_menu VALUES (11626, N'流程分类删除', 11622, 4, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'workflow:category:remove', N'#', 103, 1, GETDATE(), NULL, NULL, N'');
+GO
+INSERT sys_menu VALUES (11627, N'流程分类导出', 11622, 5, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'workflow:category:export', N'#', 103, 1, GETDATE(), NULL, NULL, N'');
+GO
+
+-- 请假测试相关按钮
+INSERT sys_menu VALUES (11638, N'请假申请', 5, 1, N'leave', N'workflow/leave/index', N'', 1, 0, N'C', N'0', N'0', N'workflow:leave:list', N'#', 103, 1, GETDATE(), NULL, NULL, N'请假申请菜单');
+GO
+INSERT sys_menu VALUES (11639, N'请假申请查询', 11638, 1, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'workflow:leave:query', N'#', 103, 1, GETDATE(), NULL, NULL, N'');
+GO
+INSERT sys_menu VALUES (11640, N'请假申请新增', 11638, 2, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'workflow:leave:add', N'#', 103, 1, GETDATE(), NULL, NULL, N'');
+GO
+INSERT sys_menu VALUES (11641, N'请假申请修改', 11638, 3, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'workflow:leave:edit', N'#', 103, 1, GETDATE(), NULL, NULL, N'');
+GO
+INSERT sys_menu VALUES (11642, N'请假申请删除', 11638, 4, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'workflow:leave:remove', N'#', 103, 1, GETDATE(), NULL, NULL, N'');
+GO
+INSERT sys_menu VALUES (11643, N'请假申请导出', 11638, 5, N'#', N'', N'', 1, 0, N'F', N'0', N'0', N'workflow:leave:export', N'#', 103, 1, GETDATE(), NULL, NULL, N'');
+
+INSERT sys_dict_type VALUES (13, N'000000', N'业务状态', N'wf_business_status', 103, 1, GETDATE(), NULL, NULL, N'业务状态列表');
+GO
+INSERT sys_dict_type VALUES (14, N'000000', N'表单类型', N'wf_form_type', 103, 1, GETDATE(), NULL, NULL, N'表单类型列表');
+GO
+INSERT sys_dict_type VALUES (15, N'000000', N'任务状态', N'wf_task_status', 103, 1, GETDATE(), NULL, NULL, N'任务状态');
+GO
+
+INSERT sys_dict_data VALUES (39, N'000000', 1, N'已撤销', N'cancel', N'wf_business_status', N'', N'danger', N'N', 103, 1, GETDATE(), NULL, NULL, N'已撤销');
+GO
+INSERT sys_dict_data VALUES (40, N'000000', 2, N'草稿', N'draft', N'wf_business_status', N'', N'info', N'N', 103, 1, GETDATE(), NULL, NULL, N'草稿');
+GO
+INSERT sys_dict_data VALUES (41, N'000000', 3, N'待审核', N'waiting', N'wf_business_status', N'', N'primary', N'N', 103, 1, GETDATE(), NULL, NULL, N'待审核');
+GO
+INSERT sys_dict_data VALUES (42, N'000000', 4, N'已完成', N'finish', N'wf_business_status', N'', N'success', N'N', 103, 1, GETDATE(), NULL, NULL, N'已完成');
+GO
+INSERT sys_dict_data VALUES (43, N'000000', 5, N'已作废', N'invalid', N'wf_business_status', N'', N'danger', N'N', 103, 1, GETDATE(), NULL, NULL, N'已作废');
+GO
+INSERT sys_dict_data VALUES (44, N'000000', 6, N'已退回', N'back', N'wf_business_status', N'', N'danger', N'N', 103, 1, GETDATE(), NULL, NULL, N'已退回');
+GO
+INSERT sys_dict_data VALUES (45, N'000000', 7, N'已终止', N'termination', N'wf_business_status', N'', N'danger', N'N', 103, 1, GETDATE(), NULL, NULL, N'已终止');
+GO
+INSERT sys_dict_data VALUES (46, N'000000', 1, N'自定义表单', N'static', N'wf_form_type', N'', N'success', N'N', 103, 1, GETDATE(), NULL, NULL, N'自定义表单');
+GO
+INSERT sys_dict_data VALUES (47, N'000000', 2, N'动态表单', N'dynamic', N'wf_form_type', N'', N'primary', N'N', 103, 1, GETDATE(), NULL, NULL, N'动态表单');
+GO
+INSERT sys_dict_data VALUES (48, N'000000', 1, N'撤销', N'cancel', N'wf_task_status', N'', N'danger', N'N', 103, 1, GETDATE(), NULL, NULL, N'撤销');
+GO
+INSERT sys_dict_data VALUES (49, N'000000', 2, N'通过', N'pass', N'wf_task_status', N'', N'success', N'N', 103, 1, GETDATE(), NULL, NULL, N'通过');
+GO
+INSERT sys_dict_data VALUES (50, N'000000', 3, N'待审核', N'waiting', N'wf_task_status', N'', N'primary', N'N', 103, 1, GETDATE(), NULL, NULL, N'待审核');
+GO
+INSERT sys_dict_data VALUES (51, N'000000', 4, N'作废', N'invalid', N'wf_task_status', N'', N'danger', N'N', 103, 1, GETDATE(), NULL, NULL, N'作废');
+GO
+INSERT sys_dict_data VALUES (52, N'000000', 5, N'退回', N'back', N'wf_task_status', N'', N'danger', N'N', 103, 1, GETDATE(), NULL, NULL, N'退回');
+GO
+INSERT sys_dict_data VALUES (53, N'000000', 6, N'终止', N'termination', N'wf_task_status', N'', N'danger', N'N', 103, 1, GETDATE(), NULL, NULL, N'终止');
+GO
+INSERT sys_dict_data VALUES (54, N'000000', 7, N'转办', N'transfer', N'wf_task_status', N'', N'primary', N'N', 103, 1, GETDATE(), NULL, NULL, N'转办');
+GO
+INSERT sys_dict_data VALUES (55, N'000000', 8, N'委托', N'depute', N'wf_task_status', N'', N'primary', N'N', 103, 1, GETDATE(), NULL, NULL, N'委托');
+GO
+INSERT sys_dict_data VALUES (56, N'000000', 9, N'抄送', N'copy', N'wf_task_status', N'', N'primary', N'N', 103, 1, GETDATE(), NULL, NULL, N'抄送');
+GO
+INSERT sys_dict_data VALUES (57, N'000000', 10, N'加签', N'sign', N'wf_task_status', N'', N'primary', N'N', 103, 1, GETDATE(), NULL, NULL, N'加签');
+GO
+INSERT sys_dict_data VALUES (58, N'000000', 11, N'减签', N'sign_off', N'wf_task_status', N'', N'danger', N'N', 103, 1, GETDATE(), NULL, NULL, N'减签');
+GO
+INSERT sys_dict_data VALUES (59, N'000000', 11, N'超时', N'timeout', N'wf_task_status', N'', N'danger', N'N', 103, 1, GETDATE(), NULL, NULL, N'超时');
+GO